Clean up indexing

Author: leonardehrenfried

application/src/main/java/org/opentripplanner/graph_builder/module/StreetLinkerModule.java

@@ -72,7 +72,7 @@ public StreetLinkerModule(
   @Override
   public void buildGraph() {
     timetableRepository.index();
-    graph.index();
+    graph.requestIndex();
 
     if (graph.hasStreets) {
       linkTransitStops(graph, timetableRepository);

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

@@ -208,6 +208,7 @@ public <T extends Vertex> List<T> getVerticesOfType(Class<T> cls) {
    */
   @Nullable
   public TransitStopVertex getStopVertexForStopId(FeedScopedId id) {
+    requireIndex();
     return streetIndex.findTransitStopVertex(id);
   }
 
@@ -253,6 +254,9 @@ public boolean containsVertex(Vertex v) {
 
   public void remove(Vertex vertex) {
     vertices.remove(vertex.getLabel());
+    if (streetIndex != null) {
+      streetIndex.remove(vertex);
+    }
   }
 
   public void removeIfUnconnected(Vertex v) {
@@ -282,7 +286,7 @@ public int countEdges() {
   /**
    * Perform indexing on vertices, edges and create transient data structures. This used to be done
    * in readObject methods upon deserialization, but stand-alone mode now allows passing graphs from
-   * graphbuilder to server in memory, without a round trip through serialization.
+   * graph builder to server in memory, without a round trip through serialization.
    * <p>
    * TODO OTP2 - Indexing the streetIndex is not something that should be delegated outside the
    *           - graph. This allows a module to index the streetIndex BEFORE another module add
@@ -294,6 +298,15 @@ public void index() {
     LOG.info("Index street model complete.");
   }
 
+  /**
+   * Index this graph if it hasn't been already.
+   */
+  public void requestIndex() {
+    if (streetIndex == null) {
+      index();
+    }
+  }
+
   @Nullable
   public OpeningHoursCalendarService getOpeningHoursCalendarService() {
     return this.openingHoursCalendarService;
@@ -314,6 +327,7 @@ public Collection<Vertex> findVertices(Envelope env) {
    * the station centroid if the station is configured to route to centroid.
    */
   public Set<Vertex> findStopVertices(FeedScopedId stopId) {
+    requireIndex();
     return streetIndex.findStopVertices(stopId);
   }
 
@@ -374,12 +388,6 @@ public void setDistanceBetweenElevationSamples(double distanceBetweenElevationSa
     CompactElevationProfile.setDistanceBetweenSamplesM(distanceBetweenElevationSamples);
   }
 
-  private void indexIfNotIndexed() {
-    if (streetIndex == null) {
-      index();
-    }
-  }
-
   private void requireIndex() {
     if (streetIndex == null) {
       throw new IllegalStateException("Graph must be indexed before querying.");

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

@@ -141,6 +141,13 @@ void remove(Edge e, Scope scope) {
     edgeIndex.remove(e, scope);
   }
 
+  /**
+   * Remove a vertex from the index.
+   */
+  void remove(Vertex vertex) {
+    vertexIndex.remove(new Envelope(vertex.getCoordinate()), vertex);
+  }
+
   private static LineString edgeGeometryOrStraightLine(Edge e) {
     LineString geometry = e.getGeometry();
     if (geometry == null) {