@geogirafe/lib-geoportal 1.1.0-dev.2640868297 → 1.1.0-dev.2643015928

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.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.
  */
@@ -132,6 +138,10 @@ export default class MFPEncoder {
                 return this.encodeTileWmtsLayer(layer);
             case LayerLocalFile.name:
                 return this.encodeLocalFileLayer(layer);
+            case LayerWmsExternal.name:
+                return this.encodeWmsLayer(layer);
+            case LayerWmtsExternal.name:
+                return this.encodeTileWmtsLayer(layer);
             default:
                 console.warn('Unsupported layer type for encoding:', layer.className);
                 return null;
@@ -183,16 +193,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.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.
@@ -53,7 +54,7 @@ export class MFPLegendEncoder {
         if (layer.children) {
             return this.encodeLayerGroupLegendClasses(layer);
         }
-        if (layer.className === LayerWms.name) {
+        if ([LayerWms.name, LayerWmsExternal.name].includes(layer.className)) {
             return this.encodeLayerWmsLegendClasses(layer);
         }
         if (layer.className === LayerWmts.name) {
@@ -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/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.2640868297",
+  "version": "1.1.0-dev.2643015928",
   "type": "module",
   "engines": {
     "node": ">=20.19.0"

package/templates/api.html

@@ -78,7 +78,7 @@
         height: 100%;
       }
 
-      geogirafe-map {
+      :not(.left.default) > geogirafe-map {
         position: absolute;
         width: 100%;
         height: 100%;
@@ -185,16 +185,33 @@
       </section>
 
       <h2>Add a simple map view</h2>
-      <p class="descr">Add a simple map to the page, with its default configuration.</p>
+      <p class="descr">Add a simple map to the page, with its default configuration and size.</p>
       <section>
         <div class="row">
-          <div class="left">
+          <div class="left default">
             <geogirafe-map />
           </div>
           <div class="right"></div>
         </div>
       </section>
 
+      <h2>Add a simple map view with a custom size</h2>
+      <p class="descr">Add a simple map to the page, with a custom size.</p>
+      <section>
+        <div class="row">
+          <div class="left default">
+            <style>
+              .custom-size {
+                width: 100%;
+                height: 100%;
+              }
+            </style>
+            <geogirafe-map class="custom-size" />
+          </div>
+          <div class="right"></div>
+        </div>
+      </section>
+
       <!-- With center -->
       <h2>Add a map with center coordinates</h2>
       <p class="descr">Set the default center point.</p>

package/templates/public/about.json

@@ -1 +1 @@
-{"version":"1.1.0-dev.2640868297", "build":"2640868297", "date":"30/06/2026"}
+{"version":"1.1.0-dev.2643015928", "build":"2643015928", "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');