fix: consistently rename countries (CZ, MD)

PyPSA · Sep 17, 2024 · 3941392 · 3941392
1 parent 515271b
commit 3941392
Show file tree

Hide file tree

Showing 5 changed files with 22,818 additions and 22,440 deletions.
diff --git a/doc/powerplants.png b/doc/powerplants.png
diff --git a/doc/release-notes.rst b/doc/release-notes.rst
@@ -6,6 +6,9 @@ Upcoming Version
 
 * BREAKING: Split "Bioenergy" into "Biogas" and "Solid Biomass".
 
+* Consistently rename countries, affecting power plants in Czech Republic and
+  Moldova.
+
 Version 0.5.19 (16.09.2024)
 ---------------------------
 

diff --git a/powerplantmatching/data.py b/powerplantmatching/data.py
@@ -104,6 +104,7 @@ def BEYONDCOAL(raw=False, update=False, config=None):
         )
         .pipe(scale_to_net_capacities)
         .pipe(clean_name)
+        .pipe(convert_to_short_name)
         .pipe(set_column_name, "BEYONDCOAL")
         .pipe(config_filter, config)
     )
@@ -629,6 +630,7 @@ def WIKIPEDIA(raw=False, update=False, config=None):
     df = (
         df.rename(columns=RENAME_COLUMNS)
         .pipe(clean_name)
+        .pipe(convert_to_short_name)
         .assign(
             Fueltype="Nuclear",
             Set="PP",

diff --git a/powerplantmatching/package_data/config.yaml b/powerplantmatching/package_data/config.yaml
@@ -233,7 +233,7 @@ target_countries:
   - Bosnia and Herzegovina
   - Bulgaria
   - Croatia
-  - Czech Republic
+  - Czechia
   - Denmark
   - Estonia
   - Finland
@@ -248,7 +248,7 @@ target_countries:
   - Lithuania
   - Luxembourg
   - North Macedonia
-  - Moldova, Republic of
+  - Moldova
   - Montenegro
   - Netherlands
   - Norway