@igo2/geo 21.0.0-next.30 → 21.0.0-next.31

package/fesm2022/igo2-geo.mjs

@@ -23676,8 +23676,10 @@ class DrawComponent {
             }
         }
         else {
-            const drawingLayer = this.activeDrawingLayer();
-            this.activeStore = this.stores().find((store) => store.layer.id === drawingLayer?.id);
+            const activeStore = this.stores().find((store) => store.layer.id === this.activeDrawingLayer()?.id) ?? this.stores()[0];
+            this.activeStore = activeStore;
+            const drawingLayer = this.activeDrawingLayer() ?? activeStore.layer;
+            this.activeDrawingLayer.set(drawingLayer);
             this.activeDrawControl = this.drawControls()?.find((dc) => dc[0] === drawingLayer?.id)?.[1];
             this.deactivateDrawControl();
             this.allLayers.forEach((layer) => {
@@ -23715,16 +23717,10 @@ class DrawComponent {
             });
     }
     /**
-     * Remove the drawing layer and the interactions
+     * Remove drawing interactions while retaining drawing layers between tab visits.
      * @internal
      */
     ngOnDestroy() {
-        if (this.activeStore.count === 0) {
-            const drawingLayer = this.activeDrawingLayer();
-            if (drawingLayer) {
-                this.activeStore.map.layerController.remove(drawingLayer);
-            }
-        }
         this.allLayers.forEach((layer) => (layer.opacity = 1));
         this.activeStore.state.updateAll({ selected: false });
         this.deactivateDrawControl();
@@ -24024,49 +24020,46 @@ class DrawComponent {
         });
     }
     setupLayer(isNewLayer) {
-        setTimeout(() => {
-            const dialogRef = this.dialog.open(DrawLayerPopupComponent, {
-                disableClose: false
-            });
-            dialogRef.afterClosed().subscribe((label) => {
-                if (dialogRef.componentInstance.confirmFlag()) {
-                    this.activeStore.state.updateAll({ selected: false });
-                    this.activeStore = new FeatureStore([], {
-                        map: this.map()
-                    });
-                    this.activeDrawingLayerSource = new OlVectorSource();
-                    const activeDrawingLayer = this.activeDrawingLayer();
-                    if (activeDrawingLayer) {
-                        activeDrawingLayer.opacity = 0;
-                    }
-                    this.deactivateDrawControl();
-                    this.initStore(label, isNewLayer);
-                    this.activeDrawControl = this.createDrawControl(this.fillColor, this.strokeColor, this.strokeWidth);
-                    this.activeDrawControl?.setGeometryType(this.currGeometryType);
-                    this.toggleDrawControl();
-                    this.stores.update((stores) => stores.concat(this.activeStore));
-                    if (activeDrawingLayer) {
-                        this.drawControls.update((controls) => controls.concat([
-                            [activeDrawingLayer.id, this.activeDrawControl]
-                        ]));
-                        this.drawControlsEvent.emit(this.drawControls());
-                        this.layersIDEvent.emit(activeDrawingLayer.id);
-                    }
-                    this.isCreatingNewLayer = false;
-                    if (!this.labelsAreShown) {
-                        this.onToggleLabels();
-                    }
-                    this.activeLayerChange.emit(activeDrawingLayer);
+        const dialogRef = this.dialog.open(DrawLayerPopupComponent, {
+            disableClose: false
+        });
+        dialogRef.afterClosed().subscribe((label) => {
+            if (dialogRef.componentInstance.confirmFlag()) {
+                this.activeStore.state.updateAll({ selected: false });
+                this.activeStore = new FeatureStore([], {
+                    map: this.map()
+                });
+                this.activeDrawingLayerSource = new OlVectorSource();
+                const previousDrawingLayer = this.activeDrawingLayer();
+                if (previousDrawingLayer) {
+                    previousDrawingLayer.opacity = 0;
                 }
-                else {
-                    const select = this.select();
-                    if (select) {
-                        select.value = this.activeDrawingLayer;
-                        select.selectionChange.emit(new MatSelectChange(select, this.activeDrawingLayer()));
-                    }
+                this.deactivateDrawControl();
+                this.initStore(label, isNewLayer);
+                const drawingLayer = this.activeDrawingLayer();
+                this.activeDrawControl = this.createDrawControl(this.fillColor, this.strokeColor, this.strokeWidth);
+                this.activeDrawControl?.setGeometryType(this.currGeometryType);
+                this.toggleDrawControl();
+                this.stores.update((stores) => stores.concat(this.activeStore));
+                if (drawingLayer) {
+                    this.drawControls.update((controls) => controls.concat([[drawingLayer.id, this.activeDrawControl]]));
+                    this.drawControlsEvent.emit(this.drawControls());
+                    this.layersIDEvent.emit(drawingLayer.id);
+                }
+                this.isCreatingNewLayer = false;
+                if (!this.labelsAreShown) {
+                    this.onToggleLabels();
+                }
+                this.activeLayerChange.emit(drawingLayer);
+            }
+            else {
+                const select = this.select();
+                if (select) {
+                    select.value = this.activeDrawingLayer;
+                    select.selectionChange.emit(new MatSelectChange(select, this.activeDrawingLayer()));
                 }
-            });
-        }, 250);
+            }
+        });
     }
     // HTML user interactions
     /**