summaryrefslogtreecommitdiff
path: root/platform/ios
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-08-15 23:34:41 -0700
committerMinh Nguyễn <mxn@1ec5.org>2016-08-17 23:16:59 -0700
commit61df0b1bfa0cd43bcc9a87f73f7ece6fbb9b4175 (patch)
treef156fd35db31827104ca4b29d01e8b173a25014c /platform/ios
parentbca9d091805dc01a4456ab3f24e9de87f9b4aa48 (diff)
downloadqtlocation-mapboxgl-61df0b1bfa0cd43bcc9a87f73f7ece6fbb9b4175.tar.gz
[ios, macos] Use local GeoJSON for runtime styling demo
Also changed the menu item to something more descriptive. Fixes #6021.
Diffstat (limited to 'platform/ios')
-rw-r--r--platform/ios/app/MBXViewController.m5
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m
index 4c98dc75fb..bd8230ea15 100644
--- a/platform/ios/app/MBXViewController.m
+++ b/platform/ios/app/MBXViewController.m
@@ -203,7 +203,7 @@ static NSString * const MBXViewControllerAnnotationViewReuseIdentifer = @"MBXVie
@"Start World Tour",
@"Add Custom Callout Point",
@"Remove Annotations",
- @"Runtime Styling",
+ @"Manipulate Style",
((_customUserLocationAnnnotationEnabled)
? @"Disable Custom User Dot"
: @"Enable Custom User Dot"),
@@ -479,7 +479,8 @@ static NSString * const MBXViewControllerAnnotationViewReuseIdentifer = @"MBXVie
- (void)styleGeoJSONSource
{
- NSURL *geoJSONURL = [NSURL URLWithString:@"https://dl.dropboxusercontent.com/u/5285447/amsterdam.geojson"];
+ NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"amsterdam" ofType:@"geojson"];
+ NSURL *geoJSONURL = [NSURL fileURLWithPath:filePath];
MGLGeoJSONSource *source = [[MGLGeoJSONSource alloc] initWithSourceIdentifier:@"ams" URL:geoJSONURL];
[self.mapView.style addSource:source];