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 17:16:29 -0700 |
| commit | 1d37eb39034f504187fe5cfd822aa69e463bf585 (patch) | |
| tree | d4489a2a7b16a624e98e4ce3a8f3c21eb5293c89 /platform/ios | |
| parent | 6fd80aebde12a4ed34f75a751f702522853923d0 (diff) | |
| download | qtlocation-mapboxgl-1d37eb39034f504187fe5cfd822aa69e463bf585.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.
Cherry-picked from 2a4eeadb295775236fe1a89b50f9179b790b127a.
Diffstat (limited to 'platform/ios')
| -rw-r--r-- | platform/ios/CHANGELOG.md | 6 | ||||
| -rw-r--r-- | platform/ios/src/MGLMapView.mm | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index b560535bec..c3138058dd 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -2,6 +2,12 @@ Mapbox welcomes participation and contributions from everyone. If you’d like to do so please see [CONTRIBUTING.md](https://github.com/mapbox/mapbox-gl-native/blob/master/CONTRIBUTING.md) first to get started. +## 3.2.2 + +- Existing MGLStyle class methods that return default style URLs have been deprecated in favor of new methods that require an explicit style version parameter. ([#4759](https://github.com/mapbox/mapbox-gl-native/pull/4759)) +- Deprecated `+[MGLStyle emeraldStyleURL]` with no replacement method. To use the Emerald style going forward, we recommend that you use the underlying URL. ([#4759](https://github.com/mapbox/mapbox-gl-native/pull/4759)) +- Added `+[MGLStyle outdoorsStyleURLWithVersion:]` for the new Outdoors style. ([#4759](https://github.com/mapbox/mapbox-gl-native/pull/4759)) + ## 3.2.1 - Fixed a hang that could occur if the host application attempts to set user defaults on a background queue. ([#4745](https://github.com/mapbox/mapbox-gl-native/pull/4745)) diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 17323720ac..8d6688e7e6 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -276,7 +276,7 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration) if ( ! styleURL) { - styleURL = [MGLStyle streetsStyleURL]; + styleURL = [MGLStyle streetsStyleURLWithVersion:MGLStyleCurrentVersion]; } if ( ! [styleURL scheme]) |