Merge pull request #366 from rl-institut/feature/#363_pv_roof_pv_grou…

…nd_swapped Feature/#363 pv roof pv ground swapped
rl-institut · Sep 7, 2023 · 36449db · 36449db
2 parents 14effb2 + 71c5a2a
commit 36449db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project tries to adhere to [Semantic Versioning](https://semver.org/spe
 - various fixes in charts, texts and units
 - RES share calculation for SQ
 - power and heat demand scaling for future scenario
+- swap mapping of PV roof and PV ground in result calculation
 
 ## [0.6.0] - 2023-09-01
 ### Added

diff --git a/digiplan/map/calculations.py b/digiplan/map/calculations.py
@@ -139,8 +139,8 @@ def capacities_per_municipality_2045(simulation_id: int) -> pd.DataFrame:
         results["capacities"].index.get_level_values(0).isin(config.SIMULATION_RENEWABLES)
     ]
     mapping = {
-        "ABW-solar-pv_ground": "pv_roof",
-        "ABW-solar-pv_rooftop": "pv_ground",
+        "ABW-solar-pv_ground": "pv_ground",
+        "ABW-solar-pv_rooftop": "pv_roof",
         "ABW-wind-onshore": "wind",
         "ABW-hydro-ror": "hydro",
         "ABW-biomass": "biomass",
@@ -182,8 +182,8 @@ def energies_per_municipality_2045(simulation_id: int) -> pd.DataFrame:
         results["electricity_production"].index.get_level_values(0).isin(config.SIMULATION_RENEWABLES)
     ]
     mapping = {
-        "ABW-solar-pv_ground": "pv_roof",
-        "ABW-solar-pv_rooftop": "pv_ground",
+        "ABW-solar-pv_ground": "pv_ground",
+        "ABW-solar-pv_rooftop": "pv_roof",
         "ABW-wind-onshore": "wind",
         "ABW-hydro-ror": "hydro",
         "ABW-biomass": "biomass",