From 1a5bc3d80336524379ec98f9de4a8976cb2c4ba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Sat, 16 Jan 2016 23:08:28 -0800 Subject: [PATCH] [ios] Removed redundant zoom constraints MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- platform/ios/src/MGLMapView.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 4f1bac781..5b1ccd162 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);