fix: ensure range-raptor queries can return multiple paths

Author: sigtot

raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java

@@ -169,7 +169,7 @@ public void findTransitForRound() {
   }
 
   @Override
-  public void findOnBoardAccessForRound() {
+  public void findOnBoardAccessForRound(int iterationDepartureTime) {
     // For an on-board access, we don't count a ride until we alight, meaning that we will have
     // n rides in round n + 1.
     // TODO consider increasing numberOfRounds to 1 as a more proper fix?
@@ -195,8 +195,10 @@ public void findOnBoardAccessForRound() {
         return;
       }
 
-      var boardTime = trip.arrival(accessPath.stopPositionInPattern());
-      transitWorker.registerOnBoardAccessStopArrival(accessPath, boardTime, trip);
+      var boardTime = trip.departure(accessPath.stopPositionInPattern());
+      if (calculator.isInIteration(boardTime, iterationDepartureTime)) {
+        transitWorker.registerOnBoardAccessStopArrival(accessPath, boardTime, trip);
+      }
     }
   }
 

raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptor.java

@@ -125,7 +125,7 @@ public RaptorRouterResult<T> route() {
   private void runRaptorForMinute(int iterationDepartureTime) {
     setupIteration(iterationDepartureTime);
     worker.findAccessOnStreetForRound();
-    worker.findOnBoardAccessForRound();
+    worker.findOnBoardAccessForRound(iterationDepartureTime);
 
     while (hasMoreRounds()) {
       lifeCycle.prepareForNextRound(roundTracker.nextRound());

raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptorWorkerComposite.java

@@ -83,9 +83,9 @@ public void findTransitForRound() {
   }
 
   @Override
-  public void findOnBoardAccessForRound() {
+  public void findOnBoardAccessForRound(int iterationDepartureTime) {
     for (RangeRaptorWorker<T> child : children) {
-      child.findOnBoardAccessForRound();
+      child.findOnBoardAccessForRound(iterationDepartureTime);
     }
   }
 

raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RangeRaptorWorker.java

@@ -27,7 +27,7 @@ public interface RangeRaptorWorker<T extends RaptorTripSchedule> {
   /**
    * Find on-board access for round (accesses on-board an already started trip)
    */
-  void findOnBoardAccessForRound();
+  void findOnBoardAccessForRound(int iterationDepartureTime);
 
   /**
    * Perform on-board (accesses on-board an already started trip) transit search for boardings and

raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java

@@ -10,6 +10,7 @@
 import java.util.function.ToIntFunction;
 import java.util.stream.Collectors;
 import org.opentripplanner.raptor.api.model.RaptorAccessEgress;
+import org.opentripplanner.raptor.api.model.RaptorOnBoardAccess;
 import org.opentripplanner.raptor.util.paretoset.ParetoComparator;
 import org.opentripplanner.raptor.util.paretoset.ParetoSet;
 import org.slf4j.Logger;
@@ -50,13 +51,19 @@ public final class AccessEgressFunctions {
    *         No opening hours is better than being restricted
    *     </li>
    *     <li>
-   *         If Both have opening hours, both need to be accepted
+   *         If both have opening hours, both need to be accepted
+   *     </li>
+   *     <li>
+   *         If both are on-board access, both need to be accepted. This is because the
+   *         pareto-optimality of a path started with an on-board access depends on the specific
+   *         trip boarded and cannot be determined from the access-path alone.
    *     </li>
    * </ol>
    */
   private static final ParetoComparator<RaptorAccessEgress> STANDARD_COMPARATOR = (l, r) ->
     ((l.stopReachedOnBoard() && !r.stopReachedOnBoard()) ||
       r.hasOpeningHours() ||
+      r instanceof RaptorOnBoardAccess ||
       l.numberOfRides() < r.numberOfRides() ||
       l.durationInSeconds() < r.durationInSeconds() ||
       l.numberOfViaLocationsVisited() > r.numberOfViaLocationsVisited());

raptor/src/test/java/org/opentripplanner/raptor/moduletests/M01_OnBoardAccessTest.java

@@ -42,7 +42,7 @@ private RaptorRequestBuilder<TestTripSchedule> prepareRequest() {
       .searchParams()
       .earliestDepartureTime(T00_00)
       .latestArrivalTime(T01_00)
-      .searchWindow(Duration.ofMinutes(2))
+      .searchWindow(Duration.ofMinutes(60))
       .timetable(true);
 
     return builder;
@@ -319,4 +319,36 @@ void walkAndOnBoard() {
       pathsToString(raptorResponse)
     );
   }
+
+  @Test
+  @DisplayName("Range query results in multiple consecutive paths")
+  void rangeQuery() {
+    data
+      .access(
+        new TestRaptorOnBoardAccess(0, 0, 1, STOP_B, 0),
+        new TestRaptorOnBoardAccess(0, 1, 1, STOP_B, 0)
+      )
+      .withRoutes()
+      .withTimetables(
+        """
+        -- R1
+        A     B        C     D
+        0:00  0:05:05  0:10  0:15
+        0:05  0:10     0:15  0:20
+        """
+      )
+      .egress("D ~ Walk 30s");
+
+    var requestBuilder = prepareRequest();
+
+    var raptorResponse = raptorService.route(requestBuilder.build(), data);
+
+    // The result of the range query should include a path for each access
+    assertEquals(
+      """
+      B ~ BUS R1 0:05:05 0:15 ~ D ~ Walk 30s [0:05:05 0:15:30 10m25s Tₙ0 C₁1_255]
+      B ~ BUS R1 0:10 0:20 ~ D ~ Walk 30s [0:10 0:20:30 10m30s Tₙ0 C₁1_260]""",
+      pathsToString(raptorResponse)
+    );
+  }
 }