From 77ca472d1b396202825318c87540c8c48de591b3 Mon Sep 17 00:00:00 2001 From: Lennart Zimmermann Date: Thu, 16 Jan 2025 14:41:36 +0100 Subject: [PATCH] Voronoi cells are created now for buses with carrier 'H2' or 'H2_grid' --- src/egon/data/datasets/gas_areas.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/egon/data/datasets/gas_areas.py b/src/egon/data/datasets/gas_areas.py index 8ea41993e..ef5c98e86 100755 --- a/src/egon/data/datasets/gas_areas.py +++ b/src/egon/data/datasets/gas_areas.py @@ -108,11 +108,23 @@ def create_voronoi(scn_name, carrier): """, geom_col="geometry", ).to_crs(epsg=4326) + + + if isinstance(carrier, str): + if carrier == "H2": + carriers = ["H2", "H2_grid"] + else: + carriers = [carrier] + else: + carriers = carrier + + carrier_strings = "', '".join(carriers) + db.execute_sql( f""" DELETE FROM grid.egon_gas_voronoi - WHERE "carrier" = '{carrier}' and "scn_name" = '{scn_name}'; + WHERE "carrier" IN ('{carrier_strings}') and "scn_name" = '{scn_name}'; """ ) @@ -122,13 +134,14 @@ def create_voronoi(scn_name, carrier): FROM grid.egon_etrago_bus WHERE scn_name = '{scn_name}' AND country = 'DE' - AND carrier = '{carrier}'; + AND carrier IN ('{carrier_strings}'); """, ).to_crs(epsg=4326) - + + if len(buses) == 0: return - + # generate voronois # For some scenarios it is defined that there is only 1 bus (e.g. gas). It # means that there will be just 1 voronoi covering the entire german