Merge pull request #352 from rl-institut/release/v0.6.0

Release/v0.6.0

.gitignore

@@ -332,7 +332,9 @@ digiplan/media/
 !.envs/.local/
 
 .idea/*
+dump.rdb
 /digiplan/data/
 /digiplan/static/mvts/
 
 distill/
+/dump.rdb

.jshintrc

@@ -33,6 +33,7 @@
     "window": false,
     "subscribeToEvents": false,
     "createChart": false,
+    "clearChart": false,
     "hidePotentialLayers": false
   },
   "strict": "implied"

CHANGELOG.md

@@ -4,6 +4,34 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project tries to adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.6.0] - 2023-09-01
+### Added
+- electricity autarky chart
+- import and export to electricity overview chart
+- heat chart overview
+- tour explaining statusquo, settings and results
+- selection to hide choropleth and region chart in SQ and 2045 dropdown
+- results for heat overview chart
+- results for GHG reduction chart
+- adapt full load hours for renewables
+- demand results for 2045 scenario
+- onboarding charts
+
+### Changed
+- remove language button
+- rework result charts
+- rework top navigation and linked pages
+- hide main charts in today and result section
+- remove transport sector
+
+### Fixed
+- ghg reduction chart
+- slider mark at wrong position
+- reduce number of attributes in unit popups
+- add missing German texts
+- remove redundant sliders in settings
+- add onboarding texts
+
 ## [0.5.0] - 2023-07-13
 ### Added
 - heat settings set for oemof simulation

README.md

@@ -142,6 +142,8 @@ You may have to put `sudo` in front of the commands.
 While using the following commands, exchange _production.yml_ (production server) and _
 local.yml_ (local development) accordingly to your needs!
 
+`USE_DISTILLED_MVTS` should be set to False at first in the env file.
+
 ### Start container
 
 ```
@@ -167,7 +169,7 @@ Following steps are necessary to refresh/load data on production server:
 ```
 docker-compose -f production.yml run --rm django python manage.py migrate
 docker-compose -f production.yml run --rm django make empty_data empty_regions
-docker-compose -f production.yml run --rm django make load_regions load_data
+docker-compose -f production.yml run --rm django make load_regions load_data load_population
 ```
 
 In order to increase loading speed of vector tiles, the tiles can be prerenderd. This is

config/settings/base.py

@@ -349,28 +349,42 @@ def __getitem__(self, item):  # noqa: D105, ANN001, ANN204
 }
 
 MAP_ENGINE_CHOROPLETHS = [
-    setup.Choropleth("population_statusquo", layers=["municipality"], title=_("Einwohner_innenzahl"), unit=_("")),
+    setup.Choropleth("population_statusquo", layers=["municipality"], title=_("EinwohnerInnenzahl"), unit=_("EW")),
     setup.Choropleth(
         "population_density_statusquo",
         layers=["municipality"],
-        title=_("Einwohner_innenzahl pro km²"),
+        title=_("EinwohnerInnenzahl pro km²"),
         unit=_(""),
     ),
-    setup.Choropleth("employees_statusquo", layers=["municipality"], title=_("Beschäftigte"), unit=_("")),
-    setup.Choropleth("companies_statusquo", layers=["municipality"], title=_("Betriebe"), unit=_("")),
+    setup.Choropleth("employees_statusquo", layers=["municipality"], title=_("Beschäftigte"), unit=""),
+    setup.Choropleth("companies_statusquo", layers=["municipality"], title=_("Betriebe"), unit=""),
     setup.Choropleth("capacity_statusquo", layers=["municipality"], title=_("Installierte Leistung"), unit=_("MW")),
+    setup.Choropleth("capacity_2045", layers=["municipality"], title=_("Installierte Leistung"), unit=_("MW")),
     setup.Choropleth(
         "capacity_square_statusquo",
         layers=["municipality"],
-        title=_("Installierte Leistung pro qm"),
-        unit=_("MW"),
+        title=_("Installierte Leistung"),
+        unit=_("MW/km²"),
     ),
-    setup.Choropleth("wind_turbines_statusquo", layers=["municipality"], title=_("Anzahl Windturbinen"), unit=_("")),
+    setup.Choropleth(
+        "capacity_square_2045",
+        layers=["municipality"],
+        title=_("Installierte Leistung"),
+        unit=_("MW/km²"),
+    ),
+    setup.Choropleth("wind_turbines_statusquo", layers=["municipality"], title=_("Anzahl Windturbinen"), unit=""),
+    setup.Choropleth("wind_turbines_2045", layers=["municipality"], title=_("Anzahl Windturbinen"), unit=""),
     setup.Choropleth(
         "wind_turbines_square_statusquo",
         layers=["municipality"],
-        title=_("Anzahl Windturbinen pro qm"),
-        unit=_(""),
+        title=_("Anzahl Windturbinen pro km²"),
+        unit="",
+    ),
+    setup.Choropleth(
+        "wind_turbines_square_2045",
+        layers=["municipality"],
+        title=_("Anzahl Windturbinen pro km²"),
+        unit="",
     ),
     setup.Choropleth(
         "energy_statusquo",
@@ -388,7 +402,7 @@ def __getitem__(self, item):  # noqa: D105, ANN001, ANN204
         "energy_share_statusquo",
         layers=["municipality"],
         title=_("Anteil Erneuerbare Energien am Strombedarf"),
-        unit=_("%"),
+        unit="%",
     ),
     setup.Choropleth(
         "energy_capita_statusquo",
@@ -420,29 +434,53 @@ def __getitem__(self, item):  # noqa: D105, ANN001, ANN204
         title=_("Strombedarf"),
         unit=_("GWh"),
     ),
+    setup.Choropleth(
+        "electricity_demand_2045",
+        layers=["municipality"],
+        title=_("Strombedarf"),
+        unit=_("GWh"),
+    ),
     setup.Choropleth(
         "electricity_demand_capita_statusquo",
         layers=["municipality"],
         title=_("Strombedarf pro EinwohnerIn"),
         unit=_("kWh"),
     ),
+    setup.Choropleth(
+        "electricity_demand_capita_2045",
+        layers=["municipality"],
+        title=_("Strombedarf pro EinwohnerIn"),
+        unit=_("kWh"),
+    ),
     setup.Choropleth(
         "heat_demand_statusquo",
         layers=["municipality"],
         title=_("Wärmebedarf"),
         unit=_("GWh"),
     ),
+    setup.Choropleth(
+        "heat_demand_2045",
+        layers=["municipality"],
+        title=_("Wärmebedarf"),
+        unit=_("GWh"),
+    ),
     setup.Choropleth(
         "heat_demand_capita_statusquo",
         layers=["municipality"],
         title=_("Wärmebedarf pro EinwohnerIn"),
         unit=_("kWh"),
     ),
+    setup.Choropleth(
+        "heat_demand_capita_2045",
+        layers=["municipality"],
+        title=_("Wärmebedarf pro EinwohnerIn"),
+        unit=_("kWh"),
+    ),
     setup.Choropleth(
         "batteries_statusquo",
         layers=["municipality"],
         title=_("Anzahl Batteriespeicher"),
-        unit=_("#"),
+        unit="",
     ),
     setup.Choropleth(
         "batteries_capacity_statusquo",
@@ -462,9 +500,13 @@ def __getitem__(self, item):  # noqa: D105, ANN001, ANN204
             "employees_statusquo",
             "companies_statusquo",
             "capacity_statusquo",
+            "capacity_2045",
             "capacity_square_statusquo",
+            "capacity_square_2045",
             "wind_turbines_statusquo",
+            "wind_turbines_2045",
             "wind_turbines_square_statusquo",
+            "wind_turbines_square_2045",
             "energy_statusquo",
             "energy_2045",
             "energy_share_statusquo",
@@ -473,9 +515,13 @@ def __getitem__(self, item):  # noqa: D105, ANN001, ANN204
             "energy_square_statusquo",
             "energy_square_2045",
             "electricity_demand_statusquo",
+            "electricity_demand_2045",
             "electricity_demand_capita_statusquo",
+            "electricity_demand_capita_2045",
             "heat_demand_statusquo",
+            "heat_demand_2045",
             "heat_demand_capita_statusquo",
+            "heat_demand_capita_2045",
             "batteries_statusquo",
             "batteries_capacity_statusquo",
         ],

digiplan/__init__.py

@@ -1,4 +1,4 @@
 """Digiplan init - holds current version."""
 
-__version__ = "0.5.0"
+__version__ = "0.6.0"
 __version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace("-", ".", 1).split(".")])