Skip to content

Pass through per-trip route_id, headsign, start_date, start_time instead of gating on active trip #466

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

Open
KTibow wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Pass through per-trip route_id, headsign, start_date, start_time instead of gating on active trip #466

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e11d2e3
Pass through per-trip route_id, headsign, start_date, start_time inst…
KTibow Jul 3, 2026
0272ae6
Use per-trip service date for start_date/start_time, skip when status…
KTibow Jul 3, 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
55 changes: 31 additions & 24 deletions ...rc/main/java/org/onebusaway/api/actions/api/gtfs_realtime/TripUpdatesForAgencyAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,9 @@ private List<TripUpdate.Builder> serveTripUpdatesFromTimepoints(String agencyId,

for (String activeTripId : activeTripsIds(tripStatus)) {

TripStopTimesBean schedule = getScheduleForTrip(activeTripId, tripStatus.getServiceDate(),
TripDetailsBean tripDetails = getTripDetailsForTrip(activeTripId, tripStatus.getServiceDate(),
tripStatus.getVehicleId(), timestamp);
TripStopTimesBean schedule = tripDetails != null ? tripDetails.getSchedule() : null;

FeedEntity.Builder entity = feed.addEntityBuilder();
// make the id something meaningful and distinct
Expand All @@ -167,27 +168,38 @@ private List<TripUpdate.Builder> serveTripUpdatesFromTimepoints(String agencyId,
tripUpdates.add(tripUpdate);
TripDescriptor.Builder tripDesc = tripUpdate.getTripBuilder();
tripDesc.setTripId(normalizeId(activeTripId));
if (TransitDataConstants.STATUS_ADDED.equals(tripStatus.getStatus())) {
tripDesc.setScheduleRelationship(TripDescriptor.ScheduleRelationship.ADDED);

// Per-trip metadata from schedule
if (tripDetails != null && tripDetails.getTrip() != null) {
TripBean trip = tripDetails.getTrip();

if (trip.getRoute() != null)
tripDesc.setRouteId(normalizeId(trip.getRoute().getId()));

tripDesc.setStartDate(formatStartDate(tripStatus.getServiceDate()));
tripDesc.setStartTime(formatStartTime(tripStatus.getServiceDate() + (tripStatus.getTripStartTime() * 1000)));
} else {
tripDesc.setScheduleRelationship(TripDescriptor.ScheduleRelationship.SCHEDULED);
}
long tripStartMs = tripStatus.getServiceDate();
if (tripDetails.getStatus() != null)
tripStartMs += tripDetails.getStatus().getTripStartTime() * 1000L;
tripDesc.setStartTime(formatStartTime(tripStartMs));
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated

if (trip.getTripHeadsign() != null) {
GtfsRealtimeOneBusAway.OneBusAwayTripUpdate.Builder obaTripUpdate =
GtfsRealtimeOneBusAway.OneBusAwayTripUpdate.newBuilder();
obaTripUpdate.setTripHeadsign(trip.getTripHeadsign());
tripUpdate.setExtension(GtfsRealtimeOneBusAway.obaTripUpdate, obaTripUpdate.build());
}

if (tripDetails.getStatus() != null
&& TransitDataConstants.STATUS_ADDED.equals(tripDetails.getStatus().getStatus())) {
tripDesc.setScheduleRelationship(TripDescriptor.ScheduleRelationship.ADDED);
} else {
tripDesc.setScheduleRelationship(TripDescriptor.ScheduleRelationship.SCHEDULED);
}
}

// delay: only meaningful for the active trip
if (activeTripId.equals(activeTrip.getId())) {
RouteBean route = activeTrip.getRoute();
// we only know route if we are on activeTrip
// the block may interline!
tripDesc.setRouteId(normalizeId(route.getId()));
tripUpdate.setDelay((int) tripStatus.getScheduleDeviation());

// add extension for headsign support
GtfsRealtimeOneBusAway.OneBusAwayTripUpdate.Builder obaTripUpdate =
GtfsRealtimeOneBusAway.OneBusAwayTripUpdate.newBuilder();
obaTripUpdate.setTripHeadsign(activeTrip.getTripHeadsign());
tripUpdate.setExtension(GtfsRealtimeOneBusAway.obaTripUpdate, obaTripUpdate.build());
}

for (TimepointPredictionBean timepointPrediction : tripStatus.getTimepointPredictions()) {
Expand Down Expand Up @@ -226,18 +238,13 @@ private List<TripUpdate.Builder> serveTripUpdatesFromTimepoints(String agencyId,
return tripUpdates;
}

private TripStopTimesBean getScheduleForTrip(String activeTripId, long serviceDate, String vehicleId, long timestamp) {
private TripDetailsBean getTripDetailsForTrip(String activeTripId, long serviceDate, String vehicleId, long timestamp) {
TripDetailsQueryBean query = new TripDetailsQueryBean();
query.setTripId(activeTripId);
query.setServiceDate(serviceDate);
query.setVehicleId(vehicleId);
query.setTime(timestamp);
TripDetailsBean tripDetails = _service.getSingleTripDetails(query);
TripStopTimesBean schedule = null;
if (tripDetails != null) {
schedule = tripDetails.getSchedule();
}
return schedule;
return _service.getSingleTripDetails(query);
}

private String getHeadsignForStop(TripStopTimesBean schedule, AgencyAndId stopId, int sequence) {
Expand Down