bumps osmnx to v2

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cityseer"
-version = '4.16.1'
+version = '4.16.2'
 description = "Computational tools for network-based pedestrian-scale urban analysis"
 readme = "README.md"
 requires-python = ">=3.10, <3.14"
@@ -49,7 +49,7 @@ dependencies = [
   "rasterio>=1.3.9",
   "pyarrow>=16.0.0",
   "fiona>=1.9.6",
-  "osmnx>=1.9.3",
+  "osmnx>=2.0.0",
 ]
 
 [project.urls]

pysrc/cityseer/tools/graphs.py

@@ -538,6 +538,7 @@ def nx_iron_edges(
     edges_tree, edge_lookups = util.create_edges_strtree(g_multi_copy)
     start_nd_key: NodeKey
     end_nd_key: NodeKey
+    remove_edges = []
     for start_nd_key, end_nd_key, edge_idx, edge_data in tqdm(
         g_multi_copy.edges(keys=True, data=True), disable=config.QUIET_MODE
     ):
@@ -546,11 +547,12 @@ def nx_iron_edges(
             continue
         edge_geom: geometry.LineString = edge_data["geom"]
         hits = edges_tree.query(edge_geom, predicate="crosses")
-        if hits.size > 0:
-            g_multi_copy.remove_edge(start_nd_key, end_nd_key, edge_idx)
+        if len(hits):
+            remove_edges.append((start_nd_key, end_nd_key, edge_idx))
             continue
         line_coords = simplify_line_by_angle(edge_geom.coords, 100)
         g_multi_copy[start_nd_key][end_nd_key][edge_idx]["geom"] = geometry.LineString(line_coords)
+    g_multi_copy.remove_edges_from(remove_edges)
     # straightening parallel edges can create duplicates
     g_multi_copy = nx_merge_parallel_edges(g_multi_copy, False, 1)
 

pysrc/cityseer/tools/io.py

@@ -222,15 +222,15 @@ def _extract_gdf(gdf):
     # extract ways and convert to polys
     # not interested in segments - which are captured separately from network query
     # but do want squares etc. described as ways - hence buffer and reverse buffer
-    if "element_type" in gdf.index.names and "way" in gdf.index.get_level_values("element_type"):
-        ways_gdf = gdf.xs("way", level="element_type", drop_level=True)
+    if "element" in gdf.index.names and "way" in gdf.index.get_level_values("element"):
+        ways_gdf = gdf.xs("way", level="element", drop_level=True)
         ways_gdf = ways_gdf.explode(index_parts=False).reset_index(drop=True)
         ways_gdf = ways_gdf[ways_gdf.geometry.type == "Polygon"]
     else:
         ways_gdf = gpd.GeoDataFrame(columns=gdf.columns, crs=gdf.crs)  # type: ignore
     # extract relations
-    if "element_type" in gdf.index.names and "relation" in gdf.index.get_level_values("element_type"):
-        relations_gdf = gdf.xs("relation", level="element_type", drop_level=True)
+    if "f" in gdf.index.names and "relation" in gdf.index.get_level_values("element"):
+        relations_gdf = gdf.xs("relation", level="element", drop_level=True)
         relations_gdf = relations_gdf.explode(index_parts=False).reset_index(drop=True)
         relations_gdf = relations_gdf[relations_gdf.geometry.type == "Polygon"]
     else: