changes default to consolidate for only indirect for parallel

benchmark-urbanism · Dec 20, 2023 · 7e2f596 · 7e2f596
1 parent 38af8a6
commit 7e2f596
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/docs/public/images/graph_cleaning_1b.png b/docs/public/images/graph_cleaning_1b.png
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "cityseer"
-version = '4.6.5'
+version = '4.6.6'
 description = "Computational tools for network-based pedestrian-scale urban analysis"
 readme = "README.md"
 requires-python = ">=3.10, <3.12"

diff --git a/pysrc/cityseer/tools/io.py b/pysrc/cityseer/tools/io.py
@@ -384,13 +384,19 @@ def osm_graph_from_poly(
     if simplify:
         graph_crs = graphs.nx_remove_dangling_nodes(graph_crs, remove_disconnected=remove_disconnected)
         graph_crs = graphs.nx_consolidate_nodes(
-            graph_crs, buffer_dist=crawl_consolidate_dist, crawl=True, contains_buffer_dist=contains_buffer_dist
+            graph_crs,
+            buffer_dist=crawl_consolidate_dist,
+            crawl=True,
+            contains_buffer_dist=contains_buffer_dist,
         )
         graph_crs = graphs.nx_split_opposing_geoms(
             graph_crs, buffer_dist=parallel_consolidate_dist, contains_buffer_dist=contains_buffer_dist
         )
         graph_crs = graphs.nx_consolidate_nodes(
-            graph_crs, buffer_dist=parallel_consolidate_dist, contains_buffer_dist=contains_buffer_dist
+            graph_crs,
+            buffer_dist=parallel_consolidate_dist,
+            contains_buffer_dist=contains_buffer_dist,
+            neighbour_policy="indirect",
         )
         graph_crs = graphs.nx_remove_filler_nodes(graph_crs)
         if iron_edges:
@@ -399,7 +405,10 @@ def osm_graph_from_poly(
             graph_crs, buffer_dist=parallel_consolidate_dist, contains_buffer_dist=contains_buffer_dist
         )
         graph_crs = graphs.nx_consolidate_nodes(
-            graph_crs, buffer_dist=parallel_consolidate_dist, contains_buffer_dist=contains_buffer_dist
+            graph_crs,
+            buffer_dist=parallel_consolidate_dist,
+            contains_buffer_dist=contains_buffer_dist,
+            neighbour_policy="indirect",
         )
         graph_crs = graphs.nx_remove_filler_nodes(graph_crs)
         if iron_edges: