Skip to content

Passthrough NO_DATA schedule_relationship for stop_time_updates #467

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

Passthrough NO_DATA schedule_relationship for stop_time_updates #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f18c541
Passthrough NO_DATA schedule_relationship for stop_time_updates
KTibow Jul 3, 2026
e8c6e54
Guard against null scheduleRelationship in TripStatusBeanServiceImpl
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
5 changes: 5 additions & 0 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 @@ -202,6 +202,11 @@ private List<TripUpdate.Builder> serveTripUpdatesFromTimepoints(String agencyId,
* to indicate that
*/
stopTimeUpdate.setStopId(normalizeId(stopId.toString()));
if (timepointPrediction.getScheduleRelationship() != null) {
stopTimeUpdate.setScheduleRelationship(
TripUpdate.StopTimeUpdate.ScheduleRelationship.valueOf(
timepointPrediction.getScheduleRelationship().getValue()));
}
if (timepointPrediction.getTimepointPredictedArrivalTime() != -1) {
TripUpdate.StopTimeEvent.Builder arrival = stopTimeUpdate.getArrivalBuilder();
arrival.setTime(timepointPrediction.getTimepointPredictedArrivalTime() / 1000L);
Expand Down
8 changes: 3 additions & 5 deletions ...ain/java/org/onebusaway/transit_data_federation/impl/beans/TripStatusBeanServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,11 +373,9 @@ public TripStatusBean getBlockLocationAsStatusBean(
List<TimepointPredictionBean> timepointPredictions = new ArrayList<TimepointPredictionBean>();
for (TimepointPredictionRecord tpr: blockLocation.getTimepointPredictions()) {
TimepointPredictionBean tpb = new TimepointPredictionBean();
if (tpr.isSkipped()) {
tpb.setScheduleRealtionship(TimepointPredictionBean.ScheduleRelationship.SKIPPED.getValue());
} else {
tpb.setScheduleRealtionship(TimepointPredictionBean.ScheduleRelationship.SCHEDULED.getValue());
}
tpb.setScheduleRealtionship(tpr.getScheduleRelationship() != null
? tpr.getScheduleRelationship().getValue()
: TimepointPredictionBean.ScheduleRelationship.SCHEDULED.getValue());

tpb.setTimepointId(tpr.getTimepointId().toString());
// This may not be the expected trip (returning entire block now)
Expand Down
22 changes: 16 additions & 6 deletions ...ebusaway/transit_data_federation/impl/realtime/gtfs_realtime/GtfsRealtimeTripLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,13 +716,18 @@ private void applyDynamicTripUpdatesToRecord(MonitoredResult result,
case SKIPPED:
tpr.setScheduleRealtionship(TimepointPredictionRecord.ScheduleRelationship.SKIPPED.getValue());
break;
case NO_DATA:
tpr.setScheduleRealtionship(TimepointPredictionRecord.ScheduleRelationship.NO_DATA.getValue());
break;
default:
tpr.setScheduleRealtionship(TimepointPredictionRecord.ScheduleRelationship.SCHEDULED.getValue());
}
if (stu.hasArrival() && stu.getArrival().hasTime())
tpr.setTimepointPredictedArrivalTime(stu.getArrival().getTime() * 1000);
if (stu.hasDeparture() && stu.getDeparture().hasTime())
tpr.setTimepointPredictedDepartureTime(stu.getDeparture().getTime() * 1000);
if (stu.getScheduleRelationship() != StopTimeUpdate.ScheduleRelationship.NO_DATA) {
if (stu.hasArrival() && stu.getArrival().hasTime())
tpr.setTimepointPredictedArrivalTime(stu.getArrival().getTime() * 1000);
if (stu.hasDeparture() && stu.getDeparture().hasTime())
tpr.setTimepointPredictedDepartureTime(stu.getDeparture().getTime() * 1000);
}
if (stu.hasExtension(GtfsRealtimeNYCT.nyctStopTimeUpdate)) {
GtfsRealtimeNYCT.NyctStopTimeUpdate ext = stu.getExtension(GtfsRealtimeNYCT.nyctStopTimeUpdate);
if (ext.hasScheduledTrack()) {
Expand Down Expand Up @@ -983,15 +988,20 @@ private void applyTripUpdatesToRecord(MonitoredResult result, BlockDescriptor bl
if (stopTimeUpdate.hasStopSequence()) {
tpr.setStopSequence(stopTimeUpdate.getStopSequence());
}
if (stopTimeUpdate.getScheduleRelationship().equals(StopTimeUpdate.ScheduleRelationship.SKIPPED)) {
if (stopTimeUpdate.getScheduleRelationship().equals(StopTimeUpdate.ScheduleRelationship.NO_DATA)) {
tpr.setScheduleRealtionship(StopTimeUpdate.ScheduleRelationship.NO_DATA_VALUE);
timepointPredictions.add(tpr);
_log.debug("NO_DATA stop:" + tpr.getTimepointId() + " seq: " + tpr.getStopSequence() + " trip: " + tpr.getTripId());
} else if (stopTimeUpdate.getScheduleRelationship().equals(StopTimeUpdate.ScheduleRelationship.SKIPPED)) {
tpr.setScheduleRealtionship(StopTimeUpdate.ScheduleRelationship.SKIPPED_VALUE); // set tpr scheduleRelationship enum to SKIPPED
timepointPredictions.add(tpr);
_log.debug("SKIPPED stop:" + tpr.getTimepointId() + " seq: " + tpr.getStopSequence() + " trip: " + tpr.getTripId());
} else {
tpr.setScheduleRealtionship(StopTimeUpdate.ScheduleRelationship.SCHEDULED_VALUE);
}

if (!stopTimeUpdate.getScheduleRelationship().equals(StopTimeUpdate.ScheduleRelationship.SKIPPED)) {
if (!stopTimeUpdate.getScheduleRelationship().equals(StopTimeUpdate.ScheduleRelationship.SKIPPED)
&& !stopTimeUpdate.getScheduleRelationship().equals(StopTimeUpdate.ScheduleRelationship.NO_DATA)) {
int currentArrivalTime = computeArrivalTime(stopTime,
stopTimeUpdate, instance.getServiceDate());
int currentDepartureTime = computeDepartureTime(stopTime,
Expand Down