Skip to content

GTFS-RT > vehicle trip IDs mistmatch fallback fix #113

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 3 commits into from
Apr 8, 2026
Merged

GTFS-RT > vehicle trip IDs mistmatch fallback fix #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e974175
GTFS-RT > vehicle trip IDs mistmatch fallback fix
mmathieum Apr 8, 2026
5348d10
fallback w/o direction
mmathieum Apr 8, 2026
31bbe7b
Update VehicleLocationProvider.kt
mmathieum Apr 8, 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
3 changes: 1 addition & 2 deletions ...main/java/org/mtransit/android/commons/provider/status/GTFSRealTimeTripUpdatesProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,10 @@ object GTFSRealTimeTripUpdatesProvider : MTLog.Loggable {

val TRIP_UPDATE_MAX_VALIDITY_IN_MS = 1.hours.inWholeMilliseconds

val TRIP_UPDATE_VALIDITY_IN_MS = 1.minutes.inWholeMilliseconds
val TRIP_UPDATE_VALIDITY_IN_MS = 3.minutes.inWholeMilliseconds
val TRIP_UPDATE_VALIDITY_IN_FOCUS_IN_MS = 30.seconds.inWholeMilliseconds

val TRIP_UPDATE_MIN_DURATION_BETWEEN_REFRESH_IN_MS = 1.minutes.inWholeMilliseconds

val TRIP_UPDATE_MIN_DURATION_BETWEEN_REFRESH_IN_FOCUS_IN_MS = 10.seconds.inWholeMilliseconds

@JvmStatic
Expand Down
33 changes: 21 additions & 12 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 @@ -97,23 +97,32 @@ object GTFSRealTimeVehiclePositionsProvider : MTLog.Loggable {
targetUUIDs to tripIds?.takeIf { it.isNotEmpty() } // no trip IDS == fallback to primary target UUID only
}?.let { (targetUUIDs, tripIds) ->
getCached(
primaryTargetUUID = filter.getPrimaryTargetUUIDs(this@getCached, ignoreDirection = ignoreDirection),
filter = filter,
targetUUIDs = targetUUIDs,
tripIds = tripIds,
)
}

fun GTFSRealTimeProvider.getCached(primaryTargetUUID: Pair<String, String>?, targetUUIDs: Map<String, String>, tripIds: List<String>?) = buildList {
tripIds?.let { // trip IDs preferred for all result filtered correctly
getCachedVehicleLocationsS(targetUUIDs.keys, tripIds)?.takeIf { it.isNotEmpty() }
} ?: primaryTargetUUID?.let { (providerTargetUUID, _) ->
// 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
getCachedVehicleLocationsS(providerTargetUUID)
}?.let {
addAll(it)
}
fun GTFSRealTimeProvider.getCached(filter: VehicleLocationProviderContract.Filter, targetUUIDs: Map<String, String>, tripIds: List<String>?) = buildList {
(
// 1 - trip IDs preferred for all result filtered correctly
tripIds?.let {
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, _) ->
getCachedVehicleLocationsS(setOf(providerTargetUUID), tripIds = null)
}?.takeIf { it.isNotEmpty() }
)
?.let {
addAll(it)
}
}.map { it.copy(targetUUID = targetUUIDs[it.targetUUID] ?: it.targetUUID) }

@JvmStatic
Expand Down
4 changes: 0 additions & 4 deletions ...in/java/org/mtransit/android/commons/provider/vehiclelocations/VehicleLocationProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,6 @@ abstract class VehicleLocationProvider : MTContentProvider(),
}
}

fun <P : VehicleLocationProviderContract> P.getCachedVehicleLocationsS(
targetUUID: String,
) = getCachedVehicleLocationsS(setOf(targetUUID), tripIds = null)

fun <P : VehicleLocationProviderContract> P.getCachedVehicleLocationsS(
targetUUIDs: Collection<String>,
tripIds: List<String>? = null,
Expand Down