@geogirafe/lib-geoportal 1.1.0-dev.2643003589 → 1.1.0-dev.2643917963

package/components/extlayers/component.js

@@ -96,16 +96,24 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
         }
     }
     async scanLayersWMS(url) {
+        const parsedUrl = URL.parse(url);
+        if (!parsedUrl) {
+            return;
+        }
         this.themeName = this.parseName(url);
+        const urlTxt = `${parsedUrl?.origin}${parsedUrl?.pathname}`;
+        // Try to add a server type from the getCapabilities url params.
+        const serverTypeKey = Array.from(parsedUrl.searchParams.keys()).find((key) => key.toLowerCase() === 'servertype');
+        const serverType = (parsedUrl.searchParams.get(serverTypeKey ?? '') ?? 'other');
         const server = new ServerOgc(this.themeName, {
-            url,
-            type: 'other',
+            url: urlTxt,
+            type: serverType,
             wfsSupport: true,
-            urlWfs: url,
+            urlWfs: urlTxt,
             imageType: 'image/png'
         });
         const client = this.context.wmsManager.createClient(WmsClientDefault, server);
-        const capabilities = await client.getWmsCapabilities();
+        const capabilities = await client.getWmsCapabilities(parsedUrl.searchParams);
         if (capabilities?.Service?.Title) {
             this.themeName = capabilities.Service.Title;
         }

package/components/print/tools/MFPEncoder.d.ts

@@ -50,7 +50,7 @@ export default class MFPEncoder {
      */
     encodeLayers(baseLayers: BaseLayer[]): MFPLayer[];
     /**
-     * Encodes a layer object according to it's className and options.
+     * Encodes a layer object according to its type and options.
      * @returns A promise that resolves to an array of MFP layers, a single MFP layer, or null.
      */
     encodeLayer(layer: BaseLayer): MFPLayer[] | MFPLayer | null;

package/components/print/tools/MFPEncoder.js

@@ -7,6 +7,12 @@ import LayerWmts from '../../../models/layers/layerwmts.js';
 import VectorLayer from 'ol/layer/Vector.js';
 import { isLayerVisible } from './printUtils.js';
 import VectorSource from 'ol/source/Vector.js';
+import LayerWmtsExternal from '../../../models/layers/layerwmtsexternal.js';
+import LayerWmsExternal from '../../../models/layers/layerwmsexternal.js';
+/** Supported MapFishPRint servers
+ * see  https://github.com/mapfish/mapfish-print/blob/master/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayerParam.java#L123
+ */
+const MFPSupportedServerType = new Set(['mapserver', 'geoserver', 'qgisserver']);
 /**
  * Class representing a Mapfish Print Encoder.
  */
@@ -119,23 +125,24 @@ export default class MFPEncoder {
         return mfpLayers;
     }
     /**
-     * Encodes a layer object according to it's className and options.
+     * Encodes a layer object according to its type and options.
      * @returns A promise that resolves to an array of MFP layers, a single MFP layer, or null.
      */
     encodeLayer(layer) {
-        switch (layer.className) {
-            case GroupLayer.name:
-                return this.encodeGroupLayer(layer);
-            case LayerWms.name:
-                return this.encodeWmsLayer(layer);
-            case LayerWmts.name:
-                return this.encodeTileWmtsLayer(layer);
-            case LayerLocalFile.name:
-                return this.encodeLocalFileLayer(layer);
-            default:
-                console.warn('Unsupported layer type for encoding:', layer.className);
-                return null;
+        if (layer instanceof GroupLayer) {
+            return this.encodeGroupLayer(layer);
+        }
+        if (layer instanceof LayerWms || layer instanceof LayerWmsExternal) {
+            return this.encodeWmsLayer(layer);
+        }
+        if (layer instanceof LayerWmts || layer instanceof LayerWmtsExternal) {
+            return this.encodeTileWmtsLayer(layer);
+        }
+        if (layer instanceof LayerLocalFile) {
+            return this.encodeLocalFileLayer(layer);
         }
+        console.warn('Unsupported layer type for encoding: ', layer);
+        return null;
     }
     /**
      * Only non mixed groups of WMS layers are supported.
@@ -183,16 +190,16 @@ export default class MFPEncoder {
                 customParams[key] = value;
             });
         }
-        const ogcServer = this.options?.state.ogcServers[layerWms.ogcServer.name];
-        let serverType = ogcServer?.type;
-        if (serverType === 'arcgis') {
+        let serverType = layerWms.ogcServer.type;
+        // Remove unsupported serverType (otherwise, you'll get an error from the print server).
+        if (!MFPSupportedServerType.has(serverType)) {
             serverType = undefined;
         }
         const layers = layerWms.layers?.split(',') ?? [''];
         // Add empty styles if needed
         let styles = layerWms.style?.split(',');
         styles ??= [''];
-        // Get the same amount of styles than layers to print
+        // Get the same number of styles than layers to print
         while (layers.length > styles.length) {
             styles.push('');
         }

package/components/print/tools/MFPLegendEncoder.d.ts

@@ -54,7 +54,7 @@ export declare class MFPLegendEncoder {
      */
     encodeLayersLegend(layers: BaseLayer[]): MFPLegendClass[];
     /**
-     * Encodes the legend classes for a given layer, based on its type or className.
+     * Encodes the legend classes for a given layer, based on its type or instance.
      * @returns The encoded legend classes for the layer, or null if the layer is not supported.
      */
     encodeLayerLegendClasses(layer: BaseLayer): MFPLegendClass | null;

package/components/print/tools/MFPLegendEncoder.js

@@ -3,6 +3,7 @@ import LayerWmts from '../../../models/layers/layerwmts.js';
 import GeoConsts from '../../../tools/geoconsts.js';
 import { isLayerVisible } from './printUtils.js';
 import LegendHelper from '../../../tools/legendhelper.js';
+import LayerWmsExternal from '../../../models/layers/layerwmsexternal.js';
 /**
  * Class representing an encoder for creating a legend in the MFP (MapFishPrint) format.
  * Iterates on the layer tree layers to collect layers in the right order and with all metadata.
@@ -46,17 +47,17 @@ export class MFPLegendEncoder {
         return groupClasses;
     }
     /**
-     * Encodes the legend classes for a given layer, based on its type or className.
+     * Encodes the legend classes for a given layer, based on its type or instance.
      * @returns The encoded legend classes for the layer, or null if the layer is not supported.
      */
     encodeLayerLegendClasses(layer) {
         if (layer.children) {
             return this.encodeLayerGroupLegendClasses(layer);
         }
-        if (layer.className === LayerWms.name) {
+        if (layer instanceof LayerWms || layer instanceof LayerWmsExternal) {
             return this.encodeLayerWmsLegendClasses(layer);
         }
-        if (layer.className === LayerWmts.name) {
+        if (layer instanceof LayerWmts) {
             return this.encodeLayerWmtsLegendClasses(layer);
         }
         return null;
@@ -113,8 +114,7 @@ export class MFPLegendEncoder {
         if (!isLayerVisible(layerWms, this.options?.printResolution) || layerWms.inactive) {
             return null;
         }
-        const ogcServers = this.options?.state.ogcServers;
-        const ogcServer = ogcServers ? ogcServers[layerWms.ogcServer.name] : undefined;
+        const ogcServer = layerWms.ogcServer;
         const serverType = ogcServer?.type ?? '';
         const dpi = this.options?.dpi ?? GeoConsts.SCREEN_DOTS_PER_INCH;
         // Case node as a legend image

package/models/gmf.d.ts

@@ -76,13 +76,14 @@ export interface GMFGroup extends GMFTreeItem {
     children: GMFTreeItem[];
 }
 export type GMFBackgroundLayer = GMFTreeItem;
+export type GMFServerOgcType = 'mapserver' | 'qgisserver' | 'georama' | 'geoserver' | 'arcgis' | 'other';
 export interface GMFServerOgc {
     url: string;
     wfsSupport: boolean;
     urlWfs?: string;
     oapifSupport?: boolean;
     urlOapif?: string;
-    type: 'mapserver' | 'qgisserver' | 'georama' | 'geoserver' | 'arcgis' | 'other';
+    type: GMFServerOgcType;
     imageType: string;
     attributes?: GMFServerOgcAttributes;
 }

package/models/layers/baselayer.d.ts

@@ -6,13 +6,6 @@ type BaseLayerOptions = {
     metadataUrl?: string;
 };
 declare abstract class BaseLayer {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     id: number;
     treeItemId: string;
     name: string;
@@ -35,10 +28,5 @@ declare abstract class BaseLayer {
     abstract clone(): BaseLayer;
     parent?: ThemeLayer | GroupLayer;
     constructor(id: number, name: string, order: number, options?: BaseLayerOptions);
-    /**
-     * @returns the name of the class to facilitate the identification
-     * of subclasses, even in Proxy objects.
-     */
-    get className(): string;
 }
 export default BaseLayer;

package/models/layers/baselayer.js

@@ -7,14 +7,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 // SPDX-License-Identifier: Apache-2.0
 import { BrainIgnoreClone } from '../../tools/state/brain/decorators.js';
 import { v4 as uuidv4 } from 'uuid';
+/*
+ * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
+ * This means that each modification made to its properties must come from outside,
+ * because they have to be made through the proxy, so that the modification can be listen.
+ * Therefore, this class must not contain any method which is updating a value directly
+ * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
+ */
 class BaseLayer {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     id;
     treeItemId;
     name;
@@ -46,13 +46,6 @@ class BaseLayer {
         this.disclaimer = options?.disclaimer;
         this.metadataUrl = options?.metadataUrl;
     }
-    /**
-     * @returns the name of the class to facilitate the identification
-     * of subclasses, even in Proxy objects.
-     */
-    get className() {
-        return this.constructor.name;
-    }
 }
 __decorate([
     BrainIgnoreClone

package/models/layers/grouplayer.d.ts

@@ -12,13 +12,6 @@ export type GroupLayerOptions = {
     timeAttribute?: string;
 };
 declare class GroupLayer extends BaseLayer implements ILayerWithTime {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     isExclusiveGroup: boolean;
     isExpanded: boolean;
     _isMixed?: boolean;

package/models/layers/grouplayer.js

@@ -2,14 +2,14 @@
 import BaseLayer from './baselayer.js';
 import LayerTimeFormatter from '../../tools/time/layertimeformatter.js';
 import LayerWms from './layerwms.js';
+/*
+ * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
+ * This means that each modification made to its properties must come from outside,
+ * because they have to be made through the proxy, so that the modification can be listen.
+ * Therefore, this class must not contain any method which is updating a value directly
+ * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
+ */
 class GroupLayer extends BaseLayer {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     isExclusiveGroup;
     isExpanded;
     _isMixed;

package/models/layers/layer.d.ts

@@ -9,13 +9,6 @@ type LayerOptions = {
     restricted?: boolean;
 };
 declare abstract class Layer extends BaseLayer {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     activeState: 'on' | 'off';
     opacity: number;
     restricted: boolean;

package/models/layers/layer.js

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: Apache-2.0
 import BaseLayer from './baselayer.js';
+/*
+ * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
+ * This means that each modification made to its properties must come from outside,
+ * because they have to be made through the proxy, so that the modification can be listen.
+ * Therefore, this class must not contain any method which is updating a value directly
+ * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
+ */
 class Layer extends BaseLayer {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     activeState = 'off';
     opacity;
     restricted;

package/models/layers/layercog.d.ts

@@ -8,13 +8,6 @@ type LayerCogTilesOptions = {
     restricted?: boolean;
 };
 declare class LayerCog extends Layer {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     source: string;
     constructor(id: number, name: string, order: number, source: string, options?: GMFTreeItem | LayerCogTilesOptions);
     clone(): LayerCog;

package/models/layers/layercog.js

@@ -1,12 +1,12 @@
 import Layer from './layer.js';
+/*
+ * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
+ * This means that each modification made to its properties must come from outside,
+ * because they have to be made through the proxy, so that the modification can be listen.
+ * Therefore, this class must not contain any method which is updating a value directly
+ * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
+ */
 class LayerCog extends Layer {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     source;
     constructor(id, name, order, source, options) {
         let opts = options ?? {};

package/models/layers/layerdrawing.d.ts

@@ -1,13 +1,6 @@
 import Layer from './layer.js';
 import VectorLayer from 'ol/layer/Vector.js';
 export default class LayerDrawing extends Layer {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     _oLayer: VectorLayer;
     constructor(name: string, oLayer: VectorLayer);
     clone(): LayerDrawing;

package/models/layers/layerdrawing.js

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: Apache-2.0
 import Layer from './layer.js';
+/*
+ * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
+ * This means that each modification made to its properties must come from outside,
+ * because they have to be made through the proxy, so that the modification can be listen.
+ * Therefore, this class must not contain any method which is updating a value directly
+ * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
+ */
 export default class LayerDrawing extends Layer {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     _oLayer;
     constructor(name, oLayer) {
         super(0, name, 0, { isDefaultChecked: true });

package/models/layers/layerlocalfile.d.ts

@@ -4,13 +4,6 @@ import Geometry from 'ol/geom/Geometry.js';
 import { Extent } from 'ol/extent.js';
 import ILayerWithLegend from './ilayerwithlegend.js';
 declare class LayerLocalFile extends Layer implements ILayerWithLegend {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     _features: Feature<Geometry>[];
     lastModifiedDate: string;
     legend: boolean;

package/models/layers/layerlocalfile.js

@@ -1,12 +1,12 @@
 import Layer from './layer.js';
+/*
+ * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
+ * This means that each modification made to its properties must come from outside,
+ * because they have to be made through the proxy, so that the modification can be listen.
+ * Therefore, this class must not contain any method which is updating a value directly
+ * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
+ */
 class LayerLocalFile extends Layer {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     _features;
     lastModifiedDate;
     legend = true;

package/models/layers/layerosm.d.ts

@@ -1,12 +1,5 @@
 import Layer from './layer.js';
 declare class LayerOsm extends Layer {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     constructor(order: number);
     clone(): LayerOsm;
 }

package/models/layers/layerosm.js

@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: Apache-2.0
 import Layer from './layer.js';
 import LayerConsts from './layerconsts.js';
+/*
+ * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
+ * This means that each modification made to its properties must come from outside,
+ * because they have to be made through the proxy, so that the modification can be listen.
+ * Therefore, this class must not contain any method which is updating a value directly
+ * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
+ */
 class LayerOsm extends Layer {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     constructor(order) {
         super(LayerConsts.LayerOsmId, 'OpenStreetMap', order);
     }

package/models/layers/layervectortiles.d.ts

@@ -9,13 +9,6 @@ type LayerVectorTilesOptions = {
     protected?: boolean;
 };
 declare class LayerVectorTiles extends Layer {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     style: string;
     layerName?: string;
     projection?: string;

package/models/layers/layervectortiles.js

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: Apache-2.0
 import Layer from './layer.js';
+/*
+ * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
+ * This means that each modification made to its properties must come from outside,
+ * because they have to be made through the proxy, so that the modification can be listen.
+ * Therefore, this class must not contain any method which is updating a value directly
+ * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
+ */
 class LayerVectorTiles extends Layer {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     style;
     layerName;
     projection;

package/models/layers/layerwms.d.ts

@@ -41,13 +41,6 @@ export type LayerWmsOptions = {
     enumeratedAttributes?: string[];
 };
 declare class LayerWms extends Layer implements ILayerWithLegend, ILayerWithFilter, ILayerWithTime {
-    /**
-     * This class is used in the state of the application, which will be accessed behind a JavaScript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listened to.
-     * Therefore, this class must not contain any method which is updating a value directly.
-     * For example, any method doing <this.xxx = value> is forbidden here because the modification must be known from the proxy
-     */
     ogcServer: ServerOgc;
     minResolution?: number;
     maxResolution?: number;

package/models/layers/layerwms.js

@@ -7,14 +7,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import LayerTimeFormatter from '../../tools/time/layertimeformatter.js';
 import Layer from './layer.js';
 import { BrainIgnore } from '../../tools/state/brain/decorators.js';
+/*
+ * This class is used in the state of the application, which will be accessed behind a JavaScript proxy.
+ * This means that each modification made to its properties must come from outside,
+ * because they have to be made through the proxy, so that the modification can be listened to.
+ * Therefore, this class must not contain any method which is updating a value directly.
+ * For example, any method doing <this.xxx = value> is forbidden here because the modification must be known from the proxy
+ */
 class LayerWms extends Layer {
-    /**
-     * This class is used in the state of the application, which will be accessed behind a JavaScript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listened to.
-     * Therefore, this class must not contain any method which is updating a value directly.
-     * For example, any method doing <this.xxx = value> is forbidden here because the modification must be known from the proxy
-     */
     // Base WMS attributes
     ogcServer;
     minResolution;

package/models/layers/layerwmsexternal.js

@@ -1,4 +1,11 @@
 import LayerWms from './layerwms.js';
+/*
+ * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
+ * This means that each modification made to its properties must come from outside,
+ * because they have to be made through the proxy, so that the modification can be listen.
+ * Therefore, this class must not contain any method which is updating a value directly
+ * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
+ */
 export default class LayerWmsExternal extends LayerWms {
     static nextAvailableLayerId = 10000000;
     selected = false;

package/models/layers/layerwmts.d.ts

@@ -28,13 +28,6 @@ export type LayerWmtsOptions = {
     hiDPILegendImages?: Record<string, string>;
 };
 declare class LayerWmts extends Layer implements ILayerWithLegend {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     url: string;
     layer: string;
     dimensions?: Record<string, object>;

package/models/layers/layerwmts.js

@@ -7,14 +7,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 // SPDX-License-Identifier: Apache-2.0
 import { BrainIgnore } from '../../tools/state/brain/decorators.js';
 import Layer from './layer.js';
+/*
+ * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
+ * This means that each modification made to its properties must come from outside,
+ * because they have to be made through the proxy, so that the modification can be listen.
+ * Therefore, this class must not contain any method which is updating a value directly
+ * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
+ */
 class LayerWmts extends Layer {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     url;
     layer;
     dimensions;

package/models/layers/layerwmtsexternal.js

@@ -1,5 +1,12 @@
 // SPDX-License-Identifier: Apache-2.0
 import LayerWmts from './layerwmts.js';
+/*
+ * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
+ * This means that each modification made to its properties must come from outside,
+ * because they have to be made through the proxy, so that the modification can be listen.
+ * Therefore, this class must not contain any method which is updating a value directly
+ * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
+ */
 export default class LayerWmtsExternal extends LayerWmts {
     static nextAvailableLayerId = 20000000;
     selected = false;

package/models/layers/layerxyz.d.ts

@@ -8,13 +8,6 @@ type LayerXYZTilesOptions = {
     restricted?: boolean;
 };
 declare class LayerXYZ extends Layer {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     source: string;
     constructor(id: number, name: string, order: number, source: string, options?: GMFTreeItem | LayerXYZTilesOptions);
     clone(): LayerXYZ;

package/models/layers/layerxyz.js

@@ -1,12 +1,12 @@
 import Layer from './layer.js';
+/*
+ * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
+ * This means that each modification made to its properties must come from outside,
+ * because they have to be made through the proxy, so that the modification can be listen.
+ * Therefore, this class must not contain any method which is updating a value directly
+ * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
+ */
 class LayerXYZ extends Layer {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     source;
     constructor(id, name, order, source, options) {
         let opts = options ?? {};

package/models/layers/themelayer.d.ts

@@ -8,13 +8,6 @@ export type ThemeLayerOptions = {
     isExclusiveTheme?: boolean;
 };
 declare class ThemeLayer extends BaseLayer {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     isExclusiveTheme: boolean;
     isExpanded: boolean;
     activeState: 'on' | 'off' | 'semi';

package/models/layers/themelayer.js

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: Apache-2.0
 import BaseLayer from './baselayer.js';
+/*
+ * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
+ * This means that each modification made to its properties must come from outside,
+ * because they have to be made through the proxy, so that the modification can be listen.
+ * Therefore, this class must not contain any method which is updating a value directly
+ * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
+ */
 class ThemeLayer extends BaseLayer {
-    /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
-     * This means that each modification made to its properties must come from outside,
-     * because they have to be made through the proxy, so that the modification can be listen.
-     * Therefore, this class must not contain any method which is updating a value directly
-     * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
-     */
     isExclusiveTheme;
     isExpanded;
     activeState = 'off';

package/models/layers/themelayerexternal.js

@@ -1,4 +1,11 @@
 import ThemeLayer from './themelayer.js';
+/*
+ * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
+ * This means that each modification made to its properties must come from outside,
+ * because they have to be made through the proxy, so that the modification can be listen.
+ * Therefore, this class must not contain any method which is updating a value directly
+ * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
+ */
 export default class ThemeLayerExternal extends ThemeLayer {
     static nextAvailableThemeId = 30000000;
     constructor(name) {

package/models/main.d.ts

@@ -5,7 +5,7 @@ export { default as BasemapSwisstopoVectorTiles } from './basemaps/basemapswisst
 export { default as CustomTheme } from './customtheme.js';
 export type { FilterOperator, AttributeTypeGroup, LogicalFilterOperator } from './filter.js';
 export { filterOperatorValues, filterOperators, isFilterOperator, isValuelessFilterOperator, isTwoSidedFilterOperator, isListFilterOperator, operatorsByAttributeTypeGroup, logicalFilterOperators, isLogicalFilterOperator } from './filter.js';
-export type { GMFMetadata, GMFChildLayer, GMFTreeItem, GMFThemeFunctionality, GMFThemeFunctionalities, GMFTheme, GMFGroup, GMFBackgroundLayer, GMFServerOgc, GMFServerOgcAttributes, GMFServerOgcObjectAttributes, GMFServerOgcColumnAttributes } from './gmf.js';
+export type { GMFMetadata, GMFChildLayer, GMFTreeItem, GMFThemeFunctionality, GMFThemeFunctionalities, GMFTheme, GMFGroup, GMFBackgroundLayer, GMFServerOgcType, GMFServerOgc, GMFServerOgcAttributes, GMFServerOgcObjectAttributes, GMFServerOgcColumnAttributes } from './gmf.js';
 export { default as BaseLayer } from './layers/baselayer.js';
 export type { GroupLayerOptions } from './layers/grouplayer.js';
 export { default as GroupLayer } from './layers/grouplayer.js';

package/models/serverogc.d.ts

@@ -1,4 +1,4 @@
-import { GMFServerOgc } from './gmf.js';
+import { GMFServerOgc, GMFServerOgcType } from './gmf.js';
 export default class ServerOgc {
     name: string;
     url: string;
@@ -6,7 +6,7 @@ export default class ServerOgc {
     urlWfs?: string;
     oapifSupport: boolean;
     urlOapif?: string;
-    type: 'mapserver' | 'qgisserver' | 'georama' | 'geoserver' | 'arcgis' | 'other';
+    type: GMFServerOgcType;
     imageType: string;
     aliases: Record<string, string>;
     constructor(name: string, elem: GMFServerOgc);

package/package.json

@@ -5,7 +5,7 @@
     "name": "GeoGirafe PSC",
     "url": "https://doc.geogirafe.org"
   },
-  "version": "1.1.0-dev.2643003589",
+  "version": "1.1.0-dev.2643917963",
   "type": "module",
   "engines": {
     "node": ">=20.19.0"

package/templates/public/about.json

@@ -1 +1 @@
-{"version":"1.1.0-dev.2643003589", "build":"2643003589", "date":"01/07/2026"}
+{"version":"1.1.0-dev.2643917963", "build":"2643917963", "date":"01/07/2026"}

package/tools/share/serializers/layerconfigserializer.js

@@ -103,7 +103,8 @@ export default class LayersConfigSerializer {
             sharedLayer.wms = {
                 name: layer.layers,
                 title: layer.name,
-                url: layer.ogcServer.url
+                url: layer.ogcServer.url,
+                serverType: layer.ogcServer?.type ?? 'other'
             };
         }
         return sharedLayer;
@@ -404,7 +405,7 @@ export default class LayersConfigSerializer {
         }
         const server = new ServerOgc('external', {
             url: sharedLayer.wms.url,
-            type: 'other',
+            type: sharedLayer.wms.serverType,
             wfsSupport: true,
             urlWfs: sharedLayer.wms.url,
             imageType: 'image/png'

package/tools/share/serializers/sharedtypes.d.ts

@@ -1,4 +1,5 @@
 import { FilterOperator, LogicalFilterOperator } from '../../../models/filter.js';
+import { GMFServerOgcType } from '../../../models/gmf.js';
 export type SharedFilterCondition = {
     property: string;
     propertyType?: string;
@@ -72,6 +73,7 @@ export type SharedExternalLayer = {
         title: string;
         name: string;
         url: string;
+        serverType: GMFServerOgcType;
     };
     wmts?: {
         name: string;

package/tools/wms/wmsclient.d.ts

@@ -55,7 +55,7 @@ export default abstract class WmsClient {
     private getFeatureInfoUrl;
     private handleGetFeatureInfoResponse;
     refreshZIndexes(): void;
-    getWmsCapabilities(): Promise<Record<string, unknown>>;
+    getWmsCapabilities(params?: URLSearchParams): Promise<Record<string, unknown>>;
 }
 export declare class WmsClientQgis extends WmsClient {
     /** QGIS-server does not filter on a WMS layer made from multiple underlying WFS queryLayers

package/tools/wms/wmsclient.js

@@ -368,7 +368,7 @@ export default class WmsClient {
             obj.olayer.setZIndex(zindex);
         }
     }
-    async getWmsCapabilities() {
+    async getWmsCapabilities(params) {
         if (this.capabilityPromise !== null) {
             return this.capabilityPromise;
         }
@@ -378,7 +378,14 @@ export default class WmsClient {
         }
         this.capabilityPromise = (async () => {
             // Capabilities were not loaded yet.
-            const params = new URLSearchParams();
+            if (params) {
+                params.delete('REQUEST');
+                params.delete('SERVICE');
+                params.delete('VERSION');
+            }
+            else {
+                params = new URLSearchParams();
+            }
             params.append('REQUEST', 'GetCapabilities');
             params.append('SERVICE', 'WMS');
             params.append('VERSION', '1.3.0');