diff options
| author | Leith Bade <leith@mapbox.com> | 2015-10-23 13:42:07 +1100 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2015-10-30 13:09:04 -0700 |
| commit | abf93c008b993f178df327e7681418df51e72844 (patch) | |
| tree | b57b3f654cb262ee7d5e834610f8fa95ed8603c1 /ios | |
| parent | ddc4251074dae9115d6e252099ec04995188e29a (diff) | |
| download | qtlocation-mapboxgl-abf93c008b993f178df327e7681418df51e72844.tar.gz | |
[core] Remove bundled styles.
Fixes #2239
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/app/MBXViewController.mm | 2 | ||||
| -rw-r--r-- | ios/app/mapboxgl-app.gypi | 1 | ||||
| -rw-r--r-- | ios/benchmark/MBXBenchViewController.mm | 2 | ||||
| -rw-r--r-- | ios/benchmark/benchmark-ios.gypi | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/ios/app/MBXViewController.mm b/ios/app/MBXViewController.mm index 6a04b7fa24..c8a305b3c3 100644 --- a/ios/app/MBXViewController.mm +++ b/ios/app/MBXViewController.mm @@ -326,7 +326,7 @@ static NSUInteger const kStyleVersion = 8; self.styleIndex = (self.styleIndex + 1) % (sizeof(MBXAvailableStyles) / sizeof(MBXAvailableStyles[0])); self.mapView.styleURL = [NSURL URLWithString: - [NSString stringWithFormat:@"asset://styles/%@-v%lu.json", + [NSString stringWithFormat:@"mapbox://styles/mapbox/%@-v%lu", MBXAvailableStyles[self.styleIndex].name, (unsigned long)kStyleVersion]]; diff --git a/ios/app/mapboxgl-app.gypi b/ios/app/mapboxgl-app.gypi index 8407ea7da2..b07bfc27ea 100644 --- a/ios/app/mapboxgl-app.gypi +++ b/ios/app/mapboxgl-app.gypi @@ -18,7 +18,6 @@ ], 'dependencies': [ - '../mbgl.gyp:bundle_styles', '../mbgl.gyp:core', '../mbgl.gyp:platform-<(platform_lib)', '../mbgl.gyp:http-<(http_lib)', diff --git a/ios/benchmark/MBXBenchViewController.mm b/ios/benchmark/MBXBenchViewController.mm index 964a5c3de4..2af2cacd1f 100644 --- a/ios/benchmark/MBXBenchViewController.mm +++ b/ios/benchmark/MBXBenchViewController.mm @@ -44,7 +44,7 @@ { [super viewDidLoad]; - NSURL* url = [[NSURL alloc] initWithString:@"asset://styles/streets-v8.json"]; + NSURL* url = [[NSURL alloc] initWithString:@"mapbox://styles/mapbox/streets-v8.json"]; self.mapView = [[MGLMapView alloc] initWithFrame:self.view.bounds styleURL:url]; self.mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; self.mapView.delegate = self; diff --git a/ios/benchmark/benchmark-ios.gypi b/ios/benchmark/benchmark-ios.gypi index 0a3440d5cd..01f4e8afb2 100644 --- a/ios/benchmark/benchmark-ios.gypi +++ b/ios/benchmark/benchmark-ios.gypi @@ -12,7 +12,6 @@ '<!@(find ../ios/benchmark/img -type f)', 'assets/glyphs', 'assets/sprites', - 'assets/styles', 'assets/tiles', ], |