fix: Load selected trip shapes on trip details

EmmaSimon · EmmaSimon · commit ce9f81a24787 · 2026-02-10T11:45:24.000-05:00
diff --git a/shared/src/commonMain/kotlin/com/mbta/tid/mbta_app/repositories/TripRepository.kt b/shared/src/commonMain/kotlin/com/mbta/tid/mbta_app/repositories/TripRepository.kt
@@ -3,10 +3,8 @@ package com.mbta.tid.mbta_app.repositories
 import co.touchlab.skie.configuration.annotations.DefaultArgumentInterop
 import com.mbta.tid.mbta_app.json
 import com.mbta.tid.mbta_app.model.ObjectCollectionBuilder
-import com.mbta.tid.mbta_app.model.Route
-import com.mbta.tid.mbta_app.model.TripShape
 import com.mbta.tid.mbta_app.model.response.ApiResult
-import com.mbta.tid.mbta_app.model.response.ShapeWithStops
+import com.mbta.tid.mbta_app.model.response.MapFriendlyRouteResponse
 import com.mbta.tid.mbta_app.model.response.TripResponse
 import com.mbta.tid.mbta_app.model.response.TripSchedulesResponse
 import com.mbta.tid.mbta_app.network.MobileBackendClient
@@ -22,7 +20,7 @@ public interface ITripRepository {
 
     public suspend fun getTrip(tripId: String): ApiResult<TripResponse>
 
-    public suspend fun getTripShape(tripId: String): ApiResult<TripShape>
+    public suspend fun getTripShape(tripId: String): ApiResult<MapFriendlyRouteResponse>
 }
 
 internal class TripRepository : ITripRepository, KoinComponent {
@@ -52,12 +50,12 @@ internal class TripRepository : ITripRepository, KoinComponent {
             return ApiResult.Ok(data = json.decodeFromString(response.body()))
         }
 
-    override suspend fun getTripShape(tripId: String): ApiResult<TripShape> =
+    override suspend fun getTripShape(tripId: String): ApiResult<MapFriendlyRouteResponse> =
         ApiResult.runCatching {
             val response =
                 mobileBackendClient.get {
                     url {
-                        path("api/trip/map")
+                        path("api/trip/map-friendly")
                         parameter("trip_id", tripId)
                     }
                 }
@@ -75,7 +73,7 @@ internal open class IdleTripRepository : ITripRepository {
         return suspendCancellableCoroutine {}
     }
 
-    override suspend fun getTripShape(tripId: String): ApiResult<TripShape> {
+    override suspend fun getTripShape(tripId: String): ApiResult<MapFriendlyRouteResponse> {
         return suspendCancellableCoroutine {}
     }
 }
@@ -89,7 +87,7 @@ internal open class ErroringTripRepository : ITripRepository {
         return ApiResult.Error(404, "")
     }
 
-    override suspend fun getTripShape(tripId: String): ApiResult<TripShape> {
+    override suspend fun getTripShape(tripId: String): ApiResult<MapFriendlyRouteResponse> {
         return ApiResult.Error(404, "")
     }
 }
@@ -99,8 +97,7 @@ public class MockTripRepository
 constructor(
     internal var tripSchedulesResponse: TripSchedulesResponse = TripSchedulesResponse.Unknown,
     internal var tripResponse: TripResponse = TripResponse(ObjectCollectionBuilder.Single.trip {}),
-    internal var tripShape: TripShape =
-        TripShape(ShapeWithStops(0, Route.Id(""), "", null, emptyList())),
+    internal var tripShape: MapFriendlyRouteResponse = MapFriendlyRouteResponse(emptyList()),
     internal val onGetTrip: (String) -> Unit = {},
     internal val onGetTripSchedules: (String) -> Unit = {},
 ) : ITripRepository {
@@ -114,7 +111,7 @@ constructor(
         return ApiResult.Ok(tripResponse)
     }
 
-    override suspend fun getTripShape(tripId: String): ApiResult<TripShape> {
+    override suspend fun getTripShape(tripId: String): ApiResult<MapFriendlyRouteResponse> {
         return ApiResult.Ok(tripShape)
     }
 }
diff --git a/shared/src/commonMain/kotlin/com/mbta/tid/mbta_app/viewModel/MapViewModel.kt b/shared/src/commonMain/kotlin/com/mbta/tid/mbta_app/viewModel/MapViewModel.kt
@@ -29,6 +29,7 @@ import com.mbta.tid.mbta_app.repositories.IGlobalRepository
 import com.mbta.tid.mbta_app.repositories.IRailRouteShapeRepository
 import com.mbta.tid.mbta_app.repositories.ISentryRepository
 import com.mbta.tid.mbta_app.repositories.IStopRepository
+import com.mbta.tid.mbta_app.repositories.ITripRepository
 import com.mbta.tid.mbta_app.routes.SheetRoutes
 import com.mbta.tid.mbta_app.utils.EasternTimeInstant
 import com.mbta.tid.mbta_app.utils.IMapLayerManager
@@ -90,6 +91,7 @@ public class MapViewModel(
     private val railRouteShapeRepository: IRailRouteShapeRepository,
     private val sentryRepository: ISentryRepository,
     private val stopRepository: IStopRepository,
+    private val tripRepository: ITripRepository,
     private val clock: Clock,
     private val defaultCoroutineDispatcher: CoroutineDispatcher,
     private val iOCoroutineDispatcher: CoroutineDispatcher,
@@ -193,6 +195,8 @@ public class MapViewModel(
         var state by remember { mutableStateOf(State(layerState, layersInitialized)) }
         val (stopId: String?, stopFilter: StopDetailsFilter?) =
             layerState.stop?.id to layerState.stopFilter
+        val tripId = (layerState as? LayerState.TripSelected)?.tripFilter?.tripId
+        val followingTrip = (layerState as? LayerState.TripSelected)?.following ?: false
 
         LaunchedEffect(null) { globalRepository.getGlobalData() }
         LaunchedEffect(null) { allRailRouteShapes = fetchRailRouteShapes() }
@@ -314,12 +318,32 @@ public class MapViewModel(
         LaunchedEffect(
             stopId,
             stopFilter,
+            tripId,
             allRailRouteShapes,
             globalData,
             globalMapData,
             routeCardData.data,
         ) {
-            if (stopId != null) {
+            if (tripId != null && followingTrip) {
+                val tripShapes =
+                    withContext(iOCoroutineDispatcher) {
+                        when (val data = tripRepository.getTripShape(tripId)) {
+                            is ApiResult.Ok -> data.data.routesWithSegmentedShapes
+                            is ApiResult.Error -> null
+                        }
+                    }
+                val resolvedGlobal = globalData
+                if (tripShapes != null && resolvedGlobal != null) {
+                    routeSourceData =
+                        RouteFeaturesBuilder.generateRouteSources(
+                            tripShapes,
+                            resolvedGlobal,
+                            globalMapData,
+                        )
+                    routeShapes = tripShapes
+                    stopLayerGeneratorState = StopLayerGenerator.State(stopId, stopFilter)
+                }
+            } else if (stopId != null) {
                 val featuresToDisplayForStop =
                     featuresToDisplayForStop(
                         globalResponse = globalData,
diff --git a/shared/src/commonMain/kotlin/com/mbta/tid/mbta_app/viewModel/viewModelModule.kt b/shared/src/commonMain/kotlin/com/mbta/tid/mbta_app/viewModel/viewModelModule.kt
@@ -33,6 +33,7 @@ public fun viewModelModule(): Module = module {
                 get(),
                 get(),
                 get(),
+                get(),
                 get(named("coroutineDispatcherDefault")),
                 get(named("coroutineDispatcherIO")),
             )

Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,8 @@ package com.mbta.tid.mbta_app.repositories`
`3`	`3`	`import co.touchlab.skie.configuration.annotations.DefaultArgumentInterop`
`4`	`4`	`import com.mbta.tid.mbta_app.json`
`5`	`5`	`import com.mbta.tid.mbta_app.model.ObjectCollectionBuilder`
`6`		`-import com.mbta.tid.mbta_app.model.Route`
`7`		`-import com.mbta.tid.mbta_app.model.TripShape`
`8`	`6`	`import com.mbta.tid.mbta_app.model.response.ApiResult`
`9`		`-import com.mbta.tid.mbta_app.model.response.ShapeWithStops`
	`7`	`+import com.mbta.tid.mbta_app.model.response.MapFriendlyRouteResponse`
`10`	`8`	`import com.mbta.tid.mbta_app.model.response.TripResponse`
`11`	`9`	`import com.mbta.tid.mbta_app.model.response.TripSchedulesResponse`
`12`	`10`	`import com.mbta.tid.mbta_app.network.MobileBackendClient`
`@@ -22,7 +20,7 @@ public interface ITripRepository {`
`22`	`20`
`23`	`21`	`public suspend fun getTrip(tripId: String): ApiResult<TripResponse>`
`24`	`22`
`25`		`- public suspend fun getTripShape(tripId: String): ApiResult<TripShape>`
	`23`	`+ public suspend fun getTripShape(tripId: String): ApiResult<MapFriendlyRouteResponse>`
`26`	`24`	`}`
`27`	`25`
`28`	`26`	`internal class TripRepository : ITripRepository, KoinComponent {`
`@@ -52,12 +50,12 @@ internal class TripRepository : ITripRepository, KoinComponent {`
`52`	`50`	`return ApiResult.Ok(data = json.decodeFromString(response.body()))`
`53`	`51`	`}`
`54`	`52`
`55`		`- override suspend fun getTripShape(tripId: String): ApiResult<TripShape> =`
	`53`	`+ override suspend fun getTripShape(tripId: String): ApiResult<MapFriendlyRouteResponse> =`
`56`	`54`	`ApiResult.runCatching {`
`57`	`55`	`val response =`
`58`	`56`	`mobileBackendClient.get {`
`59`	`57`	`url {`
`60`		`- path("api/trip/map")`
	`58`	`+ path("api/trip/map-friendly")`
`61`	`59`	`parameter("trip_id", tripId)`
`62`	`60`	`}`
`63`	`61`	`}`
`@@ -75,7 +73,7 @@ internal open class IdleTripRepository : ITripRepository {`
`75`	`73`	`return suspendCancellableCoroutine {}`
`76`	`74`	`}`
`77`	`75`
`78`		`- override suspend fun getTripShape(tripId: String): ApiResult<TripShape> {`
	`76`	`+ override suspend fun getTripShape(tripId: String): ApiResult<MapFriendlyRouteResponse> {`
`79`	`77`	`return suspendCancellableCoroutine {}`
`80`	`78`	`}`
`81`	`79`	`}`
`@@ -89,7 +87,7 @@ internal open class ErroringTripRepository : ITripRepository {`
`89`	`87`	`return ApiResult.Error(404, "")`
`90`	`88`	`}`
`91`	`89`
`92`		`- override suspend fun getTripShape(tripId: String): ApiResult<TripShape> {`
	`90`	`+ override suspend fun getTripShape(tripId: String): ApiResult<MapFriendlyRouteResponse> {`
`93`	`91`	`return ApiResult.Error(404, "")`
`94`	`92`	`}`
`95`	`93`	`}`
`@@ -99,8 +97,7 @@ public class MockTripRepository`
`99`	`97`	`constructor(`
`100`	`98`	`internal var tripSchedulesResponse: TripSchedulesResponse = TripSchedulesResponse.Unknown,`
`101`	`99`	`internal var tripResponse: TripResponse = TripResponse(ObjectCollectionBuilder.Single.trip {}),`
`102`		`- internal var tripShape: TripShape =`
`103`		`- TripShape(ShapeWithStops(0, Route.Id(""), "", null, emptyList())),`
	`100`	`+ internal var tripShape: MapFriendlyRouteResponse = MapFriendlyRouteResponse(emptyList()),`
`104`	`101`	`internal val onGetTrip: (String) -> Unit = {},`
`105`	`102`	`internal val onGetTripSchedules: (String) -> Unit = {},`
`106`	`103`	`) : ITripRepository {`
`@@ -114,7 +111,7 @@ constructor(`
`114`	`111`	`return ApiResult.Ok(tripResponse)`
`115`	`112`	`}`
`116`	`113`
`117`		`- override suspend fun getTripShape(tripId: String): ApiResult<TripShape> {`
	`114`	`+ override suspend fun getTripShape(tripId: String): ApiResult<MapFriendlyRouteResponse> {`
`118`	`115`	`return ApiResult.Ok(tripShape)`
`119`	`116`	`}`
`120`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public fun viewModelModule(): Module = module {`
`33`	`33`	`get(),`
`34`	`34`	`get(),`
`35`	`35`	`get(),`
	`36`	`+ get(),`
`36`	`37`	`get(named("coroutineDispatcherDefault")),`
`37`	`38`	`get(named("coroutineDispatcherIO")),`
`38`	`39`	`)`