Throw on invalid URL in style URL inspectable

1ec5 · 1ec5 · commit 96dcb923a078 · 2015-10-16T12:42:45.000-07:00
If the user enters an invalid URL into the “Style URL” inspectable, throw an error instead of silently setting the style to the default. This check is not required in -setStyleURL:, which takes a real NSURL.
diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm
@@ -3299,7 +3299,13 @@ - (nullable NSString *)styleURL__
 
 - (void)setStyleURL__:(nullable NSString *)URLString
 {
-    self.styleURL = URLString ? [NSURL URLWithString:URLString] : nil;
+    NSURL *url = URLString.length ? [NSURL URLWithString:URLString] : nil;
+    if (URLString.length && !url)
+    {
+        [NSException raise:@"Invalid style URL" format:
+         @"“%@” is not a valid style URL.", URLString];
+    }
+    self.styleURL = url;
 }
 
 + (NS_SET_OF(NSString *) *)keyPathsForValuesAffectingLatitude

Original file line number	Diff line number	Diff line change
`@@ -3299,7 +3299,13 @@ - (nullable NSString *)styleURL__`
`3299`	`3299`
`3300`	`3300`	`- (void)setStyleURL__:(nullable NSString *)URLString`
`3301`	`3301`	`{`
`3302`		`- self.styleURL = URLString ? [NSURL URLWithString:URLString] : nil;`
	`3302`	`+ NSURL *url = URLString.length ? [NSURL URLWithString:URLString] : nil;`
	`3303`	`+ if (URLString.length && !url)`
	`3304`	`+ {`
	`3305`	`+ [NSException raise:@"Invalid style URL" format:`
	`3306`	`+ @"“%@” is not a valid style URL.", URLString];`
	`3307`	`+ }`
	`3308`	`+ self.styleURL = url;`
`3303`	`3309`	`}`
`3304`	`3310`
`3305`	`3311`	`+ (NS_SET_OF(NSString ) )keyPathsForValuesAffectingLatitude`