diff --git a/CHANGELOG.md b/CHANGELOG.md
index ada3dd02..9f2d1c28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ and this project tries to adhere to [Semantic Versioning](https://semver.org/spe
- oemof.tabular to support TSAM
- map boolean values in popup templates to Ja/Nein
- pre results can be shown before simulation has finished
+- scenario page and scenario parameters
### Fixed
- duplicate loading of JS modules due to missing module support in django staticfile storage
diff --git a/digiplan/static/config/energy_settings_panel.json b/digiplan/static/config/energy_settings_panel.json
index b6c7ba35..59778b36 100644
--- a/digiplan/static/config/energy_settings_panel.json
+++ b/digiplan/static/config/energy_settings_panel.json
@@ -169,10 +169,10 @@
"class": "js-slider js-slider-panel js-power-mix",
"color": "#A9BDE8",
"label": "{% trans 'Wasserkraft (MW)' %}",
- "max": 30,
+ "max": 5,
"min": 0,
- "start": 5,
- "status_quo": 15,
+ "start": 0,
+ "status_quo": 0,
"step": 1,
"tooltip": "{% trans 'Nennleistung der in der Region installierten Laufwasserkraftwerke in Megawatt. Da das Potenzial hier als ausgeschöpft gilt, werden nur bestehende Anlagen berücksichtigt.' %}",
"type": "slider"
diff --git a/digiplan/static/config/scenarios.json b/digiplan/static/config/scenarios.json
index a6e29731..9e02ddfc 100644
--- a/digiplan/static/config/scenarios.json
+++ b/digiplan/static/config/scenarios.json
@@ -1,59 +1,53 @@
{
"1": {
- "windTab": "windFutureTab",
- "id_s_w_1": 720,
- "id_s_w_7": 2.1,
- "id_s_pv_ff_1": 1050,
- "id_s_pv_ff_3": 10,
- "id_s_pv_ff_4": 20,
- "id_s_pv_ff_5": 50,
- "id_s_pv_d_1": 300,
- "id_s_pv_d_3": 15,
- "id_s_pv_d_4": 20,
- "id_s_v_1": 175,
- "id_s_v_3": 160,
- "id_s_v_4": 150,
- "id_s_v_5": 175,
- "id_s_s_g_1": 16,
- "id_w_d_wp_1": 70,
- "id_w_d_wp_3": 70,
- "id_w_d_wp_4": 70,
- "id_w_d_wp_5": 55,
- "id_w_z_wp_1": 80,
- "id_w_v_1": 90,
- "id_w_v_3": 90,
- "id_w_v_4": 90,
- "id_w_v_5": 90,
- "id_w_d_s_1": 75,
- "id_w_z_s_1": 70
+ "windTab": "windPresentTab",
+ "id_s_w_1": 1769,
+ "id_s_w_6": 1.7,
+ "id_s_pv_ff_1": 1330,
+ "id_s_pv_ff_3": 5,
+ "id_s_pv_ff_4": 5,
+ "id_s_pv_ff_5": 5,
+ "id_s_pv_d_1": 1440,
+ "id_s_pv_d_3": 50,
+ "id_s_pv_d_4": 50,
+ "id_s_v_1": 85,
+ "id_s_v_3": 72,
+ "id_s_v_4": 93,
+ "id_s_v_5": 86,
+ "id_s_s_g_1": 1,
+ "id_w_d_wp_1": 50,
+ "id_w_z_wp_1": 40,
+ "id_w_v_1": 85,
+ "id_w_v_3": 72,
+ "id_w_v_4": 93,
+ "id_w_v_5": 86,
+ "id_w_d_s_1": 100,
+ "id_w_z_s_1": 100
},
"2": {
- "windTab": "windPresentTab",
- "id_s_w_1": 180,
- "id_s_w_6": 0.2,
- "id_s_pv_ff_1": 4330,
- "id_s_pv_ff_3": 15,
- "id_s_pv_ff_4": 15,
- "id_s_pv_ff_5": 15,
- "id_s_pv_d_1": 110,
- "id_s_pv_d_3": 5,
- "id_s_pv_d_4": 5,
- "id_s_v_1": 80,
- "id_s_v_3": 80,
- "id_s_v_4": 80,
- "id_s_v_5": 80,
- "id_s_s_g_1": 20,
- "id_w_d_wp_1": 75,
- "id_w_d_wp_3": 65,
- "id_w_d_wp_4": 90,
- "id_w_d_wp_5": 55,
- "id_w_z_wp_1": 20,
- "id_w_v_1": 120,
- "id_w_v_3": 130,
- "id_w_v_4": 110,
- "id_w_v_5": 150,
- "id_w_d_s_1": 30,
- "id_w_z_s_1": 45
+ "windTab": "windFutureTab",
+ "id_s_w_1": 2308,
+ "id_s_w_7": 2.2,
+ "id_s_pv_ff_1": 2437,
+ "id_s_pv_ff_3": 3,
+ "id_s_pv_ff_4": 3,
+ "id_s_pv_ff_5": 3,
+ "id_s_pv_d_1": 2640,
+ "id_s_pv_d_3": 70,
+ "id_s_pv_d_4": 50,
+ "id_s_v_1": 85,
+ "id_s_v_3": 72,
+ "id_s_v_4": 93,
+ "id_s_v_5": 86,
+ "id_s_s_g_1": 1,
+ "id_w_d_wp_1": 89,
+ "id_w_z_wp_1": 77,
+ "id_w_v_1": 85,
+ "id_w_v_3": 72,
+ "id_w_v_4": 93,
+ "id_w_v_5": 86,
+ "id_w_d_s_1": 100,
+ "id_w_z_s_1": 100
},
"3": {
"windTab": "windPastTab",
diff --git a/digiplan/static/js/scenarios.js b/digiplan/static/js/scenarios.js
index 66ba8c8a..7870f5ce 100644
--- a/digiplan/static/js/scenarios.js
+++ b/digiplan/static/js/scenarios.js
@@ -88,7 +88,7 @@ function selectScenarioCard(scenarioCardNumber) {
In der Energiestrategie 2040 hat sich das Land Brandenburg 2022 ein Leitszenario zur Gestaltung der Energiewende gegeben. In ihr wurden die Ziele in den Bereichen Energieeffizienz, Ausbau Erneuerbarer Energien, Speichertechnologien und Netzausbau festgelegt. Dieses Szenario bildet ausgewählte Kernziele für das Jahr 2030 ab.
+In der Energiestrategie 2040 hat sich das Land Brandenburg 2022 ein Leitszenario zur Gestaltung der Energiewende gegeben. In ihr wurden die Ziele in den Bereichen Energieeffizienz, Ausbau Erneuerbarer Energien, Speichertechnologien und Netzausbau festgelegt. Dieses Szenario bildet ausgewählte Kernziele für das Jahr 2030 für Oderland-Spree ab.Einstellungen, die in der Energiestrategie nicht explizit genannt werden, sind aus den Langfristszenarien des BMWK abgeleitet.