Merge branch 'dev'

empowerplan · Dec 2, 2024 · dd6d58c · dd6d58c
2 parents b92fc9a + efbc22f
commit dd6d58c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/config/settings/base.py b/config/settings/base.py
@@ -287,15 +287,15 @@ 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
 MAP_ENGINE_X_AT_MIN_Z = 137
 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 = [

diff --git 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,

diff --git 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)." %}">