From 7688d9ea27f9cd0920792b45beb1ad4a95f0270c Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 18 Mar 2020 09:56:47 +0100 Subject: [PATCH] build_bus_regions: fix 'cannot insert name, already exists' in geopandas 0.7.0 (#145) * build_bus_regions: fix 'cannot insert name, already exists' * environment: allow geopandas 0.7.0 * build_bus_regions: ignore index when concatenating --- environment.yaml | 2 +- scripts/build_bus_regions.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/environment.yaml b/environment.yaml index a9c53347..39e85c49 100644 --- a/environment.yaml +++ b/environment.yaml @@ -41,7 +41,7 @@ dependencies: - fiona - proj - pyshp - - geopandas<=0.6.3 + - geopandas - rasterio - shapely - libgdal diff --git a/scripts/build_bus_regions.py b/scripts/build_bus_regions.py index 8232a6f3..14314de3 100644 --- a/scripts/build_bus_regions.py +++ b/scripts/build_bus_regions.py @@ -88,7 +88,7 @@ if __name__ == "__main__": 'y': offshore_locs['y'], 'geometry': voronoi_partition_pts(offshore_locs.values, offshore_shape), 'country': country - }, index=offshore_locs.index) + }) offshore_regions_c = offshore_regions_c.loc[offshore_regions_c.area > 1e-2] offshore_regions.append(offshore_regions_c) @@ -98,6 +98,6 @@ if __name__ == "__main__": schema = {**gpd.io.file.infer_schema(s), 'geometry': 'Unknown'} s.to_file(fn, driver='GeoJSON', schema=schema) - save_to_geojson(pd.concat(onshore_regions), snakemake.output.regions_onshore) + save_to_geojson(pd.concat(onshore_regions, ignore_index=True), snakemake.output.regions_onshore) - save_to_geojson(pd.concat(offshore_regions), snakemake.output.regions_offshore) + save_to_geojson(pd.concat(offshore_regions, ignore_index=True), snakemake.output.regions_offshore)