diff options
| author | Fabian Guerra <fabian.guerra@mapbox.com> | 2017-09-27 12:08:24 -0400 |
|---|---|---|
| committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2017-09-27 12:08:24 -0400 |
| commit | 6d1fdf2ca3a93839bc7dc0929599dd096ab00e33 (patch) | |
| tree | 5436aefbab4abcba5caa5020c62c24de7d493616 /platform/macos/app/MapDocument.m | |
| parent | fafe0928227ec8e944e1ec68ee1d2bbc1c52f6ae (diff) | |
| parent | 3f52377543885170da6a27e1c24657cc4cbcf29c (diff) | |
| download | qtlocation-mapboxgl-6d1fdf2ca3a93839bc7dc0929599dd096ab00e33.tar.gz | |
Merge branch 'release-ios-v3.6.0-android-v5.1.0' into master.upstream/fabian-merge-release-ios-v3.6.0-final
# Conflicts:
# circle.yml
# platform/android/CHANGELOG.md
# platform/android/MapboxGLAndroidSDK/gradle.properties
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
# platform/android/dependencies.gradle
# platform/default/mbgl/storage/offline_database.cpp
# platform/ios/CHANGELOG.md
# platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec
# platform/ios/Mapbox-iOS-SDK-symbols.podspec
# platform/ios/Mapbox-iOS-SDK.podspec
# platform/ios/app/Main.storyboard
# platform/ios/src/MGLMapView.mm
# src/mbgl/programs/attributes.hpp
# src/mbgl/renderer/painter_fill.cpp
# src/mbgl/tile/geometry_tile.hpp
# src/mbgl/tile/geometry_tile_worker.cpp
# src/mbgl/tile/raster_tile.cpp
# src/mbgl/tile/raster_tile.hpp
# src/mbgl/tile/raster_tile_worker.cpp
# test/tile/annotation_tile.test.cpp
# test/tile/geojson_tile.test.cpp
# test/tile/raster_tile.test.cpp
# test/tile/vector_tile.test.cpp
Diffstat (limited to 'platform/macos/app/MapDocument.m')
| -rw-r--r-- | platform/macos/app/MapDocument.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/macos/app/MapDocument.m b/platform/macos/app/MapDocument.m index 406ff0ca9d..36ca4ad228 100644 --- a/platform/macos/app/MapDocument.m +++ b/platform/macos/app/MapDocument.m @@ -248,10 +248,10 @@ NS_ARRAY_OF(id <MGLAnnotation>) *MBXFlattenedShapes(NS_ARRAY_OF(id <MGLAnnotatio styleURL = [MGLStyle satelliteStreetsStyleURL]; break; case 7: - styleURL = [MGLStyle trafficDayStyleURL]; + styleURL = [NSURL URLWithString:@"mapbox://styles/mapbox/traffic-day-v2"]; break; case 8: - styleURL = [MGLStyle trafficNightStyleURL]; + styleURL = [NSURL URLWithString:@"mapbox://styles/mapbox/traffic-night-v2"]; break; default: NSAssert(NO, @"Cannot set style from control with tag %li", (long)tag); @@ -874,10 +874,10 @@ NS_ARRAY_OF(id <MGLAnnotation>) *MBXFlattenedShapes(NS_ARRAY_OF(id <MGLAnnotatio state = [styleURL isEqual:[MGLStyle satelliteStreetsStyleURL]]; break; case 7: - state = [styleURL isEqual:[MGLStyle trafficDayStyleURL]]; + state = [styleURL isEqual:[NSURL URLWithString:@"mapbox://styles/mapbox/traffic-day-v2"]]; break; case 8: - state = [styleURL isEqual:[MGLStyle trafficNightStyleURL]]; + state = [styleURL isEqual:[NSURL URLWithString:@"mapbox://styles/mapbox/traffic-night-v2"]]; break; default: return NO; |