diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2017-05-18 18:04:07 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2017-05-18 18:04:07 -0700 |
| commit | 281d3d4f8cf10910e04131c8020fff0f2e359aa9 (patch) | |
| tree | fba85ca12262a00078d87859621c6c41cb2f0a0d | |
| parent | 8c75001443d5b91059f90aadbec126e47f6fc64b (diff) | |
| parent | db7bb509e95d737199efa73a47bdcc973966ed97 (diff) | |
| download | qtlocation-mapboxgl-281d3d4f8cf10910e04131c8020fff0f2e359aa9.tar.gz | |
Merge branch 'release-ios-v3.5.0-android-v5.0.0' into 1ec5-release-ios-v3.5.4
| -rw-r--r-- | platform/darwin/src/MGLStyleLayer.h | 4 | ||||
| -rw-r--r-- | platform/ios/CHANGELOG.md | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/platform/darwin/src/MGLStyleLayer.h b/platform/darwin/src/MGLStyleLayer.h index d68aee29bc..7d181667d6 100644 --- a/platform/darwin/src/MGLStyleLayer.h +++ b/platform/darwin/src/MGLStyleLayer.h @@ -45,12 +45,12 @@ MGL_EXPORT @property (nonatomic, assign, getter=isVisible) BOOL visible; /** - The maximum zoom level at which the layer gets parsed and appears. + The maximum zoom level at which the layer gets parsed and appears. This value is a floating-point number. */ @property (nonatomic, assign) float maximumZoomLevel; /** - The minimum zoom level at which the layer gets parsed and appears. + The minimum zoom level at which the layer gets parsed and appears. This value is a floating-point number. */ @property (nonatomic, assign) float minimumZoomLevel; diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index ed28b65ae5..e8de9e3723 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -37,6 +37,14 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT * The error passed into `-[MGLMapViewDelegate mapViewDidFailLoadingMap:withError:]` now includes a more specific description and failure reason. ([#8418](https://github.com/mapbox/mapbox-gl-native/pull/8418)) * Fixed an issue rendering polylines that contain duplicate vertices. ([#8808](https://github.com/mapbox/mapbox-gl-native/pull/8808)) +## 3.5.4 - May 9, 2017 + +* Fixed an issue that caused view backed annotations to become detached from the map view during pan gestures combined with animations of annotation view size or when the annotation view had no size but contained subviews with a non-zero size. ([#8926](https://github.com/mapbox/mapbox-gl-native/pull/8926)) + +## 3.5.3 - May 2, 2017 + +* Fixed an issue that prevented the attribution `UIAlertController` from showing in modal hierarchies. ([#8837](https://github.com/mapbox/mapbox-gl-native/pull/8837)) + ## 3.5.2 - April 7, 2017 * Fixed an issue that caused a crash when the user location annotation was presenting a callout view and the map was moved. ([#8686](https://github.com/mapbox/mapbox-gl-native/pull/8686)) |