@geogirafe/lib-geoportal 1.2.0-dev.2714239322 → 1.2.0-dev.2729313771

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

@@ -1,6 +1,6 @@
 import type { BaseCustomizer, MFPLayer, MFPMap, MFPWmtsLayer, MFPWmsLayer } from '@geoblocks/mapfishprint';
-import GroupLayer from '../../../models/layers/grouplayer.js';
 import type BaseLayer from '../../../models/layers/baselayer.js';
+import GroupLayer from '../../../models/layers/grouplayer.js';
 import MapManager from '../../../tools/state/mapManager.js';
 import State from '../../../tools/state/state.js';
 import LayerLocalFile from '../../../models/layers/layerlocalfile.js';

package/components/print/tools/MFPEncoder.js

@@ -1,5 +1,5 @@
-import GroupLayer from '../../../models/layers/grouplayer.js';
 import { getAbsoluteUrl, getWmtsMatrices, getWmtsUrl, MFPVectorEncoder } from '@geoblocks/mapfishprint';
+import GroupLayer from '../../../models/layers/grouplayer.js';
 import { toDegrees } from 'ol/math.js';
 import LayerLocalFile from '../../../models/layers/layerlocalfile.js';
 import LayerWms from '../../../models/layers/layerwms.js';
@@ -9,6 +9,7 @@ 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';
+import WmsClient from '../../../tools/wms/wmsclient.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
  */
@@ -190,6 +191,9 @@ export default class MFPEncoder {
                 customParams[key] = value;
             });
         }
+        if (layerWms.filter) {
+            customParams.FILTER = WmsClient.buildFilterQuery(layerWms);
+        }
         let serverType = layerWms.ogcServer.type;
         // Remove unsupported serverType (otherwise, you'll get an error from the print server).
         if (!MFPSupportedServerType.has(serverType)) {

package/package.json

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

package/templates/public/about.json

@@ -1 +1 @@
-{"version":"1.2.0-dev.2714239322", "build":"2714239322", "date":"29/07/2026"}
+{"version":"1.2.0-dev.2729313771", "build":"2729313771", "date":"04/08/2026"}

package/tools/wms/wmsclient.d.ts

@@ -42,7 +42,14 @@ export default abstract class WmsClient {
     private manageLayerOptions;
     private makeLayerIndependent;
     private updateLayerFilter;
-    abstract buildFilterQuery(layerWms: LayerWms): string;
+    /**
+     * MapServer wants 1 filter per underlying WFS queryLayer, all included in parentheses
+     * QGIS-server wants 1 filter per underlying WFS queryLayer, each in its own in parentheses
+     *
+     * MapServer: (<filter>...</filter><filter>...</filter>)
+     * QGIS-server: (<filter>...</filter>)(<filter>...</filter>)
+     */
+    static buildFilterQuery(layerWms: LayerWms): string;
     private updateTimeRestriction;
     selectFeatures(extent: number[]): void;
     /**
@@ -62,17 +69,11 @@ export declare class WmsClientQgis extends WmsClient {
      * Solution: directly query the queryLayers
      */
     getOpenLayerLayerNames(layerList: LayerWms[]): string[];
-    /** MapServer wants 1 filter per underlying WFS queryLayer, all included in parentheses
-     * QGIS-server wants 1 filter per underlying WFS queryLayer, each in its own in parentheses
-     *
-     * MapServer: (<filter>...</filter><filter>...</filter>)
-     * QGIS-server: (<filter>...</filter>)(<filter>...</filter>)
-     */
-    buildFilterQuery(layerWms: LayerWms): string;
+    static buildFilterQuery(layerWms: LayerWms): string;
 }
 export declare class WmsClientMapServer extends WmsClient {
     getOpenLayerLayerNames(layerList: LayerWms[]): string[];
-    buildFilterQuery(layerWms: LayerWms): string;
+    static buildFilterQuery(layerWms: LayerWms): string;
 }
 export declare const WmsClientDefault: typeof WmsClientQgis;
 export declare const WmsClientGeoServer: typeof WmsClientMapServer;

package/tools/wms/wmsclient.js

@@ -231,7 +231,7 @@ export default class WmsClient {
     updateLayerFilter(layerWms, olayer) {
         const source = olayer.getSource();
         if (layerWms.hasFilter) {
-            const filterStr = this.buildFilterQuery(layerWms);
+            const filterStr = WmsClient.buildFilterQuery(layerWms);
             source.updateParams({ FILTER: filterStr });
         }
         else {
@@ -243,6 +243,19 @@ export default class WmsClient {
             }
         }
     }
+    /**
+     * MapServer wants 1 filter per underlying WFS queryLayer, all included in parentheses
+     * QGIS-server wants 1 filter per underlying WFS queryLayer, each in its own in parentheses
+     *
+     * MapServer: (<filter>...</filter><filter>...</filter>)
+     * QGIS-server: (<filter>...</filter>)(<filter>...</filter>)
+     */
+    static buildFilterQuery(layerWms) {
+        if (layerWms.ogcServer.type === 'qgisserver') {
+            return WmsClientQgis.buildFilterQuery(layerWms);
+        }
+        return WmsClientMapServer.buildFilterQuery(layerWms);
+    }
     updateTimeRestriction(layerWms, olayer) {
         const source = olayer.getSource();
         if (layerWms.hasTimeRestriction) {
@@ -414,34 +427,26 @@ export class WmsClientQgis extends WmsClient {
             return layerNames;
         }
     }
-    /** MapServer wants 1 filter per underlying WFS queryLayer, all included in parentheses
-     * QGIS-server wants 1 filter per underlying WFS queryLayer, each in its own in parentheses
-     *
-     * MapServer: (<filter>...</filter><filter>...</filter>)
-     * QGIS-server: (<filter>...</filter>)(<filter>...</filter>)
-     */
-    buildFilterQuery(layerWms) {
-        let filterStr = '';
-        if (layerWms.hasFilter) {
-            const filter = layerWms.filter;
-            const nbQuerylayers = layerWms.queryLayers.split(',').length;
-            filterStr = ('(' + filter.toWmsGetMapFilter() + ')').repeat(nbQuerylayers);
+    static buildFilterQuery(layerWms) {
+        if (!layerWms.hasFilter) {
+            return '';
         }
-        return filterStr;
+        const filter = layerWms.filter;
+        const nbQuerylayers = layerWms.queryLayers.split(',').length;
+        return ('(' + filter.toWmsGetMapFilter() + ')').repeat(nbQuerylayers);
     }
 }
 export class WmsClientMapServer extends WmsClient {
     getOpenLayerLayerNames(layerList) {
         return layerList.map((l) => l.layers);
     }
-    buildFilterQuery(layerWms) {
-        let filterStr = '';
-        if (layerWms.hasFilter) {
-            const filter = layerWms.filter;
-            const nbQuerylayers = layerWms.queryLayers.split(',').length;
-            filterStr = '(' + filter.toWmsGetMapFilter().repeat(nbQuerylayers) + ')';
+    static buildFilterQuery(layerWms) {
+        if (!layerWms.hasFilter) {
+            return '';
         }
-        return filterStr;
+        const filter = layerWms.filter;
+        const nbQuerylayers = layerWms.queryLayers.split(',').length;
+        return '(' + filter.toWmsGetMapFilter().repeat(nbQuerylayers) + ')';
     }
 }
 export const WmsClientDefault = WmsClientQgis;