Show pre-results (without need for simulation run) on results page

CHANGELOG.md

@@ -14,6 +14,9 @@ and this project tries to adhere to [Semantic Versioning](https://semver.org/spe
 - Adapt municipality label font size according to zoom level
 - update mapengine to v1.4.1
 
+### Changed
+- pre results can be shown before simulation has finished
+
 ### Fixed
 - duplicate loading of JS modules due to missing module support in django staticfile storage
 - settlement 200m layer is coupled to settlement layer (de)-activation

Makefile

@@ -41,6 +41,9 @@ check_distill_coordinates:
 local_env_file:
 	python merge_local_dotenvs_in_dotenv.py
 
+celery:
+	redis-server --port 6379 & celery -A config.celery worker -l INFO
+
 update_vendor_assets:
 	# Note: call this command from the same folder your Makefile is located
 	# Note: this run only update minor versions.

digiplan/map/calculations.py

@@ -273,7 +273,7 @@ def energy_shares_2045_region(simulation_id: int) -> pd.DataFrame:
     return energy_shares.astype(float).mul(1e2)
 
 
-def electricity_demand_per_municipality_2045(simulation_id: int) -> pd.DataFrame:
+def electricity_demand_per_municipality_2045(pre_result_id: int) -> pd.DataFrame:
     """
     Calculate electricity demand per sector per municipality in GWh in 2045.
 
@@ -282,33 +282,13 @@ def electricity_demand_per_municipality_2045(simulation_id: int) -> pd.DataFrame
     pd.DataFrame
         Electricity demand per municipality (index) and sector (column)
     """
-    results = get_results(
-        simulation_id,
-        {
-            "electricity_demand": electricity_demand,
-        },
-    )
-    demand = results["electricity_demand"][
-        results["electricity_demand"].index.get_level_values(1).isin(config.SIMULATION_DEMANDS)
-    ]
-    demand = demand.droplevel([0, 2])
-    demands_per_sector = datapackage.get_power_demand()
-    mappings = {
-        "hh": "ABW-electricity-demand_hh",
-        "cts": "ABW-electricity-demand_cts",
-        "ind": "ABW-electricity-demand_ind",
-    }
-    demand = demand.reindex(mappings.values())
-    sector_shares = pd.DataFrame(
-        {sector: demands_per_sector[sector]["2022"] / demands_per_sector[sector]["2022"].sum() for sector in mappings},
-    )
-    demand = sector_shares * demand.values
-    demand.columns = demand.columns.map(lambda column: config.SIMULATION_DEMANDS[mappings[column]])
-    demand = demand * 1e-3
-    return demand.astype(float)
+    demand = electricity_demand_per_municipality(year=2022)
+    pre_results = models.PreResults.objects.get(pk=pre_result_id)
+    shares = [pre_results.parameters[key] / 100 for key in ("s_v_3", "s_v_4", "s_v_5")]
+    return demand.iloc[:] * shares
 
 
-def heat_demand_per_municipality() -> pd.DataFrame:
+def heat_demand_per_municipality(year: int) -> pd.DataFrame:
     """
     Calculate heat demand per sector per municipality in GWh.
 
@@ -319,7 +299,7 @@ def heat_demand_per_municipality() -> pd.DataFrame:
     """
     demands_raw = datapackage.get_summed_heat_demand_per_municipality()
     demands_per_sector = pd.concat(
-        [distributions["cen"]["2022"] + distributions["dec"]["2022"] for distributions in demands_raw.values()],
+        [distributions["cen"][str(year)] + distributions["dec"][str(year)] for distributions in demands_raw.values()],
         axis=1,
     )
     demands_per_sector.columns = [
@@ -330,7 +310,7 @@ def heat_demand_per_municipality() -> pd.DataFrame:
     return demands_per_sector.astype(float) * 1e-3
 
 
-def heat_demand_per_municipality_2045(simulation_id: int) -> pd.DataFrame:
+def heat_demand_per_municipality_2045(pre_result_id: int) -> pd.DataFrame:
     """
     Calculate heat demand per sector per municipality in GWh in 2045.
 
@@ -339,29 +319,10 @@ def heat_demand_per_municipality_2045(simulation_id: int) -> pd.DataFrame:
     pd.DataFrame
         Heat demand per municipality (index) and sector (column)
     """
-    results = get_results(
-        simulation_id,
-        {
-            "heat_demand": heat_demand,
-        },
-    )
-    demand = results["heat_demand"]
-    demand.index = demand.index.map(lambda ind: f"heat-demand-{ind[1].split('_')[2]}")
-    demand = demand.groupby(level=0).sum()
-    demands_per_sector = datapackage.get_heat_demand()
-    mappings = {
-        "hh": "heat-demand-hh",
-        "cts": "heat-demand-cts",
-        "ind": "heat-demand-ind",
-    }
-    demand = demand.reindex(mappings.values())
-    sector_shares = pd.DataFrame(
-        {sector: demands_per_sector[sector]["2022"] / demands_per_sector[sector]["2022"].sum() for sector in mappings},
-    )
-    demand = sector_shares * demand.values
-    demand.columns = demand.columns.map(lambda column: config.SIMULATION_DEMANDS[mappings[column]])
-    demand = demand * 1e-3
-    return demand.astype(float)
+    demand = heat_demand_per_municipality(year=2022)
+    pre_results = models.PreResults.objects.get(pk=pre_result_id)
+    shares = [pre_results.parameters[key] / 100 for key in ("w_v_3", "w_v_4", "w_v_5")]
+    return demand.iloc[:] * shares
 
 
 def ghg_reduction(simulation_id: int) -> pd.Series:

digiplan/map/charts.py

@@ -834,7 +834,7 @@ class HeatDemandRegionChart(Chart):
 
     def get_chart_data(self) -> None:
         """Calculate capacities for whole region."""
-        return calculations.heat_demand_per_municipality().sum().round(1)
+        return calculations.heat_demand_per_municipality(year=2022).sum().round(1)
 
     def get_chart_options(self) -> dict:
         """Overwrite title and unit."""
@@ -851,7 +851,7 @@ class HeatDemand2045RegionChart(SimulationChart):
 
     def get_chart_data(self) -> None:
         """Calculate capacities for whole region."""
-        status_quo_data = calculations.heat_demand_per_municipality().sum().round(1)
+        status_quo_data = calculations.heat_demand_per_municipality(year=2022).sum().round(1)
         future_data = calculations.heat_demand_per_municipality_2045(self.simulation_id).sum().astype(float).round(1)
         return list(zip(status_quo_data, future_data))
 
@@ -873,7 +873,7 @@ def get_chart_data(self) -> None:
         """Calculate capacities for whole region."""
         return (
             calculations.calculate_capita_for_value(
-                pd.DataFrame(calculations.heat_demand_per_municipality().sum()).transpose(),
+                pd.DataFrame(calculations.heat_demand_per_municipality(year=2022).sum()).transpose(),
             ).sum()
             * 1e6
         ).round(1)
@@ -895,7 +895,7 @@ def get_chart_data(self) -> pd.DataFrame:
         """Calculate capacities for whole region."""
         status_quo_data = (
             calculations.calculate_capita_for_value(
-                pd.DataFrame(calculations.heat_demand_per_municipality().sum()).transpose(),
+                pd.DataFrame(calculations.heat_demand_per_municipality(year=2022).sum()).transpose(),
             ).sum()
             * 1e6
         ).round(1)
@@ -997,6 +997,13 @@ def get_chart_options(self) -> dict:
     "batteries_capacity_statusquo_region": BatteriesCapacityRegionChart,
 }
 
+PRE_RESULTS = (
+    "electricity_demand_2045_region",
+    "electricity_demand_capita_2045_region",
+    "heat_demand_2045_region",
+    "heat_demand_capita_2045_region",
+)
+
 
 def create_chart(lookup: str, chart_data: Optional[Any] = None) -> dict:
     """

digiplan/map/choropleths.py

@@ -206,7 +206,7 @@ def get_values_per_feature(self) -> dict[int, float]:  # noqa: D102
 class ElectricityDemand2045Choropleth(Choropleth):  # noqa: D101
     def get_values_per_feature(self) -> dict[int, float]:  # noqa: D102
         return (
-            calculations.electricity_demand_per_municipality_2045(self.map_state["simulation_id"]).sum(axis=1).to_dict()
+            calculations.electricity_demand_per_municipality_2045(self.map_state["pre_result_id"]).sum(axis=1).to_dict()
         )
 
 
@@ -223,7 +223,7 @@ class ElectricityDemandCapita2045Choropleth(Choropleth):  # noqa: D101
     def get_values_per_feature(self) -> dict[int, float]:  # noqa: D102
         capita_demand = (
             calculations.calculate_capita_for_value(
-                calculations.electricity_demand_per_municipality_2045(self.map_state["simulation_id"]),
+                calculations.electricity_demand_per_municipality_2045(self.map_state["pre_result_id"]),
             ).sum(axis=1)
             * 1e6
         )
@@ -232,18 +232,19 @@ def get_values_per_feature(self) -> dict[int, float]:  # noqa: D102
 
 class HeatDemandChoropleth(Choropleth):  # noqa: D101
     def get_values_per_feature(self) -> dict[int, float]:  # noqa: D102
-        return calculations.heat_demand_per_municipality().sum(axis=1).to_dict()
+        return calculations.heat_demand_per_municipality(year=2022).sum(axis=1).to_dict()
 
 
 class HeatDemand2045Choropleth(Choropleth):  # noqa: D101
     def get_values_per_feature(self) -> dict[int, float]:  # noqa: D102
-        return calculations.heat_demand_per_municipality_2045(self.map_state["simulation_id"]).sum(axis=1).to_dict()
+        return calculations.heat_demand_per_municipality_2045(self.map_state["pre_result_id"]).sum(axis=1).to_dict()
 
 
 class HeatDemandCapitaChoropleth(Choropleth):  # noqa: D101
     def get_values_per_feature(self) -> dict[int, float]:  # noqa: D102
         capita_demand = (
-            calculations.calculate_capita_for_value(calculations.heat_demand_per_municipality().sum(axis=1)) * 1e6
+            calculations.calculate_capita_for_value(calculations.heat_demand_per_municipality(year=2022).sum(axis=1))
+            * 1e6
         )
         return capita_demand.to_dict()
 
@@ -252,7 +253,7 @@ class HeatDemandCapita2045Choropleth(Choropleth):  # noqa: D101
     def get_values_per_feature(self) -> dict[int, float]:  # noqa: D102
         capita_demand = (
             calculations.calculate_capita_for_value(
-                calculations.heat_demand_per_municipality_2045(self.map_state["simulation_id"]),
+                calculations.heat_demand_per_municipality_2045(self.map_state["pre_result_id"]),
             ).sum(axis=1)
             * 1e6
         )

digiplan/map/forms.py

@@ -4,7 +4,7 @@
 from itertools import count
 from typing import TYPE_CHECKING
 
-from django.forms import BooleanField, Form, IntegerField, TextInput, renderers
+from django.forms import BooleanField, FloatField, Form, TextInput, renderers
 from django.shortcuts import reverse
 from django.utils.safestring import mark_safe
 
@@ -89,7 +89,7 @@ def generate_fields(self, parameters: dict, additional_parameters: dict | None =
             charts.merge_dicts(parameters, additional_parameters)
         for name, item in parameters.items():
             if item["type"] == "slider":
-                field = IntegerField(
+                field = FloatField(
                     label=item["label"],
                     widget=TextInput(attrs=self.get_field_attrs(name, item)),
                     help_text=item["tooltip"],

digiplan/map/migrations/0045_preresults.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.11 on 2024-04-12 11:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("map", "0044_merge_20240318_1859"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="PreResults",
+            fields=[
+                ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("scenario", models.CharField(max_length=255)),
+                ("parameters", models.JSONField()),
+            ],
+        ),
+    ]

digiplan/map/migrations/0046_merge_0045_preresults_0045_regionboundaries.py

@@ -0,0 +1,13 @@
+# Generated by Django 4.2.11 on 2024-04-23 15:29
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("map", "0045_preresults"),
+        ("map", "0045_regionboundaries"),
+    ]
+
+    operations = []

digiplan/map/models.py

@@ -708,3 +708,10 @@ class PotentialAreaWindSTP2018EG(StaticRegionModel):  # noqa: D101
 class PotentialAreaWindSTP2024VR(StaticRegionModel):  # noqa: D101
     data_file = "potentialarea_wind_stp_2024_vr"
     layer = "potentialarea_wind_stp_2024_vr"
+
+
+class PreResults(models.Model):
+    """Model to store pre results ID related to given parameters."""
+
+    scenario = models.CharField(max_length=255)
+    parameters = models.JSONField()

digiplan/map/popups.py

@@ -697,7 +697,7 @@ class ElectricityDemand2045Popup(RegionPopup):
     title = _("Strombedarf")
 
     def get_detailed_data(self) -> pd.DataFrame:  # noqa: D102
-        return calculations.electricity_demand_per_municipality_2045(self.map_state["simulation_id"])
+        return calculations.electricity_demand_per_municipality_2045(self.map_state["pre_result_id"])
 
     def get_chart_data(self) -> Iterable:
         """Create capacity chart data for SQ and future scenario."""
@@ -744,7 +744,7 @@ class ElectricityDemandCapita2045Popup(RegionPopup):
 
     def get_detailed_data(self) -> pd.DataFrame:  # noqa: D102
         return calculations.calculate_capita_for_value(
-            calculations.electricity_demand_per_municipality_2045(self.map_state["simulation_id"]),
+            calculations.electricity_demand_per_municipality_2045(self.map_state["pre_result_id"]),
         )
 
     def get_region_value(self) -> float:  # noqa: D102
@@ -777,7 +777,7 @@ class HeatDemandPopup(RegionPopup):
     title = _("Wärmebedarf")
 
     def get_detailed_data(self) -> pd.DataFrame:  # noqa: D102
-        return calculations.heat_demand_per_municipality().round(1)
+        return calculations.heat_demand_per_municipality(year=2022).round(1)
 
     def get_chart_options(self) -> dict:
         """Overwrite title and unit."""
@@ -794,11 +794,11 @@ class HeatDemand2045Popup(RegionPopup):
     title = _("Wärmebedarf")
 
     def get_detailed_data(self) -> pd.DataFrame:  # noqa: D102
-        return calculations.heat_demand_per_municipality_2045(self.map_state["simulation_id"])
+        return calculations.heat_demand_per_municipality_2045(self.map_state["pre_result_id"])
 
     def get_chart_data(self) -> Iterable:
         """Create capacity chart data for SQ and future scenario."""
-        status_quo_data = calculations.heat_demand_per_municipality().loc[self.selected_id].round(1)
+        status_quo_data = calculations.heat_demand_per_municipality(year=2022).loc[self.selected_id].round(1)
         future_data = super().get_chart_data().round(1)
         return list(zip(status_quo_data, future_data))
 
@@ -818,7 +818,9 @@ class HeatDemandCapitaPopup(RegionPopup):
     title = _("Wärmebedarf je EinwohnerIn")
 
     def get_detailed_data(self) -> pd.DataFrame:  # noqa: D102
-        return (calculations.calculate_capita_for_value(calculations.heat_demand_per_municipality()) * 1e6).round(1)
+        return (
+            calculations.calculate_capita_for_value(calculations.heat_demand_per_municipality(year=2022)) * 1e6
+        ).round(1)
 
     def get_region_value(self) -> float:  # noqa: D102
         return self.detailed_data.sum(axis=1).mean()
@@ -839,7 +841,7 @@ class HeatDemandCapita2045Popup(RegionPopup):
 
     def get_detailed_data(self) -> pd.DataFrame:  # noqa: D102
         return calculations.calculate_capita_for_value(
-            calculations.heat_demand_per_municipality_2045(self.map_state["simulation_id"]),
+            calculations.heat_demand_per_municipality_2045(self.map_state["pre_result_id"]),
         ).mul(1e6)
 
     def get_region_value(self) -> float:  # noqa: D102
@@ -849,7 +851,7 @@ def get_chart_data(self) -> Iterable:
         """Create capacity chart data for SQ and future scenario."""
         status_quo_data = (
             calculations.calculate_capita_for_value(
-                calculations.heat_demand_per_municipality(),
+                calculations.heat_demand_per_municipality(year=2022),
             )
             .loc[self.selected_id]
             .mul(1e6)

digiplan/map/urls.py

@@ -13,4 +13,5 @@
     path("popup/<str:lookup>/<int:region>", views.get_popup, name="popup"),
     path("charts", views.get_charts, name="charts"),
     path("detail_key_results", views.DetailKeyResultsView.as_view(), name="detail_key_results"),
+    path("pre_result", views.store_pre_result, name="pre_result"),
 ]