summaryrefslogtreecommitdiff
path: root/platform/darwin/src/MGLStyle.mm
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-05-02 14:26:13 -0700
committerMinh Nguyễn <mxn@1ec5.org>2016-05-06 11:06:51 -0700
commit5ccb43477fc1d2028aef283d0db64848ebc9a347 (patch)
tree7b1b3d45e201b830bc692e639cf1b5e3607a9113 /platform/darwin/src/MGLStyle.mm
parent4a112c00f1634be40d10aa4797ac8e9262b8711a (diff)
downloadqtlocation-mapboxgl-5ccb43477fc1d2028aef283d0db64848ebc9a347.tar.gz
[ios, osx] Renamed Hybrid to Satellite Streets
The style ID has also changed, but the unversioned method will continue to point to the old v8 style ID.
Diffstat (limited to 'platform/darwin/src/MGLStyle.mm')
-rw-r--r--platform/darwin/src/MGLStyle.mm12
1 files changed, 11 insertions, 1 deletions
diff --git a/platform/darwin/src/MGLStyle.mm b/platform/darwin/src/MGLStyle.mm
index c0d8714878..13404c8d08 100644
--- a/platform/darwin/src/MGLStyle.mm
+++ b/platform/darwin/src/MGLStyle.mm
@@ -27,13 +27,23 @@ MGL_DEFINE_STYLE(outdoors, outdoors)
MGL_DEFINE_STYLE(light, light)
MGL_DEFINE_STYLE(dark, dark)
MGL_DEFINE_STYLE(satellite, satellite)
-MGL_DEFINE_STYLE(hybrid, satellite-hybrid)
+MGL_DEFINE_STYLE(satelliteStreets, satellite-streets)
// Make sure all the styles listed in mbgl::util::default_styles::orderedStyles
// are defined above and also declared in MGLStyle.h.
static_assert(6 == mbgl::util::default_styles::numOrderedStyles,
"mbgl::util::default_styles::orderedStyles and MGLStyle have different numbers of styles.");
+// Hybrid has been renamed Satellite Streets, so the last Hybrid version is hard-coded here.
+static NSURL *MGLStyleURL_hybrid;
++ (NSURL *)hybridStyleURL {
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ MGLStyleURL_hybrid = [NSURL URLWithString:@"mapbox://styles/mapbox/satellite-hybrid-v8"];
+ });
+ return MGLStyleURL_hybrid;
+}
+
// Emerald is no longer getting new versions as a default style, so the current version is hard-coded here.
static NSURL *MGLStyleURL_emerald;
+ (NSURL *)emeraldStyleURL {