Skip to content

GTFS-RT > trip IDs oudated -> require direction match #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmathieum merged 5 commits into from
Apr 9, 2026
Merged

GTFS-RT > trip IDs oudated -> require direction match #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05ba3c9
GTFS-RT > trip IDs oudated -> require direction match
mmathieum Apr 9, 2026
5161a33
fix
mmathieum Apr 9, 2026
b13406a
Update src/main/java/org/mtransit/android/commons/provider/serviceupd…
mmathieum Apr 9, 2026
b50b215
missing
mmathieum Apr 9, 2026
e104aee
Merge branch 'mm/gtfs-rt-bug-fix' of github.com:mtransitapps/commons-…
mmathieum Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions .../org/mtransit/android/commons/provider/serviceupdate/GTFSRealTimeServiceAlertsProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ import org.mtransit.android.commons.provider.gtfs.GtfsRealtimeExt.optRouteType
import org.mtransit.android.commons.provider.gtfs.GtfsRealtimeExt.optTrip
import org.mtransit.android.commons.provider.gtfs.GtfsRealtimeExt.toStringExt
import org.mtransit.android.commons.provider.gtfs.agencyTag
import org.mtransit.android.commons.provider.gtfs.getPrimaryTargetUUIDs
import org.mtransit.android.commons.provider.gtfs.getTargetUUIDs
import org.mtransit.android.commons.provider.gtfs.getTripIds
import org.mtransit.android.commons.provider.gtfs.ignoreDirection
import org.mtransit.android.commons.provider.gtfs.parseRouteId
import org.mtransit.android.commons.provider.gtfs.parseStopId
import org.mtransit.android.commons.provider.gtfs.parseTripId
Expand All @@ -42,14 +44,21 @@ object GTFSRealTimeServiceAlertsProvider : MTLog.Loggable {
}
targetUUIDs to tripIds?.takeIf { it.isNotEmpty() } // trip IDs not required for GTFS Alerts
}?.let { (targetUUIDs, tripIds) ->
getCached(targetUUIDs, tripIds)
getCached(filter, targetUUIDs, tripIds)
}

fun GTFSRealTimeProvider.getCached(targetUUIDs: Map<String, String>, tripIds: List<String>?) = buildList {
// trip IDs preferred for all result filtered correctly
(tripIds?.let { getCachedServiceUpdatesS(targetUUIDs.keys, tripIds = it) }?.takeIf { it.isNotEmpty() }
// fallback to showing all w/o filtering trip IDs (main issue would be RDS UI showing other Direction alerts)
?: getCachedServiceUpdatesS(targetUUIDs.keys, tripIds = null))
fun GTFSRealTimeProvider.getCached(filter: ServiceUpdateProviderContract.Filter, targetUUIDs: Map<String, String>, tripIds: List<String>?) = buildList {
(
// 1 - trip IDs preferred for all result filtered correctly
tripIds?.let { getCachedServiceUpdatesS(targetUUIDs.keys, tripIds = it) }?.takeIf { it.isNotEmpty() }
// 2 - fallback to: ignore TRIP IDS (outdated?) and try using primary target UUID only
// - only works if Route & Direction! provided
// -> can NOT show service alerts for the wrong direction
?: if (ignoreDirection) null
else filter.getPrimaryTargetUUIDs(this@getCached, ignoreDirection = false, includeStopTags = true)?.let { (providerTargetUUID, _) ->
getCachedServiceUpdatesS(setOf(providerTargetUUID), tripIds = null)
}?.takeIf { it.isNotEmpty() }
Comment thread
mmathieum marked this conversation as resolved.
)
?.let {
Comment thread
mmathieum marked this conversation as resolved.
addAll(it)
}
Comment thread
mmathieum marked this conversation as resolved.
Expand Down
11 changes: 4 additions & 7 deletions ...transit/android/commons/provider/vehiclelocations/GTFSRealTimeVehiclePositionsProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,10 @@ object GTFSRealTimeVehiclePositionsProvider : MTLog.Loggable {
getCachedVehicleLocationsS(targetUUIDs.keys, tripIds = it)
}?.takeIf { it.isNotEmpty() }
// 2 - fallback to: ignore TRIP IDS (outdated?) and try using primary target UUID only
// - only works if Route (& Direction) provided
// -> can show vehicle in wrong direction
?: filter.getPrimaryTargetUUIDs(this@getCached, ignoreDirection = ignoreDirection)?.let { (providerTargetUUID, _) ->
getCachedVehicleLocationsS(setOf(providerTargetUUID), tripIds = null)
}?.takeIf { it.isNotEmpty() }
// 3 - fallback to: for ignore direction
?: if (ignoreDirection) null else filter.getPrimaryTargetUUIDs(this@getCached, ignoreDirection = true)?.let { (providerTargetUUID, _) ->
// - only works if Route & Direction! provided
// -> can NOT show vehicle in wrong direction
?: if (ignoreDirection) null
else filter.getPrimaryTargetUUIDs(this@getCached, ignoreDirection = false)?.let { (providerTargetUUID, _) ->
Comment thread
mmathieum marked this conversation as resolved.
getCachedVehicleLocationsS(setOf(providerTargetUUID), tripIds = null)
}?.takeIf { it.isNotEmpty() }
Comment thread
mmathieum marked this conversation as resolved.
Comment thread
mmathieum marked this conversation as resolved.
)
Expand Down