@igo2/geo 20.1.0-next.1 → 20.1.0-next.2

package/fesm2022/igo2-geo.mjs

@@ -946,7 +946,7 @@ class PrintService {
      * @param  baseMargins - Page margins
      */
     async handleMeasureLayer(doc, map, baseMargins) {
-        if (map.layerController.all.find((layer) => layer.visible && layer.id.startsWith('igo-measures-'))) {
+        if (map.layerController.all.find((layer) => layer.visible && layer.id.toString().startsWith('igo-measures-'))) {
             let canvasOverlayHTMLMeasures;
             const mapOverlayMeasuresHTML = map.ol.getOverlayContainer();
             await html2canvas(mapOverlayMeasuresHTML, {
@@ -5088,7 +5088,10 @@ class LayerBase {
         return this.options.isIgoInternalLayer || false;
     }
     get id() {
-        return String(this.options.id);
+        return this.options.id;
+    }
+    set id(value) {
+        this.options.id = value;
     }
     get parentId() {
         return this.parent?.id ?? this.options.parentId;
@@ -5882,9 +5885,6 @@ let Layer = class Layer extends LayerBase {
     link;
     linkMaster;
     resolution$$;
-    get id() {
-        return String(this.options.id || this.dataSource.id);
-    }
     get visible() {
         return super.visible;
     }
@@ -6176,7 +6176,7 @@ class VectorLayer extends Layer {
     removeLayerFromIDB() {
         const geoDB = new GeoDB();
         const layerDB = new LayerDB();
-        merge(geoDB.delete(this.id), layerDB.delete(this.id)).subscribe();
+        merge(geoDB.delete(this.id.toString()), layerDB.delete(this.id.toString())).subscribe();
     }
     maintainOptionsInIdb() {
         this.options.igoStyle.igoStyleObject = olStyleToBasicIgoStyle(this.ol);
@@ -6213,7 +6213,7 @@ class VectorLayer extends Layer {
         }));
         const geoDB = new GeoDB();
         geoDB
-            .update(this.options.sourceOptions.url || this.id, this.id, geojsonObject, InsertSourceInsertDBEnum.User, `${this.title}-${this.id}-${new Date()}`)
+            .update(this.options.sourceOptions.url || this.id.toString(), this.id, geojsonObject, InsertSourceInsertDBEnum.User, `${this.title}-${this.id}-${new Date()}`)
             .pipe(first$1())
             .subscribe();
     }
@@ -12254,6 +12254,9 @@ class LayerController extends LayerSelectionModel {
     getById(id) {
         return this.all.find((layer) => layer.id && layer.id === id);
     }
+    getByTitle(title) {
+        return this.all.find((layer) => layer.title && layer.title === title);
+    }
     getBySourceId(id) {
         return this.all.find((layer) => layer.dataSource?.id && layer.dataSource.id === id);
     }
@@ -12338,7 +12341,7 @@ class LayerController extends LayerSelectionModel {
             this._otherLayers.push(layer);
         }
         const parent = layer.parentId
-            ? this.getById(layer.parentId.split(TREE_SEPERATOR).pop())
+            ? this.getById(layer.parentId.toString().split(TREE_SEPERATOR).pop())
             : undefined;
         layer.add(parent);
         return;
@@ -12869,7 +12872,7 @@ class LayerListComponent {
     activeChange = output();
     _transformer = (layer, level) => {
         return {
-            id: layer.id || layer.options.name,
+            id: layer.id?.toString() || layer.options.name,
             isGroup: !!isLayerGroup(layer),
             descendantLevels: isLayerGroup(layer)
                 ? layer.descendantsLevel
@@ -12907,11 +12910,12 @@ class LayerListComponent {
             : this.controller().deselect(layer);
     }
     getLayerType(layer) {
+        const id = layer.id.toString();
         return layer.type === 'raster'
             ? 'raster'
-            : layer.id.includes('measure')
+            : id.includes('measure')
                 ? 'measure'
-                : layer.id.includes('draw')
+                : id.includes('draw')
                     ? 'draw'
                     : 'vector';
     }
@@ -24683,7 +24687,7 @@ class DrawComponent {
     }
     createLayer(newTitle, isNewLayer) {
         for (const layer of this.allLayers) {
-            const numberId = Number(layer.id.replace('igo-draw-layer', ''));
+            const numberId = Number(layer.id.toString().replace('igo-draw-layer', ''));
             this.layerCounterID = Math.max(numberId, this.layerCounterID);
         }
         this.activeDrawingLayer.set(new VectorLayer({
@@ -29778,7 +29782,7 @@ class ExportService {
         else if (layer.options.workspace?.enabled) {
             const wks = this.getWorkspaceByLayerId(layer.id, store);
             if (wks?.entityStore?.stateView.all().length) {
-                const features = this.getFeaturesFromWorkspace(wks, layer.id, data);
+                const features = this.getFeaturesFromWorkspace(wks, layer.id.toString(), data);
                 return of(features).pipe(catchError((e) => {
                     throw e;
                 }));
@@ -33107,7 +33111,7 @@ class SearchResultAddButtonComponent {
         // set layer id
         let layerCounterID = 0;
         for (const layer of this.allLayers) {
-            const numberId = Number(layer.id.replace('igo-search-layer', ''));
+            const numberId = Number(layer.id.toString().replace('igo-search-layer', ''));
             layerCounterID = Math.max(numberId, layerCounterID);
         }
         this.dataSourceService
@@ -37081,11 +37085,16 @@ class EditionWorkspaceService {
         };
         wfsOlLayer.setLoader(loader);
         wfsOlLayer.refresh();
+        const id = String(layer.id);
         for (const lay of map.layerController.all) {
             if (isLayerItem(lay) &&
                 lay.id !== layer.id &&
-                lay.options.linkedLayers?.linkId.includes(layer.id.substr(0, layer.id.indexOf('.') - 1)) &&
-                lay.options.linkedLayers?.linkId.includes('WmsWorkspaceTableSrc')) {
+                lay.options.linkedLayers?.linkId
+                    .toString()
+                    .includes(id.substr(0, id.indexOf('.') - 1)) &&
+                lay.options.linkedLayers?.linkId
+                    .toString()
+                    .includes('WmsWorkspaceTableSrc')) {
                 const wmsOlLayer = lay.dataSource.ol;
                 const params = wmsOlLayer.getParams();
                 params._t = new Date().getTime();