Added flag to ignore route line updates in the view under certain conditions. (#6974)

Seth Bourget · Seth Bourget · web-flow · commit 6f4b85c20287 · 2023-03-16T09:12:35.000-07:00
Co-authored-by: Seth Bourget &lt;seth@cafesilencio.net&gt;
diff --git a/changelog/unreleased/bugfixes/6974.md b/changelog/unreleased/bugfixes/6974.md
@@ -0,0 +1 @@
+- Fixed route progress vanishing point update issue introduced by feature that displays the active leg of the route line above inactive legs for multi-leg routes. [#6974](https://github.com/mapbox/mapbox-navigation-android/pull/6974)
diff --git a/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/line/api/MapboxRouteLineApi.kt b/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/line/api/MapboxRouteLineApi.kt
@@ -799,20 +799,29 @@ class MapboxRouteLineApi(
         }
     }
 
+    // The purpose of this is to provide the correct masking layer data to be rendered in the view.
+    // Although the primary route line layer data is returned here it shouldn't be rendered by the
+    // view. It is included because the parameter isn't nullable.  If it were the data wouldn't
+    // be included since it's only the masking layers that should be updated. For this reason
+    // the variable to ignore the primary route line data is set to true so the view class will
+    // ignore it.
     private fun provideRouteLegUpdate(
         routeLineOverlayDynamicData: RouteLineDynamicData?,
         consumer: MapboxNavigationConsumer<Expected<RouteLineError, RouteLineUpdateValue>>
     ) {
         ifNonNull(routeLineOverlayDynamicData) { maskingLayerData ->
             getRouteDrawData { expected ->
                 expected.value?.apply {
+                    val updateValue = RouteLineUpdateValue(
+                        this.primaryRouteLineData.dynamicData,
+                        this.alternativeRouteLinesData.map { it.dynamicData },
+                        maskingLayerData
+                    ).also {
+                        it.ignorePrimaryRouteLineData = true
+                    }
                     consumer.accept(
                         ExpectedFactory.createValue<RouteLineError, RouteLineUpdateValue>(
-                            RouteLineUpdateValue(
-                                this.primaryRouteLineData.dynamicData,
-                                this.alternativeRouteLinesData.map { it.dynamicData },
-                                maskingLayerData
-                            )
+                            updateValue
                         )
                     )
                 }
diff --git a/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/line/api/MapboxRouteLineView.kt b/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/line/api/MapboxRouteLineView.kt
@@ -370,10 +370,12 @@ class MapboxRouteLineView(options: MapboxRouteLineOptions) {
         jobControl.scope.launch(Dispatchers.Main) {
             mutex.withLock {
                 update.onValue {
-                    primaryRouteLineLayerGroup.map { layerId ->
-                        toExpressionUpdateFun(layerId, it.primaryRouteLineDynamicData)
-                    }.forEach { updateFun ->
-                        updateFun(style)
+                    if (!it.ignorePrimaryRouteLineData) {
+                        primaryRouteLineLayerGroup.map { layerId ->
+                            toExpressionUpdateFun(layerId, it.primaryRouteLineDynamicData)
+                        }.forEach { updateFun ->
+                            updateFun(style)
+                        }
                     }
 
                     ifNonNull(it.routeLineMaskingLayerDynamicData) { overlayData ->
diff --git a/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/line/model/RouteLineUpdateValue.kt b/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/line/model/RouteLineUpdateValue.kt
@@ -13,14 +13,18 @@ class RouteLineUpdateValue internal constructor(
     val routeLineMaskingLayerDynamicData: RouteLineDynamicData? = null
 ) {
 
+    internal var ignorePrimaryRouteLineData = false
+
     /**
      * @return a class with mutable values for replacing.
      */
     fun toMutableValue() = MutableRouteLineUpdateValue(
         primaryRouteLineDynamicData,
         alternativeRouteLinesDynamicData,
         routeLineMaskingLayerDynamicData
-    )
+    ).also {
+        it.ignorePrimaryRouteLineData = ignorePrimaryRouteLineData
+    }
 
     /**
      * Represents the mutable data for updating the appearance of the route lines.
@@ -35,14 +39,18 @@ class RouteLineUpdateValue internal constructor(
         var routeLineMaskingLayerDynamicData: RouteLineDynamicData? = null
     ) {
 
+        internal var ignorePrimaryRouteLineData = false
+
         /**
          * @return a RouteLineUpdateValue
          */
         fun toImmutableValue() = RouteLineUpdateValue(
             primaryRouteLineDynamicData,
             alternativeRouteLinesDynamicData,
             routeLineMaskingLayerDynamicData
-        )
+        ).also {
+            it.ignorePrimaryRouteLineData = ignorePrimaryRouteLineData
+        }
     }
 
     /**
diff --git a/libnavui-maps/src/test/java/com/mapbox/navigation/ui/maps/route/line/api/MapboxRouteLineApiTest.kt b/libnavui-maps/src/test/java/com/mapbox/navigation/ui/maps/route/line/api/MapboxRouteLineApiTest.kt
@@ -1237,6 +1237,7 @@ class MapboxRouteLineApiTest {
             checkExpression(expectedCasingExpressionContents, casingExpression)
             checkExpression(expectedTrailExpressionContents, trailExpression)
             checkExpression(expectedTrailCasingExpressionContents, trailCasingExpression)
+            assertTrue(result.ignorePrimaryRouteLineData)
 
             callbackCalled = true
         }
diff --git a/libnavui-maps/src/test/java/com/mapbox/navigation/ui/maps/route/line/api/MapboxRouteLineViewTest.kt b/libnavui-maps/src/test/java/com/mapbox/navigation/ui/maps/route/line/api/MapboxRouteLineViewTest.kt
@@ -541,6 +541,151 @@ class MapboxRouteLineViewTest {
         unmockkStatic("com.mapbox.maps.extension.style.layers.LayerUtils")
     }
 
+    @Test
+    fun renderTraveledRouteLineUpdate_whenIgnorePrimaryRouteLineData() =
+        coroutineRule.runBlockingTest {
+            mockkStatic("com.mapbox.maps.extension.style.layers.LayerUtils")
+            mockkObject(MapboxRouteLineUtils)
+            val options = MapboxRouteLineOptions.Builder(ctx).build()
+            val trafficLineExp = mockk<Expression>()
+            val routeLineExp = mockk<Expression>()
+            val casingLineEx = mockk<Expression>()
+            val restrictedRoadExp = mockk<Expression>()
+            val trailExpression = mockk<Expression>()
+            val trailCasingExpression = mockk<Expression>()
+            val state: Expected<RouteLineError, RouteLineUpdateValue> =
+                ExpectedFactory.createValue(
+                    RouteLineUpdateValue(
+                        primaryRouteLineDynamicData = RouteLineDynamicData(
+                            { routeLineExp },
+                            { casingLineEx },
+                            { trafficLineExp },
+                            { restrictedRoadExp },
+                            trailExpressionProvider = { trailExpression },
+                            trailCasingExpressionProvider = { trailCasingExpression }
+                        ),
+                        alternativeRouteLinesDynamicData = listOf(
+                            RouteLineDynamicData(
+                                { throw UnsupportedOperationException() },
+                                { throw UnsupportedOperationException() },
+                                { throw UnsupportedOperationException() },
+                                { throw UnsupportedOperationException() }
+                            ),
+                            RouteLineDynamicData(
+                                { throw UnsupportedOperationException() },
+                                { throw UnsupportedOperationException() },
+                                { throw UnsupportedOperationException() },
+                                { throw UnsupportedOperationException() }
+                            )
+                        ),
+                        routeLineMaskingLayerDynamicData = RouteLineDynamicData(
+                            { routeLineExp },
+                            { casingLineEx },
+                            { trafficLineExp },
+                            { restrictedRoadExp },
+                            trailExpressionProvider = { trailExpression },
+                            trailCasingExpressionProvider = { trailCasingExpression }
+                        )
+                    ).also {
+                        it.ignorePrimaryRouteLineData = true
+                    }
+                )
+            val style = mockk<Style> {
+                every {
+                    setStyleLayerProperty(any(), any(), any())
+                } returns ExpectedFactory.createNone()
+            }.also {
+                mockCheckForLayerInitialization(it)
+            }
+
+            pauseDispatcher {
+                val view = MapboxRouteLineView(options)
+                view.initPrimaryRouteLineLayerGroup(MapboxRouteLineUtils.layerGroup1SourceLayerIds)
+                view.renderRouteLineUpdate(style, state)
+            }
+
+            verify(exactly = 0) {
+                style.setStyleLayerProperty(
+                    LAYER_GROUP_1_TRAFFIC,
+                    "line-gradient",
+                    trafficLineExp
+                )
+            }
+            verify(exactly = 0) {
+                style.setStyleLayerProperty(
+                    LAYER_GROUP_1_MAIN,
+                    "line-gradient",
+                    routeLineExp
+                )
+            }
+            verify(exactly = 0) {
+                style.setStyleLayerProperty(
+                    LAYER_GROUP_1_CASING,
+                    "line-gradient",
+                    casingLineEx
+                )
+            }
+            verify(exactly = 0) {
+                style.setStyleLayerProperty(
+                    LAYER_GROUP_1_RESTRICTED,
+                    "line-gradient",
+                    restrictedRoadExp
+                )
+            }
+            verify(exactly = 0) {
+                style.setStyleLayerProperty(
+                    LAYER_GROUP_1_TRAIL,
+                    "line-gradient",
+                    trailExpression
+                )
+            }
+            verify(exactly = 0) {
+                style.setStyleLayerProperty(
+                    LAYER_GROUP_1_TRAIL_CASING,
+                    "line-gradient",
+                    trailCasingExpression
+                )
+            }
+            verify {
+                style.setStyleLayerProperty(
+                    MASKING_LAYER_TRAFFIC,
+                    "line-gradient",
+                    trafficLineExp
+                )
+            }
+            verify {
+                style.setStyleLayerProperty(
+                    MASKING_LAYER_MAIN,
+                    "line-gradient",
+                    routeLineExp
+                )
+            }
+            verify {
+                style.setStyleLayerProperty(
+                    MASKING_LAYER_CASING,
+                    "line-gradient",
+                    casingLineEx
+                )
+            }
+            verify {
+                style.setStyleLayerProperty(
+                    MASKING_LAYER_TRAIL,
+                    "line-gradient",
+                    trailExpression
+                )
+            }
+            verify {
+                style.setStyleLayerProperty(
+                    MASKING_LAYER_TRAIL_CASING,
+                    "line-gradient",
+                    trailCasingExpression
+                )
+            }
+
+            unmockkObject(MapboxRouteLineUtils)
+            unmockkStatic("com.mapbox.maps.extension.style.layers.LayerUtils")
+        }
+
     @Test
     fun renderTraveledRouteLineTrimUpdate() = coroutineRule.runBlockingTest {
         mockkStatic("com.mapbox.maps.extension.style.layers.LayerUtils")
diff --git a/libnavui-maps/src/test/java/com/mapbox/navigation/ui/maps/route/line/model/RouteLineUpdateValueTest.kt b/libnavui-maps/src/test/java/com/mapbox/navigation/ui/maps/route/line/model/RouteLineUpdateValueTest.kt
@@ -2,6 +2,7 @@ package com.mapbox.navigation.ui.maps.route.line.model
 
 import io.mockk.mockk
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
 import org.junit.Test
 
 class RouteLineUpdateValueTest {
@@ -12,7 +13,9 @@ class RouteLineUpdateValueTest {
             RouteLineDynamicData(mockk(), mockk(), mockk(), mockk()),
             listOf(),
             mockk()
-        )
+        ).also {
+            it.ignorePrimaryRouteLineData = true
+        }
 
         val result = original.toMutableValue()
 
@@ -25,6 +28,7 @@ class RouteLineUpdateValueTest {
             original.routeLineMaskingLayerDynamicData,
             result.routeLineMaskingLayerDynamicData
         )
+        assertTrue(result.ignorePrimaryRouteLineData)
     }
 
     @Test
@@ -33,7 +37,9 @@ class RouteLineUpdateValueTest {
             RouteLineDynamicData(mockk(), mockk(), mockk(), mockk()),
             listOf(),
             mockk()
-        )
+        ).also {
+            it.ignorePrimaryRouteLineData = true
+        }
         val replacementPrimaryRouteLineDynamicData =
             RouteLineDynamicData(mockk(), mockk(), mockk(), mockk())
         val replacementList = listOf<RouteLineDynamicData>()
@@ -48,5 +54,6 @@ class RouteLineUpdateValueTest {
         assertEquals(replacementPrimaryRouteLineDynamicData, result.primaryRouteLineDynamicData)
         assertEquals(replacementList, result.alternativeRouteLinesDynamicData)
         assertEquals(replacementMaskingData, result.routeLineMaskingLayerDynamicData)
+        assertTrue(result.ignorePrimaryRouteLineData)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+- Fixed route progress vanishing point update issue introduced by feature that displays the active leg of the route line above inactive legs for multi-leg routes. [#6974](https://github.com/mapbox/mapbox-navigation-android/pull/6974)`
Original file line number	Diff line number	Diff line change
`@@ -1237,6 +1237,7 @@ class MapboxRouteLineApiTest {`
`1237`	`1237`	`checkExpression(expectedCasingExpressionContents, casingExpression)`
`1238`	`1238`	`checkExpression(expectedTrailExpressionContents, trailExpression)`
`1239`	`1239`	`checkExpression(expectedTrailCasingExpressionContents, trailCasingExpression)`
	`1240`	`+ assertTrue(result.ignorePrimaryRouteLineData)`
`1240`	`1241`
`1241`	`1242`	`callbackCalled = true`
`1242`	`1243`	`}`