Extreme tilt of the map also moves it considerably [BUG] (#2909)

* Blocks two-finger panning gesture if shove gesture is already in progress.

Author: flasher297

CHANGELOG.md

@@ -12,6 +12,7 @@ Mapbox welcomes participation and contributions from everyone.
 
 ## Bug fixes 🐞
 * Mark `BackgroundLayer.backgroundPitchAlignment` as experimental.
+* Skip any map scroll (panning) if shove gesture is already in progress preventing camera flying away.
 
 # 11.9.0 December 18, 2024
 ## Breaking changes ⚠️

plugin-gestures/src/main/java/com/mapbox/maps/plugin/gestures/GesturesPluginImpl.kt

@@ -590,6 +590,11 @@ internal class GesturesPluginImpl : GesturesPlugin, GesturesSettingsBase, MapSty
       if (!internalSettings.pinchScrollEnabled && detector.pointersCount > 1) {
         return false
       }
+      // Skip any scroll if shove gesture is already in progress
+      // Without this fix scroll interferences with shove and the camera makes unwanted moves
+      if (gesturesManager.shoveGestureDetector.isInProgress) {
+        return false
+      }
 
       val fromX = detector.focalPoint.x.toDouble()
       val fromY = detector.focalPoint.y.toDouble()

plugin-gestures/src/test/java/com/mapbox/maps/plugin/gestures/GesturesPluginTest.kt

@@ -181,6 +181,7 @@ class GesturesPluginTest {
     every { gesturesManager.rotateGestureDetector } returns rotateGestureDetector
     every { gesturesManager.standardScaleGestureDetector } returns scaleGestureDetector
     every { gesturesManager.shoveGestureDetector } returns shoveGestureDetector
+    every { shoveGestureDetector.isInProgress } returns false
     every { gesturesManager.moveGestureDetector } returns moveGestureDetector
     every { mapCameraManagerDelegate.cameraState } returns CameraState(
       Point.fromLngLat(0.0, 0.0),
@@ -564,6 +565,22 @@ class GesturesPluginTest {
     verify(exactly = 1) { mapTransformDelegate.setGestureInProgress(false) }
   }
 
+  @OptIn(MapboxExperimental::class)
+  @Test
+  fun verifyMoveListenerShoveInProgress() {
+    every { shoveGestureDetector.isInProgress } returns true
+
+    val moveGestureDetector = mockk<MoveGestureDetector>()
+    every { moveGestureDetector.pointersCount } returns 2
+    every {
+      moveGestureDetector.focalPoint
+    } returns PointF(0.0f, 0.0f)
+    presenter.moveGestureListener.detector = moveGestureDetector
+    var handled = presenter.moveGestureListener.onMove(moveGestureDetector, 50.0f, 50.0f)
+    assertFalse(handled)
+    verify(exactly = 0) { presenter.mapInteractionDelegate.dispatch(any()) }
+  }
+
   @Test
   fun verifyMoveListenerPinchScrollEnabled() {
     presenter.pinchScrollEnabled = true