[android] - take in account focalpoint when performing transformations, simplify zoom methods (#8416)

1 files changed, 2 insertions, 20 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
index e991819e4f..1460f08e10 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
@@ -61,8 +61,6 @@ final class NativeMapView {
   // Listener invoked to return a bitmap of the map
   private MapboxMap.SnapshotReadyCallback snapshotReadyCallback;
 
-  private static final int CENTER_XY_VALUE = -1;
-
   //
   // Static methods
   //
@@ -380,27 +378,11 @@ final class NativeMapView {
     return nativeGetScale();
   }
 
-  public void setZoom(double zoom) {
-    if (isDestroyedOn("setZoom")) {
-      return;
-    }
-    setZoom(zoom, CENTER_XY_VALUE, CENTER_XY_VALUE, 0);
-  }
-
-  public void setZoom(double zoom, double cx, double cy, long duration) {
+  public void setZoom(double zoom, PointF focalPoint, long duration) {
     if (isDestroyedOn("setZoom")) {
       return;
     }
-
-    if (cx != CENTER_XY_VALUE) {
-      cx = cx / pixelRatio;
-    }
-
-    if (cy != CENTER_XY_VALUE) {
-      cy = cy / pixelRatio;
-    }
-
-    nativeSetZoom(zoom, cx, cy, duration);
+    nativeSetZoom(zoom, focalPoint.x / pixelRatio, focalPoint.y / pixelRatio, duration);
   }
 
   public double getZoom() {