Merge branch 'remove-via-slowdown' into v2

optionsome · optionsome · commit bb9af6e09346 · 2026-02-16T10:49:11.000+02:00
diff --git a/application/pom.xml b/application/pom.xml
@@ -381,7 +381,7 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-messaging-servicebus</artifactId>
-            <version>7.17.16</version>
+            <version>7.17.17</version>
         </dependency>
         <dependency>
             <groupId>com.azure</groupId>
diff --git a/application/src/client/index.html b/application/src/client/index.html
@@ -5,8 +5,8 @@
     <link rel="icon" type="image/svg+xml" href="/img/otp-logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>OTP Debug</title>
-    <script type="module" crossorigin src="https://www.opentripplanner.org/debug-client-assets/2026/02/2026-02-02T16:55/assets/index-XJnYWmAF.js"></script>
-    <link rel="stylesheet" crossorigin href="https://www.opentripplanner.org/debug-client-assets/2026/02/2026-02-02T16:55/assets/index-CME2K3XJ.css">
+    <script type="module" crossorigin src="https://www.opentripplanner.org/debug-client-assets/2026/02/2026-02-12T14:52/assets/index-DuY9OjzB.js"></script>
+    <link rel="stylesheet" crossorigin href="https://www.opentripplanner.org/debug-client-assets/2026/02/2026-02-12T14:52/assets/index-CME2K3XJ.css">
   </head>
   <body>
     <div id="root"></div>
diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/et/EstimatedCallType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/et/EstimatedCallType.java
@@ -218,6 +218,14 @@ public static GraphQLObjectType create(
           .dataFetcher(env -> ((TripTimeOnDate) env.getSource()).isCanceledEffectively())
           .build()
       )
+      .field(
+        GraphQLFieldDefinition.newFieldDefinition()
+          .name("extraCall")
+          .type(new GraphQLNonNull(Scalars.GraphQLBoolean))
+          .description("Whether this call is an extra call introduced by real-time data")
+          .dataFetcher(env -> ((TripTimeOnDate) env.getSource()).isExtraCall())
+          .build()
+      )
       .field(
         GraphQLFieldDefinition.newFieldDefinition()
           .name("date")
diff --git a/application/src/main/java/org/opentripplanner/model/TripTimeOnDate.java b/application/src/main/java/org/opentripplanner/model/TripTimeOnDate.java
@@ -284,6 +284,10 @@ public boolean isCancelledStop() {
     );
   }
 
+  public boolean isExtraCall() {
+    return tripTimes.isExtraCall(stopPosition);
+  }
+
   public boolean isPredictionInaccurate() {
     return tripTimes.isPredictionInaccurate(stopPosition);
   }
diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java
@@ -30,6 +30,7 @@ public final class RealTimeTripTimes implements TripTimes<RealTimeTripTimes> {
   private final int[] departureTimes;
   private final RealTimeState realTimeState;
   private final StopRealTimeState[] stopRealTimeStates;
+  private final boolean[] extraCalls;
 
   @Nullable
   private final I18NString tripHeadsign;
@@ -44,6 +45,7 @@ public final class RealTimeTripTimes implements TripTimes<RealTimeTripTimes> {
     departureTimes = builder.departureTimes();
     realTimeState = builder.realTimeState();
     stopRealTimeStates = builder.stopRealTimeStates();
+    extraCalls = builder.extraCalls();
     tripHeadsign = builder.tripHeadsign();
     stopHeadsigns = builder.stopHeadsigns();
     occupancyStatus = builder.occupancyStatus();
@@ -60,6 +62,7 @@ private RealTimeTripTimes(RealTimeTripTimes original, ScheduledTripTimes schedul
     this.departureTimes = original.departureTimes;
     this.realTimeState = original.realTimeState;
     this.stopRealTimeStates = original.stopRealTimeStates;
+    this.extraCalls = original.extraCalls;
     this.tripHeadsign = original.tripHeadsign;
     this.stopHeadsigns = original.stopHeadsigns;
     this.occupancyStatus = original.occupancyStatus;
@@ -78,6 +81,7 @@ private RealTimeTripTimes(RealTimeTripTimes original, int timeShift) {
     this.departureTimes = IntUtils.shiftArray(timeShift, original.departureTimes);
     this.realTimeState = original.realTimeState;
     this.stopRealTimeStates = original.stopRealTimeStates;
+    this.extraCalls = original.extraCalls;
     this.tripHeadsign = original.tripHeadsign;
     this.stopHeadsigns = original.stopHeadsigns;
     this.occupancyStatus = original.occupancyStatus;
@@ -188,6 +192,10 @@ public boolean isPredictionInaccurate(int stopPos) {
     return isStopRealTimeStates(stopPos, StopRealTimeState.INACCURATE_PREDICTIONS);
   }
 
+  public boolean isExtraCall(int stopPos) {
+    return extraCalls[stopPos];
+  }
+
   public boolean isRealTimeUpdated(int stopPos) {
     return (
       realTimeState != RealTimeState.SCHEDULED &&
diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesBuilder.java
@@ -21,6 +21,8 @@ public class RealTimeTripTimesBuilder {
 
   private final StopRealTimeState[] stopRealTimeStates;
 
+  private final boolean[] extraCalls;
+
   @Nullable
   private I18NString tripHeadsign;
 
@@ -47,6 +49,7 @@ public class RealTimeTripTimesBuilder {
     departureTimes = new Integer[numStops];
     stopRealTimeStates = new StopRealTimeState[numStops];
     Arrays.fill(stopRealTimeStates, StopRealTimeState.DEFAULT);
+    extraCalls = new boolean[numStops];
     stopHeadsigns = new I18NString[numStops];
     occupancyStatus = new OccupancyStatus[numStops];
     Arrays.fill(occupancyStatus, OccupancyStatus.NO_DATA_AVAILABLE);
@@ -199,6 +202,10 @@ public StopRealTimeState[] stopRealTimeStates() {
     return stopRealTimeStates.clone();
   }
 
+  public boolean[] extraCalls() {
+    return extraCalls.clone();
+  }
+
   public RealTimeTripTimesBuilder withRecorded(int stop) {
     return withStopRealTimeState(stop, StopRealTimeState.RECORDED);
   }
@@ -220,6 +227,11 @@ public RealTimeTripTimesBuilder withStopRealTimeState(int stop, StopRealTimeStat
     return this;
   }
 
+  public RealTimeTripTimesBuilder withExtraCall(int stop, boolean extraCall) {
+    this.extraCalls[stop] = extraCall;
+    return this;
+  }
+
   @Nullable
   public I18NString tripHeadsign() {
     if (tripHeadsign == null) {
diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java
@@ -245,6 +245,11 @@ public boolean isPredictionInaccurate(int stopPos) {
     return false;
   }
 
+  @Override
+  public boolean isExtraCall(int stopPos) {
+    return false;
+  }
+
   @Override
   public boolean isRealTimeUpdated(int stopPos) {
     return false;
diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java
@@ -139,6 +139,8 @@ default int compareTo(TripTimes other) {
 
   boolean isPredictionInaccurate(int stopPos);
 
+  boolean isExtraCall(int stopPos);
+
   /**
    * Return if trip has been updated and stop position has not been given a NO_DATA update.
    */
diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesStringBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesStringBuilder.java
@@ -48,6 +48,9 @@ public static String encodeTripTimes(TripTimes tripTimes, TripPattern pattern) {
       if (tripTimes.isNoDataStop(i)) {
         flags.add("ND");
       }
+      if (tripTimes.isExtraCall(i)) {
+        flags.add("EC");
+      }
 
       s.append(" | ").append(stops.get(i).getName());
       if (!flags.isEmpty()) {
diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealTimeTripUpdateAdapter.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealTimeTripUpdateAdapter.java
@@ -61,10 +61,6 @@ public class GtfsRealTimeTripUpdateAdapter {
   /**
    * A synchronized cache of trip patterns added to the timetable repository
    * due to GTFS-realtime messages.
-   * <p>
-   * This has "Siri" in the name because we are combining the two versions very carefully, step by
-   * step. Once this process is complete, we will clean up the name and move it to an appropriate
-   * package.
    **/
   private final TripPatternCache tripPatternCache;
 
diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/TimetableHelper.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/TimetableHelper.java
@@ -74,6 +74,10 @@ public static void applyUpdates(
       tripTimesBuilder.withCanceled(index);
     }
 
+    if (call.isExtraCall()) {
+      tripTimesBuilder.withExtraCall(index, true);
+    }
+
     int scheduledArrivalTime = tripTimesBuilder.getArrivalTime(index);
     int realTimeArrivalTime = getAvailableTime(
       departureDate,
diff --git a/application/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/application/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
@@ -252,6 +252,8 @@ type EstimatedCall {
   expectedArrivalTime: DateTime!
   "Expected time of departure from quay. Updated with real time information if available."
   expectedDepartureTime: DateTime!
+  "Whether this call is an extra call introduced by real-time data"
+  extraCall: Boolean!
   "Whether vehicle may be alighted at quay."
   forAlighting: Boolean!
   "Whether vehicle may be boarded at quay."
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/SiriEtBuilder.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/SiriEtBuilder.java
@@ -25,6 +25,7 @@
 import uk.org.siri.siri21.StopAssignmentStructure;
 import uk.org.siri.siri21.StopPointRefStructure;
 import uk.org.siri.siri21.VehicleJourneyRef;
+import uk.org.siri.siri21.VehicleModesEnumeration;
 
 /**
  * This is a helper class for constucting Siri ET messages to use in tests.
@@ -97,6 +98,25 @@ public SiriEtBuilder withLineRef(String lineRef) {
     return this;
   }
 
+  public SiriEtBuilder withExternalLineRef(String externalLineRef) {
+    var ref = new LineRef();
+    ref.setValue(externalLineRef);
+    evj.setExternalLineRef(ref);
+    return this;
+  }
+
+  public SiriEtBuilder withPublishedLineName(String lineName) {
+    var name = new NaturalLanguageStringStructure();
+    name.setValue(lineName);
+    evj.getPublishedLineNames().add(name);
+    return this;
+  }
+
+  public SiriEtBuilder withVehicleMode(VehicleModesEnumeration mode) {
+    evj.getVehicleModes().add(mode);
+    return this;
+  }
+
   public SiriEtBuilder withRecordedCalls(
     Function<RecordedCallsBuilder, RecordedCallsBuilder> producer
   ) {
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/TestCall.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/TestCall.java
@@ -12,6 +12,7 @@ public class TestCall implements CallWrapper {
 
   private final String stopPointRef;
   private final Boolean cancellation;
+  private final boolean extraCall;
   private final Boolean predictionInaccurate;
   private final OccupancyEnumeration occupancy;
   private final List<NaturalLanguageStringStructure> destinationDisplaies;
@@ -29,6 +30,7 @@ public class TestCall implements CallWrapper {
   private TestCall(
     String stopPointRef,
     Boolean cancellation,
+    boolean extraCall,
     Boolean predictionInaccurate,
     OccupancyEnumeration occupancy,
     List<NaturalLanguageStringStructure> destinationDisplaies,
@@ -45,6 +47,7 @@ private TestCall(
   ) {
     this.stopPointRef = stopPointRef;
     this.cancellation = cancellation;
+    this.extraCall = extraCall;
     this.predictionInaccurate = predictionInaccurate;
     this.occupancy = occupancy;
     this.destinationDisplaies = destinationDisplaies;
@@ -81,7 +84,7 @@ public Boolean isPredictionInaccurate() {
 
   @Override
   public boolean isExtraCall() {
-    return false;
+    return extraCall;
   }
 
   @Override
@@ -148,6 +151,7 @@ public static class TestCallBuilder {
 
     private String stopPointRef = null;
     private Boolean cancellation = null;
+    private boolean extraCall = false;
     private Boolean predictionInaccurate = null;
     private OccupancyEnumeration occupancy = null;
     private List<NaturalLanguageStringStructure> destinationDisplaies = null;
@@ -172,6 +176,11 @@ public TestCallBuilder withCancellation(Boolean cancellation) {
       return this;
     }
 
+    public TestCallBuilder withExtraCall(boolean extraCall) {
+      this.extraCall = extraCall;
+      return this;
+    }
+
     public TestCallBuilder withPredictionInaccurate(Boolean predictionInaccurate) {
       this.predictionInaccurate = predictionInaccurate;
       return this;
@@ -247,6 +256,7 @@ public TestCall build() {
       return new TestCall(
         stopPointRef,
         cancellation,
+        extraCall,
         predictionInaccurate,
         occupancy,
         destinationDisplaies,
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/TimetableHelperTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/TimetableHelperTest.java
@@ -95,7 +95,7 @@ public void testApplyUpdates_MapPredictionInaccurate_EstimatedCall() {
     TimetableHelper.applyUpdates(START_OF_SERVICE, builder, 0, false, false, estimatedCall, null);
 
     // Assert
-    assertStatuses(0, OccupancyStatus.MANY_SEATS_AVAILABLE, false, false, true);
+    assertStatuses(0, OccupancyStatus.MANY_SEATS_AVAILABLE, false, false, false, true);
   }
 
   @Test
@@ -114,7 +114,7 @@ public void testApplyUpdates_CancellationPriorityOverPredictionInaccurate_Estima
 
     // Assert
 
-    assertStatuses(0, OccupancyStatus.FULL, true, false, false);
+    assertStatuses(0, OccupancyStatus.FULL, true, false, false, false);
   }
 
   @Test
@@ -135,7 +135,7 @@ public void testApplyUpdates_CancellationPriorityOverPredictionInaccurate_Record
 
     // Assert
 
-    assertStatuses(0, OccupancyStatus.FULL, true, false, false);
+    assertStatuses(0, OccupancyStatus.FULL, true, false, false, false);
   }
 
   @Test
@@ -154,7 +154,7 @@ public void testApplyUpdates_PredictionInaccuratePriorityOverRecorded() {
     TimetableHelper.applyUpdates(START_OF_SERVICE, builder, 0, false, false, recordedCall, null);
 
     // Assert
-    assertStatuses(0, OccupancyStatus.FULL, false, false, true);
+    assertStatuses(0, OccupancyStatus.FULL, false, false, false, true);
   }
 
   @Test
@@ -173,7 +173,7 @@ public void testApplyUpdates_ActualTimeResultsInRecorded() {
     TimetableHelper.applyUpdates(START_OF_SERVICE, builder, 0, false, false, recordedCall, null);
 
     // Assert
-    assertStatuses(0, OccupancyStatus.STANDING_ROOM_ONLY, false, true, false);
+    assertStatuses(0, OccupancyStatus.STANDING_ROOM_ONLY, false, false, true, false);
   }
 
   @Test
@@ -193,13 +193,26 @@ public void testApplyUpdates_JourneyDefaultValues() {
     );
 
     // Assert
-    assertStatuses(0, OccupancyStatus.STANDING_ROOM_ONLY, false, false, true);
+    assertStatuses(0, OccupancyStatus.STANDING_ROOM_ONLY, false, false, false, true);
+  }
+
+  @Test
+  public void testApplyUpdates_ExtraCall_EstimatedCall() {
+    // Arrange
+    CallWrapper estimatedCall = TestCall.of().withExtraCall(true).build();
+
+    // Act
+    TimetableHelper.applyUpdates(START_OF_SERVICE, builder, 0, false, false, estimatedCall, null);
+
+    // Assert
+    assertStatuses(0, OccupancyStatus.NO_DATA_AVAILABLE, false, true, false, false);
   }
 
   private void assertStatuses(
     int index,
     OccupancyStatus occupancyStatus,
     boolean cancelled,
+    boolean extraCall,
     boolean recorded,
     boolean predictionInaccurate
   ) {
@@ -216,5 +229,6 @@ private void assertStatuses(
       "Occupancy should be mapped to " + occupancyStatus
     );
     assertEquals(cancelled, tripTimes.isCancelledStop(index));
+    assertEquals(extraCall, tripTimes.isExtraCall(index));
   }
 }
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extracall/ExtraCallTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extracall/ExtraCallTest.java
@@ -44,7 +44,7 @@ void testExtraCall() {
 
     assertEquals(1, result.successful());
     assertEquals(
-      "MODIFIED | A [R] 0:00:15 0:00:15 | D 0:00:20 0:00:25 | B 0:00:33 0:00:33",
+      "MODIFIED | A [R] 0:00:15 0:00:15 | D [EC] 0:00:20 0:00:25 | B 0:00:33 0:00:33",
       env.tripData(TRIP_1_ID).showTimetable()
     );
   }
@@ -60,7 +60,7 @@ void testExtraCallMultipleTimes() {
 
     assertEquals(1, result.successful());
     assertEquals(
-      "MODIFIED | A [R] 0:00:15 0:00:15 | D 0:00:20 0:00:25 | B 0:00:33 0:00:33",
+      "MODIFIED | A [R] 0:00:15 0:00:15 | D [EC] 0:00:20 0:00:25 | B 0:00:33 0:00:33",
       env.tripData(TRIP_1_ID).showTimetable()
     );
   }
diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extrajourney/ExtraJourneyTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extrajourney/ExtraJourneyTest.java
diff --git a/doc/user/Changelog.md b/doc/user/Changelog.md
diff --git a/pom.xml b/pom.xml
diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/RaptorViaLocation.java b/raptor/src/main/java/org/opentripplanner/raptor/api/request/RaptorViaLocation.java

Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,10 @@ public boolean isCancelledStop() {`
`284`	`284`	`);`
`285`	`285`	`}`
`286`	`286`
	`287`	`+ public boolean isExtraCall() {`
	`288`	`+ return tripTimes.isExtraCall(stopPosition);`
	`289`	`+ }`
	`290`	`+`
`287`	`291`	`public boolean isPredictionInaccurate() {`
`288`	`292`	`return tripTimes.isPredictionInaccurate(stopPosition);`
`289`	`293`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,9 @@ public static String encodeTripTimes(TripTimes tripTimes, TripPattern pattern) {`
`48`	`48`	`if (tripTimes.isNoDataStop(i)) {`
`49`	`49`	`flags.add("ND");`
`50`	`50`	`}`
	`51`	`+ if (tripTimes.isExtraCall(i)) {`
	`52`	`+ flags.add("EC");`
	`53`	`+ }`
`51`	`54`
`52`	`55`	`s.append(" \| ").append(stops.get(i).getName());`
`53`	`56`	`if (!flags.isEmpty()) {`