Update the sourceToFeatureMap on clearing after update commands.

jush · github-actions[bot] · commit e83677245506 · 2025-05-26T12:22:42.000Z
GitOrigin-RevId: 6e0bc75d935a0f2edc6612dd3d40878073d069d8
diff --git a/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/line/api/MapboxRouteLineView.kt b/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/line/api/MapboxRouteLineView.kt
@@ -767,26 +767,27 @@ class MapboxRouteLineView @VisibleForTesting internal constructor(
                             value.primaryRouteSource,
                             newDataId,
                         )
+                        sourceToFeatureMap[primaryRouteLineSourceKey] = RouteLineFeatureId(routeId)
                     }
-                    sourceToFeatureMap[primaryRouteLineSourceKey] = RouteLineFeatureId(routeId)
                 }
                 sourceLayerMap.keys.filter { it != primarySourceKey }
                     .forEachIndexed { index, routeLineSourceKey ->
                         if (index < value.alternativeRoutesSources.size) {
                             val newDataId = dataIdHolder
                                 .incrementDataId(routeLineSourceKey.sourceId)
+                            val routeId = value.alternativeRoutesSources[index]
+                                .features()
+                                ?.firstOrNull()
+                                ?.id()
                             updateSourceCommands.add {
                                 updateSource(
                                     style,
                                     routeLineSourceKey.sourceId,
                                     value.alternativeRoutesSources[index],
                                     newDataId,
                                 )
+                                sourceToFeatureMap[routeLineSourceKey] = RouteLineFeatureId(routeId)
                             }
-                            val routeId = value.alternativeRoutesSources[index]
-                                .features()
-                                ?.firstOrNull()
-                                ?.id()
                             expectedRoutesData.addClearedRoute(
                                 routeLineSourceKey.sourceId,
                                 newDataId,
@@ -797,7 +798,6 @@ class MapboxRouteLineView @VisibleForTesting internal constructor(
                                 newDataId,
                                 routeId,
                             )
-                            sourceToFeatureMap[routeLineSourceKey] = RouteLineFeatureId(routeId)
                         }
                     }
                 if (callback != null) {

Original file line number	Diff line number	Diff line change
`@@ -767,26 +767,27 @@ class MapboxRouteLineView @VisibleForTesting internal constructor(`
`767`	`767`	`value.primaryRouteSource,`
`768`	`768`	`newDataId,`
`769`	`769`	`)`
	`770`	`+ sourceToFeatureMap[primaryRouteLineSourceKey] = RouteLineFeatureId(routeId)`
`770`	`771`	`}`
`771`		`- sourceToFeatureMap[primaryRouteLineSourceKey] = RouteLineFeatureId(routeId)`
`772`	`772`	`}`
`773`	`773`	`sourceLayerMap.keys.filter { it != primarySourceKey }`
`774`	`774`	`.forEachIndexed { index, routeLineSourceKey ->`
`775`	`775`	`if (index < value.alternativeRoutesSources.size) {`
`776`	`776`	`val newDataId = dataIdHolder`
`777`	`777`	`.incrementDataId(routeLineSourceKey.sourceId)`
	`778`	`+ val routeId = value.alternativeRoutesSources[index]`
	`779`	`+ .features()`
	`780`	`+ ?.firstOrNull()`
	`781`	`+ ?.id()`
`778`	`782`	`updateSourceCommands.add {`
`779`	`783`	`updateSource(`
`780`	`784`	`style,`
`781`	`785`	`routeLineSourceKey.sourceId,`
`782`	`786`	`value.alternativeRoutesSources[index],`
`783`	`787`	`newDataId,`
`784`	`788`	`)`
	`789`	`+ sourceToFeatureMap[routeLineSourceKey] = RouteLineFeatureId(routeId)`
`785`	`790`	`}`
`786`		`- val routeId = value.alternativeRoutesSources[index]`
`787`		`- .features()`
`788`		`- ?.firstOrNull()`
`789`		`- ?.id()`
`790`	`791`	`expectedRoutesData.addClearedRoute(`
`791`	`792`	`routeLineSourceKey.sourceId,`
`792`	`793`	`newDataId,`
`@@ -797,7 +798,6 @@ class MapboxRouteLineView @VisibleForTesting internal constructor(`
`797`	`798`	`newDataId,`
`798`	`799`	`routeId,`
`799`	`800`	`)`
`800`		`- sourceToFeatureMap[routeLineSourceKey] = RouteLineFeatureId(routeId)`
`801`	`801`	`}`
`802`	`802`	`}`
`803`	`803`	`if (callback != null) {`