Merge pull request #6805 from leonardehrenfried/fix-multimodal

Restore lookup of multi-modal stations and group of stations

Author: leonardehrenfried

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

@@ -44,7 +44,7 @@ class ClosestTripTest {
   private static final FlexAccessEgressCallbackAdapter ADAPTER =
     new FlexAccessEgressCallbackAdapter() {
       @Override
-      public TransitStopVertex getStopVertexForStopId(FeedScopedId id) {
+      public TransitStopVertex getStopVertex(FeedScopedId id) {
         return null;
       }
 
@@ -76,7 +76,7 @@ void doNotFilter() {
 
     var trips = closestTrips(matcher);
     assertThat(trips).hasSize(1);
-    assertEquals(List.copyOf(trips).getFirst().flexTrip(), FLEX_TRIP);
+    assertEquals(FLEX_TRIP, List.copyOf(trips).getFirst().flexTrip());
   }
 
   @Test

application/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java

@@ -197,8 +197,8 @@ private List<FlexServiceDate> createFlexServiceDates(
   private class CallbackAdapter implements FlexAccessEgressCallbackAdapter {
 
     @Override
-    public TransitStopVertex getStopVertexForStopId(FeedScopedId stopId) {
-      return graph.getStopVertexForStopId(stopId);
+    public TransitStopVertex getStopVertex(FeedScopedId stopId) {
+      return graph.getStopVertex(stopId);
     }
 
     @Override

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

@@ -99,7 +99,7 @@ StopLocation getAccessEgressStop() {
    */
   Stream<FlexAccessEgress> createFlexAccessEgressStream(FlexAccessEgressCallbackAdapter callback) {
     if (transferStop instanceof RegularStop stop) {
-      var flexVertex = callback.getStopVertexForStopId(stop.getId());
+      var flexVertex = callback.getStopVertex(stop.getId());
       return Stream.of(createFlexAccessEgress(new ArrayList<>(), flexVertex, stop)).filter(
         Objects::nonNull
       );

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

@@ -18,7 +18,7 @@
  */
 public interface FlexAccessEgressCallbackAdapter {
   /** Adapter, look at implementing service for documentation.  */
-  TransitStopVertex getStopVertexForStopId(FeedScopedId id);
+  TransitStopVertex getStopVertex(FeedScopedId id);
 
   /** Adapter, look at implementing service for documentation.  */
   Collection<PathTransfer> getTransfersFromStop(StopLocation stop);

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

@@ -382,6 +382,7 @@ private TemporaryVerticesContainer createTemporaryVerticesContainer(
     return new TemporaryVerticesContainer(
       serverContext.graph(),
       serverContext.vertexLinker(),
+      serverContext.transitService()::findStopOrChildIds,
       request.from(),
       request.to(),
       request.journey().access().mode(),

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

@@ -30,6 +30,7 @@ public static List<Itinerary> route(
       var temporaryVertices = new TemporaryVerticesContainer(
         serverContext.graph(),
         serverContext.vertexLinker(),
+        serverContext.transitService()::findStopOrChildIds,
         request.from(),
         request.to(),
         request.journey().direct().mode(),

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

@@ -36,6 +36,7 @@ public static List<Itinerary> route(OtpServerRequestContext serverContext, Route
       var temporaryVertices = new TemporaryVerticesContainer(
         serverContext.graph(),
         serverContext.vertexLinker(),
+        serverContext.transitService()::findStopOrChildIds,
         request.from(),
         request.to(),
         request.journey().direct().mode(),

application/src/main/java/org/opentripplanner/routing/graph/Graph.java

@@ -7,6 +7,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
@@ -21,6 +22,7 @@
 import org.opentripplanner.routing.services.notes.StreetNotesService;
 import org.opentripplanner.street.model.edge.Edge;
 import org.opentripplanner.street.model.edge.StreetEdge;
+import org.opentripplanner.street.model.vertex.StationCentroidVertex;
 import org.opentripplanner.street.model.vertex.TransitStopVertex;
 import org.opentripplanner.street.model.vertex.Vertex;
 import org.opentripplanner.street.model.vertex.VertexLabel;
@@ -207,19 +209,27 @@ public <T extends Vertex> List<T> getVerticesOfType(Class<T> cls) {
    * Return the vertex corresponding to the stop id, or null.
    */
   @Nullable
-  public TransitStopVertex getStopVertexForStopId(FeedScopedId id) {
+  public TransitStopVertex getStopVertex(FeedScopedId id) {
     requireIndex();
-    return streetIndex.findTransitStopVertex(id);
+    return streetIndex.findStopVertex(id).orElse(null);
   }
 
   /**
-   * If the {@code id} is a stop id return a set with a single element.
-   * If it is a station id return a set containing all child stop vertices, or an empty
-   * set otherwise.
+   * If the {@code id} is a stop id return the corresponding vertex, otherwise return an empty
+   * optional.
    */
-  public Set<TransitStopVertex> findStopOrChildStopsVertices(FeedScopedId stopId) {
+  public Optional<TransitStopVertex> findStopVertex(FeedScopedId stopId) {
     requireIndex();
-    return streetIndex.getStopOrChildStopsVertices(stopId);
+    return streetIndex.findStopVertex(stopId);
+  }
+
+  /**
+   * If the {@code stopId} is a station id and it is configured to route to its center,
+   * return the corresponding vertex, otherwise return an empty optional.
+   */
+  public Optional<StationCentroidVertex> findStationCentroidVertex(FeedScopedId stopId) {
+    requireIndex();
+    return streetIndex.findStationCentroidVertex(stopId);
   }
 
   /**
@@ -319,18 +329,7 @@ public OpeningHoursCalendarService getOpeningHoursCalendarService() {
    */
   public Collection<Vertex> findVertices(Envelope env) {
     requireIndex();
-    return streetIndex.getVerticesForEnvelope(env);
-  }
-
-  /**
-   * Get the street vertices for an id. If the id corresponds to a regular stop we will return the
-   * coordinate for the stop.
-   * If the id corresponds to a station we will either return the coordinates of the child stops or
-   * the station centroid if the station is configured to route to centroid.
-   */
-  public Set<Vertex> findStopVertices(FeedScopedId stopId) {
-    requireIndex();
-    return streetIndex.findStopVertices(stopId);
+    return streetIndex.findVertices(env);
   }
 
   /**

application/src/main/java/org/opentripplanner/routing/graph/StreetIndex.java

@@ -1,16 +1,11 @@
 package org.opentripplanner.routing.graph;
 
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ImmutableSetMultimap;
-import com.google.common.collect.Multimap;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
+import java.util.Optional;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Envelope;
 import org.locationtech.jts.geom.LineString;
@@ -37,8 +32,7 @@ class StreetIndex {
 
   private static final Logger LOG = LoggerFactory.getLogger(StreetIndex.class);
 
-  private final Map<FeedScopedId, TransitStopVertex> stopVerticesById;
-  private final ImmutableSetMultimap<FeedScopedId, TransitStopVertex> stopVerticesByParentId;
+  private final Map<FeedScopedId, TransitStopVertex> stopVertices;
 
   /**
    * This list contains transitStationVertices for the stations that are configured to route to centroid
@@ -54,31 +48,39 @@ class StreetIndex {
   StreetIndex(Graph graph) {
     this.edgeIndex = new EdgeSpatialIndex();
     this.vertexIndex = new HashGridSpatialIndex<>();
-    var stopVertices = graph.getVerticesOfType(TransitStopVertex.class);
-    this.stopVerticesById = indexStopIds(stopVertices);
-    this.stopVerticesByParentId = indexStationIds(stopVertices);
+    this.stopVertices = indexStopIds(graph);
 
     this.stationCentroidVertices = indexStationCentroids(graph);
     postSetup(graph.getVertices());
   }
 
-  @Nullable
-  TransitStopVertex findTransitStopVertex(FeedScopedId stopId) {
-    return stopVerticesById.get(stopId);
+  /**
+   * @see Graph#findStopVertex(FeedScopedId) (FeedScopedId)
+   */
+  Optional<TransitStopVertex> findStopVertex(FeedScopedId id) {
+    return Optional.ofNullable(stopVertices.get(id));
+  }
+
+  /**
+   * @see Graph#findStationCentroidVertex(FeedScopedId)
+   */
+  Optional<StationCentroidVertex> findStationCentroidVertex(FeedScopedId id) {
+    return Optional.ofNullable(stationCentroidVertices.get(id));
   }
 
   /**
    * Returns the vertices intersecting with the specified envelope.
    */
-  List<Vertex> getVerticesForEnvelope(Envelope envelope) {
+  List<Vertex> findVertices(Envelope envelope) {
     List<Vertex> vertices = vertexIndex.query(envelope);
     // Here we assume vertices list modifiable
     vertices.removeIf(v -> !envelope.contains(new Coordinate(v.getLon(), v.getLat())));
     return vertices;
   }
 
   /**
-   * Return the edges whose geometry intersect with the specified envelope. Warning: edges disconnected from the graph
+   * Return the edges whose geometry intersect with the specified envelope.
+   * Warning: edges disconnected from the graph
    * will not be indexed.
    */
   Collection<Edge> findEdges(Envelope envelope) {
@@ -92,42 +94,6 @@ Collection<Edge> findEdges(Envelope envelope) {
       .toList();
   }
 
-  @Override
-  public String toString() {
-    return (
-      getClass().getName() +
-      " -- edgeTree: " +
-      edgeIndex.toString() +
-      " -- verticesTree: " +
-      vertexIndex.toString()
-    );
-  }
-
-  /**
-   * @param id Id of Stop, Station, MultiModalStation or GroupOfStations
-   * @return The associated TransitStopVertex or all underlying TransitStopVertices
-   */
-  Set<TransitStopVertex> getStopOrChildStopsVertices(FeedScopedId id) {
-    if (stopVerticesById.containsKey(id)) {
-      return Set.of(stopVerticesById.get(id));
-    } else if (stopVerticesByParentId.containsKey(id)) {
-      return stopVerticesByParentId.get(id);
-    } else {
-      return Set.of();
-    }
-  }
-
-  /**
-   * @see Graph#findStopVertices(FeedScopedId)
-   */
-  Set<Vertex> findStopVertices(FeedScopedId id) {
-    var stationVertex = stationCentroidVertices.get(id);
-    if (stationVertex != null) {
-      return Set.of(stationVertex);
-    }
-    return Collections.unmodifiableSet(getStopOrChildStopsVertices(id));
-  }
-
   Collection<Edge> findEdges(Envelope env, Scope scope) {
     return edgeIndex.query(env, scope).toList();
   }
@@ -147,6 +113,8 @@ void remove(Vertex vertex) {
     vertexIndex.remove(new Envelope(vertex.getCoordinate()), vertex);
   }
 
+  // private methods
+
   private static LineString edgeGeometryOrStraightLine(Edge e) {
     LineString geometry = e.getGeometry();
     if (geometry == null) {
@@ -181,29 +149,15 @@ private void postSetup(Collection<Vertex> vertices) {
     LOG.info(progress.completeMessage());
   }
 
-  private static Map<FeedScopedId, TransitStopVertex> indexStopIds(
-    Collection<TransitStopVertex> vertices
-  ) {
+  private static Map<FeedScopedId, TransitStopVertex> indexStopIds(Graph graph) {
+    var vertices = graph.getVerticesOfType(TransitStopVertex.class);
     var map = new HashMap<FeedScopedId, TransitStopVertex>();
     for (TransitStopVertex it : vertices) {
       map.put(it.getStop().getId(), it);
     }
     return Map.copyOf(map);
   }
 
-  private static ImmutableSetMultimap<FeedScopedId, TransitStopVertex> indexStationIds(
-    Collection<TransitStopVertex> vertices
-  ) {
-    Multimap<FeedScopedId, TransitStopVertex> map = ArrayListMultimap.create();
-    vertices
-      .stream()
-      .filter(v -> v.getStop().isPartOfStation())
-      .forEach(v -> {
-        map.put(v.getStop().getParentStation().getId(), v);
-      });
-    return ImmutableSetMultimap.copyOf(map);
-  }
-
   private static Map<FeedScopedId, StationCentroidVertex> indexStationCentroids(Graph graph) {
     return graph
       .getVerticesOfType(StationCentroidVertex.class)

application/src/main/java/org/opentripplanner/routing/graphfinder/StreetGraphFinder.java

@@ -4,6 +4,7 @@
 
 import java.util.Comparator;
 import java.util.List;
+import java.util.Set;
 import org.locationtech.jts.geom.Coordinate;
 import org.opentripplanner.astar.spi.SkipEdgeStrategy;
 import org.opentripplanner.astar.spi.TraverseVisitor;
@@ -101,6 +102,7 @@ private void findClosestUsingStreets(
       var temporaryVertices = new TemporaryVerticesContainer(
         graph,
         linker,
+        id -> Set.of(),
         GenericLocation.fromCoordinate(lat, lon),
         GenericLocation.UNKNOWN,
         StreetMode.WALK,