@geogirafe/lib-geoportal 1.1.0-dev.2640619249 → 1.1.0-dev.2640738406

package/models/layers/layerwms.d.ts

@@ -33,6 +33,7 @@ export type LayerWmsOptions = {
             maxResolution?: number;
         };
     };
+    wmsInfoFormat?: string;
     time?: ITimeOptions;
     snappingConfig?: ISnappingConfig;
     timeAttribute?: string;
@@ -41,11 +42,11 @@ export type LayerWmsOptions = {
 };
 declare class LayerWms extends Layer implements ILayerWithLegend, ILayerWithFilter, ILayerWithTime {
     /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
+     * 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 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
+     * 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;
@@ -67,6 +68,7 @@ declare class LayerWms extends Layer implements ILayerWithLegend, ILayerWithFilt
             maxResolution?: number;
         };
     };
+    wmsInfoFormat?: string;
     filter?: WfsFilter;
     timeOptions?: ITimeOptions;
     snapOptions?: ISnappingConfig;
@@ -89,5 +91,6 @@ declare class LayerWms extends Layer implements ILayerWithLegend, ILayerWithFilt
     get wmsQueryableOnly(): boolean;
     private static isGMFTreeItem;
     private static getOptionsFromGMFTreeItem;
+    private static getDefaultWmsInfoFormat;
 }
 export default LayerWms;

package/models/layers/layerwms.js

@@ -9,11 +9,11 @@ import Layer from './layer.js';
 import { BrainIgnore } from '../../tools/state/brain/decorators.js';
 class LayerWms extends Layer {
     /**
-     * This class is a used in the state of the application, which will be accessed behind a javascript proxy.
+     * 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 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
+     * 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;
@@ -33,6 +33,7 @@ class LayerWms extends Layer {
     queryable = false;
     queryLayers;
     queryLayersRanges;
+    wmsInfoFormat;
     filter;
     timeOptions;
     snapOptions;
@@ -59,6 +60,7 @@ class LayerWms extends Layer {
         this.hiDPILegendImages = opts?.hiDPILegendImages;
         this.printNativeAngle = opts?.printNativeAngle;
         this.queryable = opts?.queryable ?? false;
+        this.wmsInfoFormat = opts?.wmsInfoFormat ?? LayerWms.getDefaultWmsInfoFormat(this.ogcServer);
         this.queryLayers = opts?.queryLayers;
         this.queryLayersRanges = opts?.queryLayersRanges || {};
         this.timeOptions = opts?.time;
@@ -96,6 +98,7 @@ class LayerWms extends Layer {
             queryable: this.queryable,
             queryLayers: this.queryLayers,
             queryLayersRanges: this.queryLayersRanges,
+            wmsInfoFormat: this.wmsInfoFormat,
             time: this.timeOptions,
             snappingConfig: this.snapOptions,
             timeAttribute: this.timeAttribute,
@@ -198,6 +201,12 @@ class LayerWms extends Layer {
         }
         return opts;
     }
+    static getDefaultWmsInfoFormat(serverOgc) {
+        if (serverOgc.type === 'arcgis') {
+            return 'application/geo+json';
+        }
+        return 'application/vnd.ogc.gml';
+    }
 }
 __decorate([
     BrainIgnore

package/package.json

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

package/templates/public/about.json

@@ -1 +1 @@
-{"version":"1.1.0-dev.2640619249", "build":"2640619249", "date":"30/06/2026"}
+{"version":"1.1.0-dev.2640738406", "build":"2640738406", "date":"30/06/2026"}

package/tools/wms/wmsclient.d.ts

@@ -1,4 +1,5 @@
 import { Image as ImageLayer } from 'ol/layer.js';
+import Feature from 'ol/Feature.js';
 import ImageWMS from 'ol/source/ImageWMS.js';
 import { Map } from 'ol';
 import LayerWms from '../../models/layers/layerwms.js';
@@ -11,6 +12,8 @@ export default abstract class WmsClient {
     private readonly ogcServer;
     private readonly context;
     private readonly resolutionTolerance;
+    private readonly geoJson;
+    private readonly wmsGetFeatureInfo;
     private capabilityPromise;
     private capabilities;
     private get state();
@@ -46,7 +49,7 @@ export default abstract class WmsClient {
      * Selects features based on the specified query and prepares selection parameters.
      */
     selectFeaturesByQuery(query: WfsFilter): void;
-    getFeatureInfo(selectionParam: SelectionParam): Promise<import("ol").Feature<import("ol/geom.js").Geometry, {
+    getFeatureInfo(selectionParam: SelectionParam): Promise<Feature<import("ol/geom.js").Geometry, {
         [x: string]: any;
     }>[]>;
     private getFeatureInfoUrl;

package/tools/wms/wmsclient.js

@@ -3,6 +3,7 @@ import { Image as ImageLayer } from 'ol/layer.js';
 import ImageWMS from 'ol/source/ImageWMS.js';
 import WMSCapabilities from 'ol/format/WMSCapabilities.js';
 import WMSGetFeatureInfo from 'ol/format/WMSGetFeatureInfo.js';
+import GeoJSON from 'ol/format/GeoJSON.js';
 import SelectionParam from '../../models/selectionparam.js';
 import Exception from 'jsts/java/lang/Exception.js';
 export default class WmsClient {
@@ -10,6 +11,8 @@ export default class WmsClient {
     ogcServer;
     context;
     resolutionTolerance = 5;
+    geoJson = new GeoJSON();
+    wmsGetFeatureInfo = new WMSGetFeatureInfo();
     capabilityPromise = null;
     capabilities = null;
     get state() {
@@ -314,7 +317,7 @@ export default class WmsClient {
             const url = olLayer
                 .getSource()
                 ?.getFeatureInfoUrl(coordinate, (olLayer.getMapInternal()?.getView().getResolution() ?? currentResolution) + this.resolutionTolerance, this.state.projection, {
-                INFO_FORMAT: 'application/vnd.ogc.gml',
+                INFO_FORMAT: layer.wmsInfoFormat,
                 FEATURE_COUNT: 300
             });
             if (url !== undefined) {
@@ -326,17 +329,27 @@ export default class WmsClient {
         return urlsAndLayerNames;
     }
     handleGetFeatureInfoResponse(response, url, urlsAndLayerNames) {
-        const gmlFeatures = new WMSGetFeatureInfo().readFeatures(response, {
-            dataProjection: this.state.projection,
-            featureProjection: this.state.projection
-        });
+        const infoFormat = URL.parse(url)?.searchParams.get('INFO_FORMAT');
+        let features;
+        if (infoFormat && (infoFormat.includes('application/geo+json') || infoFormat.includes('application/geojson'))) {
+            features = this.geoJson.readFeatures(response, {
+                dataProjection: this.state.projection,
+                featureProjection: this.state.projection
+            });
+        }
+        else {
+            features = this.wmsGetFeatureInfo.readFeatures(response, {
+                dataProjection: this.state.projection,
+                featureProjection: this.state.projection
+            });
+        }
         // Set the feature id with the layer name.
-        gmlFeatures.forEach((feature) => {
+        features.forEach((feature) => {
             if (!feature.getId()) {
                 feature.setId(urlsAndLayerNames[url]);
             }
         });
-        return gmlFeatures;
+        return features;
     }
     refreshZIndexes() {
         // Recalculate source for Layers