1 files changed, 30 insertions, 22 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
index 80fd6248bc..33e13c5ecc 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
@@ -22,6 +22,8 @@ import com.mapbox.services.android.telemetry.MapboxTelemetry;
 import com.mapbox.services.android.telemetry.utils.MathUtils;
 import com.mapbox.services.android.telemetry.utils.TelemetryUtils;
 
+import static com.mapbox.mapboxsdk.maps.MapboxMap.OnCameraMoveStartedListener.REASON_API_GESTURE;
+
 /**
  * Manages gestures events on a MapView.
  * <p>
@@ -35,6 +37,7 @@ final class MapGestureDetector {
   private final UiSettings uiSettings;
   private final TrackingSettings trackingSettings;
   private final AnnotationManager annotationManager;
+  private final CameraChangeDispatcher cameraChangeDispatcher;
 
   private final GestureDetectorCompat gestureDetector;
   private final ScaleGestureDetector scaleGestureDetector;
@@ -56,12 +59,14 @@ final class MapGestureDetector {
   private boolean scaleGestureOccurred = false;
 
   MapGestureDetector(Context context, Transform transform, Projection projection, UiSettings uiSettings,
-                     TrackingSettings trackingSettings, AnnotationManager annotationManager) {
+                     TrackingSettings trackingSettings, AnnotationManager annotationManager,
+                     CameraChangeDispatcher cameraChangeDispatcher) {
     this.annotationManager = annotationManager;
     this.transform = transform;
     this.projection = projection;
     this.uiSettings = uiSettings;
     this.trackingSettings = trackingSettings;
+    this.cameraChangeDispatcher = cameraChangeDispatcher;
 
     // Touch gesture detectors
     gestureDetector = new GestureDetectorCompat(context, new GestureListener());
@@ -187,6 +192,7 @@ final class MapGestureDetector {
           MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapDragEndEvent(
             getLocationFromGesture(event.getX(), event.getY()), transform));
           scrollInProgress = false;
+          cameraChangeDispatcher.onCameraIdle();
         }
 
         twoTap = false;
@@ -273,6 +279,9 @@ final class MapGestureDetector {
             break;
           }
 
+          // notify camera change listener
+          cameraChangeDispatcher.onCameraMoveStarted(REASON_API_GESTURE);
+
           // Single finger double tap
           if (focalPoint != null) {
             // User provided focal point
@@ -337,6 +346,7 @@ final class MapGestureDetector {
         // and ignore when a scale gesture has occurred
         return false;
       }
+      cameraChangeDispatcher.onCameraMoveStarted(REASON_API_GESTURE);
 
       float screenDensity = uiSettings.getPixelRatio();
 
@@ -362,9 +372,7 @@ final class MapGestureDetector {
       long animationTime = (long) (velocityXY / 7 / tiltFactor + MapboxConstants.ANIMATION_DURATION_FLING_BASE);
 
       // update transformation
-      transform.setGestureInProgress(true);
       transform.moveBy(offsetX, offsetY, animationTime);
-      transform.setGestureInProgress(false);
 
       if (onFlingListener != null) {
         onFlingListener.onFling();
@@ -375,12 +383,6 @@ final class MapGestureDetector {
     // Called for drags
     @Override
     public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-      if (!scrollInProgress) {
-        scrollInProgress = true;
-        MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapClickEvent(
-          getLocationFromGesture(e1.getX(), e1.getY()),
-          MapboxEvent.GESTURE_PAN_START, transform));
-      }
       if (!trackingSettings.isScrollGestureCurrentlyEnabled()) {
         return false;
       }
@@ -389,10 +391,19 @@ final class MapGestureDetector {
         return false;
       }
 
+      if (!scrollInProgress) {
+        scrollInProgress = true;
+
+        // Cancel any animation
+        transform.cancelTransitions();
+        cameraChangeDispatcher.onCameraMoveStarted(REASON_API_GESTURE);
+        MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapClickEvent(
+          getLocationFromGesture(e1.getX(), e1.getY()),
+          MapboxEvent.GESTURE_PAN_START, transform));
+      }
+
       // reset tracking if needed
       trackingSettings.resetTrackingModesIfRequired(true, false, false);
-      // Cancel any animation
-      transform.cancelTransitions();
 
       // Scroll the map
       transform.moveBy(-distanceX, -distanceY, 0 /*no duration*/);
@@ -446,6 +457,8 @@ final class MapGestureDetector {
       // If scale is large enough ignore a tap
       scaleFactor *= detector.getScaleFactor();
       if ((scaleFactor > 1.05f) || (scaleFactor < 0.95f)) {
+        // notify camera change listener
+        cameraChangeDispatcher.onCameraMoveStarted(REASON_API_GESTURE);
         zoomStarted = true;
       }
 
@@ -465,9 +478,6 @@ final class MapGestureDetector {
         return false;
       }
 
-      // Cancel any animation
-      transform.cancelTransitions();
-
       // Gesture is a quickzoom if there aren't two fingers
       quickZoom = !twoTap;
 
@@ -512,6 +522,9 @@ final class MapGestureDetector {
         return false;
       }
 
+      // notify camera change listener
+      cameraChangeDispatcher.onCameraMoveStarted(REASON_API_GESTURE);
+
       beginTime = detector.getEventTime();
       MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapClickEvent(
         getLocationFromGesture(detector.getFocusX(), detector.getFocusY()),
@@ -522,6 +535,7 @@ final class MapGestureDetector {
     // Called when the fingers leave the screen
     @Override
     public void onRotateEnd(RotateGestureDetector detector) {
+      // notify camera change listener
       beginTime = 0;
       totalAngle = 0.0f;
       started = false;
@@ -553,13 +567,8 @@ final class MapGestureDetector {
       if (!started) {
         return false;
       }
-
-      // Cancel any animation
-      transform.cancelTransitions();
-
       // rotation constitutes translation of anything except the center of
       // rotation, so cancel both location and bearing tracking if required
-
       trackingSettings.resetTrackingModesIfRequired(true, true, false);
 
       // Get rotate value
@@ -593,6 +602,8 @@ final class MapGestureDetector {
         return false;
       }
 
+      // notify camera change listener
+      cameraChangeDispatcher.onCameraMoveStarted(REASON_API_GESTURE);
       beginTime = detector.getEventTime();
       MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapClickEvent(
         getLocationFromGesture(detector.getFocusX(), detector.getFocusY()),
@@ -633,9 +644,6 @@ final class MapGestureDetector {
         return false;
       }
 
-      // Cancel any animation
-      transform.cancelTransitions();
-
       // Get tilt value (scale and clamp)
       double pitch = transform.getTilt();
       pitch -= 0.1 * detector.getShovePixelsDelta();