From f60c1fdb41800d78e647f2c30cc3b3ba2592d241 Mon Sep 17 00:00:00 2001 From: Jonas Hoersch Date: Wed, 19 Dec 2018 15:37:18 +0100 Subject: [PATCH] Rename index column in geojson imports --- scripts/base_network.py | 6 +++--- scripts/build_bus_regions.py | 4 ++-- scripts/build_hydro_profile.py | 2 +- scripts/build_renewable_profiles.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/base_network.py b/scripts/base_network.py index 44a8ddba..0a85e099 100644 --- a/scripts/base_network.py +++ b/scripts/base_network.py @@ -277,8 +277,8 @@ def _set_countries_and_substations(n): ) countries = snakemake.config['countries'] - country_shapes = gpd.read_file(snakemake.input.country_shapes).set_index('id')['geometry'] - offshore_shapes = gpd.read_file(snakemake.input.offshore_shapes).set_index('id')['geometry'] + country_shapes = gpd.read_file(snakemake.input.country_shapes).set_index('name')['geometry'] + offshore_shapes = gpd.read_file(snakemake.input.offshore_shapes).set_index('name')['geometry'] substation_b = buses['symbol'].str.contains('substation|converter station', case=False) def prefer_voltage(x, which): @@ -387,7 +387,7 @@ def _replace_b2b_converter_at_country_border_by_link(n): .format(i, b0, line, linkcntry.at[i], buscntry.at[b1])) def _set_links_underwater_fraction(n): - offshore_shape = gpd.read_file(snakemake.input.offshore_shapes).set_index('id').unary_union + offshore_shape = gpd.read_file(snakemake.input.offshore_shapes).unary_union links = gpd.GeoSeries(n.links.geometry.dropna().map(shapely.wkt.loads)) n.links['underwater_fraction'] = links.intersection(offshore_shape).length / links.length diff --git a/scripts/build_bus_regions.py b/scripts/build_bus_regions.py index 9cc0974e..5055b51c 100644 --- a/scripts/build_bus_regions.py +++ b/scripts/build_bus_regions.py @@ -12,8 +12,8 @@ countries = snakemake.config['countries'] n = pypsa.Network(snakemake.input.base_network) -country_shapes = gpd.read_file(snakemake.input.country_shapes).set_index('id')['geometry'] -offshore_shapes = gpd.read_file(snakemake.input.offshore_shapes).set_index('id')['geometry'] +country_shapes = gpd.read_file(snakemake.input.country_shapes).set_index('name')['geometry'] +offshore_shapes = gpd.read_file(snakemake.input.offshore_shapes).set_index('name')['geometry'] onshore_regions = [] offshore_regions = [] diff --git a/scripts/build_hydro_profile.py b/scripts/build_hydro_profile.py index 74cd93d5..8b2533e8 100644 --- a/scripts/build_hydro_profile.py +++ b/scripts/build_hydro_profile.py @@ -13,7 +13,7 @@ cutout = atlite.Cutout(snakemake.config['renewable']['hydro']['cutout'], cutout_dir=os.path.dirname(snakemake.input.cutout)) countries = snakemake.config['countries'] -country_shapes = gpd.read_file(snakemake.input.country_shapes).set_index('id')['geometry'].reindex(countries) +country_shapes = gpd.read_file(snakemake.input.country_shapes).set_index('name')['geometry'].reindex(countries) country_shapes.index.name = 'countries' eia_stats = vhydro.get_eia_annual_hydro_generation(snakemake.input.eia_hydro_generation).reindex(columns=countries) diff --git a/scripts/build_renewable_profiles.py b/scripts/build_renewable_profiles.py index c576352c..8853e9c0 100644 --- a/scripts/build_renewable_profiles.py +++ b/scripts/build_renewable_profiles.py @@ -169,7 +169,7 @@ if __name__ == '__main__': import geopandas as gpd from shapely.geometry import LineString - offshore_shape = gpd.read_file(snakemake.input.offshore_shapes).set_index('id').unary_union + offshore_shape = gpd.read_file(snakemake.input.offshore_shapes).unary_union underwater_fraction = [] for i in regions.index: row = layoutmatrix[i]