diff options
| author | Fredrik Karlsson <bjorn.fredrik.karlsson@gmail.com> | 2017-01-31 13:38:10 +0100 |
|---|---|---|
| committer | Fredrik Karlsson <bjorn.fredrik.karlsson@gmail.com> | 2017-02-06 20:58:31 +0100 |
| commit | 7d6b91f8e79cd96fdef8c0307f8eca1687eaa6d0 (patch) | |
| tree | 480e6b3d342a4f9bdeaae351978775f981cedf4a | |
| parent | 6d331e8aa3c6115d91597afc95bbde8660ab7ce3 (diff) | |
| download | qtlocation-mapboxgl-7d6b91f8e79cd96fdef8c0307f8eca1687eaa6d0.tar.gz | |
[ios] persistent user tracking mode
| -rw-r--r-- | platform/ios/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | platform/ios/src/MGLMapView.mm | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index 550b09a016..7ac04fb916 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -2,6 +2,10 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONTRIBUTING.md](../../CONTRIBUTING.md) to get started. +## 3.4.2 + +* Programmatic camera changes no longer resets user tracking mode. ([#7856](https://github.com/mapbox/mapbox-gl-native/pull/7856)) + ## 3.4.1 * Fixed a build error in the static framework flavor of this SDK caused by a missing header. ([#7844](https://github.com/mapbox/mapbox-gl-native/pull/7844)) diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index c9900da059..fb056490ff 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -2532,7 +2532,6 @@ public: - (void)setCamera:(MGLMapCamera *)camera withDuration:(NSTimeInterval)duration animationTimingFunction:(nullable CAMediaTimingFunction *)function completionHandler:(nullable void (^)(void))completion { - self.userTrackingMode = MGLUserTrackingModeNone; _mbglMap->cancelTransitions(); if ([self.camera isEqual:camera]) { @@ -2572,8 +2571,6 @@ public: - (void)flyToCamera:(MGLMapCamera *)camera withDuration:(NSTimeInterval)duration peakAltitude:(CLLocationDistance)peakAltitude completionHandler:(nullable void (^)(void))completion { - self.userTrackingMode = MGLUserTrackingModeNone; - [self _flyToCamera:camera edgePadding:self.contentInset withDuration:duration peakAltitude:peakAltitude completionHandler:completion]; } |