Reset pattern back to original if trip not found in realtime generate…

…d pattern
mfdz · Jan 12, 2022 · 81abb7d · 81abb7d
1 parent e2e8f39
commit 81abb7d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/org/opentripplanner/model/Timetable.java b/src/main/java/org/opentripplanner/model/Timetable.java
@@ -123,9 +123,6 @@ public int getTripIndex(FeedScopedId tripId) {
             if (tt.getTrip().getId().equals(tripId)) { return ret; }
             ret += 1;
         }
-        LOG.warn("TripId {} not found in Timetable for pattern {} on {}, with {} tripTimes",
-                tripId, pattern.getId(), serviceDate, tripTimes.size()
-        );
         return -1;
     }
 

diff --git a/src/main/java/org/opentripplanner/routing/TripTimesShortHelper.java b/src/main/java/org/opentripplanner/routing/TripTimesShortHelper.java
@@ -29,6 +29,12 @@ public static List<TripTimeOnDate> getTripTimesShort(RoutingService routingServi
         pattern = routingService.getPatternForTrip().get(trip);
       }
       timetable = timetableSnapshot.resolve(pattern, serviceDate);
+
+      // If realtime moved pattern back to original trip, fetch it instead
+      if (timetable.getTripIndex(trip.getId()) == -1) {
+        pattern = routingService.getPatternForTrip().get(trip);
+        timetable = timetableSnapshot.resolve(pattern, serviceDate);
+      }
     }
     if (timetable == null) {
       timetable = routingService.getPatternForTrip().get(trip).getScheduledTimetable();