1 files changed, 51 insertions, 6 deletions

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 507bec270d..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
@@ -16,6 +16,7 @@ import com.mapbox.mapboxsdk.maps.widgets.MyLocationView;
 import timber.log.Timber;
 
 import static com.mapbox.mapboxsdk.maps.MapView.REGION_DID_CHANGE_ANIMATED;
+import static com.mapbox.mapboxsdk.maps.MapboxMap.OnCameraMoveStartedListener;
 
 /**
  * Resembles the current Map transformation.
@@ -33,13 +34,18 @@ final class Transform implements MapView.OnMapChangedListener {
 
   private CameraPosition cameraPosition;
   private MapboxMap.CancelableCallback cameraCancelableCallback;
+
   private MapboxMap.OnCameraChangeListener onCameraChangeListener;
 
-  Transform(NativeMapView mapView, MarkerViewManager markerViewManager, TrackingSettings trackingSettings) {
+  private CameraChangeDispatcher cameraChangeDispatcher;
+
+  Transform(NativeMapView mapView, MarkerViewManager markerViewManager, TrackingSettings trackingSettings,
+            CameraChangeDispatcher cameraChangeDispatcher) {
     this.mapView = mapView;
     this.markerViewManager = markerViewManager;
     this.trackingSettings = trackingSettings;
     this.myLocationView = trackingSettings.getMyLocationView();
+    this.cameraChangeDispatcher = cameraChangeDispatcher;
   }
 
   void initialise(@NonNull MapboxMap mapboxMap, @NonNull MapboxMapOptions options) {
@@ -79,6 +85,7 @@ final class Transform implements MapView.OnMapChangedListener {
         cameraCancelableCallback.onFinish();
         cameraCancelableCallback = null;
       }
+      cameraChangeDispatcher.onCameraIdle();
       mapView.removeOnMapChangedListener(this);
     }
   }
@@ -89,10 +96,12 @@ final class Transform implements MapView.OnMapChangedListener {
     if (!cameraPosition.equals(this.cameraPosition)) {
       trackingSettings.resetTrackingModesIfRequired(this.cameraPosition, cameraPosition, false);
       cancelTransitions();
+      cameraChangeDispatcher.onCameraMoveStarted(OnCameraMoveStartedListener.REASON_API_ANIMATION);
       mapView.jumpTo(cameraPosition.bearing, cameraPosition.target, cameraPosition.tilt, cameraPosition.zoom);
       if (callback != null) {
         callback.onFinish();
       }
+      cameraChangeDispatcher.onCameraIdle();
     }
   }
 
@@ -103,6 +112,8 @@ final class Transform implements MapView.OnMapChangedListener {
     if (!cameraPosition.equals(this.cameraPosition)) {
       trackingSettings.resetTrackingModesIfRequired(this.cameraPosition, cameraPosition, isDismissable);
       cancelTransitions();
+      cameraChangeDispatcher.onCameraMoveStarted(OnCameraMoveStartedListener.REASON_API_ANIMATION);
+
       if (callback != null) {
         cameraCancelableCallback = callback;
         mapView.addOnMapChangedListener(this);
@@ -118,8 +129,9 @@ final class Transform implements MapView.OnMapChangedListener {
     CameraPosition cameraPosition = update.getCameraPosition(mapboxMap);
     if (!cameraPosition.equals(this.cameraPosition)) {
       trackingSettings.resetTrackingModesIfRequired(this.cameraPosition, cameraPosition, false);
-
       cancelTransitions();
+      cameraChangeDispatcher.onCameraMoveStarted(OnCameraMoveStartedListener.REASON_API_ANIMATION);
+
       if (callback != null) {
         cameraCancelableCallback = callback;
         mapView.addOnMapChangedListener(this);
@@ -134,7 +146,12 @@ final class Transform implements MapView.OnMapChangedListener {
   @Nullable
   CameraPosition invalidateCameraPosition() {
     if (mapView != null) {
-      cameraPosition = mapView.getCameraPosition();
+      CameraPosition cameraPosition = mapView.getCameraPosition();
+      if (this.cameraPosition != null && !this.cameraPosition.equals(cameraPosition)) {
+        cameraChangeDispatcher.onCameraMove();
+      }
+
+      this.cameraPosition = cameraPosition;
       if (onCameraChangeListener != null) {
         onCameraChangeListener.onCameraChange(this.cameraPosition);
       }
@@ -143,10 +160,17 @@ final class Transform implements MapView.OnMapChangedListener {
   }
 
   void cancelTransitions() {
+    // notify user about cancel
+    cameraChangeDispatcher.onCameraMoveCanceled();
+
+    // notify animateCamera and easeCamera about cancelling
     if (cameraCancelableCallback != null) {
+      cameraChangeDispatcher.onCameraIdle();
       cameraCancelableCallback.onCancel();
       cameraCancelableCallback = null;
     }
+
+    // cancel ongoing transitions
     mapView.cancelTransitions();
   }
 
@@ -156,6 +180,10 @@ final class Transform implements MapView.OnMapChangedListener {
     mapView.resetNorth();
   }
 
+  //
+  // Camera change listener API
+  //
+
   void setOnCameraChangeListener(@Nullable MapboxMap.OnCameraChangeListener listener) {
     this.onCameraChangeListener = listener;
   }
@@ -171,9 +199,6 @@ final class Transform implements MapView.OnMapChangedListener {
   }
 
   void zoom(boolean zoomIn, @NonNull PointF focalPoint) {
-    // Cancel any animation
-    cancelTransitions();
-
     CameraPosition cameraPosition = invalidateCameraPosition();
     if (cameraPosition != null) {
       int newZoom = (int) Math.round(cameraPosition.zoom + (zoomIn ? 1 : -1));
@@ -186,6 +211,15 @@ final class Transform implements MapView.OnMapChangedListener {
   }
 
   void setZoom(double zoom, @NonNull PointF focalPoint, long duration) {
+    mapView.addOnMapChangedListener(new MapView.OnMapChangedListener() {
+      @Override
+      public void onMapChanged(int change) {
+        if (change == MapView.REGION_DID_CHANGE_ANIMATED) {
+          mapView.removeOnMapChangedListener(this);
+          cameraChangeDispatcher.onCameraIdle();
+        }
+      }
+    });
     mapView.setZoom(zoom, focalPoint, duration);
   }
 
@@ -277,6 +311,17 @@ final class Transform implements MapView.OnMapChangedListener {
   }
 
   void moveBy(double offsetX, double offsetY, long duration) {
+    if (duration > 0) {
+      mapView.addOnMapChangedListener(new MapView.OnMapChangedListener() {
+        @Override
+        public void onMapChanged(int change) {
+          if (change == MapView.DID_FINISH_RENDERING_MAP_FULLY_RENDERED) {
+            mapView.removeOnMapChangedListener(this);
+            cameraChangeDispatcher.onCameraIdle();
+          }
+        }
+      });
+    }
     mapView.moveBy(offsetX, offsetY, duration);
   }