summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-01-16 23:08:28 -0800
committerMinh Nguyễn <mxn@1ec5.org>2016-01-18 16:54:58 -0800
commit1a5bc3d80336524379ec98f9de4a8976cb2c4ba6 (patch)
tree5ae25a777ef250937c4a86b207399cfc02c9b470
parent6a0b7f8eb308c1c03a4013cff7e830c42924ce77 (diff)
downloadqtlocation-mapboxgl-1a5bc3d80336524379ec98f9de4a8976cb2c4ba6.tar.gz
[ios] Removed redundant zoom constraints
The zoom level is already clamped by Transform. -currentMinimumZoom appears to be useful only as an unrotation threshold; it doesn’t correspond to the minimum allowed zoom level.
-rw-r--r--platform/ios/src/MGLMapView.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 4f1bac781d..5b1ccd1628 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -415,7 +415,7 @@ std::chrono::steady_clock::duration MGLDurationInSeconds(float duration)
options.center = mbgl::LatLng(0, 0);
mbgl::EdgeInsets padding = MGLEdgeInsetsFromNSEdgeInsets(self.contentInset);
options.padding = padding;
- options.zoom = _mbglMap->getMinZoom();
+ options.zoom = 0;
_mbglMap->jumpTo(options);
_pendingLatitude = NAN;
_pendingLongitude = NAN;
@@ -1661,7 +1661,7 @@ std::chrono::steady_clock::duration MGLDurationInSeconds(float duration)
mbgl::CameraOptions cameraOptions;
cameraOptions.center = MGLLatLngFromLocationCoordinate2D(centerCoordinate);
cameraOptions.padding = MGLEdgeInsetsFromNSEdgeInsets(self.contentInset);
- cameraOptions.zoom = fmaxf(zoomLevel, self.currentMinimumZoom);
+ cameraOptions.zoom = zoomLevel;
if (direction >= 0)
{
cameraOptions.angle = MGLRadiansFromDegrees(-direction);