Merge pull request #603 from ropable/master

Update environment variable mapproxy_url -> geoserver_url, update map view, update project dependency versions.
dbca-wa · Sep 12, 2024 · 172fb4a · 172fb4a
2 parents 40880ab + 9e90732
commit 172fb4a
Show file tree

Hide file tree

Showing 10 changed files with 432 additions and 393 deletions.
diff --git a/README.md b/README.md
@@ -41,8 +41,9 @@ The following variables are required for the project to run:
 
 Variables below may also need to be defined (context-dependent):
 
-    SECRET_KEY="ThisIsASecretKey"
+    SECRET_KEY=ThisIsASecretKey
     DEBUG=True
+    GEOSERVER_URL=https://geoserver.url/service
 
 # Running
 

diff --git a/kustomize/overlays/prod/deployment_patch.yaml b/kustomize/overlays/prod/deployment_patch.yaml
@@ -29,11 +29,11 @@ spec:
             secretKeyRef:
               name: turtles-env-prod
               key: SECRET_KEY
-        - name: MAPPROXY_URL
+        - name: GEOSERVER_URL
           valueFrom:
             secretKeyRef:
               name: turtles-env-prod
-              key: MAPPROXY_URL
+              key: GEOSERVER_URL
         - name: MAPBOX_TOKEN
           valueFrom:
             secretKeyRef:

diff --git a/kustomize/overlays/uat/deployment_patch.yaml b/kustomize/overlays/uat/deployment_patch.yaml
@@ -29,11 +29,11 @@ spec:
             secretKeyRef:
               name: turtles-env-uat
               key: SECRET_KEY
-        - name: MAPPROXY_URL
+        - name: GEOSERVER_URL
           valueFrom:
             secretKeyRef:
               name: turtles-env-uat
-              key: MAPPROXY_URL
+              key: GEOSERVER_URL
         - name: MAPBOX_TOKEN
           valueFrom:
             secretKeyRef:

diff --git a/observations/views.py b/observations/views.py
@@ -72,7 +72,6 @@ class MapView(TemplateView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["mapproxy_url"] = settings.MAPPROXY_URL
         context["page_title"] = f"{settings.SITE_CODE} | Map"
         return context
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -43,7 +43,7 @@ django-nested-admin = "^4.0.2"
 django-grappelli = "3.0.8"
 django-bootstrap4 = "24.1"
 django-easy-select2 = "1.5.8"
-sentry-sdk = {version = "1.45.0", extras = ["django"]}
+sentry-sdk = {version = "2.14.0", extras = ["django"]}
 
 [tool.poetry.group.dev.dependencies]
 ipython = "^8.23.0"

diff --git a/wastd/context_processors.py b/wastd/context_processors.py
@@ -9,6 +9,6 @@ def template_context(request):
         "site_title": settings.SITE_TITLE,
         "site_acronym": settings.SITE_CODE,
         "APPLICATION_VERSION_NO": settings.VERSION_NO,
-        "mapproxy_url": settings.MAPPROXY_URL,
+        "geoserver_url": settings.GEOSERVER_URL,
     }
     return context
diff --git a/wastd/settings.py b/wastd/settings.py
@@ -144,7 +144,7 @@
         }
     }
 }
-MAPPROXY_URL = os.environ.get("MAPPROXY_URL", "")
+GEOSERVER_URL = os.environ.get("GEOSERVER_URL", "")
 IMPORT_EXPORT_SKIP_ADMIN_CONFIRM = True
 
 # Use the customised User model