bumps version; tweaks default OSM query

benchmark-urbanism · Oct 6, 2023 · 82cc8f5 · 82cc8f5
1 parent 1a84656
commit 82cc8f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "cityseer"
-version = '4.1.0b12'
+version = '4.1.0'
 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
@@ -229,19 +229,15 @@ def osm_graph_from_poly(
         (
         way["highway"]
         ["area"!="yes"]
-        ["highway"!~"motorway|motorway_link|bus_guideway|busway|escape|raceway|proposed|planned|abandoned|platform|construction|cycleway"]
-        ["service"!~"parking_aisle"]
-        ["amenity"!~"charging_station|parking|fuel|motorcycle_parking|parking_entrance|parking_space"]
-        ["access"!~"private|customers"]
-        ["footway"!~"sidewalk|traffic_island"]
+        ["highway"!~"motorway|motorway_link|bus_guideway|busway|escape|raceway|proposed|planned|abandoned|platform|construction|emergency_bay|rest_area"]
+        ["service"!~"parking_aisle|driveway|drive-through|slipway"] ["amenity"!~"charging_station|parking|fuel|motorcycle_parking|parking_entrance|parking_space"]
+        ["footway"!~"sidewalk|traffic_island|crossing"]
         ["indoor"!="yes"]
-        ["level"!="-1"]
         ["level"!="-2"]
         ["level"!="-3"]
         ["level"!="-4"]
         ["level"!="-5"]
-        ["conveying"!="yes"]
-            (poly:"{geom_osm}");
+        (poly:"{geom_osm}");
         );
         out body;
         >;