NAVAND-5909: always use latest CameraState as a fallback startValue

(cherry picked from commit a7c626c4870cffa6a471378d174018d25681c491)

GitOrigin-RevId: 0446abb1ac53927106d5b6c768c299e1d9307d8e

Author: dzinad

CHANGELOG.md

@@ -10,6 +10,7 @@ Mapbox welcomes participation and contributions from everyone.
 
 ## Bug fixes 🐞
 * Fix exception when accessing enum properties in annotations.
+* Fix an issue where instant animation might not have been executed in case of launching multiple animations within a single frame.
 
 ## Dependencies
 * Update gl-native to [v11.14.0-rc.1](https://github.com/mapbox/mapbox-maps-android/releases/tag/v11.14.0-rc.1), common to [24.14.0-rc.1](https://github.com/mapbox/mapbox-maps-android/releases/tag/v11.14.0-rc.1).

plugin-animation/src/main/java/com/mapbox/maps/plugin/animation/CameraAnimationsPluginImpl.kt

@@ -276,12 +276,12 @@ internal class CameraAnimationsPluginImpl : CameraAnimationsPlugin, MapCameraPlu
       return false
     }
     val startValue = cameraAnimator.startValue ?: when (cameraAnimator.type) {
-      CameraAnimatorType.CENTER -> center ?: mapCameraManagerDelegate.cameraState.center
-      CameraAnimatorType.ZOOM -> zoom ?: mapCameraManagerDelegate.cameraState.zoom
-      CameraAnimatorType.ANCHOR -> anchor ?: ScreenCoordinate(0.0, 0.0)
-      CameraAnimatorType.PADDING -> padding ?: mapCameraManagerDelegate.cameraState.padding
-      CameraAnimatorType.BEARING -> bearing ?: mapCameraManagerDelegate.cameraState.bearing
-      CameraAnimatorType.PITCH -> pitch ?: mapCameraManagerDelegate.cameraState.pitch
+      CameraAnimatorType.CENTER -> mapCameraManagerDelegate.cameraState.center
+      CameraAnimatorType.ZOOM -> mapCameraManagerDelegate.cameraState.zoom
+      CameraAnimatorType.ANCHOR -> ScreenCoordinate(0.0, 0.0)
+      CameraAnimatorType.PADDING -> mapCameraManagerDelegate.cameraState.padding
+      CameraAnimatorType.BEARING -> mapCameraManagerDelegate.cameraState.bearing
+      CameraAnimatorType.PITCH -> mapCameraManagerDelegate.cameraState.pitch
     }.also {
       if (debugMode) {
         logI(

plugin-animation/src/test/java/com/mapbox/maps/plugin/animation/CameraAnimationsPluginImplTest.kt

@@ -1352,6 +1352,89 @@ class CameraAnimationsPluginImplTest {
     assertEquals(EdgeInsets(1.0, 2.0, 3.0, 4.0), edgeInsets)
   }
 
+  @Test
+  fun useCameraStateValuesIfStartValueIsNotSet() {
+    val cachedCameraOptions = CameraOptions.Builder()
+      .center(Point.fromLngLat(50.0, 50.0))
+      .pitch(50.0)
+      .bearing(50.0)
+      .zoom(5.0)
+      .padding(EdgeInsets(50.0, 50.0, 50.0, 50.0))
+      .anchor(ScreenCoordinate(50.0, 50.0))
+      .build()
+    cameraAnimationsPluginImpl.onCameraMove(cachedCameraOptions.toCameraState())
+
+    val mapCameraOptions = CameraOptions.Builder()
+      .center(Point.fromLngLat(51.0, 51.0))
+      .pitch(51.0)
+      .bearing(51.0)
+      .zoom(5.1)
+      .padding(EdgeInsets(51.0, 51.0, 51.0, 51.0))
+      .build()
+
+    every { mapCameraManagerDelegate.cameraState } returns mapCameraOptions.toCameraState()
+
+    val centerAnimator = spyk(
+      cameraAnimationsPluginImpl.createCenterAnimator(
+        cameraAnimatorOptions(Point.fromLngLat(52.0, 52.0))
+      )
+    )
+    val bearingAnimator = spyk(
+      cameraAnimationsPluginImpl.createBearingAnimator(
+        cameraAnimatorOptions(60.0)
+      )
+    )
+    val zoomAnimator = spyk(
+      cameraAnimationsPluginImpl.createZoomAnimator(
+        cameraAnimatorOptions(15.0)
+      )
+    )
+    val pitchAnimator = spyk(
+      cameraAnimationsPluginImpl.createPitchAnimator(
+        cameraAnimatorOptions(40.0)
+      )
+    )
+    val anchorAnimator = spyk(
+      cameraAnimationsPluginImpl.createAnchorAnimator(
+        cameraAnimatorOptions(ScreenCoordinate(52.0, 52.0))
+      )
+    )
+    val paddingAnimator = spyk(
+      cameraAnimationsPluginImpl.createPaddingAnimator(
+        cameraAnimatorOptions(EdgeInsets(52.0, 52.0, 52.0, 52.0))
+      )
+    )
+    cameraAnimationsPluginImpl.registerAnimators(
+      centerAnimator, bearingAnimator, zoomAnimator, pitchAnimator, anchorAnimator, paddingAnimator,
+    )
+
+    centerAnimator.start()
+    bearingAnimator.start()
+    zoomAnimator.start()
+    pitchAnimator.start()
+    anchorAnimator.start()
+    paddingAnimator.start()
+
+    verify {
+      centerAnimator.setObjectValues(mapCameraOptions.center, Point.fromLngLat(52.0, 52.0))
+    }
+    verify { bearingAnimator.setObjectValues(mapCameraOptions.bearing, 60.0) }
+    verify { zoomAnimator.setObjectValues(mapCameraOptions.zoom, 15.0) }
+    verify { pitchAnimator.setObjectValues(mapCameraOptions.pitch, 40.0) }
+    verify {
+      anchorAnimator.setObjectValues(
+        ScreenCoordinate(0.0, 0.0),
+        ScreenCoordinate(52.0, 52.0)
+      )
+    }
+    verify {
+      paddingAnimator.setObjectValues(
+        mapCameraOptions.padding,
+        EdgeInsets(52.0, 52.0, 52.0, 52.0),
+      )
+    }
+  }
+
   class LifecycleListener : CameraAnimationsLifecycleListener {
     var starting = false
     var interrupting = false