From 3f10f74a70f992f1fdbc2475b8fa3007ae3b2c5f Mon Sep 17 00:00:00 2001 From: Tobrun Date: Thu, 31 Mar 2016 07:43:49 +0200 Subject: [PATCH] [android] #4520 - don't update camera position after padding call --- .../src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java | 2 -- .../src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java index e1a9cd8cd..21aee525a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java @@ -1151,8 +1151,6 @@ public class MapboxMap { public void setPadding(int left, int top, int right, int bottom) { mMapView.setContentPadding(left, top, right, bottom); mUiSettings.invalidate(); - - moveCamera(CameraUpdateFactory.newCameraPosition(new CameraPosition.Builder(mCameraPosition).build())); } /** diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java index 1705f44fa..48a3a9700 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java @@ -197,7 +197,7 @@ public class MapboxMapTest { CameraPosition position = new CameraPosition.Builder().bearing(1).tilt(2).zoom(3).target(new LatLng(4, 5)).build(); mMapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition(position)); mMapboxMap.setPadding(0, 0, 0, 0); - verify(mOnCameraChangeListener, times(2)).onCameraChange(position); + verify(mOnCameraChangeListener, times(1)).onCameraChange(position); } //