Add support for via locations in access/egress

Author: optionsome

application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java

@@ -23,9 +23,10 @@
 import org.opentripplanner.raptor.spi.ExtraMcRouterSearch;
 import org.opentripplanner.routing.algorithm.mapping.RaptorPathToItineraryMapper;
 import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressPenaltyDecorator;
+import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressRouter;
+import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressRouterFactory;
 import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressType;
 import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgresses;
-import org.opentripplanner.routing.algorithm.raptoradapter.router.street.DefaultAccessEgressRouter;
 import org.opentripplanner.routing.algorithm.raptoradapter.router.street.FlexAccessEgressRouter;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress;
@@ -63,7 +64,7 @@ public class TransitRouter {
   private final AdditionalSearchDays additionalSearchDays;
   private final ViaCoordinateTransferFactory viaTransferResolver;
   private final LinkingContext linkingContext;
-  private final DefaultAccessEgressRouter accessEgressRouter;
+  private final AccessEgressRouter accessEgressRouter;
 
   private TransitRouter(
     RouteRequest request,
@@ -82,7 +83,8 @@ private TransitRouter(
     this.debugTimingAggregator = debugTimingAggregator;
     this.viaTransferResolver = serverContext.viaTransferResolver();
     this.linkingContext = linkingContext;
-    this.accessEgressRouter = new DefaultAccessEgressRouter(
+    this.accessEgressRouter = AccessEgressRouterFactory.create(
+      request,
       new TransitServiceResolver(serverContext.transitService())
     );
   }
@@ -274,11 +276,13 @@ private Collection<? extends RoutingAccessEgress> fetchAccessEgresses(AccessEgre
     var nearbyStops = accessEgressRouter.findAccessEgresses(
       accessRequest,
       streetRequest,
+      serverContext.traverseVisitor(),
       serverContext.listExtensionRequestContexts(accessRequest),
       type,
       durationLimit,
       stopCountLimit,
-      linkingContext
+      linkingContext,
+      serverContext.streetLimitationParametersService().maxCarSpeed()
     );
     var accessEgresses = AccessEgressMapper.mapNearbyStops(nearbyStops, type);
     accessEgresses = timeshiftRideHailing(streetRequest, type, accessEgresses);

application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouter.java

@@ -5,15 +5,18 @@
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import org.opentripplanner.astar.spi.TraverseVisitor;
 import org.opentripplanner.framework.application.OTPRequestTimeoutException;
 import org.opentripplanner.graph_builder.module.nearbystops.StopResolver;
 import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.routing.api.request.request.StreetRequest;
 import org.opentripplanner.routing.graphfinder.NearbyStop;
 import org.opentripplanner.routing.graphfinder.NearbyStopFactory;
 import org.opentripplanner.routing.linking.LinkingContext;
+import org.opentripplanner.street.model.edge.Edge;
 import org.opentripplanner.street.model.edge.ExtensionRequestContext;
 import org.opentripplanner.street.model.vertex.Vertex;
+import org.opentripplanner.street.search.state.State;
 import org.opentripplanner.utils.collection.ListUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,7 +30,7 @@ public abstract class AccessEgressRouter {
   private static final Logger LOG = LoggerFactory.getLogger(AccessEgressRouter.class);
   private final NearbyStopFactory nearbyStopFactory;
 
-  public AccessEgressRouter(StopResolver stopResolver) {
+  AccessEgressRouter(StopResolver stopResolver) {
     this.nearbyStopFactory = new NearbyStopFactory(stopResolver::getRegularStop);
   }
 
@@ -37,11 +40,13 @@ public AccessEgressRouter(StopResolver stopResolver) {
   public Collection<NearbyStop> findAccessEgresses(
     RouteRequest request,
     StreetRequest streetRequest,
+    TraverseVisitor<State, Edge> traverseVisitor,
     Collection<ExtensionRequestContext> extensionRequestContexts,
     AccessEgressType accessOrEgress,
     Duration durationLimit,
     int maxStopCount,
-    LinkingContext linkingContext
+    LinkingContext linkingContext,
+    float maxCarSpeed
   ) {
     OTPRequestTimeoutException.checkForTimeout();
 
@@ -64,12 +69,14 @@ public Collection<NearbyStop> findAccessEgresses(
     var streetAccessEgress = findStreetAccessEgresses(
       request,
       streetRequest,
+      traverseVisitor,
       extensionRequestContexts,
       accessOrEgress,
       durationLimit,
       maxStopCount,
       linkingContext,
-      ignoreVertices
+      ignoreVertices,
+      maxCarSpeed
     );
 
     var results = ListUtils.combine(zeroDistanceAccessEgress, streetAccessEgress);
@@ -83,12 +90,14 @@ public Collection<NearbyStop> findAccessEgresses(
   abstract Collection<NearbyStop> findStreetAccessEgresses(
     RouteRequest request,
     StreetRequest streetRequest,
+    TraverseVisitor<State, Edge> traverseVisitor,
     Collection<ExtensionRequestContext> extensionRequestContexts,
     AccessEgressType accessOrEgress,
     Duration durationLimit,
     int maxStopCount,
     LinkingContext linkingContext,
-    Set<Vertex> ignoreVertices
+    Set<Vertex> ignoreVertices,
+    float maxCarSpeed
   );
 
   /**

application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterFactory.java

@@ -0,0 +1,20 @@
+package org.opentripplanner.routing.algorithm.raptoradapter.router.street;
+
+import org.opentripplanner.graph_builder.module.nearbystops.StopResolver;
+import org.opentripplanner.routing.api.request.RouteRequest;
+
+/**
+ * This factory encapsulates the logic for deciding which access/egress router to use.
+ */
+public class AccessEgressRouterFactory {
+
+  /**
+   * @return {@link DefaultAccessEgressRouter} if there are no via locations, otherwise
+   * {@link ViaAccessEgressRouter}.
+   */
+  public static AccessEgressRouter create(RouteRequest request, StopResolver stopResolver) {
+    return request.isViaSearch()
+      ? new ViaAccessEgressRouter(stopResolver)
+      : new DefaultAccessEgressRouter(stopResolver);
+  }
+}

application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DefaultAccessEgressRouter.java

@@ -3,14 +3,17 @@
 import java.time.Duration;
 import java.util.Collection;
 import java.util.Set;
+import org.opentripplanner.astar.spi.TraverseVisitor;
 import org.opentripplanner.graph_builder.module.nearbystops.StopResolver;
 import org.opentripplanner.graph_builder.module.nearbystops.StreetNearbyStopFinder;
 import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.routing.api.request.request.StreetRequest;
 import org.opentripplanner.routing.graphfinder.NearbyStop;
 import org.opentripplanner.routing.linking.LinkingContext;
+import org.opentripplanner.street.model.edge.Edge;
 import org.opentripplanner.street.model.edge.ExtensionRequestContext;
 import org.opentripplanner.street.model.vertex.Vertex;
+import org.opentripplanner.street.search.state.State;
 
 /**
  * This uses a street search to find paths to all the access/egress stop within range. Doesn't
@@ -20,24 +23,23 @@ public class DefaultAccessEgressRouter extends AccessEgressRouter {
 
   private final StopResolver stopResolver;
 
-  public DefaultAccessEgressRouter(StopResolver stopResolver) {
+  DefaultAccessEgressRouter(StopResolver stopResolver) {
     super(stopResolver);
     this.stopResolver = stopResolver;
   }
 
-  /**
-   * Find accesses or egresses.
-   */
   @Override
   Collection<NearbyStop> findStreetAccessEgresses(
     RouteRequest request,
     StreetRequest streetRequest,
+    TraverseVisitor<State, Edge> traverseVisitor,
     Collection<ExtensionRequestContext> extensionRequestContexts,
     AccessEgressType accessOrEgress,
     Duration durationLimit,
     int maxStopCount,
     LinkingContext linkingContext,
-    Set<Vertex> ignoreVertices
+    Set<Vertex> ignoreVertices,
+    float maxCarSpeed
   ) {
     var originVertices = accessOrEgress.isAccess()
       ? linkingContext.findVertices(request.from())

application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java

@@ -35,20 +35,24 @@ public static List<Itinerary> route(
     Collection<NearbyStop> accessStops = accessEgressRouter.findAccessEgresses(
       request,
       request.journey().direct(),
+      serverContext.traverseVisitor(),
       serverContext.listExtensionRequestContexts(request),
       AccessEgressType.ACCESS,
       serverContext.flexParameters().maxAccessWalkDuration(),
       0,
-      linkingContext
+      linkingContext,
+      serverContext.streetLimitationParametersService().maxCarSpeed()
     );
     Collection<NearbyStop> egressStops = accessEgressRouter.findAccessEgresses(
       request,
       request.journey().direct(),
+      serverContext.traverseVisitor(),
       serverContext.listExtensionRequestContexts(request),
       AccessEgressType.EGRESS,
       serverContext.flexParameters().maxEgressWalkDuration(),
       0,
-      linkingContext
+      linkingContext,
+      serverContext.streetLimitationParametersService().maxCarSpeed()
     );
 
     var flexRouter = new FlexRouter(

application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java

@@ -23,7 +23,7 @@ private FlexAccessEgressRouter() {}
 
   public static Collection<FlexAccessEgress> routeAccessEgress(
     RouteRequest request,
-    DefaultAccessEgressRouter accessEgressRouter,
+    AccessEgressRouter accessEgressRouter,
     OtpServerRequestContext serverContext,
     AdditionalSearchDays searchDays,
     FlexParameters config,
@@ -39,23 +39,27 @@ public static Collection<FlexAccessEgress> routeAccessEgress(
       ? accessEgressRouter.findAccessEgresses(
         request,
         new StreetRequest(StreetMode.WALK),
+        serverContext.traverseVisitor(),
         extensionRequestContexts,
         AccessEgressType.ACCESS,
         serverContext.flexParameters().maxAccessWalkDuration(),
         0,
-        linkingContext
+        linkingContext,
+        serverContext.streetLimitationParametersService().maxCarSpeed()
       )
       : List.of();
 
     Collection<NearbyStop> egressStops = accessOrEgress.isEgress()
       ? accessEgressRouter.findAccessEgresses(
         request,
         new StreetRequest(StreetMode.WALK),
+        serverContext.traverseVisitor(),
         extensionRequestContexts,
         AccessEgressType.EGRESS,
         serverContext.flexParameters().maxEgressWalkDuration(),
         0,
-        linkingContext
+        linkingContext,
+        serverContext.streetLimitationParametersService().maxCarSpeed()
       )
       : List.of();