Merge pull request #101 from empowerplan/feature/result_charts1

Pre-result charts for PV and wind
empowerplan · May 2, 2024 · 89df9c5 · 89df9c5
2 parents 0e4fc9a + ff800bd
commit 89df9c5
Show file tree

Hide file tree

Showing 20 changed files with 735 additions and 1,275 deletions.
diff --git a/digiplan/map/calculations.py b/digiplan/map/calculations.py
@@ -304,34 +304,6 @@ def heat_demand_per_municipality_2045(user_settings: dict) -> pd.DataFrame:
     return demand.iloc[:] * shares
 
 
-def ghg_reduction(simulation_id: int) -> pd.Series:
-    """
-    Calculate data for GHG reduction chart from simulation ID.
-
-    Parameters
-    ----------
-    simulation_id: int
-        Simulation ID to calculate results from
-
-    Returns
-    -------
-    pandas.Series
-        holding data for GHG reduction chart
-    """
-    renewables = renewable_electricity_production(simulation_id).sum()
-
-    results = get_results(
-        simulation_id,
-        {
-            "electricity_production": electricity_production,
-        },
-    )
-    electricity_import = results["electricity_production"].loc[["ABW-electricity-import"]]
-    electricity_import.index = electricity_import.index.get_level_values(0)
-    electricity_import["ABW-renewables"] = renewables
-    return electricity_import * 1e-3
-
-
 def electricity_from_from_biomass(simulation_id: int) -> pd.Series:
     """
     Calculate electricity from biomass.

diff --git a/digiplan/map/charts.py b/digiplan/map/charts.py
@@ -147,24 +147,6 @@ def render(self) -> dict:  # noqa: D102
         return self.chart_options
 
 
-class GHGReductionChart(SimulationChart):
-    """GHG Reduction Chart. Shows greenhouse gas emissions."""
-
-    lookup = "ghg_reduction"
-
-    def get_chart_data(self):  # noqa: D102, ANN201
-        return calculations.get_reduction(simulation_id=self.simulation_id)
-
-    def render(self) -> dict:  # noqa: D102
-        # Enter import and energy from renewables
-        for i, item in enumerate(self.chart_options["series"][7:9]):
-            item["data"][1] = self.chart_data[i]
-        # Calculate emission offset
-        summed_emissions_2019 = sum(item["data"][0] for item in self.chart_options["series"][:7])
-        self.chart_options["series"][0]["data"][1] = summed_emissions_2019 - sum(self.chart_data)
-        return self.chart_options
-
-
 class ElectricityOverviewChart(SimulationChart):
     """Chart for electricity overview."""
 
@@ -285,23 +267,6 @@ def get_chart_data(self):  # noqa: D102, ANN201
         return calculations.heat_overview(simulation_id=self.simulation_id, distribution="decentral")
 
 
-class GhgHistoryChart(SimulationChart):
-    """GHG history chart."""
-
-    lookup = "ghg_history"
-
-    def get_chart_data(self):  # noqa: D102, ANN201
-        # TODO(Hendrik): Get static data from digipipe datapackage  # noqa: TD003
-        return pd.DataFrame()
-
-    def render(self) -> dict:  # noqa: D102
-        for item in self.chart_options["series"]:
-            profile = config.SIMULATION_NAME_MAPPING[item["name"]]
-            item["data"][1] = self.chart_data[profile]
-
-        return self.chart_options
-
-
 class PopulationRegionChart(Chart):
     """Chart for regional population."""
 
@@ -976,7 +941,6 @@ def get_chart_options(self) -> dict:
 
 CHARTS: dict[str, Union[type[PreResultsChart], type[SimulationChart]]] = {
     "detailed_overview": DetailedOverviewChart,
-    "ghg_reduction": GHGReductionChart,
     "electricity_overview": ElectricityOverviewChart,
     "electricity_autarky": ElectricityAutarkyChart,
     "heat_decentralized": HeatStructureDecentralChart,

diff --git a/digiplan/map/charts/electricity_autarky.json b/digiplan/map/charts/electricity_autarky.json
@@ -1,8 +1,4 @@
 {
-  "brush": {
-    "toolbox": ["rect", "polygon", "lineX", "lineY", "keep", "clear"],
-    "xAxisIndex": 0
-  },
   "grid": {
     "bottom": "25%"
   },
@@ -20,7 +16,7 @@
   },
   "yAxis": {
     "type": "category",
-    "data": ["Dein Szenario", "2022"],
+    "data": ["Dein Szenario", "2023"],
     "axisTick": {
       "show": false
     }

diff --git a/digiplan/map/charts/electricity_overview.json b/digiplan/map/charts/electricity_overview.json
@@ -1,17 +1,4 @@
 {
-  "brush": {
-    "toolbox": ["rect", "polygon", "lineX", "lineY", "keep", "clear"],
-    "xAxisIndex": 0
-  },
-  "toolbox": {
-    "feature": {
-      "magicType": {
-        "type": ["stack"]
-      },
-      "dataView": {}
-    }
-  },
-  "tooltip": {},
   "grid": {
     "top": "10%",
     "left": "3%",
@@ -20,7 +7,7 @@
     "containLabel": true
   },
   "yAxis": {
-    "data": ["Ziel 2045", "Dein Szenario", "2022"],
+    "data": ["Ziel Brandenburg 2040", "Ziel Brandenburg 2030", "Dein Szenario", "2023"],
     "axisLine": { "onZero": true },
     "splitLine": { "show": false },
     "splitArea": { "show": false }
@@ -49,7 +36,7 @@
           "shadowColor": "rgba(0,0,0,0.3)"
         }
       },
-      "data": [0, 0, 0]
+      "data": [0, 0, 0, 0]
     },
     {
       "name": "Freiflächen-PV",
@@ -62,7 +49,7 @@
           "shadowColor": "rgba(0,0,0,0.3)"
         }
       },
-      "data": [0, 0, 0]
+      "data": [0, 0, 0, 0]
     },
     {
       "name": "Aufdach-PV",
@@ -75,7 +62,7 @@
           "shadowColor": "rgba(0,0,0,0.3)"
         }
       },
-      "data": [0, 0, 0]
+      "data": [0, 0, 0, 0]
     },
     {
       "name": "Bioenergie",
@@ -88,7 +75,7 @@
           "shadowColor": "rgba(0,0,0,0.3)"
         }
       },
-      "data": [0, 0, 0]
+      "data": [0, 0, 0, 0]
     },
     {
       "name": "Wasserkraft",
@@ -102,7 +89,7 @@
           "shadowColor": "rgba(0,0,0,0.3)"
         }
       },
-      "data": [0, 0, 0]
+      "data": [0, 0, 0, 0]
     },
     {
       "name": "Verbrauch Haushalte",
@@ -116,7 +103,7 @@
           "shadowColor": "rgba(0,0,0,0.3)"
         }
       },
-      "data": [0, 0, 0]
+      "data": [0, 0, 0, 0]
     },
     {
       "name": "Verbrauch GHD",
@@ -129,7 +116,7 @@
           "shadowColor": "rgba(0,0,0,0.3)"
         }
       },
-      "data": [0, 0, 0]
+      "data": [0, 0, 0, 0]
     },
     {
       "name": "Verbrauch Industrie",
@@ -143,7 +130,7 @@
           "shadowColor": "rgba(0,0,0,0.3)"
         }
       },
-      "data": [0, 0, 0]
+      "data": [0, 0, 0, 0]
     },
     {
       "name": "Import*",
@@ -157,7 +144,7 @@
           "shadowColor": "rgba(0,0,0,0.3)"
         }
       },
-      "data": [0, 0, 0]
+      "data": [0, 0, 0, 0]
     },
     {
       "name": "Export*",
@@ -171,7 +158,7 @@
           "shadowColor": "rgba(0,0,0,0.3)"
         }
       },
-      "data": [0, 0, 0]
+      "data": [0, 0, 0, 0]
     }
   ]
 }