optimizes road objects creation by re-using the parsing that was alre…

…ady done
mapbox · Sep 23, 2022 · 3a65560 · 3a65560
1 parent 014a0b6
commit 3a65560
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/...avigation-core/src/main/java/com/mapbox/navigation/core/trip/session/MapboxTripSession.kt b/...avigation-core/src/main/java/com/mapbox/navigation/core/trip/session/MapboxTripSession.kt
@@ -7,9 +7,7 @@ import com.mapbox.api.directions.v5.models.BannerInstructions
 import com.mapbox.api.directions.v5.models.VoiceInstructions
 import com.mapbox.navigation.base.ExperimentalMapboxNavigationAPI
 import com.mapbox.navigation.base.internal.factory.RoadFactory
-import com.mapbox.navigation.base.internal.factory.RoadObjectFactory.toUpcomingRoadObjects
 import com.mapbox.navigation.base.internal.factory.TripNotificationStateFactory.buildTripNotificationState
-import com.mapbox.navigation.base.internal.route.nativeRoute
 import com.mapbox.navigation.base.route.NavigationRoute
 import com.mapbox.navigation.base.trip.model.RouteLegProgress
 import com.mapbox.navigation.base.trip.model.RouteProgress
@@ -100,8 +98,7 @@ internal class MapboxTripSession(
                     val primaryRoute = routes.first()
                     navigator.refreshRoute(primaryRoute).onValue {
                         this@MapboxTripSession.primaryRoute = routes.first()
-                        roadObjects = primaryRoute.nativeRoute().routeInfo.alerts
-                            .toUpcomingRoadObjects()
+                        roadObjects = primaryRoute.upcomingRoadObjects
                     }.fold({ NativeSetRouteError(it) }, { NativeSetRouteValue(it) }).also {
                         logD(
                             "routes update (route IDs: ${routes.map { it.id }}) - refresh finished",
@@ -141,8 +138,7 @@ internal class MapboxTripSession(
         ).onValue {
             updateLegIndexJob?.cancel()
             this@MapboxTripSession.primaryRoute = newPrimaryRoute
-            roadObjects = newPrimaryRoute?.nativeRoute()?.routeInfo?.alerts
-                ?.toUpcomingRoadObjects() ?: emptyList()
+            roadObjects = newPrimaryRoute?.upcomingRoadObjects ?: emptyList()
             isOffRoute = false
             invalidateLatestInstructions()
             routeProgress = null

diff --git a/...ation-core/src/test/java/com/mapbox/navigation/core/trip/session/MapboxTripSessionTest.kt b/...ation-core/src/test/java/com/mapbox/navigation/core/trip/session/MapboxTripSessionTest.kt
@@ -8,8 +8,6 @@ import com.mapbox.api.directions.v5.models.VoiceInstructions
 import com.mapbox.bindgen.ExpectedFactory
 import com.mapbox.navigation.base.internal.CurrentIndicesFactory
 import com.mapbox.navigation.base.internal.factory.RoadObjectFactory
-import com.mapbox.navigation.base.internal.factory.RoadObjectFactory.toUpcomingRoadObjects
-import com.mapbox.navigation.base.internal.route.nativeRoute
 import com.mapbox.navigation.base.options.NavigationOptions
 import com.mapbox.navigation.base.route.NavigationRoute
 import com.mapbox.navigation.base.trip.model.RouteProgress
@@ -1489,10 +1487,7 @@ class MapboxTripSessionTest {
 private fun mockNavigationRoute(
     roadObjects: List<UpcomingRoadObject> = listOf(mockk())
 ): NavigationRoute = mockk(relaxed = true) {
-    val navigationRoute = this
-    every {
-        navigationRoute.nativeRoute().routeInfo.alerts.toUpcomingRoadObjects()
-    } returns roadObjects
+    every { upcomingRoadObjects } returns roadObjects
 }
 
 fun createSetRouteError(