From 9bdfec080566ed332f80c298ecef215051dc7f16 Mon Sep 17 00:00:00 2001
From: Hendrik Huyskens <hendrik.huyskens@rl-institut.de>
Date: Thu, 28 Nov 2024 14:14:59 +0100
Subject: [PATCH 1/3] Fix choropleth for energy_share_2045

---
 digiplan/map/choropleths.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/digiplan/map/choropleths.py b/digiplan/map/choropleths.py
index 64d15a2a..81c41c68 100644
--- a/digiplan/map/choropleths.py
+++ b/digiplan/map/choropleths.py
@@ -111,7 +111,7 @@ def get_fill_color(self, values: dict[int, float]) -> dict:  # noqa: ARG002
         return [
             "interpolate",
             ["linear"],
-            ["feature-state", "energy_share_statusquo"],
+            ["feature-state", "energy_share_2045"],
             0.0,
             "rgb(255, 255, 204)",
             20.0,

From 7bc18c9862a24853cb14b6eab04cdd73c9d5d3e0 Mon Sep 17 00:00:00 2001
From: nesnoj <jonathan.amme@rl-institut.de>
Date: Mon, 2 Dec 2024 16:15:17 +0100
Subject: [PATCH 2/3] Fix en translation

---
 digiplan/templates/components/panel_5_results.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/digiplan/templates/components/panel_5_results.html b/digiplan/templates/components/panel_5_results.html
index 739248f5..072d61e0 100644
--- a/digiplan/templates/components/panel_5_results.html
+++ b/digiplan/templates/components/panel_5_results.html
@@ -31,7 +31,7 @@ <h2 class="panel-item__heading panel-item__heading--nopadding">
         <optgroup label="{% translate "Renewable Energies (RE)" %}">
           <option value="energy_share_2045"
                   title="{% translate "Annual balance sheet share of renewable energy (wind energy, photovoltaic, hydroelectric power) in the electricity demand of the sectors agriculture, GHG (trade, commerce, services), households and industry in percent. The demand is the net electricity consumption, i.e. transmission losses and power plant consumption are not taken into account. 49.7% of the electricity demand in Germany was covered by renewable energies in 2022." %}">
-                  {% translate "Renewable Energy Share of Demand (%)" %}
+                  {% translate "Renewable Energy Share of Demand" %} (%)
           </option>
           <option value="energy_2045"
                   title="{% translate "Annual amount of energy fed into the grid from renewable plants in gigawatt hours (wind energy, photovoltaic, hydro power)." %}">

From efbc22f7a1ae5d487d461599072768ab3a1845fc Mon Sep 17 00:00:00 2001
From: nesnoj <jonathan.amme@rl-institut.de>
Date: Mon, 2 Dec 2024 16:16:46 +0100
Subject: [PATCH 3/3] Set tile zoom to 16

---
 config/settings/base.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/settings/base.py b/config/settings/base.py
index d7856e3b..8cbc7edb 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -287,7 +287,7 @@ def __getitem__(self, item):  # noqa: D105, ANN001, ANN204
 MAP_ENGINE_CENTER_AT_STARTUP = [14.2, 52.45]
 MAP_ENGINE_ZOOM_AT_STARTUP = 8
 MAP_ENGINE_MIN_ZOOM = 8
-MAP_ENGINE_MAX_ZOOM = 14
+MAP_ENGINE_MAX_ZOOM = 16
 MAP_ENGINE_MAX_BOUNDS = [[12.6, 51.8], [16.1, 53.1]]
 
 # distill
@@ -295,7 +295,7 @@ def __getitem__(self, item):  # noqa: D105, ANN001, ANN204
 MAP_ENGINE_Y_AT_MIN_Z = 83
 MAP_ENGINE_X_OFFSET = 1  # Defines how many tiles to the right are added at first level
 MAP_ENGINE_Y_OFFSET = 1  # Defines how many tiles to the bottom are added at first level
-MAP_ENGINE_MAX_DISTILLED_ZOOM = 14
+MAP_ENGINE_MAX_DISTILLED_ZOOM = 16
 DISTILL = env.bool("MAP_ENGINE_USE_DISTILLED_MVTS", False)
 
 MAP_ENGINE_IMAGES = [