Use db-name corrected gs workspace in terria

GeospatialResearch · Nov 26, 2024 · 94bb57c · 94bb57c
1 parent e3ec3ef
commit 94bb57c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/otakaro/pollution_model/medusa_process_service.py b/otakaro/pollution_model/medusa_process_service.py
@@ -104,14 +104,15 @@ def _format_number(number: float) -> Union[int, float]:
         # Present the user with the scenario details for visualization
         response.outputs['scenarioDetails'].data = scenario_details
 
-        geoserver_url = f"{EnvVar.GEOSERVER_HOST}:{EnvVar.GEOSERVER_PORT}/geoserver/db-pollution/ows"
+        geoserver_workspace = f"{EnvVar.POSTGRES_DB}-pollution"
+        geoserver_url = f"{EnvVar.GEOSERVER_HOST}:{EnvVar.GEOSERVER_PORT}/geoserver/{geoserver_workspace}/ows"
 
         # Add Geoserver JSON Catalog entries to WPS response for use by Terria
         response.outputs['roofs'].data = json.dumps({
             "type": "wfs",
             "name": "MEDUSA Roof Surfaces",
             "url": geoserver_url,
-            "typeNames": "db-pollution:medusa2_model_output_buildings",
+            "typeNames": f"{geoserver_workspace}:medusa2_model_output_buildings",
             "parameters": {
                 "cql_filter": f"scenario_id={scenario_id}",
             },
@@ -122,7 +123,7 @@ def _format_number(number: float) -> Union[int, float]:
             "type": "wfs",
             "name": "MEDUSA Road Surfaces",
             "url": geoserver_url,
-            "typeNames": "db-pollution:medusa2_model_output_roads",
+            "typeNames": f"{geoserver_workspace}:medusa2_model_output_roads",
             "parameters": {
                 "cql_filter": f"scenario_id={scenario_id}",
             },