Remove otakaro module

GeospatialResearch · Jan 23, 2025 · 6f18d8f · 6f18d8f
1 parent 3df5d57
commit 6f18d8f
Show file tree

Hide file tree

Showing 25 changed files with 8 additions and 2,407 deletions.
diff --git a/.env.template b/.env.template
@@ -34,8 +34,6 @@ INSTRUCTIONS_FILE=./instructions.json
 
 # The following variables are used only for local development and debugging.
 # See the wiki for instuctions on how to use them. <https://github.com/GeospatialResearch/Digital-Twins/wiki/Running-the-code-in-development-environment>
-ROOF_SURFACE_DATASET_PATH=U:/Research/FloodRiskResearch/DigitalTwin/stored_data/roof_surfaces_data/clipped_CCC_Lynker_RoofMaterials_Update_2023.gdb
-ROAD_DATASET_PATH=U:/Research/FloodRiskResearch/DigitalTwin/stored_data/landcover/ccc_chch_roads_polygons.gpkg
 DATA_DIR=U:/Research/FloodRiskResearch/DigitalTwin/stored_data
 DATA_DIR_MODEL_OUTPUT=U:/Research/FloodRiskResearch/DigitalTwin/stored_data/model_output
 DATA_DIR_GEOSERVER=U:/Research/FloodRiskResearch/DigitalTwin/stored_data/geoserver

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -20,8 +20,6 @@ services:
       - ${DATA_DIR}:/stored_data
       - ${DATA_DIR_MODEL_OUTPUT}:/stored_data/model_output
       - ${DATA_DIR_GEOSERVER}:/stored_data/geoserver
-      - ${ROOF_SURFACE_DATASET_PATH}:/stored_data/roof_surfaces_data/roof_surfaces.gdb
-      - ${ROAD_DATASET_PATH}:/stored_data/roads.gpkg
 
   terria_map:
     volumes:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -25,7 +25,7 @@ services:
     build:
       context: .
       dockerfile: src/Dockerfile
-    image: lparkinson/otakaro-dt:1.2
+    image: lparkinson/flood-resilience-dt:2.0
     container_name: backend_digital_twin
     entrypoint: ["src/backend_entrypoint.sh"]
     env_file:
@@ -51,7 +51,7 @@ services:
     build:
       context: .
       dockerfile: src/Dockerfile
-    image: lparkinson/otakaro-dt:1.2
+    image: lparkinson/flood-resilience-dt:2.0
     container_name: celery_worker_digital_twin
     entrypoint: ["src/celery_worker_entrypoint.sh"]
     restart: always

diff --git a/otakaro/__init__.py b/otakaro/__init__.py
diff --git a/otakaro/blueprint.py b/otakaro/blueprint.py
diff --git a/otakaro/environmental/__init__.py b/otakaro/environmental/__init__.py
diff --git a/otakaro/environmental/water_quality/__init__.py b/otakaro/environmental/water_quality/__init__.py
diff --git a/otakaro/environmental/water_quality/main_water_quality.py b/otakaro/environmental/water_quality/main_water_quality.py