small updates

carderne · Feb 16, 2024 · ef7ffac · ef7ffac
1 parent c0578a7
commit ef7ffac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gridfinder/post.py b/gridfinder/post.py
@@ -172,7 +172,7 @@ def accuracy(
         aoi = gpd.read_file(aoi_in)
 
     grid_masked = gpd.read_file(grid_in, mask=aoi)
-    grid = gpd.sjoin(grid_masked, aoi, how="inner", op="intersects")
+    grid = gpd.sjoin(grid_masked, aoi, how="inner", predicate="intersects")
     grid = grid[grid_masked.columns]
 
     grid_buff = grid.buffer(buffer_amount)

diff --git a/gridfinder/prepare.py b/gridfinder/prepare.py
@@ -327,10 +327,10 @@ def prepare_roads(
         aoi = gpd.read_file(aoi_in)
 
     roads_masked = gpd.read_file(roads_in, mask=aoi)
-    roads = gpd.sjoin(roads_masked, aoi, how="inner", op="intersects")
+    roads = gpd.sjoin(roads_masked, aoi, how="inner", predicate="intersects")
     roads = roads[roads_masked.columns]
 
-    roads["weight"] = 1
+    roads["weight"] = 1.0
     roads.loc[roads["highway"] == "motorway", "weight"] = 1 / 10
     roads.loc[roads["highway"] == "trunk", "weight"] = 1 / 9
     roads.loc[roads["highway"] == "primary", "weight"] = 1 / 8