diff options
Diffstat (limited to 'platform/darwin/src')
| -rw-r--r-- | platform/darwin/src/MGLStyle.h | 12 | ||||
| -rw-r--r-- | platform/darwin/src/MGLStyle.mm | 12 |
2 files changed, 17 insertions, 7 deletions
diff --git a/platform/darwin/src/MGLStyle.h b/platform/darwin/src/MGLStyle.h index 798bc1cf12..124954fee4 100644 --- a/platform/darwin/src/MGLStyle.h +++ b/platform/darwin/src/MGLStyle.h @@ -99,20 +99,20 @@ static const NSInteger MGLStyleCurrentVersion = 9; + (NSURL *)satelliteStyleURLWithVersion:(NSInteger)version; /** - Returns the URL to version 8 of the Hybrid style. + Returns the URL to version 8 of the Satellite Streets style. - Mapbox Hybrid combines the global satellite and aerial imagery of Mapbox Satellite with unobtrusive labels. + Mapbox Satellite Streets combines the global satellite and aerial imagery of Mapbox Satellite with unobtrusive labels and translucent roads from Mapbox Streets. */ -+ (NSURL *)hybridStyleURL __attribute__((deprecated("Use -hybridStyleURLWithVersion:."))); ++ (NSURL *)hybridStyleURL __attribute__((deprecated("Use -satelliteStreetsStyleURLWithVersion:."))); /** - Returns the URL to the given version of the Hybrid style. + Returns the URL to the given version of the Satellite Streets style. - Mapbox Hybrid combines the global satellite and aerial imagery of Mapbox Satellite with unobtrusive labels. + Mapbox Satellite Streets combines the global satellite and aerial imagery of Mapbox Satellite with unobtrusive labels and translucent roads from Mapbox Streets. @param version The style’s latest released version. The current version is given by `MGLStyleCurrentVersion`. */ -+ (NSURL *)hybridStyleURLWithVersion:(NSInteger)version; ++ (NSURL *)satelliteStreetsStyleURLWithVersion:(NSInteger)version; - (instancetype)init NS_UNAVAILABLE; 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 { |