summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2018-08-15 08:46:58 -0700
committerMinh Nguyễn <mxn@1ec5.org>2018-08-15 08:53:34 -0700
commit890b09dfb6e421f844bfb9670878dd37276ea363 (patch)
tree059579909c57a812f90205052a5c8b250cf7363d
parent1771875b120083ce025f6e7a5c08b16284c06700 (diff)
downloadqtlocation-mapboxgl-upstream/1ec5-exception-standardization-12583.tar.gz
[macos] Canonicalized another exception nameupstream/1ec5-exception-standardization-12583
-rw-r--r--platform/macos/CHANGELOG.md1
-rw-r--r--platform/macos/src/MGLMapView+IBAdditions.mm4
2 files changed, 4 insertions, 1 deletions
diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md
index 1c1454de4d..64cbc4fb00 100644
--- a/platform/macos/CHANGELOG.md
+++ b/platform/macos/CHANGELOG.md
@@ -4,6 +4,7 @@
- Don't default-show text/icons that depend on the placement of a paired icon/text [#12483](https://github.com/mapbox/mapbox-gl-native/issues/12483)
- Fix the `-[MGLMapView annotationAtPoint:]` method near tile boundaries at high zoom. ([#12472](https://github.com/mapbox/mapbox-gl-native/issues/12472))
+* Fixed inconsistencies in exception naming. ([#12583](https://github.com/mapbox/mapbox-gl-native/issues/12583))
## Styles and rendering
diff --git a/platform/macos/src/MGLMapView+IBAdditions.mm b/platform/macos/src/MGLMapView+IBAdditions.mm
index cef2863ee6..0c65abc031 100644
--- a/platform/macos/src/MGLMapView+IBAdditions.mm
+++ b/platform/macos/src/MGLMapView+IBAdditions.mm
@@ -1,5 +1,7 @@
#import "MGLMapView+IBAdditions.h"
+#import "MGLStyle.h"
+
#import "MGLMapView_Private.h"
@implementation MGLMapView (IBAdditions)
@@ -17,7 +19,7 @@
[NSCharacterSet whitespaceAndNewlineCharacterSet]];
NSURL *url = URLString.length ? [NSURL URLWithString:URLString] : nil;
if (URLString.length && !url) {
- [NSException raise:@"Invalid style URL"
+ [NSException raise:MGLInvalidStyleURLException
format:@"“%@” is not a valid style URL.", URLString];
}
self.styleURL = url;