diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2016-04-19 21:15:30 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2016-05-06 10:57:54 -0700 |
| commit | 2a4eeadb295775236fe1a89b50f9179b790b127a (patch) | |
| tree | 8efffe60f9a2cff3abad624dc889b37809bb0194 /src | |
| parent | d28b6f37190dc1c9cbb1e3973f8a4534b507865c (diff) | |
| download | qtlocation-mapboxgl-2a4eeadb295775236fe1a89b50f9179b790b127a.tar.gz | |
[core, ios, osx] Version default style URL APIs; deprecated Emerald
Updated default styles from v8 to v9. Deprecated the MGLMapView class methods in favor of new methods that take a version parameter. Deprecated Emerald outright in favor of Outdoors. Replaced usage of the unversioned MGLStyle methods with the corresponding versioned methods and MGLStyleCurrentVersion to ensure consistency.
Expanded MGLStyle unit tests to also assert that MGLStyle has the right number of style URL methods and that they’re all public. Linked the OS X SDK unit test bundle to libmbgl-core.a. Removed an unnecessary dependency on osxapp.
Replaced Emerald with Outdoors in iosapp and osxapp.
Fixes the iOS and OS X side of #4577 and #4702.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/util/default_styles.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/util/default_styles.cpp b/src/mbgl/util/default_styles.cpp index d051fc60c3..247b7320eb 100644 --- a/src/mbgl/util/default_styles.cpp +++ b/src/mbgl/util/default_styles.cpp @@ -4,12 +4,12 @@ namespace mbgl { namespace util { namespace default_styles { -const DefaultStyle streets = { "mapbox://styles/mapbox/streets-v8", "Streets" }; -const DefaultStyle emerald = { "mapbox://styles/mapbox/emerald-v8", "Emerald" }; -const DefaultStyle light = { "mapbox://styles/mapbox/light-v8", "Light" }; -const DefaultStyle dark = { "mapbox://styles/mapbox/dark-v8", "Dark" }; -const DefaultStyle satellite = { "mapbox://styles/mapbox/satellite-v8", "Satellite" }; -const DefaultStyle hybrid = { "mapbox://styles/mapbox/satellite-hybrid-v8", "Hybrid" }; +const DefaultStyle streets = { "mapbox://styles/mapbox/streets-v9", "Streets" }; +const DefaultStyle outdoors = { "mapbox://styles/mapbox/outdoors-v9", "Outdoors" }; +const DefaultStyle light = { "mapbox://styles/mapbox/light-v9", "Light" }; +const DefaultStyle dark = { "mapbox://styles/mapbox/dark-v9", "Dark" }; +const DefaultStyle satellite = { "mapbox://styles/mapbox/satellite-v9", "Satellite" }; +const DefaultStyle hybrid = { "mapbox://styles/mapbox/satellite-hybrid-v9", "Hybrid" }; } // namespace default_styles } // end namespace util |