tidyup bbox definition for osm

rosepearson · Oct 29, 2024 · 2fd3ca5 · 2fd3ca5
1 parent 86b386c
commit 2fd3ca5
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/src/geofabrics/processor.py b/src/geofabrics/processor.py
@@ -3542,12 +3542,7 @@ def load_waterways(self) -> bool:
 
             # Construct query
             query = OSMPythonTools.overpass.overpassQueryBuilder(
-                bbox=[
-                    bbox_lat_long.bounds.miny[0],
-                    bbox_lat_long.bounds.minx[0],
-                    bbox_lat_long.bounds.maxy[0],
-                    bbox_lat_long.bounds.maxx[0],
-                ],
+                bbox=list(bbox_lat_long.total_bounds[[1,0,3,2]]),
                 elementType="way",
                 selector="waterway",
                 out="body",
@@ -3941,12 +3936,7 @@ def load_stopbanks(self) -> bool:
         elif "osm" == source:
             # Download from OSM and save
             bbox_lat_long = self.catchment_geometry.catchment.to_crs(self.OSM_CRS)
-            bbox = [
-                bbox_lat_long.bounds.miny[0],
-                bbox_lat_long.bounds.minx[0],
-                bbox_lat_long.bounds.maxy[0],
-                bbox_lat_long.bounds.maxx[0],
-            ]
+            bbox = list(bbox_lat_long.total_bounds[[1,0,3,2]])
             element_dict = {
                 "geometry": [],
                 "OSM_id": [],