Merge branch 'access-egress-via-routing' into v2

Author: optionsome

application/src/ext-test/java/org/opentripplanner/ext/flex/template/ClosestTripTest.java

@@ -96,7 +96,7 @@ void filter() {
   private static Collection<ClosestTrip> closestTrips(Matcher<Trip> matcher) {
     return ClosestTrip.of(
       ADAPTER,
-      List.of(new NearbyStop(STOP.getId(), 100, List.of(), null)),
+      List.of(new NearbyStop(STOP.getId(), 100, List.of(), List.of())),
       matcher,
       List.of(FSD),
       true

application/src/ext/java/org/opentripplanner/ext/carpooling/routing/CarpoolAccessEgress.java

@@ -119,7 +119,7 @@ public RoutingAccessEgress withPenalty(TimeAndCost penalty) {
     It is never used for instances of CarpoolAccessEgress, but this might change in the future.
    */
   @Override
-  public State getFinalState() {
+  public List<State> getFinalStates() {
     throw new UnsupportedOperationException(
       "Fetching last state of CarpoolAccessEgress is not yet implemented"
     );

application/src/ext/java/org/opentripplanner/ext/carpooling/routing/CarpoolStreetRouter.java

@@ -6,6 +6,7 @@
 import org.opentripplanner.routing.api.request.request.StreetRequest;
 import org.opentripplanner.street.model.StreetMode;
 import org.opentripplanner.street.model.edge.Edge;
+import org.opentripplanner.street.model.path.StreetPath;
 import org.opentripplanner.street.model.vertex.Vertex;
 import org.opentripplanner.street.search.EuclideanRemainingWeightHeuristic;
 import org.opentripplanner.street.search.StreetSearchBuilder;
@@ -105,12 +106,6 @@ private GraphPath<State, Edge, Vertex> carpoolRouting(
       .withFrom(fromVertex)
       .withTo(toVertex);
 
-    var paths = streetSearch.getPathsToTarget();
-
-    if (paths.isEmpty()) {
-      return null;
-    }
-
-    return paths.getFirst().toGraphPath();
+    return streetSearch.getPathToTarget().map(StreetPath::toGraphPath).orElse(null);
   }
 }

application/src/ext/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingService.java

@@ -389,7 +389,7 @@ public List<CarpoolAccessEgress> routeAccessEgress(
 
       var nearbyStopsWithVertices = new HashMap<NearbyStop, Vertex>();
       for (var stop : nearbyStops) {
-        nearbyStopsWithVertices.put(stop, stop.state.getVertex());
+        nearbyStopsWithVertices.put(stop, stop.finalStates.getFirst().getVertex());
       }
 
       var candidateTripsWithVertices = candidateTrips

application/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java

@@ -108,7 +108,8 @@ Stream<FlexAccessEgress> createFlexAccessEgressStream(FlexAccessEgressCallbackAd
     // transferStop is Location Area/Line
     else {
       double maxDistanceMeters =
-        maxTransferDuration.getSeconds() * accessEgress.state.getRequest().walk().speed();
+        maxTransferDuration.getSeconds() *
+        accessEgress.finalStates.getFirst().getRequest().walk().speed();
 
       return getTransfersFromTransferStop(callback)
         .stream()
@@ -193,7 +194,10 @@ private FlexAccessEgress createFlexAccessEgress(
     // this code is a little repetitive but needed as a performance improvement. previously
     // the flex path was checked before this method was called. this meant that every path
     // was traversed twice, leading to a noticeable slowdown.
-    final var afterFlexState = flexEdge.traverse(accessEgress.state);
+
+    // TODO flex routing doesn't support via locations yet
+    var lastState = accessEgress.finalStates.getFirst();
+    final var afterFlexState = flexEdge.traverse(lastState);
     if (State.isEmpty(afterFlexState)) {
       return null;
     }

application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java

@@ -59,7 +59,7 @@ protected Vertex getFlexVertex(Edge edge) {
   }
 
   protected FlexPathDurations calculateFlexPathDurations(FlexTripEdge flexEdge, State state) {
-    int preFlexTime = (int) accessEgress.state.getElapsedTimeSeconds();
+    int preFlexTime = (int) accessEgress.duration().getSeconds();
     int edgeTimeInSeconds = flexEdge.getTimeInSeconds();
     int postFlexTime = (int) state.getElapsedTimeSeconds() - preFlexTime - edgeTimeInSeconds;
     return new FlexPathDurations(
@@ -71,8 +71,10 @@ protected FlexPathDurations calculateFlexPathDurations(FlexTripEdge flexEdge, St
   }
 
   protected FlexTripEdge getFlexEdge(Vertex flexToVertex, FeedScopedId transferStopId) {
+    // TODO flex doesn't support via locations yet
+    var lastVertex = accessEgress.finalStates.getLast().getVertex();
     var flexPath = calculator.calculateFlexPath(
-      accessEgress.state.getVertex(),
+      lastVertex,
       flexToVertex,
       boardStopPosition,
       alightStopPosition
@@ -83,7 +85,7 @@ protected FlexTripEdge getFlexEdge(Vertex flexToVertex, FeedScopedId transferSto
     }
 
     return new FlexTripEdge(
-      accessEgress.state.getVertex(),
+      lastVertex,
       flexToVertex,
       accessEgress.stopId,
       transferStopId,

application/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java

@@ -105,7 +105,8 @@ private Optional<DirectFlexPath> createDirectGraphPath(
     int accessAlightStopPosition = accessTemplate.alightStopPosition;
     int requestedBookingTime = accessTemplate.requestedBookingTime;
 
-    var flexToVertex = egress.state.getVertex();
+    // TODO flex doesn't support via locations yet
+    var flexToVertex = egress.finalStates.getLast().getVertex();
 
     if (!isRouteable(accessTemplate, flexToVertex)) {
       return Optional.empty();
@@ -117,7 +118,9 @@ private Optional<DirectFlexPath> createDirectGraphPath(
       return Optional.empty();
     }
 
-    final State[] afterFlexState = flexEdge.traverse(accessNearbyStop.state);
+    // TODO flex doesn't support via locations yet
+    var lastState = accessNearbyStop.finalStates.getLast();
+    final State[] afterFlexState = flexEdge.traverse(lastState);
 
     var finalStateOpt = EdgeTraverser.traverseEdges(afterFlexState[0], egress.edges);
 
@@ -183,12 +186,14 @@ private Optional<DirectFlexPath> createDirectGraphPath(
   }
 
   protected boolean isRouteable(FlexAccessTemplate accessTemplate, Vertex flexVertex) {
-    if (accessTemplate.accessEgress.state.getVertex() == flexVertex) {
+    // TODO flex doesn't support via locations yet
+    var lastVertex = accessTemplate.accessEgress.finalStates.getLast().getVertex();
+    if (lastVertex == flexVertex) {
       return false;
     } else {
       return (
         accessTemplate.calculator.calculateFlexPath(
-          accessTemplate.accessEgress.state.getVertex(),
+          lastVertex,
           flexVertex,
           accessTemplate.boardStopPosition,
           accessTemplate.alightStopPosition

application/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java

@@ -60,7 +60,7 @@ protected Vertex getFlexVertex(Edge edge) {
   }
 
   protected FlexPathDurations calculateFlexPathDurations(FlexTripEdge flexEdge, State state) {
-    int postFlexTime = (int) accessEgress.state.getElapsedTimeSeconds();
+    int postFlexTime = (int) accessEgress.duration().getSeconds();
     int edgeTimeInSeconds = flexEdge.getTimeInSeconds();
     int preFlexTime = (int) state.getElapsedTimeSeconds() - postFlexTime - edgeTimeInSeconds;
     return new FlexPathDurations(
@@ -72,9 +72,11 @@ protected FlexPathDurations calculateFlexPathDurations(FlexTripEdge flexEdge, St
   }
 
   protected FlexTripEdge getFlexEdge(Vertex flexFromVertex, FeedScopedId transferStopId) {
+    // TODO flex doesn't support via locations yet
+    var lastVertex = accessEgress.finalStates.getLast().getVertex();
     var flexPath = calculator.calculateFlexPath(
       flexFromVertex,
-      accessEgress.state.getVertex(),
+      lastVertex,
       boardStopPosition,
       alightStopPosition
     );
@@ -85,7 +87,7 @@ protected FlexTripEdge getFlexEdge(Vertex flexFromVertex, FeedScopedId transferS
 
     return new FlexTripEdge(
       flexFromVertex,
-      accessEgress.state.getVertex(),
+      lastVertex,
       transferStopId,
       accessEgress.stopId,
       trip,

application/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessAdapter.java

@@ -14,7 +14,7 @@ public final class RideHailingAccessAdapter extends DefaultAccessEgress {
   private final Duration arrival;
 
   public RideHailingAccessAdapter(RoutingAccessEgress access, Duration arrival) {
-    super(access.stop(), access.getFinalState());
+    super(access.stop(), access.getFinalStates());
     this.arrival = arrival;
   }
 

application/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java

@@ -12,6 +12,7 @@
 import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.street.geometry.WgsCoordinate;
 import org.opentripplanner.street.model.StreetMode;
+import org.opentripplanner.street.search.state.State;
 import org.opentripplanner.transit.model.framework.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,7 +46,7 @@ public static List<RoutingAccessEgress> shiftAccesses(
       .map(ae -> {
         // only time-shift access legs on a car
         // (there could be walk-only accesses if you're close to the stop)
-        if (isAccess && ae.getFinalState().containsModeCar()) {
+        if (isAccess && ae.getFinalStates().stream().allMatch(State::containsModeCar)) {
           var duration = fetchArrivalDelay(services, request, now);
           if (duration.isSuccess()) {
             return new RideHailingAccessAdapter(ae, duration.successValue());