PB-1299: Going into drawing module with pre-loaded empty KML breaks t…

…he drawing module
geoadmin · Jan 23, 2025 · d09be62 · d09be62
1 parent 19b95ea
commit d09be62
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/src/modules/drawing/DrawingModule.vue b/src/modules/drawing/DrawingModule.vue
@@ -55,7 +55,7 @@ const showAddVertexButton = computed(() => {
 
 const hasKml = computed(() => {
     if (online.value) {
-        return !!activeKmlLayer.value
+        return !!activeKmlLayer.value && !activeKmlLayer.value.isEmpty()
     }
     return !!store.state.layers.systemLayers.find(
         (l) => l.id === store.state.drawing.temporaryKmlId

diff --git a/src/modules/drawing/components/DrawingToolbox.vue b/src/modules/drawing/components/DrawingToolbox.vue
@@ -100,6 +100,12 @@ function onCloseClearConfirmation(confirmed) {
         drawingLayer.getSource().clear()
         debounceSaveDrawing()
         store.dispatch('setDrawingMode', { mode: null, ...dispatcher })
+        store.dispatch('removeLayer', {
+            layerId: activeKmlLayer.value.id,
+            isExternal: activeKmlLayer.value.isExternal,
+            baseUrl: activeKmlLayer.value.baseUrl,
+            ...dispatcher,
+        })
     }
 }
 

diff --git a/src/modules/drawing/useKmlDataManagement.composable.js b/src/modules/drawing/useKmlDataManagement.composable.js
@@ -138,10 +138,12 @@ export default function useSaveKmlOnChange(drawingLayerDirectReference) {
                     ...dispatcher,
                 })
             }
-            await store.dispatch('addLayer', {
-                layer: kmlLayer,
-                ...dispatcher,
-            })
+            if (!kmlLayer.isEmpty()) {
+                await store.dispatch('addLayer', {
+                    layer: kmlLayer,
+                    ...dispatcher,
+                })
+            }
         } else {
             // if a KMLLayer is already defined, we update it
             const kmlMetadata = await updateKml(

diff --git a/src/views/MapView.vue b/src/views/MapView.vue
@@ -40,11 +40,7 @@ const showDragAndDropOverlay = computed(() => store.state.ui.showDragAndDropOver
 const isOpeningNewTab = computed(() => store.state.ui.isOpeningNewTab)
 const showNotSharedDrawingWarning = computed(() => store.getters.showNotSharedDrawingWarning)
 const loadDrawingModule = computed(() => {
-    return (
-        (!activeKmlLayer.value || activeKmlLayer.value?.kmlData) &&
-        isDrawingMode.value &&
-        !is3DActive.value
-    )
+    return isDrawingMode.value && !is3DActive.value
 })
 
 onMounted(() => {