@igo2/geo 21.0.0-next.28 → 21.0.0-next.29

package/fesm2022/igo2-geo.mjs

@@ -20,7 +20,7 @@ import html2canvas from 'html2canvas';
 import jsPDF, { jsPDF as jsPDF$1 } from 'jspdf';
 import { autoTable } from 'jspdf-autotable';
 import moment from 'moment';
-import { Observable, of, combineLatest, BehaviorSubject, interval, tap, merge, fromEvent, firstValueFrom, Subject, forkJoin, map as map$1, catchError as catchError$1, debounceTime as debounceTime$1, switchMap, EMPTY, timer, filter as filter$1, take, from, pairwise, Subscription, lastValueFrom, throwError, first as first$1, zip } from 'rxjs';
+import { Observable, of, combineLatest, BehaviorSubject, interval, tap, merge, fromEvent, firstValueFrom, Subject, forkJoin, map as map$1, catchError as catchError$1, debounceTime as debounceTime$1, switchMap, EMPTY, timer, filter as filter$1, take, from, Subscription, pairwise, lastValueFrom, throwError, first as first$1, zip } from 'rxjs';
 import { HttpClient, HttpParams, HttpHeaders } from '@angular/common/http';
 import { fetchImageFromDepotUrl, ImageErrorDirective, SecureImagePipe } from '@igo2/common/image';
 import { saveAs } from 'file-saver';
@@ -11979,6 +11979,9 @@ function olLayerFeatureIsQueryable(olLayer) {
         : layerIsQueryable(layer) && layerFeatureIsQueryable(layer);
 }
 
+function isWmsDataSourceOptions(sourceOptions) {
+    return sourceOptions.type === 'wms';
+}
 class LayerLegendComponent {
     capabilitiesService = inject(CapabilitiesService);
     languageService = inject(LanguageService);
@@ -11998,12 +12001,10 @@ class LayerLegendComponent {
     /**
      * The available styles
      */
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     styles;
     /**
      * The style used to make the legend
      */
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     currentStyle;
     /**
      * The extent used to make the legend
@@ -12029,11 +12030,12 @@ class LayerLegendComponent {
         let lastlLegend = this.layer().legend;
         this.styles = this.listStyles();
         const sourceOptions = this.layer().options.source?.options;
-        if (sourceOptions && sourceOptions.params && sourceOptions.params.STYLES) {
+        const wmsSourceOptions = sourceOptions && isWmsDataSourceOptions(sourceOptions)
+            ? sourceOptions
+            : undefined;
+        if (wmsSourceOptions?.params.STYLES) {
             // if a styles is provided into the layers wms params
-            this.currentStyle = this.styles.find(
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            (style) => style.name === sourceOptions.params.STYLES)?.name;
+            this.currentStyle = this.styles?.find((style) => style.name === wmsSourceOptions.params.STYLES)?.name;
         }
         else if (!lastlLegend) {
             // if no legend is manually provided
@@ -12058,7 +12060,7 @@ class LayerLegendComponent {
             lastlLegend = layer.dataSource.getLegend(this.currentStyle, this.view);
         }
         if (this.updateLegendOnResolutionChange() ||
-            sourceOptions.contentDependentLegend) {
+            wmsSourceOptions?.contentDependentLegend) {
             const state$ = layer.map.viewController.state$;
             this.state$$ = state$.subscribe(() => this.onViewControllerStateChange());
         }
@@ -12141,18 +12143,23 @@ class LayerLegendComponent {
         }
         return outLegends;
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     computeItemTitle(layerLegend) {
-        const layerOptions = this.layer().dataSource.options;
-        if (layerOptions.type !== 'wms') {
-            return of(layerLegend.title);
+        const layerLegendTitle = layerLegend.title ?? '';
+        const sourceOptions = this.layer().dataSource.options;
+        if (!isWmsDataSourceOptions(sourceOptions)) {
+            return of(layerLegendTitle);
         }
-        const layers = layerOptions.params.LAYERS.split(',');
-        const localLayerOptions = JSON.parse(JSON.stringify(layerOptions)); // to avoid to alter the original options.
-        localLayerOptions.params.LAYERS = layers.find(
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (layer) => layer === layerLegend.title);
-        return this.capabilitiesService.getWMSOptions(localLayerOptions).pipe(map((wmsDataSourceOptions) => {
+        const layers = sourceOptions.params.LAYERS.split(',');
+        const layersName = layers.find((layer) => layer === layerLegendTitle) ?? layerLegendTitle;
+        return this.capabilitiesService
+            .getWMSOptions({
+            ...sourceOptions,
+            params: {
+                ...sourceOptions.params,
+                LAYERS: layersName
+            }
+        })
+            .pipe(map((wmsDataSourceOptions) => {
             return wmsDataSourceOptions._layerOptionsFromSource.title;
         }));
     }
@@ -21206,8 +21213,6 @@ class FeatureStoreInMapResolutionStrategy extends EntityStoreStrategy {
      * Subscription to the store's OL source changes
      */
     stores$$ = new Map();
-    resolution$$ = [];
-    empty$$;
     constructor(options) {
         super(options);
         this.options = options;
@@ -21222,7 +21227,6 @@ class FeatureStoreInMapResolutionStrategy extends EntityStoreStrategy {
         if (this.active === true) {
             this.watchStore(featureStore);
         }
-        this.empty$$ = featureStore.empty$.subscribe(() => this.updateEntitiesInResolution(featureStore, featureStore.layer.map.viewController.getResolution()));
     }
     /**
      * Unbind this strategy from a store and stop watching for Ol source changes
@@ -21230,10 +21234,7 @@ class FeatureStoreInMapResolutionStrategy extends EntityStoreStrategy {
      */
     unbindStore(store) {
         super.unbindStore(store);
-        const featureStore = store;
-        if (this.active === true) {
-            this.unwatchStore(featureStore);
-        }
+        this.unwatchStore(store);
     }
     /**
      * Start watching all stores already bound to that strategy at once.
@@ -21257,12 +21258,15 @@ class FeatureStoreInMapResolutionStrategy extends EntityStoreStrategy {
         if (this.stores$$.has(store)) {
             return;
         }
-        this.updateEntitiesInResolution(store, store.layer.map.viewController.getResolution());
-        this.resolution$$.push(store.layer
-            .map.viewController.resolution$.pipe(debounceTime$1(250))
+        this.updateEntitiesInResolution(store, store.map.viewController.getResolution());
+        const subscription = new Subscription();
+        subscription.add(store.map.viewController.resolution$
+            .pipe(debounceTime$1(250))
             .subscribe((res) => {
             this.updateEntitiesInResolution(store, res);
         }));
+        subscription.add(store.empty$.subscribe(() => this.updateEntitiesInResolution(store, store.map.viewController.getResolution())));
+        this.stores$$.set(store, subscription);
     }
     updateEntitiesInResolution(store, mapResolution) {
         if ((mapResolution ?? 0) > store.layer.minResolution &&
@@ -21278,8 +21282,9 @@ class FeatureStoreInMapResolutionStrategy extends EntityStoreStrategy {
      * @param store Feature store
      */
     unwatchStore(store) {
-        const key = this.stores$$.get(store);
-        if (key !== undefined) {
+        const subscription = this.stores$$.get(store);
+        if (subscription !== undefined) {
+            subscription.unsubscribe();
             this.stores$$.delete(store);
         }
     }
@@ -21287,11 +21292,7 @@ class FeatureStoreInMapResolutionStrategy extends EntityStoreStrategy {
      * Stop watching for OL source changes in all stores.
      */
     unwatchAll() {
-        this.stores$$.clear();
-        this.resolution$$.map((state) => state.unsubscribe());
-        if (this.empty$$) {
-            this.empty$$.unsubscribe();
-        }
+        Array.from(this.stores$$.keys()).forEach((store) => this.unwatchStore(store));
     }
 }
 
@@ -35924,7 +35925,6 @@ class EditionWorkspace extends Workspace {
                 enabled: false
             }
         });
-        this.map.layerController.remove(this.olDrawingLayer);
     }
     getDeleteUrl(feature) {
         let url;
@@ -36367,8 +36367,7 @@ class EditionWorkspaceService {
         layer.options.linkedLayers.links = clonedLinks;
         layer.createLink();
         let wks;
-        this.layerService
-            .createAsyncLayer({
+        const options = {
             title: layer.title,
             parentId: layer.options.parentId,
             visible: layer.visible,
@@ -36410,22 +36409,22 @@ class EditionWorkspaceService {
                 sourceFields: dataSource.options.sourceFields || undefined,
                 edition: dataSource.options.edition
             }
-        })
-            .subscribe((layer) => {
-            const workspaceLayer = layer;
-            if (!workspaceLayer)
+        };
+        this.layerService.createAsyncLayer(options).subscribe((createdLayer) => {
+            if (!createdLayer)
                 return;
+            const workspaceLayer = createdLayer;
             map.layerController.add(workspaceLayer);
-            layer.ol.setProperties({
+            workspaceLayer.ol.setProperties({
                 linkedLayers: {
-                    linkId: layer.options.linkedLayers.linkId,
+                    linkId: workspaceLayer.options.linkedLayers.linkId,
                     links: clonedLinks
                 }
             }, false);
             workspaceLayer.dataSource.ol.refresh();
             wks = new EditionWorkspace(this.configService, this.adding$, this.layerService, {
                 id: layer.id,
-                title: layer.title,
+                title: workspaceLayer.title,
                 layer: workspaceLayer,
                 map,
                 entityStore: this.createFeatureStore(workspaceLayer, map),
@@ -36436,9 +36435,7 @@ class EditionWorkspaceService {
             });
             this.createTableTemplate(wks, workspaceLayer);
             workspaceLayer.options.workspace.workspaceId = workspaceLayer.id;
-            layer.options.workspace = Object.assign({}, layer.options.workspace, {
-                wksConfig
-            });
+            workspaceLayer.options.workspace = Object.assign({}, workspaceLayer.options.workspace, { wksConfig });
             delete dataSource.options.download;
         });
         return wks;
@@ -36765,47 +36762,49 @@ class EditionWorkspaceService {
         // WORKAROUND to handle PostgrestApi specificity
         const properties = this.parseFeature(feature, workspace.meta.tableTemplate.columns);
         this.loading = true;
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const baseRequest = this.http[protocole];
-        baseRequest(`${url}`, properties, {
+        this.http
+            .request(protocole, `${url}`, {
+            body: properties,
             headers: headers
-        }).subscribe(() => {
-            this.loading = false;
-            this.cancelEdit(feature, workspace, true);
-            this.messageService.success('igo.geo.workspace.modifySuccess');
-            this.refreshMap(workspace.layer, workspace.layer.map);
-            const relationLayers = [];
-            workspace.layer.options.sourceOptions.relations?.forEach((relation) => {
-                workspace.map.layerController.all.forEach((layer) => {
-                    if (isLayerItem(layer) && layer.title === relation.title) {
-                        relationLayers.push(layer);
-                        layer.dataSource.ol.refresh();
-                    }
+        })
+            .subscribe({
+            next: () => {
+                this.loading = false;
+                this.cancelEdit(feature, workspace, true);
+                this.messageService.success('igo.geo.workspace.modifySuccess');
+                this.refreshMap(workspace.layer, workspace.layer.map);
+                const relationLayers = [];
+                workspace.layer.options.sourceOptions.relations?.forEach((relation) => {
+                    workspace.map.layerController.all.forEach((layer) => {
+                        if (isLayerItem(layer) && layer.title === relation.title) {
+                            relationLayers.push(layer);
+                            layer.dataSource.ol.refresh();
+                        }
+                    });
                 });
-            });
-            this.relationLayers$.next(relationLayers);
-        }, 
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (error) => {
-            this.loading = false;
-            error.error.caught = true;
-            const messages = dataSourceOptions.edition.messages;
-            if (messages) {
-                let text;
-                messages.forEach((message) => {
-                    const key = Object.keys(message)[0];
-                    if (error.error.message.includes(key)) {
-                        text = message[key];
-                        this.messageService.error(text);
+                this.relationLayers$.next(relationLayers);
+            },
+            error: (error) => {
+                this.loading = false;
+                error.error.caught = true;
+                const messages = dataSourceOptions.edition.messages;
+                if (messages) {
+                    let text;
+                    messages.forEach((message) => {
+                        const key = Object.keys(message)[0];
+                        if (error.error.message.includes(key)) {
+                            text = message[key];
+                            this.messageService.error(text);
+                        }
+                    });
+                    if (!text) {
+                        this.messageService.error('igo.geo.workspace.addError');
                     }
-                });
-                if (!text) {
+                }
+                else {
                     this.messageService.error('igo.geo.workspace.addError');
                 }
             }
-            else {
-                this.messageService.error('igo.geo.workspace.addError');
-            }
         });
     }
     cleanFeatureProperties(feature, dataSourceOptions) {