Merge branch 'main' into es-gl-stop-details-vehicles

androidApp/src/androidTest/java/com/mbta/tid/mbta_app/android/nearbyTransit/NearbyTransitPageTest.kt

@@ -195,6 +195,8 @@ class NearbyTransitPageTest : KoinTest {
 
                         override var lastUpdated: Instant? = null
 
+                        override fun shouldForgetPredictions(predictionCount: Int) = false
+
                         override fun disconnect() {
                             /* no-op */
                         }

androidApp/src/androidTest/java/com/mbta/tid/mbta_app/android/nearbyTransit/NearbyTransitViewTest.kt

@@ -189,6 +189,8 @@ class NearbyTransitViewTest : KoinTest {
 
                         override var lastUpdated: Instant? = null
 
+                        override fun shouldForgetPredictions(predictionCount: Int) = false
+
                         override fun disconnect() {
                             /* no-op */
                         }

androidApp/src/androidTest/java/com/mbta/tid/mbta_app/android/stopDetails/StopDetailsViewTest.kt

@@ -135,6 +135,8 @@ class StopDetailsViewTest {
 
                         override var lastUpdated: Instant? = null
 
+                        override fun shouldForgetPredictions(predictionCount: Int) = false
+
                         override fun disconnect() {
                             /* no-op */
                         }

androidApp/src/androidTest/java/com/mbta/tid/mbta_app/android/util/SubscribeToPredictionsTest.kt

@@ -59,6 +59,8 @@ class SubscribeToPredictionsTest {
 
                 override var lastUpdated: Instant? = null
 
+                override fun shouldForgetPredictions(predictionCount: Int) = false
+
                 override fun disconnect() {
                     check(isConnected) { "called disconnect when not connected" }
                     isConnected = false

iosApp/Podfile.lock

@@ -1,9 +1,9 @@
 PODS:
-  - Sentry (8.26.0):
-    - Sentry/Core (= 8.26.0)
-  - Sentry/Core (8.26.0)
+  - Sentry (8.36.0):
+    - Sentry/Core (= 8.36.0)
+  - Sentry/Core (8.36.0)
   - shared (1.0):
-    - Sentry (~> 8.26.0)
+    - Sentry (~> 8.36.0)
 
 DEPENDENCIES:
   - shared (from `../shared/`)
@@ -17,8 +17,8 @@ EXTERNAL SOURCES:
     :path: "../shared/"
 
 SPEC CHECKSUMS:
-  Sentry: 74a073c71c998117edb08f56f443c83570a31bed
-  shared: 3feb3c866b91cde11fd8e459d237a2cc925cd032
+  Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
+  shared: 19e2aa6dcc6627fddba6b8c32232f932ea8b8cc2
 
 PODFILE CHECKSUM: 32413a7fdb16d40c9f57cf8da0c74d4507ff5f90
 

iosApp/iosApp/Localizable.xcstrings

@@ -350,6 +350,9 @@
     },
     "select location" : {
 
+    },
+    "Service Change" : {
+      "comment" : "Possible alert effect"
     },
     "Service ended" : {
 

iosApp/iosApp/Pages/AlertDetails/AlertDetails.swift

@@ -32,6 +32,7 @@ struct AlertDetails: View {
         switch alert.effect {
         case .detour: NSLocalizedString("Detour", comment: "Possible alert effect")
         case .dockClosure: NSLocalizedString("Dock Closure", comment: "Possible alert effect")
+        case .serviceChange: NSLocalizedString("Service Change", comment: "Possible alert effect")
         case .shuttle: NSLocalizedString("Shuttle", comment: "Possible alert effect")
         case .stationClosure: NSLocalizedString("Station Closure", comment: "Possible alert effect")
         case .stopClosure: NSLocalizedString("Stop Closure", comment: "Possible alert effect")

iosApp/iosApp/Pages/NearbyTransit/NearbyTransitView.swift

@@ -88,7 +88,14 @@ struct NearbyTransitView: View {
             }
         }
         .withScenePhaseHandlers(
-            onActive: { joinPredictions(state.nearbyByRouteAndStop?.stopIds()) },
+            onActive: {
+                if let predictionsByStop,
+                   predictionsRepository
+                   .shouldForgetPredictions(predictionCount: predictionsByStop.predictionQuantity()) {
+                    self.predictionsByStop = nil
+                }
+                joinPredictions(state.nearbyByRouteAndStop?.stopIds())
+            },
             onInactive: leavePredictions,
             onBackground: {
                 leavePredictions()

iosApp/iosApp/Pages/StopDetails/StopDetailsPage.swift

@@ -106,11 +106,20 @@ struct StopDetailsPage: View {
             .onDisappear {
                 leavePredictions()
             }
-            .withScenePhaseHandlers(onActive: { joinPredictions(stop) },
-                                    onInactive: leavePredictions,
-                                    onBackground: { leavePredictions()
-                                        isReturningFromBackground = true
-                                    })
+            .withScenePhaseHandlers(
+                onActive: {
+                    if let predictionsByStop,
+                       predictionsRepository
+                       .shouldForgetPredictions(predictionCount: predictionsByStop.predictionQuantity()) {
+                        self.predictionsByStop = nil
+                    }
+                    joinPredictions(stop)
+                },
+                onInactive: leavePredictions,
+                onBackground: { leavePredictions()
+                    isReturningFromBackground = true
+                }
+            )
         }
     }
 

iosApp/iosApp/Pages/TripDetails/TripDetailsPage.swift

@@ -130,12 +130,21 @@ struct TripDetailsPage: View {
             joinVehicle(vehicleId: vehicleId)
         }
         .onReceive(inspection.notice) { inspection.visit(self, $0) }
-        .withScenePhaseHandlers(onActive: joinRealtime,
-                                onInactive: leaveRealtime,
-                                onBackground: {
-                                    leaveRealtime()
-                                    isReturningFromBackground = true
-                                })
+        .withScenePhaseHandlers(
+            onActive: {
+                if let tripPredictions,
+                   tripPredictionsRepository
+                   .shouldForgetPredictions(predictionCount: tripPredictions.predictionQuantity()) {
+                    self.tripPredictions = nil
+                }
+                joinRealtime()
+            },
+            onInactive: leaveRealtime,
+            onBackground: {
+                leaveRealtime()
+                isReturningFromBackground = true
+            }
+        )
     }
 
     private func loadEverything() {

iosApp/iosAppTests/Pages/TripDetails/TripDetailsPageTests.swift

@@ -655,6 +655,10 @@ final class TripDetailsPageTests: XCTestCase {
 
         var lastUpdated: Instant?
 
+        func shouldForgetPredictions(predictionCount _: Int32) -> Bool {
+            false
+        }
+
         func disconnect() {
             onDisconnect?()
         }

iosApp/iosAppTests/Views/ErrorBannerTests.swift

@@ -30,7 +30,7 @@ final class ErrorBannerTests: XCTestCase {
 
         let stateSetPublisher = PassthroughSubject<Void, Never>()
 
-        let showedState = sut.inspection.inspect(onReceive: stateSetPublisher, after: 0.2) { view in
+        let showedState = sut.inspection.inspect(onReceive: stateSetPublisher, after: 0.5) { view in
             XCTAssertEqual(try view.find(ViewType.Text.self).string(), "Updated \(minutesAgo) minutes ago")
 
             try view.find(ViewType.Button.self).tap()

iosApp/iosAppTests/Views/NearbyTransitViewTests.swift

@@ -463,7 +463,7 @@ final class NearbyTransitViewTests: XCTestCase {
             nearbyVM: .init()
         )
 
-        let exp = sut.inspection.inspect(onReceive: globalLoadedPublisher, after: 0.2) { view in
+        let exp = sut.inspection.inspect(onReceive: globalLoadedPublisher, after: 0.5) { view in
             let stops = view.findAll(NearbyStopView.self)
             XCTAssertEqual(stops[0].findAll(DestinationRowView.self).count, 3)
 
@@ -710,7 +710,7 @@ final class NearbyTransitViewTests: XCTestCase {
             nearbyVM: .init()
         )
 
-        sut.inspection.inspect(after: 0.2) { view in
+        sut.inspection.inspect(after: 0.5) { view in
             XCTAssertNotNil(try view.view(NearbyTransitView.self)
                 .find(text: "Error loading data"))
         }

shared/shared.podspec

@@ -9,7 +9,7 @@ Pod::Spec.new do |spec|
     spec.vendored_frameworks      = 'build/cocoapods/framework/shared.framework'
     spec.libraries                = 'c++'
     spec.ios.deployment_target    = '15.0'
-    spec.dependency 'Sentry', '~> 8.26.0'
+    spec.dependency 'Sentry', '~> 8.36.0'
 
     if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework')
         raise "

shared/src/commonMain/kotlin/com/mbta/tid/mbta_app/endToEnd/EndToEndRepositories.kt

@@ -133,6 +133,8 @@ fun endToEndModule(): Module {
 
                 override var lastUpdated: Instant? = null
 
+                override fun shouldForgetPredictions(predictionCount: Int) = false
+
                 override fun connectV2(
                     stopIds: List<String>,
                     onJoin: (ApiResult<PredictionsByStopJoinResponse>) -> Unit,
@@ -199,6 +201,8 @@ fun endToEndModule(): Module {
 
                 override var lastUpdated: Instant? = null
 
+                override fun shouldForgetPredictions(predictionCount: Int) = false
+
                 override fun disconnect() {
                     TODO("Not yet implemented")
                 }

shared/src/commonMain/kotlin/com/mbta/tid/mbta_app/model/NearbyStaticData.kt

@@ -8,6 +8,7 @@ import com.mbta.tid.mbta_app.model.response.PredictionsStreamDataResponse
 import com.mbta.tid.mbta_app.model.response.ScheduleResponse
 import com.mbta.tid.mbta_app.utils.resolveParentId
 import io.github.dellisd.spatialk.geojson.Position
+import kotlin.time.Duration
 import kotlin.time.Duration.Companion.minutes
 import kotlinx.datetime.Instant
 
@@ -449,19 +450,22 @@ data class NearbyStaticData(val data: List<TransitWithStops>) {
 
 /**
  * Attaches [schedules] and [predictions] to the route, stop, and routePattern to which they apply.
- * Removes non-typical route patterns which are not predicted within 90 minutes of [filterAtTime].
- * Sorts routes by subway first then nearest stop, stops by distance, and headsigns by route pattern
- * sort order.
+ * Removes non-typical route patterns which are not happening either at all or between
+ * [filterAtTime] and [filterAtTime] + [hideNonTypicalPatternsBeyondNext]. Sorts routes by subway
+ * first then nearest stop, stops by distance, and headsigns by route pattern sort order.
  *
  * Runs static data and predictions through [TemporaryTerminalRewriter].
  */
 fun NearbyStaticData.withRealtimeInfo(
     globalData: GlobalResponse?,
-    sortByDistanceFrom: Position,
+    sortByDistanceFrom: Position?,
     schedules: ScheduleResponse?,
     predictions: PredictionsStreamDataResponse?,
     alerts: AlertsStreamDataResponse?,
     filterAtTime: Instant,
+    showAllPatternsWhileLoading: Boolean,
+    hideNonTypicalPatternsBeyondNext: Duration?,
+    filterCancellations: Boolean,
     pinnedRoutes: Set<String>
 ): List<StopsAssociated> {
     val activeRelevantAlerts =
@@ -543,11 +547,26 @@ fun NearbyStaticData.withRealtimeInfo(
             )
             .orEmpty()
 
-    val cutoffTime = filterAtTime.plus(90.minutes)
+    val cutoffTime = hideNonTypicalPatternsBeyondNext?.let { filterAtTime + it }
     val hasSchedulesTodayByPattern = NearbyStaticData.getSchedulesTodayByPattern(schedules)
 
-    val upcomingTripsMap: UpcomingTripsMap =
-        (upcomingTripsByRoutePatternAndStop + upcomingTripsByDirectionAndStop)
+    val upcomingTripsMap: UpcomingTripsMap? =
+        (upcomingTripsByRoutePatternAndStop + upcomingTripsByDirectionAndStop).takeUnless {
+            schedules == null && predictions == null
+        }
+
+    fun UpcomingTripsMap.maybeFilterCancellations(isSubway: Boolean) =
+        if (filterCancellations) this.filterCancellations(isSubway) else this
+
+    fun RealtimePatterns.shouldShow(): Boolean {
+        if (!allDataLoaded && showAllPatternsWhileLoading) return true
+        val isUpcoming =
+            when (cutoffTime) {
+                null -> this.isUpcoming()
+                else -> this.isUpcomingWithin(filterAtTime, cutoffTime)
+            }
+        return (isTypical() || isUpcoming) && !isArrivalOnly()
+    }
 
     fun List<PatternsByStop>.filterEmptyAndSort(): List<PatternsByStop> {
         return this.filterNot { it.patterns.isEmpty() }
@@ -562,14 +581,13 @@ fun NearbyStaticData.withRealtimeInfo(
                     StopsAssociated.WithRoute(
                         transit.route,
                         transit.patternsByStop
-                            .map {
+                            .map { stopPatterns ->
                                 PatternsByStop(
-                                    it,
-                                    upcomingTripsMap.filterCancellations(
+                                    stopPatterns,
+                                    upcomingTripsMap?.maybeFilterCancellations(
                                         transit.route.type.isSubway()
                                     ),
-                                    filterAtTime,
-                                    cutoffTime,
+                                    { it.shouldShow() },
                                     activeRelevantAlerts,
                                     hasSchedulesTodayByPattern,
                                     allDataLoaded
@@ -582,14 +600,13 @@ fun NearbyStaticData.withRealtimeInfo(
                         transit.line,
                         transit.routes,
                         transit.patternsByStop
-                            .map {
+                            .map { stopPatterns ->
                                 PatternsByStop(
-                                    it,
-                                    upcomingTripsMap.filterCancellations(
+                                    stopPatterns,
+                                    upcomingTripsMap?.maybeFilterCancellations(
                                         transit.routes.min().type.isSubway()
                                     ),
-                                    filterAtTime,
-                                    cutoffTime,
+                                    { it.shouldShow() },
                                     activeRelevantAlerts,
                                     hasSchedulesTodayByPattern,
                                     allDataLoaded
@@ -604,6 +621,29 @@ fun NearbyStaticData.withRealtimeInfo(
         .sortedWith(PatternSorting.compareStopsAssociated(pinnedRoutes, sortByDistanceFrom))
 }
 
+fun NearbyStaticData.withRealtimeInfo(
+    globalData: GlobalResponse?,
+    sortByDistanceFrom: Position,
+    schedules: ScheduleResponse?,
+    predictions: PredictionsStreamDataResponse?,
+    alerts: AlertsStreamDataResponse?,
+    filterAtTime: Instant,
+    pinnedRoutes: Set<String>
+): List<StopsAssociated> {
+    return this.withRealtimeInfo(
+        globalData,
+        sortByDistanceFrom,
+        schedules,
+        predictions,
+        alerts,
+        filterAtTime,
+        showAllPatternsWhileLoading = false,
+        hideNonTypicalPatternsBeyondNext = 90.minutes,
+        filterCancellations = true,
+        pinnedRoutes
+    )
+}
+
 class NearbyStaticDataBuilder {
     val data = mutableListOf<NearbyStaticData.TransitWithStops>()
 

shared/src/commonMain/kotlin/com/mbta/tid/mbta_app/model/PatternSorting.kt

@@ -72,13 +72,17 @@ object PatternSorting {
 
     fun compareStopsAssociated(
         pinnedRoutes: Set<String>,
-        sortByDistanceFrom: Position
+        sortByDistanceFrom: Position?
     ): Comparator<StopsAssociated> =
         compareBy(
             { pinnedRouteBucket(it.sortRoute(), pinnedRoutes) },
             { patternServiceBucket(it.patternsByStop.first().patterns.first()) },
             { subwayBucket(it.sortRoute()) },
-            { it.distanceFrom(sortByDistanceFrom) },
+            if (sortByDistanceFrom != null) {
+                { it.distanceFrom(sortByDistanceFrom) }
+            } else {
+                { 0 }
+            },
             { it.sortRoute() },
         )
 }

shared/src/commonMain/kotlin/com/mbta/tid/mbta_app/model/PatternsByStop.kt

@@ -4,7 +4,6 @@ import com.mbta.tid.mbta_app.model.response.GlobalResponse
 import io.github.dellisd.spatialk.geojson.Position
 import io.github.dellisd.spatialk.turf.ExperimentalTurfApi
 import io.github.dellisd.spatialk.turf.distance
-import kotlinx.datetime.Instant
 
 /**
  * @property patterns [RealtimePatterns]s serving the stop grouped by headsign or direction. The
@@ -24,8 +23,7 @@ data class PatternsByStop(
     constructor(
         staticData: NearbyStaticData.StopPatterns,
         upcomingTripsMap: UpcomingTripsMap?,
-        filterTime: Instant,
-        cutoffTime: Instant,
+        patternsPredicate: (RealtimePatterns) -> Boolean,
         alerts: Collection<Alert>?,
         hasSchedulesTodayByPattern: Map<String, Boolean>?,
         allDataLoaded: Boolean,
@@ -62,10 +60,7 @@ data class PatternsByStop(
                         )
                 }
             }
-            .filter {
-                (it.isTypical() || it.isUpcomingWithin(filterTime, cutoffTime)) &&
-                    !it.isArrivalOnly()
-            }
+            .filter(patternsPredicate)
             .sortedWith(PatternSorting.compareRealtimePatterns()),
         staticData.directions
     )