diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-30 17:01:54 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-30 17:43:37 -0700 |
| commit | 5eda74a514964d1cac684483bafa08d458175f9a (patch) | |
| tree | a38f886f5742d52a915c3c72959a5eba50b9fa0e /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java | |
| parent | b6a181097c3e7c3168be3575d5d7e95820fc74ba (diff) | |
| parent | 7b5a1ca1670a0346cdbf2af689fabde4e70ed561 (diff) | |
| download | qtlocation-mapboxgl-5eda74a514964d1cac684483bafa08d458175f9a.tar.gz | |
Merge branch 'release-ios-3.2.0-android-4.0.0'
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java index b3da298c06..8c6591f9a0 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java @@ -249,7 +249,7 @@ public final class CameraUpdateFactory { float scaleY = (uiSettings.getHeight() - padding.top - padding.bottom) / height; float minScale = scaleX < scaleY ? scaleX : scaleY; double zoom = projection.calculateZoom(minScale); - zoom = MathUtils.clamp(zoom, (float) uiSettings.getMinZoom(), (float) uiSettings.getMaxZoom()); + zoom = MathUtils.clamp(zoom, (float) mapboxMap.getMinZoom(), (float) mapboxMap.getMaxZoom()); // Calculate the center point PointF paddedNEPixel = new PointF(nePixel.x + padding.right / minScale, nePixel.y + padding.top / minScale); |