Merge pull request opentripplanner#6495 from HSLdevcom/optimize-area-linking

Optimize routing time vertex linking with areas

Author: vesameskanen

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

@@ -52,27 +52,31 @@ public class StreetLinkerModule implements GraphBuilderModule {
   private final VehicleParkingRepository parkingRepository;
   private final TimetableRepository timetableRepository;
   private final DataImportIssueStore issueStore;
-  private final Boolean addExtraEdgesToAreas;
+  private final boolean areaVisibility;
+  private final int maxAreaNodes;
 
   public StreetLinkerModule(
     Graph graph,
     VehicleParkingRepository parkingRepository,
     TimetableRepository timetableRepository,
     DataImportIssueStore issueStore,
-    boolean addExtraEdgesToAreas
+    boolean areaVisibility,
+    int maxAreaNodes
   ) {
     this.graph = graph;
     this.parkingRepository = parkingRepository;
     this.timetableRepository = timetableRepository;
     this.issueStore = issueStore;
-    this.addExtraEdgesToAreas = addExtraEdgesToAreas;
+    this.areaVisibility = areaVisibility;
+    this.maxAreaNodes = maxAreaNodes;
   }
 
   @Override
   public void buildGraph() {
     timetableRepository.index();
     graph.index(timetableRepository.getSiteRepository());
-    graph.getLinker().setAddExtraEdgesToAreas(this.addExtraEdgesToAreas);
+    graph.getLinker().setAreaVisibility(this.areaVisibility);
+    graph.getLinker().setMaxAreaNodes(this.maxAreaNodes);
 
     if (graph.hasStreets) {
       linkTransitStops(graph, timetableRepository);

application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java

@@ -175,7 +175,8 @@ static StreetLinkerModule provideStreetLinkerModule(
       parkingRepository,
       timetableRepository,
       issueStore,
-      config.areaVisibility
+      config.areaVisibility,
+      config.maxAreaNodes
     );
   }
 
@@ -197,7 +198,8 @@ static PruneIslands providePruneIslands(
         parkingRepository,
         timetableRepository,
         issueStore,
-        config.areaVisibility
+        config.areaVisibility,
+        config.maxAreaNodes
       )
     );
     pruneIslands.setPruningThresholdIslandWithoutStops(

application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java

@@ -132,6 +132,7 @@ public void buildGraph() {
     build();
     graph.hasStreets = true;
     streetLimitationParameters.initMaxCarSpeed(getMaxCarSpeed());
+    streetLimitationParameters.initMaxAreaNodes(params.maxAreaNodes());
   }
 
   @Override

application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModuleBuilder.java

@@ -10,6 +10,7 @@
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.service.osminfo.OsmInfoGraphBuildRepository;
 import org.opentripplanner.service.vehicleparking.VehicleParkingRepository;
+import org.opentripplanner.street.model.StreetConstants;
 import org.opentripplanner.street.model.StreetLimitationParameters;
 
 /**
@@ -29,7 +30,7 @@ public class OsmModuleBuilder {
   private boolean staticParkAndRide = false;
   private boolean staticBikeParkAndRide = false;
   private boolean includeOsmSubwayEntrances = false;
-  private int maxAreaNodes;
+  private int maxAreaNodes = StreetConstants.DEFAULT_MAX_AREA_NODES;
   private StreetLimitationParameters streetLimitationParameters = new StreetLimitationParameters();
 
   OsmModuleBuilder(

application/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java

@@ -167,6 +167,8 @@ public void buildWithVisibility(OsmAreaGroup group) {
     // Edges which are part of the rings
     Set<Edge> ringEdges = new HashSet<>();
 
+    HashMap<AreaGroup, HashSet<IntersectionVertex>> visibilityVertexCandidates = new HashMap<>();
+
     // OSM ways that this area group consists of
     Set<Long> osmWayIds = group.areas
       .stream()
@@ -189,7 +191,6 @@ public void buildWithVisibility(OsmAreaGroup group) {
       HashSet<IntersectionVertex> platformLinkingVertices = new HashSet<>();
       HashSet<IntersectionVertex> visibilityVertices = new HashSet<>();
       GeometryFactory geometryFactory = GeometryUtils.getGeometryFactory();
-
       OsmEntity areaEntity = group.getSomeOsmObject();
 
       for (OsmArea area : group.areas) {
@@ -293,13 +294,11 @@ public void buildWithVisibility(OsmAreaGroup group) {
         }
         continue;
       }
-
-      areaGroup.addVisibilityVertices(visibilityVertices);
-      createAreas(areaGroup, ring, group.areas);
-
       if (visibilityVertices.size() > maxAreaNodes) {
         issueStore.add(new AreaTooComplicated(group, visibilityVertices.size(), maxAreaNodes));
       }
+      visibilityVertexCandidates.put(areaGroup, visibilityVertices);
+      createAreas(areaGroup, ring, group.areas);
 
       // if area is too complex, consider only part of visibility nodes
       // so that at least some edges passing through the area are added
@@ -343,6 +342,21 @@ public void buildWithVisibility(OsmAreaGroup group) {
       }
     }
     pruneAreaEdges(startingVertices, edges, ringEdges);
+
+    visibilityVertexCandidates.forEach((areaGroup, vertices) -> {
+      if (vertices.size() > maxAreaNodes) {
+        // keep nodes which have most connections
+        areaGroup.addVisibilityVertices(
+          vertices
+            .stream()
+            .sorted((v1, v2) -> Long.compare((v2.getDegreeOut()), v1.getDegreeOut()))
+            .limit(maxAreaNodes)
+            .collect(Collectors.toSet())
+        );
+      } else {
+        areaGroup.addVisibilityVertices(vertices);
+      }
+    });
   }
 
   /**