diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2016-05-02 14:22:16 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2016-05-06 17:16:55 -0700 |
| commit | f7f6f775f47d65923702f48aa184af37818f8ca0 (patch) | |
| tree | 9fa7833d2c098b6bcce35ef04f04a857e837a492 /platform/darwin | |
| parent | 1d37eb39034f504187fe5cfd822aa69e463bf585 (diff) | |
| download | qtlocation-mapboxgl-f7f6f775f47d65923702f48aa184af37818f8ca0.tar.gz | |
[ios, osx] Pin unversioned style URL APIs to v8 styles
Cherry-picked from 4a112c00f1634be40d10aa4797ac8e9262b8711a.
Diffstat (limited to 'platform/darwin')
| -rw-r--r-- | platform/darwin/include/MGLStyle.h | 12 | ||||
| -rw-r--r-- | platform/darwin/src/MGLStyle.mm | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/platform/darwin/include/MGLStyle.h b/platform/darwin/include/MGLStyle.h index 2a2d61657f..798bc1cf12 100644 --- a/platform/darwin/include/MGLStyle.h +++ b/platform/darwin/include/MGLStyle.h @@ -19,7 +19,7 @@ static const NSInteger MGLStyleCurrentVersion = 9; @interface MGLStyle : NSObject /** - Returns the URL to the current version of the Streets style. + Returns the URL to version 8 of the Streets style. Mapbox Streets is a complete base map that balances nature, commerce, and infrastructure. */ @@ -35,7 +35,7 @@ static const NSInteger MGLStyleCurrentVersion = 9; + (NSURL *)streetsStyleURLWithVersion:(NSInteger)version; /** - Returns the URL to the current version of the Emerald style. + Returns the URL to version 8 of the Emerald style. Mapbox Emerald is a versatile style with emphasis on road networks and public transportation. */ @@ -51,7 +51,7 @@ static const NSInteger MGLStyleCurrentVersion = 9; + (NSURL *)outdoorsStyleURLWithVersion:(NSInteger)version; /** - Returns the URL to the current version of the Light style. + Returns the URL to version 8 of the Light style. Mapbox Light is a subtle, light-colored backdrop for data visualizations. */ @@ -67,7 +67,7 @@ static const NSInteger MGLStyleCurrentVersion = 9; + (NSURL *)lightStyleURLWithVersion:(NSInteger)version; /** - Returns the URL to the current version of the Dark style. + Returns the URL to version 8 of the Dark style. Mapbox Dark is a subtle, dark-colored backdrop for data visualizations. */ @@ -83,7 +83,7 @@ static const NSInteger MGLStyleCurrentVersion = 9; + (NSURL *)darkStyleURLWithVersion:(NSInteger)version; /** - Returns the URL to the current version of the Satellite style. + Returns the URL to version 8 of the Satellite style. Mapbox Satellite is a beautiful global satellite and aerial imagery layer. */ @@ -99,7 +99,7 @@ static const NSInteger MGLStyleCurrentVersion = 9; + (NSURL *)satelliteStyleURLWithVersion:(NSInteger)version; /** - Returns the URL to the current version of the Hybrid style. + Returns the URL to version 8 of the Hybrid style. Mapbox Hybrid combines the global satellite and aerial imagery of Mapbox Satellite with unobtrusive labels. */ diff --git a/platform/darwin/src/MGLStyle.mm b/platform/darwin/src/MGLStyle.mm index c906337a56..c0d8714878 100644 --- a/platform/darwin/src/MGLStyle.mm +++ b/platform/darwin/src/MGLStyle.mm @@ -13,7 +13,7 @@ static_assert(mbgl::util::default_styles::currentVersion == MGLStyleCurrentVersi + (NSURL *)name##StyleURL { \ static dispatch_once_t onceToken; \ dispatch_once(&onceToken, ^{ \ - MGLStyleURL_##name = [self name##StyleURLWithVersion:MGLStyleCurrentVersion]; \ + MGLStyleURL_##name = [self name##StyleURLWithVersion:8]; \ }); \ return MGLStyleURL_##name; \ } \ |