Fix access/egress when via locations don't have coordinates

Author: optionsome

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

@@ -4,7 +4,6 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 import java.util.OptionalInt;
 import java.util.Set;
 import org.opentripplanner.astar.spi.TraverseVisitor;
@@ -48,10 +47,28 @@ Collection<NearbyStop> findStreetAccessEgresses(
     Set<Vertex> ignoreVertices,
     float maxCarSpeed
   ) {
+    var accessEgressRequest = getViaFriendlyRequest(request);
+    var firstVertices = accessOrEgress.isAccess()
+      ? linkingContext.findVertices(accessEgressRequest.from())
+      : linkingContext.findVertices(accessEgressRequest.to());
+    var stopsFromFirstLocation = StreetNearbyStopFinder.of(
+      stopResolver,
+      durationLimit,
+      maxStopCount
+    )
+      .withIgnoreVertices(ignoreVertices)
+      .withExtensionRequestContexts(extensionRequestContexts)
+      .build()
+      .findNearbyStops(
+        firstVertices,
+        accessEgressRequest,
+        streetRequest,
+        accessOrEgress.isEgress()
+      );
     var lastViaWithCoordinates = lastCoordinateViaLocationIndex(request, accessOrEgress);
     // There are no coordinate locations to route to/from
     if (lastViaWithCoordinates.isEmpty()) {
-      return List.of();
+      return stopsFromFirstLocation;
     }
     var graphPathFinder = new GraphPathFinder(
       traverseVisitor,
@@ -63,13 +80,13 @@ Collection<NearbyStop> findStreetAccessEgresses(
       accessOrEgress,
       lastViaWithCoordinates.getAsInt()
     );
-    var accessEgressRequest = getViaFriendlyRequest(request);
     return accessOrEgress.isAccess()
       ? findStreetAccesses(
           accessEgressRequest,
           directRequest,
           streetRequest,
           extensionRequestContexts,
+          stopsFromFirstLocation,
           durationLimit,
           maxStopCount,
           linkingContext,
@@ -81,6 +98,7 @@ Collection<NearbyStop> findStreetAccessEgresses(
           directRequest,
           streetRequest,
           extensionRequestContexts,
+          stopsFromFirstLocation,
           durationLimit,
           maxStopCount,
           linkingContext,
@@ -94,19 +112,14 @@ private Collection<NearbyStop> findStreetAccesses(
     RouteRequest directRequest,
     StreetRequest streetRequest,
     Collection<ExtensionRequestContext> extensionRequestContexts,
+    Collection<NearbyStop> stopsFromFirstLocation,
     Duration durationLimit,
     int maxStopCount,
     LinkingContext linkingContext,
     Set<Vertex> ignoreVertices,
     GraphPathFinder graphPathFinder
   ) {
-    var originVertices = linkingContext.findVertices(accessEgressRequest.from());
-    var stopsFromOrigin = StreetNearbyStopFinder.of(stopResolver, durationLimit, maxStopCount)
-      .withIgnoreVertices(ignoreVertices)
-      .withExtensionRequestContexts(extensionRequestContexts)
-      .build()
-      .findNearbyStops(originVertices, accessEgressRequest, streetRequest, false);
-    var nearbyStops = new ArrayList<>(stopsFromOrigin);
+    var nearbyStops = new ArrayList<>(stopsFromFirstLocation);
     var paths = directRouter.findDepartAfterPaths(
       linkingContext,
       graphPathFinder,
@@ -156,19 +169,14 @@ private Collection<NearbyStop> findStreetEgresses(
     RouteRequest directRequest,
     StreetRequest streetRequest,
     Collection<ExtensionRequestContext> extensionRequestContexts,
+    Collection<NearbyStop> stopsFromFirstLocation,
     Duration durationLimit,
     int maxStopCount,
     LinkingContext linkingContext,
     Set<Vertex> ignoreVertices,
     GraphPathFinder graphPathFinder
   ) {
-    var originVertices = linkingContext.findVertices(accessEgressRequest.to());
-    var stopsFromOrigin = StreetNearbyStopFinder.of(stopResolver, durationLimit, maxStopCount)
-      .withIgnoreVertices(ignoreVertices)
-      .withExtensionRequestContexts(extensionRequestContexts)
-      .build()
-      .findNearbyStops(originVertices, accessEgressRequest, streetRequest, true);
-    var nearbyStops = new ArrayList<>(stopsFromOrigin);
+    var nearbyStops = new ArrayList<>(stopsFromFirstLocation);
     var paths = directRouter.findArriveByPaths(
       linkingContext,
       graphPathFinder,