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

Author: optionsome

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

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

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

@@ -4,7 +4,6 @@
 import java.util.Set;
 import org.opentripplanner.astar.model.GraphPath;
 import org.opentripplanner.astar.strategy.DurationSkipEdgeStrategy;
-import org.opentripplanner.astar.strategy.PathComparator;
 import org.opentripplanner.framework.i18n.NonLocalizedString;
 import org.opentripplanner.model.GenericLocation;
 import org.opentripplanner.routing.api.request.RouteRequest;
@@ -195,13 +194,6 @@ private GraphPath<State, Edge, Vertex> carpoolRouting(
       .withFrom(fromVertices)
       .withTo(toVertices);
 
-    List<GraphPath<State, Edge, Vertex>> paths = streetSearch.getPathsToTarget();
-    paths.sort(new PathComparator(request.arriveBy()));
-
-    if (paths.isEmpty()) {
-      return null;
-    }
-
-    return paths.getFirst();
+    return streetSearch.getPathToTarget().orElse(null);
   }
 }

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

@@ -107,7 +107,8 @@ Stream<FlexAccessEgress> createFlexAccessEgressStream(FlexAccessEgressCallbackAd
     // transferStop is Location Area/Line
     else {
       double maxDistanceMeters =
-        maxTransferDuration.getSeconds() * accessEgress.state.getRequest().walk().speed();
+        maxTransferDuration.getSeconds() *
+        accessEgress.lastStates.getFirst().getRequest().walk().speed();
 
       return getTransfersFromTransferStop(callback)
         .stream()
@@ -192,7 +193,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.lastStates.getFirst();
+    final var afterFlexState = flexEdge.traverse(lastState);
     if (State.isEmpty(afterFlexState)) {
       return null;
     }

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

@@ -58,7 +58,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(
@@ -70,8 +70,10 @@ protected FlexPathDurations calculateFlexPathDurations(FlexTripEdge flexEdge, St
   }
 
   protected FlexTripEdge getFlexEdge(Vertex flexToVertex, StopLocation transferStop) {
+    // TODO flex doesn't support via locations yet
+    var lastVertex = accessEgress.lastStates.getLast().getVertex();
     var flexPath = calculator.calculateFlexPath(
-      accessEgress.state.getVertex(),
+      lastVertex,
       flexToVertex,
       boardStopPosition,
       alightStopPosition
@@ -82,7 +84,7 @@ protected FlexTripEdge getFlexEdge(Vertex flexToVertex, StopLocation transferSto
     }
 
     return new FlexTripEdge(
-      accessEgress.state.getVertex(),
+      lastVertex,
       flexToVertex,
       accessEgress.stop,
       transferStop,

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.lastStates.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.lastStates.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.lastStates.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

@@ -59,7 +59,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(
@@ -71,9 +71,11 @@ protected FlexPathDurations calculateFlexPathDurations(FlexTripEdge flexEdge, St
   }
 
   protected FlexTripEdge getFlexEdge(Vertex flexFromVertex, StopLocation transferStop) {
+    // TODO flex doesn't support via locations yet
+    var lastVertex = accessEgress.lastStates.getLast().getVertex();
     var flexPath = calculator.calculateFlexPath(
       flexFromVertex,
-      accessEgress.state.getVertex(),
+      lastVertex,
       boardStopPosition,
       alightStopPosition
     );
@@ -84,7 +86,7 @@ protected FlexTripEdge getFlexEdge(Vertex flexFromVertex, StopLocation transferS
 
     return new FlexTripEdge(
       flexFromVertex,
-      accessEgress.state.getVertex(),
+      lastVertex,
       transferStop,
       accessEgress.stop,
       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.getLastState());
+    super(access.stop(), access.getLastStates());
     this.arrival = arrival;
   }
 

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

@@ -12,6 +12,7 @@
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress;
 import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.routing.api.request.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.getLastState().containsModeCar()) {
+        if (isAccess && ae.getLastStates().stream().allMatch(State::containsModeCar)) {
           var duration = fetchArrivalDelay(services, request, now);
           if (duration.isSuccess()) {
             return new RideHailingAccessAdapter(ae, duration.successValue());

application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java

@@ -457,7 +457,7 @@ public DataFetcher<Object> node() {
           var stop = transitService.getRegularStop(FeedScopedId.parse(parts[1]));
 
           // TODO: Add geometry
-          return new NearbyStop(stop, Integer.parseInt(parts[0]), null, null);
+          return new NearbyStop(stop, Integer.parseInt(parts[0]), List.of(), List.of());
         }
         case "TicketType":
           return null; //TODO

application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopImpl.java

@@ -443,7 +443,12 @@ public DataFetcher<Iterable<NearbyStop>> transfers() {
             .filter(transfer -> maxDistance == null || transfer.getDistanceMeters() < maxDistance)
             .filter(transfer -> transfer.to instanceof RegularStop)
             .map(transfer ->
-              new NearbyStop(transfer.to, transfer.getDistanceMeters(), transfer.getEdges(), null)
+              new NearbyStop(
+                transfer.to,
+                transfer.getDistanceMeters(),
+                transfer.getEdges(),
+                List.of()
+              )
             )
             .collect(Collectors.toList());
         },