NAVAND-5941 Let Map SDK to normalize bearing (#9900)

yuryybk · github-actions[bot] · commit 8cfbe6c946be · 2025-08-01T10:45:51.000Z
* NAVAND-5941 Rely on Map SDK to normalize bearing inside for Animators

GitOrigin-RevId: e6383acd8f6f1761d01425837e77c5665c30b10e
diff --git a/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/NavigationCamera.kt b/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/NavigationCamera.kt
@@ -1,5 +1,6 @@
 package com.mapbox.navigation.ui.maps.camera
 
+import android.os.SystemClock
 import androidx.annotation.RestrictTo
 import androidx.annotation.UiThread
 import androidx.annotation.VisibleForTesting
@@ -37,6 +38,7 @@ import com.mapbox.navigation.ui.maps.camera.transition.SimplifiedFrameAnimatorsC
 import com.mapbox.navigation.ui.maps.camera.transition.TransitionEndListener
 import com.mapbox.navigation.ui.maps.camera.transition.UpdateFrameAnimatorsOptions
 import com.mapbox.navigation.ui.maps.internal.camera.SimplifiedUpdateFrameTransitionProvider
+import com.mapbox.navigation.utils.internal.logI
 import java.util.concurrent.CopyOnWriteArraySet
 
 /**
@@ -175,7 +177,7 @@ internal constructor(
         viewportDataSource: ViewportDataSource,
         stateTransition: NavigationCameraStateTransition,
         simplifiedUpdateFrameTransitionProvider: SimplifiedUpdateFrameTransitionProvider =
-            DefaultSimplifiedUpdateFrameTransitionProvider(mapboxMap, cameraPlugin),
+            DefaultSimplifiedUpdateFrameTransitionProvider(cameraPlugin),
     ) : this(
         mapboxMap,
         cameraPlugin,
@@ -189,6 +191,10 @@ internal constructor(
     )
 
     companion object {
+
+        private const val LOG_CATEGORY = "NavigationCamera"
+        private const val LOG_CAMERA_STATE_SAMPLING_PERIOD_MILLIS = 1000L
+
         /**
          * Constant used to recognize the owner of transitions initiated by the [NavigationCamera].
          *
@@ -215,7 +221,7 @@ internal constructor(
                         cameraPlugin,
                         mapboxMap,
                         stateTransition,
-                        DefaultSimplifiedUpdateFrameTransitionProvider(mapboxMap, cameraPlugin),
+                        DefaultSimplifiedUpdateFrameTransitionProvider(cameraPlugin),
                     )
                 }
                 false -> {
@@ -257,9 +263,18 @@ internal constructor(
             updateDebugger()
         }
 
+    private var lastCameraStateLogTime = 0L
     private val sourceUpdateObserver =
-        ViewportDataSourceUpdateObserver {
-                viewportData ->
+        ViewportDataSourceUpdateObserver { viewportData ->
+            val currentTime = SystemClock.elapsedRealtime()
+            if (currentTime - lastCameraStateLogTime >= LOG_CAMERA_STATE_SAMPLING_PERIOD_MILLIS) {
+                logI(
+                    "Current camera state = ${mapboxMap.cameraState}, " +
+                        "viewport update = $viewportData",
+                    LOG_CATEGORY,
+                )
+                lastCameraStateLogTime = currentTime
+            }
             updateFrame(viewportData, instant = false)
         }
 
diff --git a/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/transition/DefaultSimplifiedUpdateFrameTransitionProvider.kt b/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/transition/DefaultSimplifiedUpdateFrameTransitionProvider.kt
@@ -3,15 +3,12 @@ package com.mapbox.navigation.ui.maps.camera.transition
 import android.animation.ValueAnimator
 import androidx.core.view.animation.PathInterpolatorCompat
 import com.mapbox.maps.CameraOptions
-import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.plugin.animation.CameraAnimationsPlugin
 import com.mapbox.maps.plugin.animation.CameraAnimatorOptions
 import com.mapbox.navigation.ui.maps.camera.NavigationCamera.Companion.NAVIGATION_CAMERA_OWNER
 import com.mapbox.navigation.ui.maps.internal.camera.SimplifiedUpdateFrameTransitionProvider
-import com.mapbox.navigation.ui.maps.internal.camera.normalizeBearing
 
 internal class DefaultSimplifiedUpdateFrameTransitionProvider(
-    private val mapboxMap: MapboxMap,
     private val cameraPlugin: CameraAnimationsPlugin,
 ) : SimplifiedUpdateFrameTransitionProvider {
 
@@ -43,6 +40,7 @@ internal class DefaultSimplifiedUpdateFrameTransitionProvider(
                 CameraAnimatorOptions.cameraAnimatorOptions(center) {
                     owner(NAVIGATION_CAMERA_OWNER)
                 },
+                false,
             ) {
                 duration = animationDuration
                 interpolator = LINEAR_INTERPOLATOR
@@ -63,9 +61,8 @@ internal class DefaultSimplifiedUpdateFrameTransitionProvider(
         }
 
         cameraOptions.bearing?.let { bearing ->
-            val bearingShortestRotation = normalizeBearing(mapboxMap.cameraState.bearing, bearing)
             val bearingAnimator = cameraPlugin.createBearingAnimator(
-                CameraAnimatorOptions.cameraAnimatorOptions(bearingShortestRotation) {
+                CameraAnimatorOptions.cameraAnimatorOptions(bearing) {
                     owner(NAVIGATION_CAMERA_OWNER)
                 },
             ) {
diff --git a/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/transition/MapboxNavigationCameraTransition.kt b/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/transition/MapboxNavigationCameraTransition.kt
@@ -16,7 +16,6 @@ import com.mapbox.navigation.ui.maps.camera.utils.getAnimatorsFactory
 import com.mapbox.navigation.ui.maps.camera.utils.normalizeProjection
 import com.mapbox.navigation.ui.maps.camera.utils.projectedDistance
 import com.mapbox.navigation.ui.maps.internal.camera.constraintDurationTo
-import com.mapbox.navigation.ui.maps.internal.camera.normalizeBearing
 import com.mapbox.navigation.utils.internal.ifNonNull
 import kotlin.math.abs
 import kotlin.math.min
@@ -38,7 +37,7 @@ class MapboxNavigationCameraTransition @VisibleForTesting internal constructor(
     ) : this(
         mapboxMap,
         cameraPlugin,
-        DefaultSimplifiedUpdateFrameTransitionProvider(mapboxMap, cameraPlugin),
+        DefaultSimplifiedUpdateFrameTransitionProvider(cameraPlugin),
     )
 
     override fun transitionFromLowZoomToHighZoom(
@@ -62,6 +61,7 @@ class MapboxNavigationCameraTransition @VisibleForTesting internal constructor(
                 CameraAnimatorOptions.cameraAnimatorOptions(center) {
                     owner(NAVIGATION_CAMERA_OWNER)
                 },
+                useShortestPath = false,
             ) {
                 startDelay = 800
                 duration = 1000
@@ -84,9 +84,8 @@ class MapboxNavigationCameraTransition @VisibleForTesting internal constructor(
         }
 
         cameraOptions.bearing?.let { bearing ->
-            val bearingShortestRotation = normalizeBearing(currentMapCameraState.bearing, bearing)
             val bearingAnimator = cameraPlugin.createBearingAnimator(
-                CameraAnimatorOptions.cameraAnimatorOptions(bearingShortestRotation) {
+                CameraAnimatorOptions.cameraAnimatorOptions(bearing) {
                     owner(NAVIGATION_CAMERA_OWNER)
                 },
             ) {
diff --git a/ui-maps/src/test/java/com/mapbox/navigation/ui/maps/camera/transition/DefaultSimplifiedUpdateFrameTransitionProviderTest.kt b/ui-maps/src/test/java/com/mapbox/navigation/ui/maps/camera/transition/DefaultSimplifiedUpdateFrameTransitionProviderTest.kt
@@ -4,57 +4,18 @@ import android.animation.ValueAnimator
 import com.mapbox.maps.CameraOptions
 import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.plugin.animation.CameraAnimationsPlugin
-import com.mapbox.maps.plugin.animation.CameraAnimatorOptions
-import com.mapbox.navigation.ui.maps.camera.NavigationCamera.Companion.DEFAULT_FRAME_TRANSITION_OPT
-import com.mapbox.navigation.ui.maps.internal.camera.normalizeBearing
 import io.mockk.every
 import io.mockk.mockk
-import io.mockk.mockkStatic
 import io.mockk.slot
-import io.mockk.unmockkStatic
 import io.mockk.verify
-import org.junit.After
 import org.junit.Assert.assertEquals
-import org.junit.Before
 import org.junit.Test
 
 class DefaultSimplifiedUpdateFrameTransitionProviderTest {
 
     private val mapboxMap: MapboxMap = mockk(relaxed = true)
     private val cameraPlugin: CameraAnimationsPlugin = mockk(relaxed = true)
-    private val updateFrame = DefaultSimplifiedUpdateFrameTransitionProvider(
-        mapboxMap,
-        cameraPlugin,
-    )
-
-    @Before
-    fun setUp() {
-        mockkStatic(::normalizeBearing)
-    }
-
-    @After
-    fun tearDown() {
-        unmockkStatic(::normalizeBearing)
-    }
-
-    @Test
-    fun `transitionLinear - bearing is normalized`() {
-        every { mapboxMap.cameraState } returns mockk {
-            every { bearing } returns 10.0
-        }
-        val cameraOptions = CameraOptions.Builder()
-            .bearing(350.0)
-            .build()
-
-        val valueSlot = slot<CameraAnimatorOptions<Double>>()
-        every {
-            cameraPlugin.createBearingAnimator(capture(valueSlot), any(), any())
-        } returns mockk()
-        updateFrame.updateFrame(cameraOptions, DEFAULT_FRAME_TRANSITION_OPT)
-
-        assertEquals(-10.0, valueSlot.captured.targets.last(), 0.0000000001)
-        verify { normalizeBearing(10.0, 350.0) }
-    }
+    private val updateFrame = DefaultSimplifiedUpdateFrameTransitionProvider(cameraPlugin)
 
     @Test
     fun updateFrame() {
@@ -93,7 +54,7 @@ class DefaultSimplifiedUpdateFrameTransitionProviderTest {
         val zoomAnimator = mockk<ValueAnimator>(relaxed = true)
         val paddingAnimator = mockk<ValueAnimator>(relaxed = true)
         every {
-            cameraPlugin.createCenterAnimator(any(), any<(ValueAnimator.() -> Unit)>())
+            cameraPlugin.createCenterAnimator(any(), any(), any<(ValueAnimator.() -> Unit)>())
         } returns centerAnimator
         every { cameraPlugin.createBearingAnimator(any(), any(), any()) } returns bearingAnimator
         every { cameraPlugin.createPitchAnimator(any(), any()) } returns pitchAnimator
@@ -111,6 +72,7 @@ class DefaultSimplifiedUpdateFrameTransitionProviderTest {
         verify {
             cameraPlugin.createCenterAnimator(
                 any(),
+                useShortestPath = any(),
                 capture(centerBlockSlot),
             )
         }
diff --git a/ui-maps/src/test/java/com/mapbox/navigation/ui/maps/camera/transition/MapboxNavigationCameraTransitionTest.kt b/ui-maps/src/test/java/com/mapbox/navigation/ui/maps/camera/transition/MapboxNavigationCameraTransitionTest.kt
@@ -18,7 +18,6 @@ import com.mapbox.navigation.ui.maps.camera.utils.normalizeProjection
 import com.mapbox.navigation.ui.maps.camera.utils.projectedDistance
 import com.mapbox.navigation.ui.maps.camera.utils.screenDistanceFromMapCenterToTarget
 import com.mapbox.navigation.ui.maps.internal.camera.constraintDurationTo
-import com.mapbox.navigation.ui.maps.internal.camera.normalizeBearing
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkStatic
@@ -51,7 +50,7 @@ class MapboxNavigationCameraTransitionTest {
         every { projectedDistance(any(), any(), any(), any()) } returns 1300.0
         every { screenDistanceFromMapCenterToTarget(mapboxMap, any(), any()) } returns 1000.0
         every {
-            cameraPlugin.createCenterAnimator(any(), any<(ValueAnimator.() -> Unit)>())
+            cameraPlugin.createCenterAnimator(any(), any(), any<(ValueAnimator.() -> Unit)>())
         } returns mockk()
         every { cameraPlugin.createBearingAnimator(any(), any(), any()) } returns mockk()
         every { cameraPlugin.createPitchAnimator(any(), any()) } returns mockk()
@@ -84,7 +83,7 @@ class MapboxNavigationCameraTransitionTest {
     }
 
     @Test
-    fun `transitionFromHighZoomToLowZoom - bearing is normalized`() {
+    fun `test transitionFromHighZoomToLowZoom - bearing is normalized`() {
         every { mapboxMap.cameraState } returns mockk {
             every { bearing } returns 10.0
         }
@@ -98,9 +97,6 @@ class MapboxNavigationCameraTransitionTest {
             cameraPlugin.createBearingAnimator(capture(valueSlot), any(), any())
         } returns mockk()
         transitions.transitionFromHighZoomToLowZoom(cameraOptions, DEFAULT_STATE_TRANSITION_OPT)
-
-        assertEquals(-10.0, valueSlot.captured.targets.last(), 0.0000000001)
-        verify { normalizeBearing(10.0, 350.0) }
     }
 
     @Test
@@ -117,9 +113,6 @@ class MapboxNavigationCameraTransitionTest {
             cameraPlugin.createBearingAnimator(capture(valueSlot), any(), any())
         } returns mockk()
         transitions.transitionLinear(cameraOptions, DEFAULT_FRAME_TRANSITION_OPT)
-
-        assertEquals(-10.0, valueSlot.captured.targets.last(), 0.0000000001)
-        verify { normalizeBearing(10.0, 350.0) }
     }
 
     @Test
@@ -157,6 +150,7 @@ class MapboxNavigationCameraTransitionTest {
         val centerBlockSlot = slot<(ValueAnimator.() -> Unit)>()
         verify {
             cameraPlugin.createCenterAnimator(
+                any(),
                 any(),
                 capture(centerBlockSlot),
             )
