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

package/assets/i18n/de.json

@@ -352,6 +352,7 @@
     "Search visible": "Suche sichtbar",
     "Search...": "Suchen...",
     "search_tip": "Ort, Objekt oder Karte suchen",
+    "search_tooltip": "Suchen Sie nach einem Ort, einer Adresse, einer Karte oder geografischen Daten",
     "searchFillColor": "Suchresultat Füllfarbe",
     "searchStrokeColor": "Suchresultat Strichfarbe",
     "Select all": "Alles auswählen",

package/assets/i18n/en.json

@@ -353,6 +353,7 @@
     "Search visible": "Search visible",
     "Search...": "Search...",
     "search_tip": "Search for a place, object or map",
+    "search_tooltip": "Search for a place, address, map, or geographic data",
     "searchFillColor": "Search result fill color",
     "searchStrokeColor": "Search result stroke color",
     "Select all": "Select all",

package/assets/i18n/fr.json

@@ -352,6 +352,7 @@
     "Search visible": "Recherche visible",
     "Search...": "Rechercher...",
     "search_tip": "Rechercher un lieu, un objet ou une carte",
+    "search_tooltip": "Rechercher un lieu, une adresse, une carte ou une donnée géographique",
     "searchFillColor": "Couleur de remplissage des résultats de recherche",
     "searchStrokeColor": "Couleur du trait des résultats de recherche",
     "Select all": "Tout sélectionner",

package/assets/i18n/it.json

@@ -352,6 +352,7 @@
     "Search visible": "Ricerca visibile",
     "Search...": "Cerca...",
     "search_tip": "Cerca un luogo, un oggetto o una mappa",
+    "search_tooltip": "Cerca un luogo, un indirizzo, una mappa o un dato geografico",
     "searchFillColor": "Colore di riempimento dei risultati della ricerca",
     "searchStrokeColor": "Colore del tratto dei risultati della ricerca",
     "Select all": "Seleziona tutto",

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/components/search/component.d.ts

@@ -68,6 +68,7 @@ declare class SearchComponent extends GirafeHTMLElement {
     onMouseMove(): void;
     onKeyDown(e: KeyboardEvent): void;
     private navigateToResult;
+    private createTooltip;
     private initColorPicker;
     private updatePreviewLayerStyle;
     private defaultColorHasChanged;

package/components/search/component.js

@@ -2,6 +2,7 @@ import { html as uHtml } from 'uhtml';
 import Collection from 'ol/Collection.js';
 import Feature from 'ol/Feature.js';
 import GeoJSON from 'ol/format/GeoJSON.js';
+import tippy from 'tippy.js';
 import VectorSource from 'ol/source/Vector.js';
 import VectorLayer from 'ol/layer/Vector.js';
 import { Point } from 'ol/geom.js';
@@ -20,9 +21,9 @@ class SearchComponent extends GirafeHTMLElement {
         return uHtml `<style>
 *{font-family:Arial,sans-serif}.hidden{display:none!important}.gg-rotate90{transform:rotate(90deg)}.gg-rotate180{transform:rotate(180deg)}.gg-rotate270{transform:rotate(270deg)}img{filter:var(--svg-filter)}img.legend-image{filter:var(--svg-map-filter);background:var(--svg-legend-bkg)}div{scrollbar-width:thin}a,a:visited{color:var(--link-color)}@keyframes spin{0%{transform:rotate(0)}to{transform:rotate(360deg)}}@keyframes spin-wait{0%{transform:rotate(0)}7%{transform:rotate(360deg)}to{transform:rotate(360deg)}}.gg-spin{animation-name:spin;animation-duration:2s;animation-timing-function:linear;animation-iteration-count:infinite}.gg-spin-wait{animation-name:spin-wait;animation-duration:10s;animation-timing-function:linear;animation-iteration-count:infinite}::-webkit-scrollbar{width:5px}::-webkit-scrollbar-thumb{background:#999}.gg-button,.gg-select,.gg-input,.gg-textarea{background-color:var(--bkg-color);color:var(--text-color);border:var(--app-standard-border);box-sizing:border-box;cursor:pointer;border-radius:3px;outline:0;margin:0;padding:0 0 0 .5rem;display:inline-block}.gg-label{background-color:var(--bkg-color);color:var(--text-color);border:none;align-items:center;margin:0;padding:0;display:flex}.gg-button,.gg-select,.gg-input,.gg-label{min-height:calc(var(--app-standard-height)/1.5)}.gg-textarea{max-height:initial;resize:vertical;height:6rem;padding:.5rem;line-height:1.3rem}.gg-input{cursor:text}.gg-checkbox{accent-color:var(--text-color);width:1.2rem}.gg-range{accent-color:var(--text-color)}.gg-button{padding:0 .5rem}.gg-button.active{border:solid 1px var(--text-color-grad2);background-color:var(--text-color-grad2);color:var(--bkg-color)}.gg-button:disabled{color:gray;cursor:not-allowed;background-color:#d3d3d3;border:none}.gg-input:disabled,.gg-select:disabled,.gg-textarea:disabled{color:gray;cursor:not-allowed;background-color:#d3d3d3}.gg-button>img{vertical-align:middle}.gg-icon-button{color:var(--text-color);cursor:pointer;background-color:#0000;border:none;flex-direction:column;justify-content:center;align-items:center;padding:0;display:flex}.gg-icon{justify-content:center;align-items:center;display:flex}.gg-big,.gg-big-withtext{min-width:var(--app-standard-height);min-height:var(--app-standard-height);max-height:var(--app-standard-height)}.gg-big img,.gg-big-withtext img{width:calc(var(--app-standard-height) - 1.5rem);margin:0}.gg-big-withtext span{font-variant:small-caps;padding:0 1rem;font-size:.9rem}.gg-medium,.gg-medium-withtext{min-width:calc(var(--app-standard-height)/1.2);min-height:calc(var(--app-standard-height)/1.2);max-height:calc(var(--app-standard-height)/1.2);flex-direction:row}.gg-medium img{width:calc(var(--app-standard-height)/2.4);margin:0}.gg-medium-withtext img{width:calc(var(--app-standard-height)/2.4);margin-left:.5rem}.gg-medium-withtext span{padding:0 1rem 0 .5rem;font-size:.9rem}.gg-small,.gg-small-withtext{min-width:calc(var(--app-standard-height)/2);min-height:calc(var(--app-standard-height)/2);max-height:calc(var(--app-standard-height)/2);flex-direction:row}.gg-small img{width:calc(var(--app-standard-height)/3);margin:0}.gg-small-withtext img{width:calc(var(--app-standard-height)/3);margin-left:.5rem}.gg-small-withtext span{padding:0 .5rem 0 .3rem;font-size:.9rem}.gg-button:hover,.gg-select:hover,.gg-input:hover,.gg-textarea:hover,.gg-icon-button:hover{background-color:var(--bkg-color-grad1)}.gg-opacity{opacity:.5}.gg-opacity:hover{opacity:1;background-color:#0000}.gg-tabs{cursor:pointer;grid-auto-flow:column;padding-bottom:1rem;font-size:1rem;display:grid}.gg-tab{border:none;border-bottom:var(--app-standard-border);cursor:pointer;color:var(--text-color);background:0 0;padding:.5rem}.gg-tab.active{border-bottom:solid 1px var(--text-color)}.girafe-button-big,.girafe-button-large,.girafe-button-small,.girafe-button-tiny{color:var(--text-color);background-color:#0000;border:none;flex-direction:column;display:flex}.girafe-button-big:hover,.girafe-button-large:hover,.girafe-button-small:hover,.girafe-button-tiny:hover{background-color:var(--bkg-color-grad1);cursor:pointer}.girafe-button-big.dark,.girafe-button-large.dark,.girafe-button-small.dark,.girafe-button-tiny.dark{background-color:var(--bkg-color);filter:invert()}.girafe-button-big{width:var(--app-standard-height);height:var(--app-standard-height);align-items:center;padding:1rem}.girafe-button-big img{overflow:hidden}.girafe-button-large{flex-direction:row}.girafe-button-large img{height:2rem;margin:.3rem}.girafe-button-large span{height:2rem;margin:.3rem;line-height:2rem}.girafe-button-small{min-width:calc(var(--app-standard-height)/2);height:calc(var(--app-standard-height)/2);align-items:center;padding:.5rem}.girafe-button-small img{overflow:hidden}.girafe-button-small span{text-align:left;text-overflow:ellipsis;width:100%;overflow:hidden}.girafe-button-tiny{align-items:center;width:1rem;height:1rem;padding:0}.girafe-button-tiny img{overflow:hidden}.girafe-onboarding-theme{background-color:var(--bkg-color)!important;color:var(--text-color)!important}.girafe-onboarding-theme button{background-color:var(--bkg-color)!important;color:var(--text-color)!important;text-shadow:none!important}.girafe-onboarding-theme button.driver-popover-close-btn{z-index:10000}
 </style><style>
-.hidden{display:none}#searchbox{background-color:var(--bkg-color);border:1px solid #cfd6dd;border-radius:4px;flex-direction:row;width:100%;height:2.25rem;display:flex}#search{-webkit-appearance:none;width:auto;height:2.25rem;color:var(--text-color);background:0 0;border:0;outline:none;-webkit-flex:auto;-ms-flex:auto;flex:auto;margin:0 0 0 .5rem;padding-left:.8rem;font-size:1rem}.search-icon,.close-icon,.select-color-icon{width:14px;color:var(--text-color);padding:0 1rem}.close-button,.select-color-button{cursor:pointer;background-color:#0000;border:none;padding:0}#results{z-index:1000;background-color:var(--bkg-color);scrollbar-width:thin;width:36rem;max-height:31rem;margin-top:.1rem;margin-bottom:.5rem;position:absolute;top:3.5rem;overflow-x:hidden}.result,.title{width:34rem;padding:.3rem 1rem;line-height:1.3rem;display:inline-block}.title{color:var(--text-color);padding-top:1.5rem;font-size:1.3rem;font-weight:600;line-height:2.5rem}.result{cursor:pointer;text-align:left;width:100%;color:var(--text-color);background:0 0;border:none;border-top:1px solid #ccc}.title img{width:14px;margin-right:1rem}.title span{text-transform:uppercase}.result.selected{color:var(--text-color);background-color:#aaa!important}#no-result{background:var(--warning-color);opacity:.75;visibility:hidden;pointer-events:none;border-radius:6px;width:fit-content;margin:auto;padding:.5rem 0;font-size:1rem;position:absolute;top:3.5rem;left:0;right:0}#no-result>span{padding:1.3rem}@keyframes fadeOut{0%{opacity:1}80%{opacity:1}to{opacity:0}}.shown-then-fadeout{animation:2s ease-in-out forwards fadeOut;visibility:visible!important}
+.hidden{display:none}#searchbox{background-color:var(--bkg-color);border:1px solid #cfd6dd;border-radius:4px;flex-direction:row;width:100%;height:2.25rem;display:flex;& slot[name=search-tooltip]{display:none}}#search{-webkit-appearance:none;width:auto;height:2.25rem;color:var(--text-color);background:0 0;border:0;outline:none;-webkit-flex:auto;-ms-flex:auto;flex:auto;margin:0 0 0 .5rem;padding-left:.8rem;font-size:1rem}.search-icon,.close-icon,.select-color-icon{width:14px;color:var(--text-color);padding:0 1rem}.close-button,.select-color-button{cursor:pointer;background-color:#0000;border:none;padding:0}#results{z-index:1000;background-color:var(--bkg-color);scrollbar-width:thin;width:36rem;max-height:31rem;margin-top:.1rem;margin-bottom:.5rem;position:absolute;top:3.5rem;overflow-x:hidden}.result,.title{width:34rem;padding:.3rem 1rem;line-height:1.3rem;display:inline-block}.title{color:var(--text-color);padding-top:1.5rem;font-size:1.3rem;font-weight:600;line-height:2.5rem}.result{cursor:pointer;text-align:left;width:100%;color:var(--text-color);background:0 0;border:none;border-top:1px solid #ccc}.title img{width:14px;margin-right:1rem}.title span{text-transform:uppercase}.result.selected{color:var(--text-color);background-color:#aaa!important}#no-result{background:var(--warning-color);opacity:.75;visibility:hidden;pointer-events:none;border-radius:6px;width:fit-content;margin:auto;padding:.5rem 0;font-size:1rem;position:absolute;top:3.5rem;left:0;right:0}#no-result>span{padding:1.3rem}@keyframes fadeOut{0%{opacity:1}80%{opacity:1}to{opacity:0}}.shown-then-fadeout{animation:2s ease-in-out forwards fadeOut;visibility:visible!important}
 </style>
-<link rel="stylesheet" href="lib/vanilla-picker/vanilla-picker.csp.css"><link rel="stylesheet" href="styles/girafecolorpicker.css"><div id="searchbox"><input tip="search_tip" id="search" class="gg-input" length="20" maxlength="1000" autocomplete="off" autocorrect="off" i18n="Search..." placeholder="Search..." oninput="${(e) => this.doSearchDebounced(e)}" onfocusin="${() => this.onFocusIn()}" onfocusout="${() => this.onFocusOut()}" onkeydown="${(e) => this.onKeyDown(e)}"> <img class="${this.allResults.length > 0 ? 'hidden' : 'search-icon'}" alt="search-icon" src="${this.searchIcon}"> <button class="${this.allResults.length > 0 ? 'close-button' : 'hidden'}" onclick="${() => this.clearSearch(true)}"><img class="close-icon" alt="close-icon" src="icons/close.svg"></button> <button tip="change_search_result_color" id="colorPickerBtn" class="${this.paintSearchResults ? 'select-color-button' : 'hidden'}"><img class="select-color-icon" alt="select-color-icon" src="${this.paintbrushIcon}"></button><div id="results" class="${Object.keys(this.groupedResults).length === 0 || this.forceHide ? 'hidden' : ''}" onmousemove="${() => this.onMouseMove()}">${Object.keys(this.groupedResults).map(group => uHtml `<div class="title"><img alt="result icon" src="${this.getIcon(group)}"> <span i18n="${group}"></span></div>${this.groupedResults[group].map(result => uHtml ` <button class="${result.get('selected') ? 'result selected' : 'result'}" onmousedown="${() => this.onMouseDown()}" onclick="${() => this.onSelect(result)}" onmouseover="${() => this.onMouseOver(result)}" onmouseleave="${() => this.onMouseLeave()}">${result.get('label')}</button> `)} `)}</div><div id="no-result" class="${this.showNoResultWarning ? 'shown-then-fadeout' : ''}"><span i18n="${'No match found'}"></span></div></div>`;
+<link rel="stylesheet" href="lib/vanilla-picker/vanilla-picker.csp.css"><link rel="stylesheet" href="styles/girafecolorpicker.css"><div id="searchbox"><slot name="search-tooltip"></slot><input id="search" class="gg-input" length="20" maxlength="1000" autocomplete="off" autocorrect="off" i18n="Search..." placeholder="Search..." oninput="${(e) => this.doSearchDebounced(e)}" onfocusin="${() => this.onFocusIn()}" onfocusout="${() => this.onFocusOut()}" onkeydown="${(e) => this.onKeyDown(e)}"> <img class="${this.allResults.length > 0 ? 'hidden' : 'search-icon'}" alt="search-icon" src="${this.searchIcon}"> <button class="${this.allResults.length > 0 ? 'close-button' : 'hidden'}" onclick="${() => this.clearSearch(true)}"><img class="close-icon" alt="close-icon" src="icons/close.svg"></button> <button tip="change_search_result_color" id="colorPickerBtn" class="${this.paintSearchResults ? 'select-color-button' : 'hidden'}"><img class="select-color-icon" alt="select-color-icon" src="${this.paintbrushIcon}"></button><div id="results" class="${Object.keys(this.groupedResults).length === 0 || this.forceHide ? 'hidden' : ''}" onmousemove="${() => this.onMouseMove()}">${Object.keys(this.groupedResults).map(group => uHtml `<div class="title"><img alt="result icon" src="${this.getIcon(group)}"> <span i18n="${group}"></span></div>${this.groupedResults[group].map(result => uHtml ` <button class="${result.get('selected') ? 'result selected' : 'result'}" onmousedown="${() => this.onMouseDown()}" onclick="${() => this.onSelect(result)}" onmouseover="${() => this.onMouseOver(result)}" onmouseleave="${() => this.onMouseLeave()}">${result.get('label')}</button> `)} `)}</div><div id="no-result" class="${this.showNoResultWarning ? 'shown-then-fadeout' : ''}"><span i18n="${'No match found'}"></span></div></div>`;
     };
     searchIcon = SearchIcon;
     paintbrushIcon = PaintbrushIcon;
@@ -116,6 +117,7 @@ class SearchComponent extends GirafeHTMLElement {
         this.render();
         super.girafeTranslate();
         this.registerEvents();
+        this.createTooltip();
         if (this.context.permalinkManager.hasSearch()) {
             this.subscribe('application.isReady', () => {
                 if (this.state.application.isReady) {
@@ -454,6 +456,39 @@ class SearchComponent extends GirafeHTMLElement {
                 break;
         }
     }
+    createTooltip() {
+        const searchInput = this.shadowRoot?.getElementById('search');
+        if (searchInput) {
+            // Create a tooltip using tippy.js
+            tippy(searchInput, {
+                content: () => {
+                    // Check if there's a slot named "search-tooltip"
+                    const slot = this.shadow.querySelector('slot[name="search-tooltip"]');
+                    if (slot) {
+                        const assignedNodes = slot.assignedNodes({ flatten: true });
+                        if (assignedNodes.length > 0) {
+                            // Create a temporary div to hold the content
+                            const tooltipContent = document.createElement('div');
+                            assignedNodes.forEach((node) => {
+                                tooltipContent.appendChild(node.cloneNode(true));
+                            });
+                            return tooltipContent;
+                        }
+                    }
+                    // Fallback to the default tooltip text if no slot content is found
+                    return this.context.i18nManager.getTranslation('search_tooltip') || 'Search...';
+                },
+                trigger: 'mouseenter',
+                hideOnClick: false,
+                interactive: true,
+                theme: 'light',
+                placement: 'bottom',
+                arrow: true,
+                appendTo: document.body,
+                maxWidth: '300px'
+            });
+        }
+    }
     initColorPicker() {
         super.render();
         const colorPicker = this.shadowRoot?.getElementById('colorPickerBtn');

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.2334445027",
   "type": "module",
   "engines": {
     "node": ">=20.19.0"

package/templates/index.html

@@ -86,7 +86,13 @@
       <header>
         <girafe-theme-select data-tour="theme-selection"></girafe-theme-select>
         <img class="logo" alt="geogirafe-logo" src="images/logo/horizontal_black.svg" />
-        <girafe-search id="search"></girafe-search>
+        <girafe-search id="search">
+          <!-- <div slot="search-tooltip">
+            <p>
+              Create a custom tooltip
+            </p>
+          </div> -->
+        </girafe-search>
         <girafe-oauth></girafe-oauth>
         <girafe-nav-history></girafe-nav-history>
         <girafe-video-record></girafe-video-record>

package/templates/public/about.json

@@ -1 +1 @@
-{"version":"1.1.0-dev.2321641404", "build":"2321641404", "date":"12/02/2026"}
+{"version":"1.1.0-dev.2334445027", "build":"2334445027", "date":"18/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;