Merge pull request #547 from oakdbca/main

Misc Issues
dbca-wa · Dec 31, 2024 · 49ff6e0 · 49ff6e0
2 parents df8cda9 + 32c8a96
commit 49ff6e0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,6 +50,7 @@ htmlcov/
 .coverage
 .coverage*
 .cache
+.eslintcache
 nosetests.xml
 coverage.xml
 *,cover
@@ -107,4 +108,4 @@ git_history_recent
 *.xls*
 *.DAV
 
-private-media/
+private-media/
diff --git a/Dockerfile b/Dockerfile
@@ -33,10 +33,12 @@ RUN --mount=type=cache,target=/var/cache/apt apt-get update && \
     curl \
     g++ \
     gcc \
+    gdal-bin \
     git \
     graphviz \
     htop \
     ipython3 \
+    libgdal-dev \
     libgraphviz-dev \
     libmagic-dev \
     libpq-dev \
@@ -46,6 +48,7 @@ RUN --mount=type=cache,target=/var/cache/apt apt-get update && \
     patch \
     postgresql-client \
     python3-dev \
+    python3-gdal \
     python3-pil \
     python3-pip \
     python3-setuptools \
@@ -61,15 +64,6 @@ RUN --mount=type=cache,target=/var/cache/apt apt-get update && \
     rm -rf /var/lib/apt/lists/* && \
     update-ca-certificates
 
-RUN add-apt-repository ppa:ubuntugis/ubuntugis-unstable
-
-RUN --mount=type=cache,target=/var/cache/apt apt-get update && \
-    apt-get upgrade -y && \
-    apt-get install --no-install-recommends -y \
-    gdal-bin \
-    libgdal-dev \
-    python3-gdal
-
 FROM apt_packages_boranga as node_boranga
 
 # install node

diff --git a/boranga/frontend/boranga/src/components/common/component_map.vue b/boranga/frontend/boranga/src/components/common/component_map.vue
@@ -2427,13 +2427,6 @@ export default {
             } else {
                 console.log('Done initializing map (no refresh)');
             }
-            // Priya calling this event from mounted as its only been triggered from loadMapFeatures() which is coomented at the moment
-            // vm.map.dispatchEvent({
-            //     type: 'features-loaded',
-            //     details: {
-            //         loaded: true,
-            //     },
-            // });
         });
     },
     methods: {
@@ -4256,7 +4249,7 @@ export default {
                 vm.layerSources[vm.defaultQueryLayerName];
             // If no geometry name is provided, assume the geometry is the proposals object itself
             const geometry_name =
-                vm.getLayerDefinitionByName(toSource).geometry_name || null;
+                vm.getLayerDefinitionByName(toSource)?.geometry_name || null;
 
             console.log(`Loading features to source ${toSource}`, proposals);
             let opacities = [];
@@ -4741,7 +4734,10 @@ export default {
                     // so calling this will remove the file list from the front end
                     vm.$refs.shapefile_document.get_documents();
                     vm.$nextTick(() => {
-                        vm.loadMapFeatures([data]);
+                        vm.loadMapFeatures(
+                            [data],
+                            this.queryLayerDefinition.name
+                        );
                         vm.displayAllFeatures();
                         swal.fire(
                             'Success',

diff --git a/requirements.txt b/requirements.txt
@@ -16,7 +16,6 @@ django-countries~=7.5
 django-cron==0.6.0 # This project is no longer maintained
 django-dynamic-fixture==3.1.3
 django-filter~=24.3
-gdal==3.8.4
 openpyxl~=3.1
 datapackage~=1.15
 python-dateutil~=2.8