@geogirafe/lib-geoportal 1.1.0-dev.2321641404 → 1.1.0-dev.2321895443

package/components/print/tools/MFPEncoder.js

@@ -66,7 +66,7 @@ export default class MFPEncoder {
                 // If all the children have the same ogcServer and the group
                 // has no grandchildren, we keep the layers together
                 if (group.isMixed === false && group.hasGrandChildren === false) {
-                    layers.push(group);
+                    layers.push(...group.children);
                 }
                 else {
                     const resultLayers = this.getFlatLayers(group.children);

package/components/print/tools/MFPEncoder.spec.js

@@ -87,10 +87,14 @@ describe('MFPEncoder', () => {
             expect(result.dpi).toBe(defaultOptions.dpi);
             expect(result.scale).toBe(defaultOptions.scale);
             expect(result.rotation).toBe(180);
-            expect(result.layers.length).toBe(5);
+            expect(result.layers.length).toBe(6);
             // Test order
             expect(result.layers[0].name).toBe('Test Vector layer');
-            expect(result.layers[4].name).toBe('basemap-below');
+            expect(result.layers[1].layers[0]).toBe('wms-2');
+            expect(result.layers[2].name).toBe('testWmts');
+            expect(result.layers[3].layers[0]).toBe('wms-0');
+            expect(result.layers[4].layers[0]).toBe('wms-1');
+            expect(result.layers[5].name).toBe('basemap-below');
         });
     });
     describe('encodeWmsLayer method', () => {

package/components/print/tools/MFPLegendEncoder.js

@@ -132,7 +132,7 @@ export class MFPLegendEncoder {
         }
         const layerNames = layerWms.layers?.split(',') ?? [];
         layerNames.forEach((name) => {
-            const url = LegendHelper.getWMSLegendURL(layerWms.ogcServer.url, name, {
+            const url = LegendHelper.getWMSLegendURL(layerWms.ogcServer, name, {
                 dpi,
                 serverType,
                 scale: this.options?.scale,

package/components/print/tools/MFPLegendEncoder.spec.js

@@ -1,6 +1,6 @@
 import { it, describe, expect, beforeEach, afterAll } from 'vitest';
 import { MFPLegendEncoder } from './MFPLegendEncoder';
-import { createTestGroupLayer, createTestLayerWms, createTestLayerWmts, createTestOgcServer } from '../../../tools/tests/layerhelpers';
+import { createTestGroupLayer, createTestLayerWms, createTestLayerWmsQGis, createTestLayerWmts, createTestOgcServer } from '../../../tools/tests/layerhelpers';
 import MockHelper from '../../../tools/tests/mockhelper';
 import { createOlWmtsLayer } from '../../../tools/tests/olhelpers';
 describe('MFPLegendEncoder', () => {
@@ -199,6 +199,21 @@ describe('MFPLegendEncoder', () => {
             });
         });
     });
+    describe('encodeLayerWmsLegendClasses QGis', () => {
+        let layer;
+        beforeEach(() => {
+            layer = createTestLayerWmsQGis();
+        });
+        it('should return MFPLegendClass for QGisServer (including LAYERTITLE)', () => {
+            layer.layers = 'foo';
+            const result = encoder.encodeLayerWmsLegendClasses(layer);
+            expect(result?.name).toEqual('testWmsQGis');
+            // One layer = no subclass, complete directly the current class.
+            expect(result?.icons).toEqual([
+                'https://ogc.test.url?FORMAT=image%2Fpng&TRANSPARENT=TRUE&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=foo&LAYERTITLE=False&SCALE=10000'
+            ]);
+        });
+    });
     it('getLegendClassForWMS', () => {
         const layerName = 'LayerName';
         const icon_dpi = {

package/models/gmf.d.ts

@@ -79,7 +79,7 @@ export interface GMFServerOgc {
     urlWfs?: string;
     oapifSupport?: boolean;
     urlOapif?: string;
-    type: string;
+    type: 'mapserver' | 'qgisserver' | 'georama' | 'geoserver' | 'arcgis' | 'other';
     imageType: string;
     attributes?: GMFServerOgcAttributes;
 }

package/models/serverogc.d.ts

@@ -6,7 +6,7 @@ export default class ServerOgc {
     urlWfs?: string;
     oapifSupport: boolean;
     urlOapif?: string;
-    type: string;
+    type: 'mapserver' | 'qgisserver' | 'georama' | 'geoserver' | 'arcgis' | 'other';
     imageType: string;
     aliases: Record<string, string>;
     constructor(name: string, elem: GMFServerOgc);

package/package.json

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

package/templates/public/about.json

@@ -1 +1 @@
-{"version":"1.1.0-dev.2321641404", "build":"2321641404", "date":"12/02/2026"}
+{"version":"1.1.0-dev.2321895443", "build":"2321895443", "date":"12/02/2026"}

package/tools/legendhelper.d.ts

@@ -1,14 +1,15 @@
 import TileLayer from 'ol/layer/Tile.js';
 import WMTS from 'ol/source/WMTS.js';
+import ServerOgc from '../models/serverogc.js';
 declare class LegendHelper {
     /**
      * Get the WMS legend URL.
-     * @param url The base url of the wms service.
+     * @param serverOgc The base url of the wms service.
      * @param layerName The name of a wms layer.
      * @param options to create the legend url.
      * @returns The legend URL or undefined.
      */
-    static readonly getWMSLegendURL: (url: string | undefined, layerName: string, options?: WMSLegendURLOptions) => string | undefined;
+    static readonly getWMSLegendURL: (serverOgc: ServerOgc, layerName: string, options?: WMSLegendURLOptions) => string | undefined;
     /**
      * Retrieves the legend URL for a given WMTS tile layer.
      * @param {TileLayer<WMTS>} olayer - The OpenLayers tile layer object.

package/tools/legendhelper.js

@@ -2,13 +2,13 @@ import { appendParams } from 'ol/uri.js';
 class LegendHelper {
     /**
      * Get the WMS legend URL.
-     * @param url The base url of the wms service.
+     * @param serverOgc The base url of the wms service.
      * @param layerName The name of a wms layer.
      * @param options to create the legend url.
      * @returns The legend URL or undefined.
      */
-    static getWMSLegendURL = (url, layerName, options) => {
-        if (!url) {
+    static getWMSLegendURL = (serverOgc, layerName, options) => {
+        if (!serverOgc.url) {
             return undefined;
         }
         const queryString = {
@@ -19,6 +19,9 @@ class LegendHelper {
             REQUEST: 'GetLegendGraphic',
             LAYER: layerName
         };
+        if (serverOgc.type === 'qgisserver') {
+            queryString.LAYERTITLE = 'False';
+        }
         const scale = options?.scale;
         const legendRule = options?.legendRule;
         const legendWidth = options?.legendWidth;
@@ -55,7 +58,7 @@ class LegendHelper {
         if (additionalQueryString) {
             Object.assign(queryString, additionalQueryString);
         }
-        return appendParams(url, queryString);
+        return appendParams(serverOgc.url, queryString);
     };
     /**
      * Retrieves the legend URL for a given WMTS tile layer.

package/tools/ogcapi/demolayers.js

@@ -33,7 +33,7 @@ export const DEMO_LAYERS = {
             urlWfs: '',
             oapifSupport: true,
             urlOapif: 'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy/QGIS_Server/wfs3',
-            type: 'gmf',
+            type: 'qgisserver',
             imageType: ''
         })
     }

package/tools/ogcapi/ogcapiclient.spec.js

@@ -11,7 +11,7 @@ const server = new ServerOgc('test', {
     urlWfs: '',
     oapifSupport: true,
     urlOapif: mockUrl,
-    type: 'default',
+    type: 'qgisserver',
     imageType: ''
 });
 let context;

package/tools/ogcapi/ogcapifeaturesclient.spec.js

@@ -12,7 +12,7 @@ const server = new ServerOgc('test', {
     urlWfs: '',
     oapifSupport: true,
     urlOapif: mockUrl,
-    type: 'default',
+    type: 'qgisserver',
     imageType: ''
 });
 const collectionId = 'test-collection';

package/tools/ogcapi/ogcapifeaturesmanager.spec.js

@@ -29,7 +29,7 @@ describe('OgcApiFeaturesManager', () => {
             urlWfs: '',
             oapifSupport: true,
             urlOapif: "'https://testUrl.com",
-            type: 'default',
+            type: 'qgisserver',
             imageType: ''
         })
     };

package/tools/tests/layerhelpers.d.ts

@@ -4,7 +4,9 @@ import GroupLayer, { GroupLayerOptions } from '../../models/layers/grouplayer';
 import ServerOgc from '../../models/serverogc';
 import Basemap from '../../models/basemaps/basemap';
 export declare function createTestOgcServer(): ServerOgc;
+export declare function createTestOgcServerQGis(): ServerOgc;
 export declare function createTestLayerWms(options?: LayerWmsOptions): LayerWms;
+export declare function createTestLayerWmsQGis(options?: LayerWmsOptions): LayerWms;
 export declare function createTestLayerWmts(options?: LayerWmtsOptions, ogcServer?: ServerOgc): LayerWmts;
 export declare function createTestGroupLayer(options?: GroupLayerOptions): GroupLayer;
 export declare function createTestBasemap(): Basemap;

package/tools/tests/layerhelpers.js

@@ -11,12 +11,26 @@ export function createTestOgcServer() {
         imageType: 'image/png'
     });
 }
+export function createTestOgcServerQGis() {
+    return new ServerOgc('testOgcServer', {
+        url: 'https://ogc.test.url',
+        wfsSupport: false,
+        type: 'qgisserver',
+        imageType: 'image/png'
+    });
+}
 export function createTestLayerWms(options) {
     const ogcServer = createTestOgcServer();
     const layerWms = new LayerWms(1, 'testWms', 1, ogcServer, options);
     layerWms.activeState = 'on';
     return layerWms;
 }
+export function createTestLayerWmsQGis(options) {
+    const ogcServer = createTestOgcServerQGis();
+    const layerWms = new LayerWms(1, 'testWmsQGis', 1, ogcServer, options);
+    layerWms.activeState = 'on';
+    return layerWms;
+}
 export function createTestLayerWmts(options, ogcServer) {
     const layerWmts = new LayerWmts(1, 'testWmts', 1, 'https://test.ch', 'testWmts', options, ogcServer);
     layerWmts.activeState = 'on';

package/tools/wms/wmslegendhelper.js

@@ -58,6 +58,9 @@ export default class WmsLegendHelper {
                 graphicUrl += '&HEIGHT=' + this.context.configManager.Config.treeview.defaultIconSize.height;
                 graphicUrl += '&WIDTH=' + this.context.configManager.Config.treeview.defaultIconSize.width;
             }
+            if (layer.ogcServer.type === 'qgisserver') {
+                graphicUrl += '&LAYERTITLE=False';
+            }
             legends[l] = graphicUrl;
         }
         return legends;