Merge branch 'dev-2.x' into add_non_regression_module_tests

# Conflicts:
#	application/src/test/java/org/opentripplanner/updater/trip/siri/SiriEtBuilder.java
#	application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/fuzzymatching/FuzzyTripMatchingTest.java
#	application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/update/QuayChangeTest.java

Author: vpaturet

application/src/main/java/org/opentripplanner/model/TripTimeOnDate.java

@@ -251,14 +251,14 @@ public int getRealtimeDeparture() {
    * Returns the actual arrival time if available. Otherwise -1 is returned.
    */
   public int getActualArrival() {
-    return isRecordedStop() ? tripTimes.getArrivalTime(stopPosition) : UNDEFINED;
+    return hasArrived() ? tripTimes.getArrivalTime(stopPosition) : UNDEFINED;
   }
 
   /**
    * Returns the actual departure time if available. Otherwise -1 is returned.
    */
   public int getActualDeparture() {
-    return isRecordedStop() ? tripTimes.getDepartureTime(stopPosition) : UNDEFINED;
+    return hasDeparted() ? tripTimes.getDepartureTime(stopPosition) : UNDEFINED;
   }
 
   public int getArrivalDelay() {
@@ -305,12 +305,14 @@ public boolean isNoDataStop() {
     return tripTimes.isNoDataStop(stopPosition);
   }
 
-  /**
-   * Is the real-time time a recorded time (i.e. has the vehicle already passed the stop).
-   * This information is currently only available from SIRI feeds.
-   */
-  public boolean isRecordedStop() {
-    return tripTimes.isRecordedStop(stopPosition);
+  /// True if there is realtime information indicating that the trip has arrived at the stop.
+  public boolean hasArrived() {
+    return tripTimes.hasArrived(stopPosition);
+  }
+
+  /// True if there is realtime information indicating that the trip has departed from the stop.
+  public boolean hasDeparted() {
+    return tripTimes.hasDeparted(stopPosition);
   }
 
   public RealTimeState getRealTimeState() {

application/src/main/java/org/opentripplanner/model/modes/AllowMainAndSubModeFilter.java

@@ -23,7 +23,7 @@ class AllowMainAndSubModeFilter implements AllowTransitModeFilter {
   }
 
   @Override
-  public boolean isSubMode() {
+  public boolean isModeSelective() {
     return true;
   }
 

application/src/main/java/org/opentripplanner/model/modes/AllowMainAndSubModesFilter.java

@@ -28,7 +28,7 @@ class AllowMainAndSubModesFilter implements AllowTransitModeFilter {
   }
 
   @Override
-  public boolean isSubMode() {
+  public boolean isModeSelective() {
     return true;
   }
 

application/src/main/java/org/opentripplanner/model/modes/AllowMainModeFilter.java

@@ -21,6 +21,11 @@ public boolean match(TransitMode transitMode, SubMode ignore) {
     return mainMode == transitMode;
   }
 
+  @Override
+  public boolean isModeSelective() {
+    return true;
+  }
+
   @Override
   public int hashCode() {
     return mainMode.hashCode() + 176393;

application/src/main/java/org/opentripplanner/model/modes/AllowMainModesFilter.java

@@ -20,6 +20,11 @@ public boolean match(TransitMode transitMode, SubMode ignore) {
     return mainModes.contains(transitMode);
   }
 
+  @Override
+  public boolean isModeSelective() {
+    return true;
+  }
+
   @Override
   public int hashCode() {
     return mainModes.hashCode() + 176393;

application/src/main/java/org/opentripplanner/model/modes/AllowTransitModeFilter.java

@@ -19,7 +19,17 @@ static AllowTransitModeFilter of(Collection<MainAndSubMode> modes) {
    */
   boolean match(TransitMode transitMode, SubMode netexSubMode);
 
-  default boolean isSubMode() {
+  /**
+   * Returns {@code true} if this filter is selective about which modes it allows, i.e. it does
+   * not accept all modes. This is used to determine whether trip-level filtering is needed for
+   * {@link org.opentripplanner.transit.model.network.TripPattern}s that contain trips with
+   * different modes or submodes. For such multi-mode patterns, pattern-level filtering alone is
+   * insufficient and each trip must be checked individually against the mode filter.
+   * <p>
+   * The default is {@code false}, which is appropriate for filters that accept all modes (like
+   * {@link AllowAllModesFilter}). Selective filters should override this to return {@code true}.
+   */
+  default boolean isModeSelective() {
     return false;
   }
 }

application/src/main/java/org/opentripplanner/model/modes/FilterCollection.java

@@ -35,7 +35,7 @@ public boolean match(TransitMode transitMode, SubMode netexSubMode) {
   }
 
   @Override
-  public boolean isSubMode() {
-    return filters.stream().anyMatch(AllowTransitModeFilter::isSubMode);
+  public boolean isModeSelective() {
+    return filters.stream().anyMatch(AllowTransitModeFilter::isModeSelective);
   }
 }

application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilter.java

@@ -38,7 +38,7 @@ public class DefaultTransitDataProviderFilter implements TransitDataProviderFilt
 
   private final Set<FeedScopedId> bannedTrips;
 
-  private final boolean hasSubModeFilters;
+  private final boolean hasTripLevelModeFilters;
 
   public DefaultTransitDataProviderFilter(DefaultTransitDataProviderFilterBuilder builder) {
     requireBikesAllowed = builder.requireBikesAllowed();
@@ -49,7 +49,7 @@ public DefaultTransitDataProviderFilter(DefaultTransitDataProviderFilterBuilder
     includeRealtimeCancellations = builder.includeRealtimeCancellations();
     bannedTrips = Set.copyOf(builder.bannedTrips());
     filters = builder.filters().toArray(TransitFilter[]::new);
-    hasSubModeFilters = builder.filters().stream().anyMatch(TransitFilter::isSubModePredicate);
+    hasTripLevelModeFilters = builder.filters().stream().anyMatch(TransitFilter::isModeSelective);
   }
 
   public static DefaultTransitDataProviderFilterBuilder of() {
@@ -73,7 +73,8 @@ public static BikeAccess bikeAccessForTrip(Trip trip) {
   public Predicate<TripTimes> createTripFilter(TripPattern tripPattern) {
     for (TransitFilter filter : filters) {
       if (filter.matchTripPattern(tripPattern)) {
-        var applyTripTimesFilters = hasSubModeFilters && tripPattern.getContainsMultipleModes();
+        var applyTripTimesFilters =
+          hasTripLevelModeFilters && tripPattern.getContainsMultipleModes();
         return tripTimes -> tripTimesPredicate(tripTimes, applyTripTimesFilters);
       }
     }

application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitFilter.java

@@ -14,7 +14,13 @@ public interface TransitFilter {
    */
   boolean matchTripTimes(TripTimes trip);
 
-  default boolean isSubModePredicate() {
+  /**
+   * Returns {@code true} if this filter contains mode-selective constraints that may require
+   * per-trip filtering on multi-mode patterns.
+   *
+   * @see org.opentripplanner.model.modes.AllowTransitModeFilter#isModeSelective()
+   */
+  default boolean isModeSelective() {
     return false;
   }
 }

application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitFilterRequest.java

@@ -40,11 +40,11 @@ public static Builder of() {
   }
 
   @Override
-  public boolean isSubModePredicate() {
+  public boolean isModeSelective() {
     for (var selectRequest : select) {
       if (
         selectRequest.transportModeFilter() != null &&
-        selectRequest.transportModeFilter().isSubMode()
+        selectRequest.transportModeFilter().isModeSelective()
       ) {
         return true;
       }
@@ -53,7 +53,7 @@ public boolean isSubModePredicate() {
     for (var selectRequest : not) {
       if (
         selectRequest.transportModeFilter() != null &&
-        selectRequest.transportModeFilter().isSubMode()
+        selectRequest.transportModeFilter().isModeSelective()
       ) {
         return true;
       }