From 796f4208e1384e73ff327824e201f0709abbc971 Mon Sep 17 00:00:00 2001
From: paczos <lukaszp@yanosik.pl>
Date: Tue, 6 Jun 2017 09:57:41 +0200
Subject: [android] - using easeCamera to keep location tracking instead of
 overloaded moveCamera (#9187)

---
 .../java/com/mapbox/mapboxsdk/maps/MapboxMap.java  | 26 ++--------------------
 .../java/com/mapbox/mapboxsdk/maps/Transform.java  |  6 ++---
 2 files changed, 5 insertions(+), 27 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 5a86fa374e..e382cda50e 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
@@ -146,7 +146,7 @@ public final class MapboxMap {
     trackingSettings.onRestoreInstanceState(savedInstanceState);
 
     if (cameraPosition != null) {
-      moveCamera(CameraUpdateFactory.newCameraPosition(new CameraPosition.Builder(cameraPosition).build()), null, trackingSettings.isLocationTrackingDisabled());
+      easeCamera(CameraUpdateFactory.newCameraPosition(new CameraPosition.Builder(cameraPosition).build()), 0, false, null, !trackingSettings.isLocationTrackingDisabled());
     }
 
     nativeMapView.setDebug(savedInstanceState.getBoolean(MapboxConstants.STATE_DEBUG_ACTIVE));
@@ -645,29 +645,7 @@ public final class MapboxMap {
     new Handler().post(new Runnable() {
       @Override
       public void run() {
-        transform.moveCamera(MapboxMap.this, update, callback, true);
-        // MapChange.REGION_DID_CHANGE_ANIMATED is not called for `jumpTo`
-        // invalidate camera position to provide OnCameraChange event.
-        invalidateCameraPosition();
-      }
-    });
-  }
-
-  /**
-   * Repositions the camera according to the instructions defined in the update.
-   * The move is instantaneous, and a subsequent getCameraPosition() will reflect the new position.
-   * See CameraUpdateFactory for a set of updates.
-   *
-   * @param update             The change that should be applied to the camera
-   * @param callback           the callback to be invoked when an animation finishes or is canceled
-   * @param canDismissTracking you can specify whether this move can reset location tracking or not
-   */
-  @UiThread
-  public final void moveCamera(final CameraUpdate update, final MapboxMap.CancelableCallback callback, final boolean canDismissTracking) {
-    new Handler().post(new Runnable() {
-      @Override
-      public void run() {
-        transform.moveCamera(MapboxMap.this, update, callback, canDismissTracking);
+        transform.moveCamera(MapboxMap.this, update, callback);
         // MapChange.REGION_DID_CHANGE_ANIMATED is not called for `jumpTo`
         // invalidate camera position to provide OnCameraChange event.
         invalidateCameraPosition();
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
index 472a58a890..7f44e0de07 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
@@ -51,7 +51,7 @@ final class Transform implements MapView.OnMapChangedListener {
   void initialise(@NonNull MapboxMap mapboxMap, @NonNull MapboxMapOptions options) {
     CameraPosition position = options.getCamera();
     if (position != null && !position.equals(CameraPosition.DEFAULT)) {
-      moveCamera(mapboxMap, CameraUpdateFactory.newCameraPosition(position), null, true);
+      moveCamera(mapboxMap, CameraUpdateFactory.newCameraPosition(position), null);
     }
     setMinZoom(options.getMinZoomPreference());
     setMaxZoom(options.getMaxZoomPreference());
@@ -91,10 +91,10 @@ final class Transform implements MapView.OnMapChangedListener {
   }
 
   @UiThread
-  final void moveCamera(MapboxMap mapboxMap, CameraUpdate update, MapboxMap.CancelableCallback callback, boolean canDismissTracking) {
+  final void moveCamera(MapboxMap mapboxMap, CameraUpdate update, MapboxMap.CancelableCallback callback) {
     CameraPosition cameraPosition = update.getCameraPosition(mapboxMap);
     if (!cameraPosition.equals(this.cameraPosition)) {
-      trackingSettings.resetTrackingModesIfRequired(this.cameraPosition, cameraPosition, !canDismissTracking);
+      trackingSettings.resetTrackingModesIfRequired(this.cameraPosition, cameraPosition, false);
       cancelTransitions();
       cameraChangeDispatcher.onCameraMoveStarted(OnCameraMoveStartedListener.REASON_API_ANIMATION);
       mapView.jumpTo(cameraPosition.bearing, cameraPosition.target, cameraPosition.tilt, cameraPosition.zoom);
-- 
cgit v1.2.1