Add support for via locations in access/egress

Author: optionsome

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

@@ -13,8 +13,8 @@
 import org.opentripplanner.ext.ridehailing.RideHailingAccessShifter;
 import org.opentripplanner.framework.application.OTPFeature;
 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.DefaultAccessEgressRouter;
 import org.opentripplanner.routing.algorithm.raptoradapter.router.street.FlexAccessEgressRouter;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.AccessEgressMapper;
@@ -66,7 +66,7 @@ public AccessEgressFetcher(
     this.carpoolingService = carpoolingService;
     this.transitServiceResolver = new TransitServiceResolver(serverContext.transitService());
     this.accessEgressMapper = new AccessEgressMapper(transitServiceResolver);
-    this.accessEgressRouter = new DefaultAccessEgressRouter();
+    this.accessEgressRouter = AccessEgressRouterFactory.create(request);
   }
 
   Collection<? extends RoutingAccessEgress> fetchAccess() {
@@ -108,7 +108,8 @@ private Collection<? extends RoutingAccessEgress> fetchAccessEgresses(AccessEgre
       type,
       durationLimit,
       stopCountLimit,
-      linkingContext
+      linkingContext,
+      serverContext.streetLimitationParametersService().maxCarSpeed()
     );
     var accessEgresses = accessEgressMapper.mapNearbyStops(nearbyStops);
     accessEgresses = timeshiftRideHailing(streetRequest, type, accessEgresses);

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

@@ -35,7 +35,8 @@ public Collection<NearbyStop> findAccessEgresses(
     AccessEgressType accessOrEgress,
     Duration durationLimit,
     int maxStopCount,
-    LinkingContext linkingContext
+    LinkingContext linkingContext,
+    float maxCarSpeed
   ) {
     OTPRequestTimeoutException.checkForTimeout();
 
@@ -63,7 +64,8 @@ public Collection<NearbyStop> findAccessEgresses(
       durationLimit,
       maxStopCount,
       linkingContext,
-      ignoreVertices
+      ignoreVertices,
+      maxCarSpeed
     );
 
     var results = ListUtils.combine(zeroDistanceAccessEgress, streetAccessEgress);
@@ -82,7 +84,8 @@ abstract Collection<NearbyStop> findStreetAccessEgresses(
     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,17 @@
+package org.opentripplanner.routing.algorithm.raptoradapter.router.street;
+
+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) {
+    return request.isViaSearch() ? new ViaAccessEgressRouter() : new DefaultAccessEgressRouter();
+  }
+}

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

@@ -17,9 +17,6 @@
  */
 public class DefaultAccessEgressRouter extends AccessEgressRouter {
 
-  /**
-   * Find accesses or egresses.
-   */
   @Override
   Collection<NearbyStop> findStreetAccessEgresses(
     RouteRequest request,
@@ -29,7 +26,8 @@ Collection<NearbyStop> findStreetAccessEgresses(
     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

@@ -36,7 +36,8 @@ public static List<Itinerary> route(
       AccessEgressType.ACCESS,
       serverContext.flexParameters().maxAccessWalkDuration(),
       0,
-      linkingContext
+      linkingContext,
+      serverContext.streetLimitationParametersService().maxCarSpeed()
     );
     Collection<NearbyStop> egressStops = accessEgressRouter.findAccessEgresses(
       request,
@@ -45,7 +46,8 @@ public static List<Itinerary> route(
       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

@@ -42,7 +42,8 @@ public static Collection<FlexAccessEgress> routeAccessEgress(
           AccessEgressType.ACCESS,
           serverContext.flexParameters().maxAccessWalkDuration(),
           0,
-          linkingContext
+          linkingContext,
+          serverContext.streetLimitationParametersService().maxCarSpeed()
         )
       : List.of();
 
@@ -54,7 +55,8 @@ public static Collection<FlexAccessEgress> routeAccessEgress(
           AccessEgressType.EGRESS,
           serverContext.flexParameters().maxEgressWalkDuration(),
           0,
-          linkingContext
+          linkingContext,
+          serverContext.streetLimitationParametersService().maxCarSpeed()
         )
       : List.of();