From d6b38153eb4be17d454f0afa998e1cc920c441ae Mon Sep 17 00:00:00 2001
From: Seth Bourget <seth@cafesilencio.net>
Date: Thu, 5 Jan 2023 11:40:14 -0800
Subject: [PATCH 1/2] Modified the initialize layers behavior to always apply
 the current options even if it means removing the existing layers.

---
 changelog/unreleased/bugfixes/6793.md         |   1 +
 .../route/line/MapboxRouteLineUtils.kt        |  27 ++
 .../route/line/api/MapboxRouteLineView.kt     |  56 +++-
 .../route/line/MapboxRouteLineUtilsTest.kt    |  35 +++
 .../route/line/api/MapboxRouteLineViewTest.kt | 262 ++++++++++++++++++
 5 files changed, 378 insertions(+), 3 deletions(-)
 create mode 100644 changelog/unreleased/bugfixes/6793.md

diff --git a/changelog/unreleased/bugfixes/6793.md b/changelog/unreleased/bugfixes/6793.md
new file mode 100644
index 00000000000..7886711c84e
--- /dev/null
+++ b/changelog/unreleased/bugfixes/6793.md
@@ -0,0 +1 @@
+- Updated behavior of `MapboxRouteLineView::initializeLayers` to always reset the route line related layers with the options provided even if it means removing existing layers in order to apply the options. Also new instances of `MapboxRouteLineView` will result in an initialization of the layers upon the first render call. 
\ No newline at end of file
diff --git a/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/internal/route/line/MapboxRouteLineUtils.kt b/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/internal/route/line/MapboxRouteLineUtils.kt
index a27aff9a266..4dfbb29a1b0 100644
--- a/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/internal/route/line/MapboxRouteLineUtils.kt
+++ b/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/internal/route/line/MapboxRouteLineUtils.kt
@@ -1751,4 +1751,31 @@ internal object MapboxRouteLineUtils {
             .iconIgnorePlacement(true)
             .iconKeepUpright(true)
     }
+
+    internal fun removeLayersAndSources(style: Style) {
+        style.removeStyleSource(RouteLayerConstants.LAYER_GROUP_1_SOURCE_ID)
+        style.removeStyleSource(RouteLayerConstants.LAYER_GROUP_2_SOURCE_ID)
+        style.removeStyleSource(RouteLayerConstants.LAYER_GROUP_3_SOURCE_ID)
+        style.removeStyleSource(RouteLayerConstants.WAYPOINT_SOURCE_ID)
+        style.removeStyleLayer(RouteLayerConstants.TOP_LEVEL_ROUTE_LINE_LAYER_ID)
+        style.removeStyleLayer(RouteLayerConstants.BOTTOM_LEVEL_ROUTE_LINE_LAYER_ID)
+        style.removeStyleLayer(RouteLayerConstants.LAYER_GROUP_1_TRAIL_CASING)
+        style.removeStyleLayer(RouteLayerConstants.LAYER_GROUP_1_TRAIL)
+        style.removeStyleLayer(RouteLayerConstants.LAYER_GROUP_1_CASING)
+        style.removeStyleLayer(RouteLayerConstants.LAYER_GROUP_1_MAIN)
+        style.removeStyleLayer(RouteLayerConstants.LAYER_GROUP_1_TRAFFIC)
+        style.removeStyleLayer(RouteLayerConstants.LAYER_GROUP_1_RESTRICTED)
+        style.removeStyleLayer(RouteLayerConstants.LAYER_GROUP_2_TRAIL_CASING)
+        style.removeStyleLayer(RouteLayerConstants.LAYER_GROUP_2_TRAIL)
+        style.removeStyleLayer(RouteLayerConstants.LAYER_GROUP_2_CASING)
+        style.removeStyleLayer(RouteLayerConstants.LAYER_GROUP_2_MAIN)
+        style.removeStyleLayer(RouteLayerConstants.LAYER_GROUP_2_TRAFFIC)
+        style.removeStyleLayer(RouteLayerConstants.LAYER_GROUP_2_RESTRICTED)
+        style.removeStyleLayer(RouteLayerConstants.LAYER_GROUP_3_TRAIL_CASING)
+        style.removeStyleLayer(RouteLayerConstants.LAYER_GROUP_3_TRAIL)
+        style.removeStyleLayer(RouteLayerConstants.LAYER_GROUP_3_CASING)
+        style.removeStyleLayer(RouteLayerConstants.LAYER_GROUP_3_MAIN)
+        style.removeStyleLayer(RouteLayerConstants.LAYER_GROUP_3_TRAFFIC)
+        style.removeStyleLayer(RouteLayerConstants.LAYER_GROUP_3_RESTRICTED)
+    }
 }
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
index 3d1fcf50f1a..f53482adc50 100644
--- 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
@@ -18,6 +18,7 @@ import com.mapbox.navigation.ui.maps.internal.route.line.MapboxRouteLineUtils.ge
 import com.mapbox.navigation.ui.maps.internal.route.line.MapboxRouteLineUtils.layerGroup1SourceLayerIds
 import com.mapbox.navigation.ui.maps.internal.route.line.MapboxRouteLineUtils.layerGroup2SourceLayerIds
 import com.mapbox.navigation.ui.maps.internal.route.line.MapboxRouteLineUtils.layerGroup3SourceLayerIds
+import com.mapbox.navigation.ui.maps.internal.route.line.MapboxRouteLineUtils.layersAreInitialized
 import com.mapbox.navigation.ui.maps.internal.route.line.MapboxRouteLineUtils.sourceLayerMap
 import com.mapbox.navigation.ui.maps.route.RouteLayerConstants
 import com.mapbox.navigation.ui.maps.route.RouteLayerConstants.LAYER_GROUP_1_CASING
@@ -78,6 +79,8 @@ import org.jetbrains.annotations.TestOnly
 @UiThread
 class MapboxRouteLineView(options: MapboxRouteLineOptions) {
 
+    private var rebuildLayersOnFirstRender: Boolean = true
+
     private companion object {
         private const val TAG = "MbxRouteLineView"
     }
@@ -142,6 +145,8 @@ class MapboxRouteLineView(options: MapboxRouteLineOptions) {
      * the layers if they have not yet been initialized. If you have a use case for initializing
      * the layers in advance of any API calls this method may be used.
      *
+     * If the layers already exist they will be removed and re-initialized with the options provided.
+     *
      * Each [Layer] added to the map by this class is a persistent layer - it will survive style changes.
      * This means that if the data has not changed, it does not have to be manually redrawn after a style change.
      * See [Style.addPersistentStyleLayer].
@@ -149,7 +154,23 @@ class MapboxRouteLineView(options: MapboxRouteLineOptions) {
      * @param style a valid [Style] instance
      */
     fun initializeLayers(style: Style) {
-        MapboxRouteLineUtils.initializeLayers(style, options)
+        resetLayers(style)
+    }
+
+    /**
+     * Updates the [MapboxRouteLineOptions] used for the route line related layers and initializes the layers.
+     * If the layers already exist they will be removed and re-initialized with the options provided.
+     *
+     * Each [Layer] added to the map by this class is a persistent layer - it will survive style changes.
+     * This means that if the data has not changed, it does not have to be manually redrawn after a style change.
+     * See [Style.addPersistentStyleLayer].
+     *
+     * @param style a valid [Style] instance
+     * @param options used for the route line related layers.
+     */
+    fun initializeLayers(style: Style, options: MapboxRouteLineOptions) {
+        this.options = options
+        resetLayers(style)
     }
 
     /**
@@ -159,7 +180,7 @@ class MapboxRouteLineView(options: MapboxRouteLineOptions) {
      * @param routeDrawData a [Expected<RouteLineError, RouteSetValue>]
      */
     fun renderRouteDrawData(style: Style, routeDrawData: Expected<RouteLineError, RouteSetValue>) {
-        MapboxRouteLineUtils.initializeLayers(style, options)
+        rebuildSourcesAndLayersIfNeeded(style)
         jobControl.scope.launch(Dispatchers.Main) {
             mutex.withLock {
                 val primaryRouteTrafficVisibility = getTrafficVisibility(style)
@@ -332,7 +353,7 @@ class MapboxRouteLineView(options: MapboxRouteLineOptions) {
         style: Style,
         clearRouteLineValue: Expected<RouteLineError, RouteLineClearValue>
     ) {
-        MapboxRouteLineUtils.initializeLayers(style, options)
+        rebuildSourcesAndLayersIfNeeded(style)
         jobControl.scope.launch(Dispatchers.Main) {
             mutex.withLock {
                 clearRouteLineValue.onValue { value ->
@@ -862,4 +883,33 @@ class MapboxRouteLineView(options: MapboxRouteLineOptions) {
                 }
             }
     }
+
+    private fun rebuildSourcesAndLayersIfNeeded(style: Style) {
+        if (rebuildLayersOnFirstRender || !layersAreInitialized(style, options)) {
+            rebuildLayersOnFirstRender = false
+            resetLayers(style)
+        }
+    }
+
+    private fun resetLayers(style: Style) {
+        sourceToFeatureMap.clear()
+        sourceToFeatureMap[MapboxRouteLineUtils.layerGroup1SourceKey] = RouteLineFeatureId(null)
+        sourceToFeatureMap[MapboxRouteLineUtils.layerGroup2SourceKey] = RouteLineFeatureId(null)
+        sourceToFeatureMap[MapboxRouteLineUtils.layerGroup3SourceKey] = RouteLineFeatureId(null)
+        primaryRouteLineLayerGroup = setOf()
+        listOf(
+            RouteLayerConstants.LAYER_GROUP_1_SOURCE_ID,
+            RouteLayerConstants.LAYER_GROUP_2_SOURCE_ID,
+            RouteLayerConstants.LAYER_GROUP_3_SOURCE_ID,
+            RouteLayerConstants.WAYPOINT_SOURCE_ID
+        ).forEach {
+            updateSource(
+                style,
+                it,
+                FeatureCollection.fromFeatures(listOf())
+            )
+        }
+        MapboxRouteLineUtils.removeLayersAndSources(style)
+        MapboxRouteLineUtils.initializeLayers(style, options)
+    }
 }
diff --git a/libnavui-maps/src/test/java/com/mapbox/navigation/ui/maps/internal/route/line/MapboxRouteLineUtilsTest.kt b/libnavui-maps/src/test/java/com/mapbox/navigation/ui/maps/internal/route/line/MapboxRouteLineUtilsTest.kt
index c58892e4512..91bb6db4510 100644
--- a/libnavui-maps/src/test/java/com/mapbox/navigation/ui/maps/internal/route/line/MapboxRouteLineUtilsTest.kt
+++ b/libnavui-maps/src/test/java/com/mapbox/navigation/ui/maps/internal/route/line/MapboxRouteLineUtilsTest.kt
@@ -2028,6 +2028,41 @@ class MapboxRouteLineUtilsTest {
         assertFalse(result)
     }
 
+    @Test
+    fun removeLayersAndSources() {
+        val style = mockk<Style> {
+            every { removeStyleLayer(any()) } returns ExpectedFactory.createNone()
+            every { removeStyleSource(any()) } returns ExpectedFactory.createNone()
+        }
+
+        MapboxRouteLineUtils.removeLayersAndSources(style)
+
+        verify { style.removeStyleSource(LAYER_GROUP_1_SOURCE_ID) }
+        verify { style.removeStyleSource(LAYER_GROUP_2_SOURCE_ID) }
+        verify { style.removeStyleSource(LAYER_GROUP_3_SOURCE_ID) }
+        verify { style.removeStyleSource(WAYPOINT_SOURCE_ID) }
+        verify { style.removeStyleLayer(TOP_LEVEL_ROUTE_LINE_LAYER_ID) }
+        verify { style.removeStyleLayer(BOTTOM_LEVEL_ROUTE_LINE_LAYER_ID) }
+        verify { style.removeStyleLayer(LAYER_GROUP_1_TRAIL_CASING) }
+        verify { style.removeStyleLayer(LAYER_GROUP_1_TRAIL) }
+        verify { style.removeStyleLayer(LAYER_GROUP_1_CASING) }
+        verify { style.removeStyleLayer(LAYER_GROUP_1_MAIN) }
+        verify { style.removeStyleLayer(LAYER_GROUP_1_TRAFFIC) }
+        verify { style.removeStyleLayer(LAYER_GROUP_1_RESTRICTED) }
+        verify { style.removeStyleLayer(LAYER_GROUP_2_TRAIL_CASING) }
+        verify { style.removeStyleLayer(LAYER_GROUP_2_TRAIL) }
+        verify { style.removeStyleLayer(LAYER_GROUP_2_CASING) }
+        verify { style.removeStyleLayer(LAYER_GROUP_2_MAIN) }
+        verify { style.removeStyleLayer(LAYER_GROUP_2_TRAFFIC) }
+        verify { style.removeStyleLayer(LAYER_GROUP_2_RESTRICTED) }
+        verify { style.removeStyleLayer(LAYER_GROUP_3_TRAIL_CASING) }
+        verify { style.removeStyleLayer(LAYER_GROUP_3_TRAIL) }
+        verify { style.removeStyleLayer(LAYER_GROUP_3_CASING) }
+        verify { style.removeStyleLayer(LAYER_GROUP_3_MAIN) }
+        verify { style.removeStyleLayer(LAYER_GROUP_3_TRAFFIC) }
+        verify { style.removeStyleLayer(LAYER_GROUP_3_RESTRICTED) }
+    }
+
     private fun <T> listElementsAreEqual(
         first: List<T>,
         second: List<T>,
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
index ec233a3561f..4585787089a 100644
--- 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
@@ -149,6 +149,8 @@ class MapboxRouteLineViewTest {
             every {
                 styleLayerExists(BOTTOM_LEVEL_ROUTE_LINE_LAYER_ID)
             } returns true
+            every { removeStyleSource(any()) } returns ExpectedFactory.createNone()
+            every { removeStyleLayer(any()) } returns ExpectedFactory.createNone()
         }
     }
 
@@ -169,6 +171,88 @@ class MapboxRouteLineViewTest {
             every {
                 setStyleSourceProperty(WAYPOINT_SOURCE_ID, any(), any())
             } returns ExpectedFactory.createNone()
+            every { getSource(LAYER_GROUP_1_SOURCE_ID) } returns null
+            every { getSource(LAYER_GROUP_2_SOURCE_ID) } returns null
+            every { getSource(LAYER_GROUP_3_SOURCE_ID) } returns null
+            every { getSource(WAYPOINT_SOURCE_ID) } returns null
+            every {
+                removeStyleSource(LAYER_GROUP_1_SOURCE_ID)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleSource(LAYER_GROUP_2_SOURCE_ID)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleSource(LAYER_GROUP_3_SOURCE_ID)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleSource(WAYPOINT_SOURCE_ID)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleSource(TOP_LEVEL_ROUTE_LINE_LAYER_ID)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleSource(BOTTOM_LEVEL_ROUTE_LINE_LAYER_ID)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(TOP_LEVEL_ROUTE_LINE_LAYER_ID)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(BOTTOM_LEVEL_ROUTE_LINE_LAYER_ID)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_1_TRAIL_CASING)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_1_TRAIL)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_1_CASING)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_1_MAIN)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_1_TRAFFIC)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_1_RESTRICTED)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_2_TRAIL_CASING)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_2_TRAIL)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_2_CASING)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_2_MAIN)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_2_TRAFFIC)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_2_RESTRICTED)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_3_TRAIL_CASING)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_3_TRAIL)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_3_CASING)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_3_MAIN)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_3_TRAFFIC)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_3_RESTRICTED)
+            } returns ExpectedFactory.createNone()
         }.also {
             mockCheckForLayerInitialization(it)
         }
@@ -179,6 +263,123 @@ class MapboxRouteLineViewTest {
         unmockkObject(MapboxRouteLineUtils)
     }
 
+    @Test
+    fun initializeLayers_withOptions() {
+        mockkObject(MapboxRouteLineUtils)
+        val options = MapboxRouteLineOptions.Builder(ctx).build()
+        val options2 = MapboxRouteLineOptions.Builder(ctx).withTolerance(59.0).build()
+        val style = mockk<Style> {
+            every {
+                setStyleSourceProperty(LAYER_GROUP_1_SOURCE_ID, any(), any())
+            } returns ExpectedFactory.createNone()
+            every {
+                setStyleSourceProperty(LAYER_GROUP_2_SOURCE_ID, any(), any())
+            } returns ExpectedFactory.createNone()
+            every {
+                setStyleSourceProperty(LAYER_GROUP_3_SOURCE_ID, any(), any())
+            } returns ExpectedFactory.createNone()
+            every {
+                setStyleSourceProperty(WAYPOINT_SOURCE_ID, any(), any())
+            } returns ExpectedFactory.createNone()
+            every { getSource(LAYER_GROUP_1_SOURCE_ID) } returns null
+            every { getSource(LAYER_GROUP_2_SOURCE_ID) } returns null
+            every { getSource(LAYER_GROUP_3_SOURCE_ID) } returns null
+            every { getSource(WAYPOINT_SOURCE_ID) } returns null
+            every {
+                removeStyleSource(LAYER_GROUP_1_SOURCE_ID)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleSource(LAYER_GROUP_2_SOURCE_ID)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleSource(LAYER_GROUP_3_SOURCE_ID)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleSource(WAYPOINT_SOURCE_ID)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleSource(TOP_LEVEL_ROUTE_LINE_LAYER_ID)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleSource(BOTTOM_LEVEL_ROUTE_LINE_LAYER_ID)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(TOP_LEVEL_ROUTE_LINE_LAYER_ID)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(BOTTOM_LEVEL_ROUTE_LINE_LAYER_ID)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_1_TRAIL_CASING)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_1_TRAIL)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_1_CASING)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_1_MAIN)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_1_TRAFFIC)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_1_RESTRICTED)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_2_TRAIL_CASING)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_2_TRAIL)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_2_CASING)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_2_MAIN)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_2_TRAFFIC)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_2_RESTRICTED)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_3_TRAIL_CASING)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_3_TRAIL)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_3_CASING)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_3_MAIN)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_3_TRAFFIC)
+            } returns ExpectedFactory.createNone()
+            every {
+                removeStyleLayer(LAYER_GROUP_3_RESTRICTED)
+            } returns ExpectedFactory.createNone()
+        }.also {
+            mockCheckForLayerInitialization(it)
+        }
+        val view = MapboxRouteLineView(options)
+
+        view.initializeLayers(style, options2)
+
+        verify { MapboxRouteLineUtils.removeLayersAndSources(style) }
+        verify { MapboxRouteLineUtils.initializeLayers(style, options2) }
+        verify { style.getSource(LAYER_GROUP_1_SOURCE_ID) }
+        verify { style.getSource(LAYER_GROUP_2_SOURCE_ID) }
+        verify { style.getSource(LAYER_GROUP_3_SOURCE_ID) }
+        verify { style.getSource(WAYPOINT_SOURCE_ID) }
+        assertEquals(view.options, options2)
+        unmockkObject(MapboxRouteLineUtils)
+    }
+
     @Test
     fun renderClearRouteLineValue() = coroutineRule.runBlockingTest {
         mockkStatic("com.mapbox.maps.extension.style.sources.SourceUtils")
@@ -242,6 +443,66 @@ class MapboxRouteLineViewTest {
         unmockkStatic("com.mapbox.maps.extension.style.sources.SourceUtils")
     }
 
+    @Test
+    fun renderClearRouteLineValue_noInitializeRepeat() = coroutineRule.runBlockingTest {
+        mockkStatic("com.mapbox.maps.extension.style.sources.SourceUtils")
+        mockkObject(MapboxRouteLineUtils)
+        val options = MapboxRouteLineOptions.Builder(ctx).build()
+        val primaryRouteFeatureCollection =
+            FeatureCollection.fromFeatures(listOf(getEmptyFeature(UUID.randomUUID().toString())))
+        val altRoutesFeatureCollection =
+            FeatureCollection.fromFeatures(listOf(getEmptyFeature(UUID.randomUUID().toString())))
+        val waypointsFeatureCollection =
+            FeatureCollection.fromFeatures(listOf(getEmptyFeature(UUID.randomUUID().toString())))
+        val primaryRouteSource = mockk<GeoJsonSource>(relaxed = true)
+        val altRoute1Source = mockk<GeoJsonSource>(relaxed = true)
+        val altRoute2Source = mockk<GeoJsonSource>(relaxed = true)
+        val wayPointSource = mockk<GeoJsonSource>(relaxed = true)
+        val topLevelRouteLayer = StyleObjectInfo(
+            TOP_LEVEL_ROUTE_LINE_LAYER_ID,
+            "background"
+        )
+        val bottomLevelRouteLayer = StyleObjectInfo(
+            BOTTOM_LEVEL_ROUTE_LINE_LAYER_ID,
+            "background"
+        )
+        val mainLayer = StyleObjectInfo(
+            LAYER_GROUP_1_MAIN,
+            "line"
+        )
+        val style = mockk<Style> {
+            every { getSource(LAYER_GROUP_1_SOURCE_ID) } returns primaryRouteSource
+            every { getSource(LAYER_GROUP_2_SOURCE_ID) } returns altRoute1Source
+            every { getSource(LAYER_GROUP_3_SOURCE_ID) } returns altRoute2Source
+            every { getSource(WAYPOINT_SOURCE_ID) } returns wayPointSource
+            every { styleLayers } returns listOf(
+                bottomLevelRouteLayer,
+                mainLayer,
+                topLevelRouteLayer
+            )
+        }.also {
+            mockCheckForLayerInitialization(it)
+        }
+
+        val state: Expected<RouteLineError, RouteLineClearValue> = ExpectedFactory.createValue(
+            RouteLineClearValue(
+                primaryRouteFeatureCollection,
+                listOf(altRoutesFeatureCollection, altRoutesFeatureCollection),
+                waypointsFeatureCollection
+            )
+        )
+
+        pauseDispatcher {
+            val view = MapboxRouteLineView(options)
+            view.renderClearRouteLineValue(style, state)
+            view.renderClearRouteLineValue(style, state)
+        }
+
+        verify(exactly = 1) { MapboxRouteLineUtils.initializeLayers(style, options) }
+        unmockkObject(MapboxRouteLineUtils)
+        unmockkStatic("com.mapbox.maps.extension.style.sources.SourceUtils")
+    }
+
     @Test
     fun renderTraveledRouteLineUpdate() = coroutineRule.runBlockingTest {
         mockkStatic("com.mapbox.maps.extension.style.layers.LayerUtils")
@@ -1095,6 +1356,7 @@ class MapboxRouteLineViewTest {
             view.renderRouteDrawData(style, state)
             view.renderRouteDrawData(style2, state2)
 
+            verify(exactly = 1) { MapboxRouteLineUtils.initializeLayers(style, options) }
             verify(exactly = 1) { style.moveStyleLayer(LAYER_GROUP_1_TRAIL_CASING, any()) }
             verify(exactly = 1) { style.moveStyleLayer(LAYER_GROUP_1_TRAIL, any()) }
             verify(exactly = 1) { style.moveStyleLayer(LAYER_GROUP_1_CASING, any()) }

From 9905db4bb591e3bbbfd795c29ff147eb5f3cd693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lukasz.paczos@mapbox.com>
Date: Fri, 3 Feb 2023 13:14:21 +0100
Subject: [PATCH 2/2] review updates

---
 changelog/unreleased/bugfixes/6793.md         |   2 +-
 .../route/line/api/MapboxRouteLineView.kt     |  34 ++---
 .../route/line/api/MapboxRouteLineViewTest.kt | 117 -----------------
 .../CustomAlternativeRouteColoringActivity.kt | 120 +++++++++++-------
 ...rnative_route_coloring_activity_layout.xml |  25 +++-
 qa-test-app/src/main/res/values/strings.xml   |   2 +-
 6 files changed, 110 insertions(+), 190 deletions(-)

diff --git a/changelog/unreleased/bugfixes/6793.md b/changelog/unreleased/bugfixes/6793.md
index 7886711c84e..44a42aaa261 100644
--- a/changelog/unreleased/bugfixes/6793.md
+++ b/changelog/unreleased/bugfixes/6793.md
@@ -1 +1 @@
-- Updated behavior of `MapboxRouteLineView::initializeLayers` to always reset the route line related layers with the options provided even if it means removing existing layers in order to apply the options. Also new instances of `MapboxRouteLineView` will result in an initialization of the layers upon the first render call. 
\ No newline at end of file
+- :warning: If you're recreating the `MapboxRouteLineView` instance, for example to change the `MapboxRouteLineOptions`, make sure that your first interaction restores the state and re-applies the options by calling `MapboxRouteLineApi.getRouteDrawData` and passing the result to `MapboxRouteLineView.renderRouteDrawData`. This is a necessary change to fix an issue where `MapboxRouteLineOptions` provided in a new instance of `MapboxRouteLineView` were ignored if the style object used with `render` functions already had route line layers initialized.
\ No newline at end of file
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
index f53482adc50..a14e0e5a12e 100644
--- 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
@@ -74,6 +74,10 @@ import org.jetbrains.annotations.TestOnly
  * Many of the method calls execute tasks on a background thread. A cancel method is provided
  * in this class which will cancel the background tasks.
  *
+ * If you're recreating the [MapboxRouteLineView] instance, for example to change the
+ * [MapboxRouteLineOptions], make sure that your first interaction restores the state and re-applies
+ * the options by calling [MapboxRouteLineApi.getRouteDrawData] and passing the result to [MapboxRouteLineView.renderRouteDrawData].
+ *
  * @param options resource options used rendering the route line on the map
  */
 @UiThread
@@ -91,7 +95,8 @@ class MapboxRouteLineView(options: MapboxRouteLineOptions) {
     var options: MapboxRouteLineOptions = options
         @Deprecated(
             message = "Avoid using this setter as it will not correctly " +
-                "re-apply all mutated parameters."
+                "re-apply all mutated parameters. " +
+                "Recreate the instance and provide options via constructor instead."
         )
         set
 
@@ -145,8 +150,6 @@ class MapboxRouteLineView(options: MapboxRouteLineOptions) {
      * the layers if they have not yet been initialized. If you have a use case for initializing
      * the layers in advance of any API calls this method may be used.
      *
-     * If the layers already exist they will be removed and re-initialized with the options provided.
-     *
      * Each [Layer] added to the map by this class is a persistent layer - it will survive style changes.
      * This means that if the data has not changed, it does not have to be manually redrawn after a style change.
      * See [Style.addPersistentStyleLayer].
@@ -154,23 +157,7 @@ class MapboxRouteLineView(options: MapboxRouteLineOptions) {
      * @param style a valid [Style] instance
      */
     fun initializeLayers(style: Style) {
-        resetLayers(style)
-    }
-
-    /**
-     * Updates the [MapboxRouteLineOptions] used for the route line related layers and initializes the layers.
-     * If the layers already exist they will be removed and re-initialized with the options provided.
-     *
-     * Each [Layer] added to the map by this class is a persistent layer - it will survive style changes.
-     * This means that if the data has not changed, it does not have to be manually redrawn after a style change.
-     * See [Style.addPersistentStyleLayer].
-     *
-     * @param style a valid [Style] instance
-     * @param options used for the route line related layers.
-     */
-    fun initializeLayers(style: Style, options: MapboxRouteLineOptions) {
-        this.options = options
-        resetLayers(style)
+        rebuildSourcesAndLayersIfNeeded(style)
     }
 
     /**
@@ -255,7 +242,9 @@ class MapboxRouteLineView(options: MapboxRouteLineOptions) {
                                         sourceLayerMap
                                     )
                                 }
-                            } else { {} }
+                            } else {
+                                {}
+                            }
                             listOf(layerMoveCommand).plus(trimOffsetCommands).plus(gradientCommands)
                         } ?: listOf()
                     }
@@ -858,7 +847,8 @@ class MapboxRouteLineView(options: MapboxRouteLineOptions) {
                             }
                             else -> null
                         }
-                    } else -> {
+                    }
+                    else -> {
                         when (it) {
                             in casingLayerIds -> {
                                 options.resourceProvider.alternativeRouteCasingLineScaleExpression
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
index 4585787089a..0fb9ca6587a 100644
--- 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
@@ -263,123 +263,6 @@ class MapboxRouteLineViewTest {
         unmockkObject(MapboxRouteLineUtils)
     }
 
-    @Test
-    fun initializeLayers_withOptions() {
-        mockkObject(MapboxRouteLineUtils)
-        val options = MapboxRouteLineOptions.Builder(ctx).build()
-        val options2 = MapboxRouteLineOptions.Builder(ctx).withTolerance(59.0).build()
-        val style = mockk<Style> {
-            every {
-                setStyleSourceProperty(LAYER_GROUP_1_SOURCE_ID, any(), any())
-            } returns ExpectedFactory.createNone()
-            every {
-                setStyleSourceProperty(LAYER_GROUP_2_SOURCE_ID, any(), any())
-            } returns ExpectedFactory.createNone()
-            every {
-                setStyleSourceProperty(LAYER_GROUP_3_SOURCE_ID, any(), any())
-            } returns ExpectedFactory.createNone()
-            every {
-                setStyleSourceProperty(WAYPOINT_SOURCE_ID, any(), any())
-            } returns ExpectedFactory.createNone()
-            every { getSource(LAYER_GROUP_1_SOURCE_ID) } returns null
-            every { getSource(LAYER_GROUP_2_SOURCE_ID) } returns null
-            every { getSource(LAYER_GROUP_3_SOURCE_ID) } returns null
-            every { getSource(WAYPOINT_SOURCE_ID) } returns null
-            every {
-                removeStyleSource(LAYER_GROUP_1_SOURCE_ID)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleSource(LAYER_GROUP_2_SOURCE_ID)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleSource(LAYER_GROUP_3_SOURCE_ID)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleSource(WAYPOINT_SOURCE_ID)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleSource(TOP_LEVEL_ROUTE_LINE_LAYER_ID)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleSource(BOTTOM_LEVEL_ROUTE_LINE_LAYER_ID)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(TOP_LEVEL_ROUTE_LINE_LAYER_ID)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(BOTTOM_LEVEL_ROUTE_LINE_LAYER_ID)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(LAYER_GROUP_1_TRAIL_CASING)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(LAYER_GROUP_1_TRAIL)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(LAYER_GROUP_1_CASING)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(LAYER_GROUP_1_MAIN)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(LAYER_GROUP_1_TRAFFIC)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(LAYER_GROUP_1_RESTRICTED)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(LAYER_GROUP_2_TRAIL_CASING)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(LAYER_GROUP_2_TRAIL)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(LAYER_GROUP_2_CASING)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(LAYER_GROUP_2_MAIN)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(LAYER_GROUP_2_TRAFFIC)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(LAYER_GROUP_2_RESTRICTED)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(LAYER_GROUP_3_TRAIL_CASING)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(LAYER_GROUP_3_TRAIL)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(LAYER_GROUP_3_CASING)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(LAYER_GROUP_3_MAIN)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(LAYER_GROUP_3_TRAFFIC)
-            } returns ExpectedFactory.createNone()
-            every {
-                removeStyleLayer(LAYER_GROUP_3_RESTRICTED)
-            } returns ExpectedFactory.createNone()
-        }.also {
-            mockCheckForLayerInitialization(it)
-        }
-        val view = MapboxRouteLineView(options)
-
-        view.initializeLayers(style, options2)
-
-        verify { MapboxRouteLineUtils.removeLayersAndSources(style) }
-        verify { MapboxRouteLineUtils.initializeLayers(style, options2) }
-        verify { style.getSource(LAYER_GROUP_1_SOURCE_ID) }
-        verify { style.getSource(LAYER_GROUP_2_SOURCE_ID) }
-        verify { style.getSource(LAYER_GROUP_3_SOURCE_ID) }
-        verify { style.getSource(WAYPOINT_SOURCE_ID) }
-        assertEquals(view.options, options2)
-        unmockkObject(MapboxRouteLineUtils)
-    }
-
     @Test
     fun renderClearRouteLineValue() = coroutineRule.runBlockingTest {
         mockkStatic("com.mapbox.maps.extension.style.sources.SourceUtils")
diff --git a/qa-test-app/src/main/java/com/mapbox/navigation/qa_test_app/view/CustomAlternativeRouteColoringActivity.kt b/qa-test-app/src/main/java/com/mapbox/navigation/qa_test_app/view/CustomAlternativeRouteColoringActivity.kt
index 893b8d3c735..97a6725a88a 100644
--- a/qa-test-app/src/main/java/com/mapbox/navigation/qa_test_app/view/CustomAlternativeRouteColoringActivity.kt
+++ b/qa-test-app/src/main/java/com/mapbox/navigation/qa_test_app/view/CustomAlternativeRouteColoringActivity.kt
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.graphics.Color
 import android.os.Bundle
 import android.util.Log
+import androidx.annotation.ColorInt
 import androidx.appcompat.app.AppCompatActivity
 import com.mapbox.api.directions.v5.models.DirectionsRoute
 import com.mapbox.maps.CameraOptions
@@ -33,64 +34,42 @@ class CustomAlternativeRouteColoringActivity : AppCompatActivity() {
         viewBinding.mapView.getMapboxMap()
     }
 
-    private val routeLineColorResources by lazy {
-        RouteLineColorResources.Builder().build()
-    }
+    private val styles = listOf(
+        NavigationStyles.NAVIGATION_DAY_STYLE,
+        NavigationStyles.NAVIGATION_NIGHT_STYLE,
+        Style.LIGHT,
+    )
 
-    private val routeLineResources: RouteLineResources by lazy {
-        RouteLineResources.Builder().routeLineColorResources(routeLineColorResources).build()
-    }
+    private val colors = listOf(
+        RouteLineColorResources.Builder().build().routeDefaultColor,
+        Color.GREEN,
+    )
 
-    private val routeLineOptions: MapboxRouteLineOptions by lazy {
-        MapboxRouteLineOptions.Builder(this)
-            .withRouteLineResources(routeLineResources)
-            .withRouteLineBelowLayerId("road-label-navigation")
-            .withVanishingRouteLineEnabled(true)
-            .withRouteStyleDescriptors(
-                listOf(
-                    RouteStyleDescriptor("altRoute1", Color.YELLOW, Color.GREEN),
-                    RouteStyleDescriptor("altRoute2", Color.CYAN, Color.MAGENTA)
-                )
-            )
-            .build()
-    }
-
-    private val routeLineView by lazy {
-        MapboxRouteLineView(routeLineOptions)
-    }
-
-    private val routeLineApi: MapboxRouteLineApi by lazy {
-        MapboxRouteLineApi(routeLineOptions)
-    }
+    private var routeColor = colors.first()
+    private var styleId = styles.first()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(viewBinding.root)
-        initStyle()
+        initStyle(styleId)
+        viewBinding.buttonChangeStyle.setOnClickListener {
+            styleId = styles.filter { it != styleId }.random()
+            initStyle(styleId)
+        }
+        viewBinding.buttonChangePrimaryRouteColor.setOnClickListener {
+            routeColor = colors.filter { it != routeColor }.random()
+            setRoutes(mapboxMap.getStyle()!!, generateRouteLineOptions(styleId, routeColor))
+        }
     }
 
     @SuppressLint("MissingPermission")
-    private fun initStyle() {
+    private fun initStyle(
+        styleId: String,
+    ) {
         mapboxMap.loadStyleUri(
-            NavigationStyles.NAVIGATION_DAY_STYLE,
+            styleId,
             { style: Style ->
-
-                val route1 = getRoute(R.raw.basic_route1)
-                val route2 = getRoute(R.raw.basic_route2)
-                val route3 = getRoute(R.raw.basic_route3)
-                routeLineApi.setRoutes(
-                    listOf(
-                        RouteLine(route1, null),
-                        RouteLine(route2, "altRoute1"),
-                        RouteLine(route3, "altRoute2")
-                    )
-                ) {
-                    routeLineView.renderRouteDrawData(style, it)
-                    routeLineView.hideTraffic(style)
-                }
-                val routeOrigin = Utils.getRouteOriginPoint(route1)
-                val cameraOptions = CameraOptions.Builder().center(routeOrigin).zoom(14.0).build()
-                viewBinding.mapView.getMapboxMap().setCamera(cameraOptions)
+                setRoutes(style, generateRouteLineOptions(styleId, routeColor))
             },
             object : OnMapLoadErrorListener {
                 override fun onMapLoadError(eventData: MapLoadingErrorEventData) {
@@ -104,6 +83,53 @@ class CustomAlternativeRouteColoringActivity : AppCompatActivity() {
         )
     }
 
+    private fun setRoutes(style: Style, options: MapboxRouteLineOptions) {
+        val routeLineApi = MapboxRouteLineApi(options)
+        val routeLineView = MapboxRouteLineView(options)
+        val route1 = getRoute(R.raw.basic_route1)
+        val route2 = getRoute(R.raw.basic_route2)
+        val route3 = getRoute(R.raw.basic_route3)
+        routeLineApi.setRoutes(
+            listOf(
+                RouteLine(route1, null),
+                RouteLine(route2, "altRoute1"),
+                RouteLine(route3, "altRoute2")
+            )
+        ) {
+            routeLineView.renderRouteDrawData(style, it)
+            routeLineView.hideTraffic(style)
+        }
+        val routeOrigin = Utils.getRouteOriginPoint(route1)
+        val cameraOptions = CameraOptions.Builder().center(routeOrigin).zoom(14.0).build()
+        viewBinding.mapView.getMapboxMap().setCamera(cameraOptions)
+    }
+
+    private fun generateRouteLineOptions(styleId: String, @ColorInt routeColor: Int) =
+        MapboxRouteLineOptions.Builder(this)
+            .withRouteLineResources(
+                RouteLineResources.Builder()
+                    .routeLineColorResources(
+                        RouteLineColorResources.Builder()
+                            .routeDefaultColor(routeColor)
+                            .build()
+                    )
+                    .build()
+            )
+            .withRouteLineBelowLayerId(
+                when (styleId) {
+                    NavigationStyles.NAVIGATION_DAY_STYLE -> "road-label-navigation"
+                    Style.LIGHT -> "road-label"
+                    else -> "road-label-navigation"
+                }
+            )
+            .withRouteStyleDescriptors(
+                listOf(
+                    RouteStyleDescriptor("altRoute1", Color.YELLOW, Color.GREEN),
+                    RouteStyleDescriptor("altRoute2", Color.CYAN, Color.MAGENTA)
+                )
+            )
+            .build()
+
     private fun getRoute(routeResourceId: Int): DirectionsRoute {
         val routeAsString = Utils.readRawFileText(this, routeResourceId)
         return DirectionsRoute.fromJson(routeAsString)
diff --git a/qa-test-app/src/main/res/layout/custom_alternative_route_coloring_activity_layout.xml b/qa-test-app/src/main/res/layout/custom_alternative_route_coloring_activity_layout.xml
index b7cf4e02842..a564c3b00de 100644
--- a/qa-test-app/src/main/res/layout/custom_alternative_route_coloring_activity_layout.xml
+++ b/qa-test-app/src/main/res/layout/custom_alternative_route_coloring_activity_layout.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
     <com.mapbox.maps.MapView
         android:id="@+id/mapView"
@@ -13,4 +13,25 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/button_change_style"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_margin="16dp"
+        android:layout_marginTop="8dp"
+        android:src="@android:drawable/ic_menu_gallery"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/button_change_primary_route_color"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_margin="16dp"
+        android:layout_marginBottom="8dp"
+        android:src="@android:drawable/stat_sys_upload_done"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/button_change_style"
+        app:layout_constraintEnd_toEndOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/qa-test-app/src/main/res/values/strings.xml b/qa-test-app/src/main/res/values/strings.xml
index 3dd9793ed58..7835968b4d2 100644
--- a/qa-test-app/src/main/res/values/strings.xml
+++ b/qa-test-app/src/main/res/values/strings.xml
@@ -4,7 +4,7 @@
     <string name="experimental_alt_components_install" tools:ignore="MissingTranslation">Experimental UI Components installation API using MapboxNavigation instance.</string>
     <string name="mapbox_navigation_app_lifecycle_description" tools:ignore="MissingTranslation">Test the usage of MapboxNavigationApp which can manage lifecycles between a car and app.</string>
     <string name="alternative_route_selection_description" tools:ignore="MissingTranslation">Tests the selecting of an alternative route line. \n\n1. Long press a point on the map in order to get a primary route and at least one alternative route. \n\n2. Select an alternative route by touching it. The touched route should appear as the primary route and the previous primary route should appear as an alternative. \n\n3. Click start navigation and make sure the puck follows the selected route.</string>
-    <string name="custom_alternative_route_color_description" tools:ignore="MissingTranslation">Tests overriding the default alternative route colors with custom colors. \n\nThe screen should display 3 route lines.  One blue line that represents the primary route line as well as a yellow line with a green border and a cyan colored line with a magenta boarder. \n\nThis indicates the two alternative route lines have been colored with the custom colors indicated in the activity.</string>
+    <string name="custom_alternative_route_color_description" tools:ignore="MissingTranslation">Tests overriding the default alternative route colors with custom colors. \n\nThe screen should display 3 route lines.  One blue line that represents the primary route line as well as a yellow line with a green border and a cyan colored line with a magenta boarder. \n\nThis indicates the two alternative route lines have been colored with the custom colors indicated in the activity. \n\nColor of the primary route can be changed, as well as the map style. This helps verifying that options can be updated in the runtime. One of the indicators for the successful update is route line positioned always below road labels for each style.</string>
     <string name="routeline_activity" translatable="false">Internal Development Activity</string>
     <string name="label_start_navigation" translatable="false">Start Navigation</string>
     <string name="route_drawing_utility" translatable="false">Internal Route Drawing Utility</string>