Island pruning

src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java

@@ -18,7 +18,7 @@
 import org.opentripplanner.graph_builder.model.GtfsBundle;
 import org.opentripplanner.graph_builder.module.DirectTransferGenerator;
 import org.opentripplanner.graph_builder.module.GtfsModule;
-import org.opentripplanner.graph_builder.module.PruneFloatingIslands;
+import org.opentripplanner.graph_builder.module.PruneNoThruIslands;
 import org.opentripplanner.graph_builder.module.StreetLinkerModule;
 import org.opentripplanner.graph_builder.module.TransitToTaggedStopsModule;
 import org.opentripplanner.graph_builder.module.map.BusRouteStreetMatcher;
@@ -125,10 +125,6 @@ public static GraphBuilder create(
             osmModule.banDiscouragedBiking = config.banDiscouragedBiking;
             osmModule.maxAreaNodes = config.maxAreaNodes;
             graphBuilder.addModule(osmModule);
-            PruneFloatingIslands pruneFloatingIslands = new PruneFloatingIslands();
-            pruneFloatingIslands.setPruningThresholdIslandWithoutStops(config.pruningThresholdIslandWithoutStops);
-            pruneFloatingIslands.setPruningThresholdIslandWithStops(config.pruningThresholdIslandWithStops);
-            graphBuilder.addModule(pruneFloatingIslands);
         }
         if ( hasGtfs ) {
             List<GtfsBundle> gtfsBundles = Lists.newArrayList();
@@ -172,6 +168,17 @@ public static GraphBuilder create(
         StreetLinkerModule streetLinkerModule = new StreetLinkerModule();
         streetLinkerModule.setAddExtraEdgesToAreas(config.areaVisibility);
         graphBuilder.addModule(streetLinkerModule);
+
+        // Prune graph connectivity islands after transit stop linking, so that pruning can take into account
+        // existence of stops in islands. If an island has a stop, it actually may be a real island and should
+        // not be removed quite as easily
+        if ( hasOsm ) {
+            PruneNoThruIslands pruneNoThruIslands = new PruneNoThruIslands(streetLinkerModule);
+            pruneNoThruIslands.setPruningThresholdIslandWithoutStops(config.pruningThresholdIslandWithoutStops);
+            pruneNoThruIslands.setPruningThresholdIslandWithStops(config.pruningThresholdIslandWithStops);
+            graphBuilder.addModule(pruneNoThruIslands);
+        }
+
         // Load elevation data and apply it to the streets.
         // We want to do run this module after loading the OSM street network but before finding transfers.
         List<ElevationGridCoverageFactory> elevationGridCoverageFactories = new ArrayList<>();
@@ -237,4 +244,3 @@ public static GraphBuilder create(
         return graphBuilder;
     }
 }
-

src/main/java/org/opentripplanner/graph_builder/issues/GraphConnectivity.java

@@ -1,40 +1,37 @@
 package org.opentripplanner.graph_builder.issues;
 
+import org.opentripplanner.routing.core.TraverseMode;
 import org.opentripplanner.graph_builder.DataImportIssue;
-import org.opentripplanner.routing.graph.Vertex;
 
 public class GraphConnectivity implements DataImportIssue {
 
-    public static final String FMT = "Removed/depedestrianized disconnected subgraph containing vertex '%s' at (%f, %f), with %d edges";
-    public static final String HTMLFMT = "Removed/depedestrianized disconnected subgraph containing vertex <a href='http://www.openstreetmap.org/node/%s'>'%s'</a>, with %d edges";
-
-    final Vertex vertex;
-    final int size;
-
-    public GraphConnectivity(Vertex vertex, int size){
-    	this.vertex = vertex;
-    	this.size = size;
+    public static final String FMT = "%s graph connectivity: found %d islands, %d islands with stops, modified %d islands with stops, removed %d isolated edges, removed traverse mode from %d edges, converted %d edges to no through traffic";
+
+    final TraverseMode traverseMode;
+    final long size;
+    final long stopIslands;
+    final long stopIslandsChanged;
+    final long removed;
+    final long restricted;
+    final long nothru;
+
+    public GraphConnectivity(TraverseMode traverseMode, long size, long stopIslands, long stopIslandsChanged, long removed, long restricted, long nothru) {
+        this.traverseMode = traverseMode;
+        this.size = size;
+        this.stopIslands = stopIslands;
+        this.stopIslandsChanged = stopIslandsChanged;
+        this.removed = removed;
+        this.restricted = restricted;
+        this.nothru = nothru;
     }
 
     @Override
     public String getMessage() {
-        return String.format(FMT, vertex, vertex.getCoordinate().x, vertex.getCoordinate().y, size);
+        return String.format(FMT,this.traverseMode.toString(), this.size, this.stopIslands, this.stopIslandsChanged, this.removed, this.restricted, this.nothru);
     }
 
     @Override
     public String getHTMLMessage() {
-        String label = vertex.getLabel();
-        if (label.startsWith("osm:")) {
-            String osmNodeId = label.split(":")[2];
-            return String.format(HTMLFMT, osmNodeId, osmNodeId, size);
-        } else {
-            return this.getMessage();
-        }
+        return this.getMessage();
     }
-
-    @Override
-    public Vertex getReferencedVertex() {
-        return vertex;
-    }
-
 }

src/main/java/org/opentripplanner/graph_builder/issues/GraphIsland.java

@@ -0,0 +1,39 @@
+package org.opentripplanner.graph_builder.issues;
+
+import org.opentripplanner.graph_builder.DataImportIssue;
+import org.opentripplanner.routing.graph.Vertex;
+
+public class GraphIsland implements DataImportIssue {
+
+    public static final String FMT = "Processed disconnected subgraph containing vertex '%s' at (%f, %f), with %d edges";
+    public static final String HTMLFMT = "Processed disconnected subgraph containing vertex <a href='http://www.openstreetmap.org/node/%s'>'%s'</a>, with %d edges";
+
+    final Vertex vertex;
+    final int size;
+
+    public GraphIsland(Vertex vertex, int size){
+        this.vertex = vertex;
+        this.size = size;
+    }
+
+    @Override
+    public String getMessage() {
+        return String.format(FMT, vertex, vertex.getCoordinate().x, vertex.getCoordinate().y, size);
+    }
+
+    @Override
+    public String getHTMLMessage() {
+        String label = vertex.getLabel();
+        if (label.startsWith("osm:")) {
+            String osmNodeId = label.split(":")[2];
+            return String.format(HTMLFMT, osmNodeId, osmNodeId, size);
+        } else {
+            return this.getMessage();
+        }
+    }
+
+    @Override
+    public Vertex getReferencedVertex() {
+        return vertex;
+    }
+}

src/main/java/org/opentripplanner/graph_builder/issues/IsolatedStop.java

@@ -0,0 +1,30 @@
+package org.opentripplanner.graph_builder.issues;
+
+import org.opentripplanner.graph_builder.DataImportIssue;
+import org.opentripplanner.routing.graph.Vertex;
+
+public class IsolatedStop implements DataImportIssue {
+
+    public static final String FMT = "Unable to link stop %s to the street graph";
+
+    final Vertex vertex;
+
+    public IsolatedStop(Vertex vertex){
+        this.vertex = vertex;
+    }
+
+    @Override
+    public String getMessage() {
+        return String.format(FMT, vertex.getLabel());
+    }
+
+    @Override
+    public String getHTMLMessage() {
+        return String.format(FMT, vertex.getLabel());
+    }
+
+    @Override
+    public Vertex getReferencedVertex() {
+        return vertex;
+    }
+}