Skip to content

Commit cc70912

Browse files
kmadsenkmadsen
committed
Make ReplayRouteSession handle route changes
1 parent bc34e46 commit cc70912

File tree

6 files changed

+71
-70
lines changed

6 files changed

+71
-70
lines changed

‎android-auto-app/build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,9 @@ dependencies {
7272
// This example is used for development so it may depend on unstable versions.
7373
// Examples based on final versions can be found in the examples repository.
7474
// https://github.com/mapbox/mapbox-navigation-android-examples
75-
implementation("com.mapbox.navigation:ui-dropin:2.10.0-rc.1")
76-
implementation("com.mapbox.search:mapbox-search-android:1.0.0-beta.42")
75+
implementation project(':libnavui-dropin')
76+
// implementation("com.mapbox.navigation:ui-dropin:2.10.0")
77+
implementation("com.mapbox.search:mapbox-search-android:1.0.0-beta.43")
7778

7879
// Dependencies needed for this example.
7980
implementation dependenciesList.androidXCore

‎android-auto-app/src/main/java/com/mapbox/navigation/examples/androidauto/car/MainCarSession.kt‎

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package com.mapbox.navigation.examples.androidauto.car
22

3-
import android.annotation.SuppressLint
43
import android.content.Intent
54
import android.content.res.Configuration
65
import androidx.car.app.Screen
76
import androidx.car.app.Session
87
import androidx.car.app.model.ActionStrip
98
import androidx.lifecycle.DefaultLifecycleObserver
10-
import androidx.lifecycle.Lifecycle
119
import androidx.lifecycle.LifecycleOwner
1210
import androidx.lifecycle.lifecycleScope
13-
import androidx.lifecycle.repeatOnLifecycle
1411
import com.mapbox.android.core.permissions.PermissionsManager
1512
import com.mapbox.androidauto.MapboxCarContext
1613
import com.mapbox.androidauto.action.MapboxScreenActionStripProvider
@@ -29,12 +26,11 @@ import com.mapbox.maps.applyDefaultParams
2926
import com.mapbox.maps.extension.androidauto.MapboxCarMap
3027
import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
3128
import com.mapbox.navigation.core.lifecycle.MapboxNavigationApp
32-
import com.mapbox.navigation.core.lifecycle.requireMapboxNavigation
33-
import com.mapbox.navigation.core.replay.route.ReplayRouteSession
34-
import com.mapbox.navigation.core.trip.session.TripSessionState
29+
import com.mapbox.navigation.core.trip.MapboxTripStarter
3530
import com.mapbox.navigation.examples.androidauto.CarAppSyncComponent
36-
import kotlinx.coroutines.flow.collect
37-
import kotlinx.coroutines.launch
31+
import kotlinx.coroutines.flow.filter
32+
import kotlinx.coroutines.flow.launchIn
33+
import kotlinx.coroutines.flow.onEach
3834

3935
@OptIn(ExperimentalPreviewMapboxNavigationAPI::class)
4036
class MainCarSession : Session() {
@@ -57,10 +53,11 @@ class MainCarSession : Session() {
5753
}
5854
}
5955
}
60-
private val mapboxNavigation by requireMapboxNavigation()
61-
private val replayRouteSession = ReplayRouteSession()
56+
private val mapboxTripStarter = MapboxTripStarter.getRegisteredInstance()
6257

6358
init {
59+
MapboxNavigationApp.attach(this)
60+
6461
// Decide how you want the car and app to interact. In this example, the car and app
6562
// are kept in sync where they essentially mirror each other.
6663
CarAppSyncComponent.getInstance().setCarSession(this)
@@ -143,31 +140,9 @@ class MainCarSession : Session() {
143140
// computer terminal.
144141
// adb shell dumpsys activity service com.mapbox.navigation.examples.androidauto.car.MainCarAppService AUTO_DRIVE
145142
private fun observeAutoDrive() {
146-
lifecycleScope.launch {
147-
lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
148-
mapboxCarContext.mapboxNavigationManager.autoDriveEnabledFlow.collect {
149-
refreshTripSession()
150-
}
151-
}
152-
}
153-
}
154-
155-
@SuppressLint("MissingPermission")
156-
private fun refreshTripSession() {
157-
val isAutoDriveEnabled = mapboxCarContext.mapboxNavigationManager
158-
.autoDriveEnabledFlow.value
159-
if (!PermissionsManager.areLocationPermissionsGranted(carContext)) {
160-
mapboxNavigation.stopTripSession()
161-
return
162-
}
163-
164-
if (isAutoDriveEnabled) {
165-
MapboxNavigationApp.registerObserver(replayRouteSession)
166-
} else {
167-
MapboxNavigationApp.unregisterObserver(replayRouteSession)
168-
if (mapboxNavigation.getTripSessionState() != TripSessionState.STARTED) {
169-
mapboxNavigation.startTripSession()
170-
}
171-
}
143+
mapboxCarContext.mapboxNavigationManager.autoDriveEnabledFlow
144+
.filter { it }
145+
.onEach { mapboxTripStarter.enableReplayRoute() }
146+
.launchIn(lifecycleScope)
172147
}
173148
}

‎libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayRouteSession.kt‎

Lines changed: 53 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import com.mapbox.navigation.base.route.NavigationRoute
1212
import com.mapbox.navigation.base.trip.model.RouteProgress
1313
import com.mapbox.navigation.core.MapboxNavigation
1414
import com.mapbox.navigation.core.directions.session.RoutesObserver
15-
import com.mapbox.navigation.core.history.MapboxHistoryReaderProvider
1615
import com.mapbox.navigation.core.lifecycle.MapboxNavigationApp
1716
import com.mapbox.navigation.core.lifecycle.MapboxNavigationObserver
1817
import com.mapbox.navigation.core.replay.MapboxReplayer
@@ -24,6 +23,7 @@ import com.mapbox.navigation.utils.internal.logW
2423
import kotlinx.coroutines.CoroutineScope
2524
import kotlinx.coroutines.Dispatchers
2625
import kotlinx.coroutines.SupervisorJob
26+
import kotlinx.coroutines.cancel
2727
import kotlinx.coroutines.flow.Flow
2828
import kotlinx.coroutines.flow.MutableStateFlow
2929
import kotlinx.coroutines.flow.StateFlow
@@ -67,25 +67,33 @@ import java.util.Collections
6767
class ReplayRouteSession : MapboxNavigationObserver {
6868

6969
private lateinit var replayRouteMapper: ReplayRouteMapper
70+
private lateinit var coroutineScope: CoroutineScope
7071
private val optionsFlow = MutableStateFlow(ReplayRouteSessionOptions.Builder().build())
7172
private var mapboxNavigation: MapboxNavigation? = null
7273
private var lastLocationEvent: ReplayEventUpdateLocation? = null
7374
private var polylineDecodeStream: ReplayPolylineDecodeStream? = null
7475
private var currentRoute: NavigationRoute? = null
75-
private var coroutineScope: CoroutineScope? = null
76+
set(value) {
77+
field = value
78+
isNewRouteInitialized = value != null
79+
}
80+
private var isNewRouteInitialized = false
7681

7782
private val routeProgressObserver = RouteProgressObserver { routeProgress ->
7883
if (currentRoute?.id != routeProgress.navigationRoute.id) {
7984
currentRoute = routeProgress.navigationRoute
80-
onRouteChanged(routeProgress)
85+
onRouteProgressRouteChanged(routeProgress)
8186
}
8287
}
8388

8489
private val routesObserver = RoutesObserver { result ->
85-
if (result.navigationRoutes.isEmpty()) {
90+
val route = result.navigationRoutes.firstOrNull()
91+
if (route == null) {
8692
mapboxNavigation?.resetReplayLocation()
8793
currentRoute = null
8894
polylineDecodeStream = null
95+
} else if (!isNewRouteInitialized && currentRoute?.id != route.id) {
96+
onInitializeNewRoute(route)
8997
}
9098
}
9199

@@ -113,24 +121,23 @@ class ReplayRouteSession : MapboxNavigationObserver {
113121
}
114122

115123
override fun onAttached(mapboxNavigation: MapboxNavigation) {
116-
val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
117-
.also { this.coroutineScope = it }
124+
this.coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
118125
this.mapboxNavigation = mapboxNavigation
119126
mapboxNavigation.startReplayTripSession()
120-
mapboxNavigation.registerRouteProgressObserver(routeProgressObserver)
127+
observeStateFlow(mapboxNavigation).launchIn(coroutineScope)
121128
mapboxNavigation.registerRoutesObserver(routesObserver)
129+
mapboxNavigation.registerRouteProgressObserver(routeProgressObserver)
122130
mapboxNavigation.mapboxReplayer.registerObserver(replayEventsObserver)
123-
mapboxNavigation.mapboxReplayer.play()
124-
observeStateFlow(mapboxNavigation).launchIn(coroutineScope)
125131
}
126132

127133
private fun observeStateFlow(mapboxNavigation: MapboxNavigation): Flow<*> {
128134
return optionsFlow.mapDistinct { it.replayRouteOptions }.onEach { replayRouteOptions ->
129135
mapboxNavigation.mapboxReplayer.clearEvents()
130136
this.replayRouteMapper = ReplayRouteMapper(replayRouteOptions)
131-
val routes = mapboxNavigation.getNavigationRoutes()
132-
mapboxNavigation.setNavigationRoutes(emptyList())
133-
mapboxNavigation.setNavigationRoutes(routes)
137+
currentRoute = null
138+
mapboxNavigation.resetTripSession {
139+
mapboxNavigation.mapboxReplayer.play()
140+
}
134141
}
135142
}
136143

@@ -158,6 +165,9 @@ class ReplayRouteSession : MapboxNavigationObserver {
158165
}
159166

160167
override fun onDetached(mapboxNavigation: MapboxNavigation) {
168+
if (this::coroutineScope.isInitialized) {
169+
coroutineScope.cancel()
170+
}
161171
mapboxNavigation.unregisterRoutesObserver(routesObserver)
162172
mapboxNavigation.unregisterRouteProgressObserver(routeProgressObserver)
163173
mapboxNavigation.mapboxReplayer.unregisterObserver(replayEventsObserver)
@@ -167,28 +177,43 @@ class ReplayRouteSession : MapboxNavigationObserver {
167177
this.currentRoute = null
168178
}
169179

170-
private fun onRouteChanged(routeProgress: RouteProgress) {
180+
private fun onInitializeNewRoute(route: NavigationRoute) {
181+
mapboxNavigation?.mapboxReplayer?.clearEvents()
182+
this.replayRouteMapper = ReplayRouteMapper(optionsFlow.value.replayRouteOptions)
183+
mapboxNavigation?.resetTripSession {
184+
route.routeOptions.coordinatesList().firstOrNull()?.let {
185+
val replayFirstLocation = replayRouteMapper.mapPointList(listOf(it))
186+
mapboxNavigation?.mapboxReplayer?.pushEvents(replayFirstLocation)
187+
}
188+
mapboxNavigation?.mapboxReplayer?.play()
189+
}
190+
isNewRouteInitialized = true
191+
}
192+
193+
private fun onRouteProgressRouteChanged(routeProgress: RouteProgress) {
171194
val navigationRoute = routeProgress.navigationRoute
172195
val mapboxReplayer = mapboxNavigation?.mapboxReplayer ?: return
173196
mapboxReplayer.clearEvents()
174-
mapboxReplayer.play()
175-
val geometries = navigationRoute.directionsRoute.routeOptions()!!.geometries()
176-
val usesPolyline6 = geometries.contains(DirectionsCriteria.GEOMETRY_POLYLINE6)
177-
val geometry = navigationRoute.directionsRoute.geometry()
178-
if (!usesPolyline6 || geometry.isNullOrEmpty()) {
179-
logW(LOG_CATEGORY) {
180-
"The NavigationRouteReplay must have geometry encoded with polyline6 " +
181-
"$geometries $geometry"
197+
mapboxNavigation?.resetTripSession {
198+
mapboxReplayer.play()
199+
val geometries = navigationRoute.directionsRoute.routeOptions()!!.geometries()
200+
val usesPolyline6 = geometries.contains(DirectionsCriteria.GEOMETRY_POLYLINE6)
201+
val geometry = navigationRoute.directionsRoute.geometry()
202+
if (!usesPolyline6 || geometry.isNullOrEmpty()) {
203+
logW(LOG_CATEGORY) {
204+
"The NavigationRouteReplay must have geometry encoded with polyline6 " +
205+
"$geometries $geometry"
206+
}
207+
return@resetTripSession
182208
}
183-
return
184-
}
185-
polylineDecodeStream = ReplayPolylineDecodeStream(geometry, 6)
209+
polylineDecodeStream = ReplayPolylineDecodeStream(geometry, 6)
186210

187-
// Skip up to the current geometry index. There is some imprecision here because the
188-
// distance traveled is not equal to a route index.
189-
polylineDecodeStream?.skip(routeProgress.currentRouteGeometryIndex)
211+
// Skip up to the current geometry index. There is some imprecision here because the
212+
// distance traveled is not equal to a route index.
213+
polylineDecodeStream?.skip(routeProgress.currentRouteGeometryIndex)
190214

191-
pushMorePoints()
215+
pushMorePoints()
216+
}
192217
}
193218

194219
private fun isLastEventPlayed(events: List<ReplayEventBase>): Boolean {

‎libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/MapboxTripStarter.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import kotlinx.coroutines.flow.onEach
3737
*/
3838
@ExperimentalPreviewMapboxNavigationAPI
3939
class MapboxTripStarter internal constructor(
40-
private val services: MapboxTripStarterServices = MapboxTripStarterServices()
40+
services: MapboxTripStarterServices = MapboxTripStarterServices()
4141
) : MapboxNavigationObserver {
4242

4343
private val tripType = MutableStateFlow<MapboxTripStarterType>(

‎libnavigation-core/src/test/java/com/mapbox/navigation/core/replay/route/ReplayRouteSessionTest.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class ReplayRouteSessionTest {
145145
sut.setOptions(firstOptions)
146146

147147
assertNotEquals(firstOptions, initialOptions)
148-
assertEquals(firstOptions, sut.getOptions())
148+
assertEquals(firstOptions, sut.getOptions().value)
149149
}
150150

151151
@Test
@@ -158,7 +158,7 @@ class ReplayRouteSessionTest {
158158
sut.setOptions(firstOptions)
159159

160160
assertNotEquals(firstOptions, initialOptions)
161-
assertEquals(firstOptions, sut.getOptions())
161+
assertEquals(firstOptions, sut.getOptions().value)
162162
}
163163

164164
@Test
@@ -355,7 +355,6 @@ class ReplayRouteSessionTest {
355355
progressObserver.captured.onRouteProgressChanged(secondRouteProgress)
356356

357357
verify(exactly = 2) {
358-
replayer.clearEvents()
359358
replayer.pushEvents(any())
360359
}
361360
verifyOrder {

‎libnavigation-core/src/test/java/com/mapbox/navigation/core/trip/MapboxTripStarterTest.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ class MapboxTripStarterTest {
219219
sut.onDetached(mapboxNavigation)
220220

221221
verifyOrder {
222+
replayRouteSession.onDetached(mapboxNavigation)
222223
replayHistorySession.onDetached(mapboxNavigation)
223224
replayRouteSession.onAttached(mapboxNavigation)
224225
replayRouteSession.onDetached(mapboxNavigation)

0 commit comments

Comments
 (0)