Integration of added value calculator

config/settings/base.py

@@ -85,6 +85,7 @@
 LOCAL_APPS = [
     "slapp.users",
     "slapp.explorer",
+    "slapp.kommWertTool"
     # Your stuff: custom apps go here
 ]
 # https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps

config/urls.py

@@ -20,6 +20,7 @@
     path("explorer/", include("slapp.explorer.urls", namespace="explorer")),
     path("map/", include("django_mapengine.urls")),
     *static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT),
+    path('kommWertTool/', include('slapp.kommWertTool.urls', namespace="kommWertTool")),
 ]
 
 # API URLS

requirements/base.txt

@@ -33,3 +33,10 @@ pandas==2.2.1
 
 django-filter~=23.5
 djangorestframework-gis~=1.0
+
+# ADDED VALUE REQUIREMENTS
+gunicorn
+python-dotenv
+matplotlib
+pandas
+numpy

slapp/explorer/admin.py

@@ -24,10 +24,10 @@
     PotentialareaPVAgricultureLFAOff,
     PotentialareaPVRoadRailway,
     PotentialareaWindSTP2018Vreg,
-    PotentialareaWindSTP2027Repowering,
-    PotentialareaWindSTP2027SearchAreaForestArea,
-    PotentialareaWindSTP2027SearchAreaOpenArea,
-    PotentialareaWindSTP2027VR,
+    #PotentialareaWindSTP2027Repowering,
+    #PotentialareaWindSTP2027SearchAreaForestArea,
+    #PotentialareaWindSTP2027SearchAreaOpenArea,
+    #PotentialareaWindSTP2027VR,
     PVground,
     PVroof,
     Railway,
@@ -77,9 +77,9 @@
         PotentialareaPVAgricultureLFAOff,
         PotentialareaPVRoadRailway,
         PotentialareaWindSTP2018Vreg,
-        PotentialareaWindSTP2027Repowering,
-        PotentialareaWindSTP2027SearchAreaForestArea,
-        PotentialareaWindSTP2027SearchAreaOpenArea,
-        PotentialareaWindSTP2027VR,
+        #PotentialareaWindSTP2027Repowering,
+        #PotentialareaWindSTP2027SearchAreaForestArea,
+        #PotentialareaWindSTP2027SearchAreaOpenArea,
+        #PotentialareaWindSTP2027VR,
     ],
 )

slapp/explorer/migrations/0004_delete_potentialareawindstp2027repowering_and_more.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.10 on 2024-10-29 07:15
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("explorer", "0003_region_municipality_region"),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name="PotentialareaWindSTP2027Repowering",
+        ),
+        migrations.DeleteModel(
+            name="PotentialareaWindSTP2027SearchAreaForestArea",
+        ),
+        migrations.DeleteModel(
+            name="PotentialareaWindSTP2027SearchAreaOpenArea",
+        ),
+        migrations.DeleteModel(
+            name="PotentialareaWindSTP2027VR",
+        ),
+    ]

slapp/explorer/models.py

@@ -571,20 +571,20 @@ class Water(StaticRegionModel):  # noqa: D101
 
 class PotentialareaPVAgricultureLFAOff(StaticRegionModel):  # noqa: D101
     data_file = "potentialarea_pv_agriculture_lfa-off_region"
-    layer = "potentialarea_pv_agriculture_lfa-off_region"
+    layer = "potentialarea_pv_agriculture_lfa-off"
 
 
 class PotentialareaPVRoadRailway(StaticRegionModel):  # noqa: D101
     data_file = "potentialarea_pv_road_railway_region"
-    layer = "potentialarea_pv_road_railway_region"
+    layer = "potentialarea_pv_road_railway"
 
 
 class PotentialareaWindSTP2018Vreg(StaticRegionModel):  # noqa: D101
     data_file = "potentialarea_wind_stp_2018_vreg"
     layer = "potentialarea_wind_stp_2018_vreg"
 
 
-class PotentialareaWindSTP2027Repowering(StaticRegionModel):  # noqa: D101
+""" class PotentialareaWindSTP2027Repowering(StaticRegionModel):  # noqa: D101
     data_file = "potentialarea_wind_stp_2027_repowering"
     layer = "potentialarea_wind_stp_2027_repowering"
 
@@ -602,3 +602,4 @@ class PotentialareaWindSTP2027SearchAreaOpenArea(StaticRegionModel):  # noqa: D1
 class PotentialareaWindSTP2027VR(StaticRegionModel):  # noqa: D101
     data_file = "potentialarea_wind_stp_2027_vr"
     layer = "potentialarea_wind_stp_2027_vr"
+"""

slapp/explorer/urls.py

@@ -15,7 +15,6 @@
     path("results_variation/", views.optimization_results, name="results_variation"),
     path("results_robustness/", views.robustness, name="results_robustness"),
     path("parameters_robustness/", views.robustness_parameters, name="parameters_robustness"),
-    path("added_value/", views.added_value, name="added_value"),
 ]
 
 htmx_urlpatterns = [

slapp/explorer/views.py

@@ -322,7 +322,7 @@ def optimization_results(request: HttpRequest) -> HttpResponse:
         municipalities = None
         messages.add_message(request, messages.WARNING, "Keine Gemeinde(n) ausgewählt.")
 
-    next_url = reverse("explorer:added_value")
+    next_url = reverse("kommWertTool:added_value")
     prev_url = reverse("explorer:parameters_variation")
     active_tab = "step_6_results"
     sidepanel = True
@@ -414,7 +414,7 @@ def robustness(request: HttpRequest) -> HttpResponse:
         municipalities = None
         messages.add_message(request, messages.WARNING, "Keine Gemeinde(n) ausgewählt.")
 
-    next_url = reverse("explorer:added_value")
+    next_url = reverse("kommWertTool:added_value")
     prev_url = reverse("explorer:parameters_robustness")
     active_tab = "step_6_results"
     sidepanel = True
@@ -462,11 +462,11 @@ def added_value(request: HttpRequest) -> HttpResponse:
     {4: "explorer:esm_mode"},
     {5: "explorer:parameters_variation"},
     {6: "explorer:results_variation"},
-    {7: "explorer:added_value"},
+    {7: "kommWertTool:added_value"},
     {8: "--- placeholder ---"},
     {9: "explorer:parameters_robustness"},
     {10: "explorer:results_robustness"},
-    {11: "explorer:added_value"},
+    {11: "kommWertTool:added_value"},
 ]
 
 

slapp/kommWertTool/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

slapp/kommWertTool/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class KommwerttoolConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "kommWertTool"