[ios, macos] style and styleURL depend on one another

mapbox · Aug 20, 2016 · 6f19b2f · 6f19b2f
1 parent 7834552
commit 6f19b2f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
@@ -327,9 +327,13 @@ - (instancetype)initWithCoder:(nonnull NSCoder *)decoder
     return self;
 }
 
++ (NS_SET_OF(NSString *) *)keyPathsForValuesAffectingStyle {
+    return [NSSet setWithObject:@"styleURL"];
+}
+
 + (NS_SET_OF(NSString *) *)keyPathsForValuesAffectingStyleURL
 {
-    return [NSSet setWithObjects:@"styleURL__", nil];
+    return [NSSet setWithObjects:@"styleURL__", @"style", nil];
 }
 
 - (nonnull NSURL *)styleURL

diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm
@@ -522,6 +522,14 @@ - (void)setDelegate:(id<MGLMapViewDelegate>)delegate {
 
 #pragma mark Style
 
++ (NS_SET_OF(NSString *) *)keyPathsForValuesAffectingStyle {
+    return [NSSet setWithObject:@"styleURL"];
+}
+
++ (NS_SET_OF(NSString *) *)keyPathsForValuesAffectingStyleURL {
+    return [NSSet setWithObject:@"style"];
+}
+
 - (nonnull NSURL *)styleURL {
     NSString *styleURLString = @(_mbglMap->getStyleURL().c_str()).mgl_stringOrNilIfEmpty;
     return styleURLString ? [NSURL URLWithString:styleURLString] : [MGLStyle streetsStyleURLWithVersion:MGLStyleDefaultVersion];