summaryrefslogtreecommitdiff
path: root/platform/default
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-09-09 10:17:42 -0700
committerMinh Nguyễn <mxn@1ec5.org>2017-05-12 10:02:27 -0700
commit0ef1293dada1490c808ae821228d5a2f3324afdb (patch)
tree8e29572e8f2bf131da3284e94c0d67bbce8e4e7e /platform/default
parentcb737362b631284e1516561caf30c2027f9bdc03 (diff)
downloadqtlocation-mapboxgl-0ef1293dada1490c808ae821228d5a2f3324afdb.tar.gz
[core, android, ios, macos, qt] v10 default styles
Upgraded from v9 default styles to v10 wherever the developer expects to get the latest and greatest, as well as in a couple tests where it may be beneficial to ensure that we can handle a two-digit version number in the style URL. Cherry-picked from ed54849e9909e7f7cd8724b39b2bc94f16cf9a11.
Diffstat (limited to 'platform/default')
-rw-r--r--platform/default/mbgl/util/default_styles.cpp12
-rw-r--r--platform/default/mbgl/util/default_styles.hpp2
2 files changed, 7 insertions, 7 deletions
diff --git a/platform/default/mbgl/util/default_styles.cpp b/platform/default/mbgl/util/default_styles.cpp
index 17cc2f5740..5457d0f0a2 100644
--- a/platform/default/mbgl/util/default_styles.cpp
+++ b/platform/default/mbgl/util/default_styles.cpp
@@ -4,12 +4,12 @@ namespace mbgl {
namespace util {
namespace default_styles {
-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 satelliteStreets = { "mapbox://styles/mapbox/satellite-streets-v9", "Satellite Streets" };
+const DefaultStyle streets = { "mapbox://styles/mapbox/streets-v10", "Streets" };
+const DefaultStyle outdoors = { "mapbox://styles/mapbox/outdoors-v10", "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 satelliteStreets = { "mapbox://styles/mapbox/satellite-streets-v10", "Satellite Streets" };
} // namespace default_styles
} // end namespace util
diff --git a/platform/default/mbgl/util/default_styles.hpp b/platform/default/mbgl/util/default_styles.hpp
index eb7e034722..32944394aa 100644
--- a/platform/default/mbgl/util/default_styles.hpp
+++ b/platform/default/mbgl/util/default_styles.hpp
@@ -24,7 +24,7 @@ const DefaultStyle orderedStyles[] = {
};
const size_t numOrderedStyles = sizeof(orderedStyles) / sizeof(DefaultStyle);
-static const unsigned currentVersion = 9;
+static const unsigned currentVersion = 10;
} // end namespace default_styles
} // end namespace util