Merge remote-tracking branch 'origin' into msw_incineration

This commit is contained in:
lisazeyen 2024-08-05 10:38:25 +02:00
commit 7447a3d0c9

View File

@ -808,7 +808,7 @@ def voronoi(points, outline, crs=4326):
voronoi = gpd.GeoDataFrame(geometry=voronoi) voronoi = gpd.GeoDataFrame(geometry=voronoi)
joined = gpd.sjoin_nearest(pts, voronoi, how="right") joined = gpd.sjoin_nearest(pts, voronoi, how="right")
return joined.dissolve(by="Bus").squeeze() return joined.dissolve(by="Bus").reindex(points.index).squeeze()
def build_bus_shapes(n, country_shapes, offshore_shapes, countries): def build_bus_shapes(n, country_shapes, offshore_shapes, countries):