diff options
| author | Tobrun <tobrun@mapbox.com> | 2016-05-17 09:54:04 +0200 |
|---|---|---|
| committer | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2016-05-26 11:30:27 +0200 |
| commit | 034246e00af154bdfe777e9b59ddb4703f2b1e89 (patch) | |
| tree | 86b16657984a2a148a1a9fe59fdc50982929e1e7 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera | |
| parent | 102e62ae5582ec5cad5d8bbe3d42f99b875d143e (diff) | |
| download | qtlocation-mapboxgl-034246e00af154bdfe777e9b59ddb4703f2b1e89.tar.gz | |
[android] #5034 - LatLngBounds Camera update not taking map padding in account
[android] #5034 - padding not being included in getVisibleBounds
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java | 10 |
1 files changed, 8 insertions, 2 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 8ba0b4e5c8..028d077a09 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 @@ -226,7 +226,14 @@ public final class CameraUpdateFactory { // Get required objects Projection projection = mapboxMap.getProjection(); UiSettings uiSettings = mapboxMap.getUiSettings(); - RectF padding = getPadding(); + + // calculate correct padding + int[] mapPadding = mapboxMap.getPadding(); + RectF latLngPadding = getPadding(); + RectF padding = new RectF(latLngPadding.left + mapPadding[0], + latLngPadding.top + mapPadding[1], + latLngPadding.right + mapPadding[2], + latLngPadding.bottom + mapPadding[3]); // Calculate the bounds of the possibly rotated shape with respect to the viewport PointF nePixel = new PointF(-Float.MAX_VALUE, -Float.MAX_VALUE); @@ -244,7 +251,6 @@ public final class CameraUpdateFactory { float width = nePixel.x - swPixel.x; float height = nePixel.y - swPixel.y; - double zoom = 0; float minScale = 1; // Calculate the zoom level |