@geogirafe/lib-geoportal 1.1.0-dev.2299940648 → 1.1.0-dev.2316166507

package/components/map/tools/vectortilesmanager.d.ts

@@ -1,11 +1,17 @@
 import { Map } from 'ol';
 import olVectorTileLayer from 'ol/layer/VectorTile.js';
 import LayerVectorTiles from '../../../models/layers/layervectortiles.js';
+import LayerGroup from 'ol/layer/Group.js';
 declare class VectorTilesManager {
     map: Map;
-    basemapLayers: olVectorTileLayer[];
+    basemapLayers: (olVectorTileLayer | LayerGroup)[];
     constructor(map: Map);
     removeAllBasemapLayers(): void;
+    /**
+     * Adds a vectortiles basemap based on its layerName. If no layerName is provided,
+     * will use apply from ol-mapbox-style to create all layers.
+     * @param basemap
+     */
     addBasemapLayer(basemap: LayerVectorTiles): void;
 }
 export default VectorTilesManager;

package/components/map/tools/vectortilesmanager.js

@@ -1,5 +1,6 @@
 import olVectorTileLayer from 'ol/layer/VectorTile.js';
-import { applyStyle } from 'ol-mapbox-style';
+import apply, { applyStyle } from 'ol-mapbox-style';
+import LayerGroup from 'ol/layer/Group.js';
 class VectorTilesManager {
     map;
     basemapLayers = [];
@@ -12,9 +13,21 @@ class VectorTilesManager {
         });
         this.basemapLayers = [];
     }
+    /**
+     * Adds a vectortiles basemap based on its layerName. If no layerName is provided,
+     * will use apply from ol-mapbox-style to create all layers.
+     * @param basemap
+     */
     addBasemapLayer(basemap) {
-        const olayer = new olVectorTileLayer({ declutter: true });
-        applyStyle(olayer, basemap.style, basemap.source);
+        let olayer;
+        if (basemap.layerName) {
+            olayer = new olVectorTileLayer({ declutter: true });
+            applyStyle(olayer, basemap.style, basemap.layerName);
+        }
+        else {
+            olayer = new LayerGroup();
+            apply(olayer, basemap.style);
+        }
         this.basemapLayers.push(olayer);
         // For basemap, set a minimal number (arbitrary defined to less than -5000)
         olayer.setZIndex(-5000 - basemap.order);

package/models/basemaps/basemapswisstopovectortiles.js

@@ -16,7 +16,7 @@ export default class BasemapSwisstopoVectorTiles extends Basemap {
             name: 'Swisstopo Vector-Tiles',
             metadata: { ...basemapMetadata }
         });
-        const vectorTilesLayer = new LayerVectorTiles(LayerConsts.LayerSwisstopoVectorTilesId, 'Swisstopo Vector-Tiles', 0, 'https://vectortiles.geo.admin.ch/styles/ch.swisstopo.leichte-basiskarte.vt/style.json', 'leichtebasiskarte_v3.0.1', { projection: 'EPSG:3857' });
+        const vectorTilesLayer = new LayerVectorTiles(LayerConsts.LayerSwisstopoVectorTilesId, 'Swisstopo Vector-Tiles', 0, 'https://vectortiles.geo.admin.ch/styles/ch.swisstopo.lightbasemap.vt/style.json', { projection: 'EPSG:3857' });
         this.layersList.push(vectorTilesLayer);
     }
 }

package/models/layers/layervectortiles.d.ts

@@ -1,6 +1,7 @@
 import Layer from './layer.js';
 type LayerVectorTilesOptions = {
     projection?: string;
+    layerName?: string;
     isDefaultChecked?: boolean;
     disclaimer?: string;
     metadataUrl?: string;
@@ -16,9 +17,9 @@ declare class LayerVectorTiles extends Layer {
      * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
      */
     style: string;
-    source: string;
+    layerName?: string;
     projection?: string;
-    constructor(id: number, name: string, order: number, style: string, source: string, options?: LayerVectorTilesOptions);
+    constructor(id: number, name: string, order: number, style: string, options?: LayerVectorTilesOptions);
     clone(): LayerVectorTiles;
 }
 export default LayerVectorTiles;

package/models/layers/layervectortiles.js

@@ -8,24 +8,25 @@ class LayerVectorTiles extends Layer {
      * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
      */
     style;
-    source;
+    layerName;
     projection;
-    constructor(id, name, order, style, source, options) {
+    constructor(id, name, order, style, options) {
         super(id, name, order, options);
         this.style = style;
-        this.source = source;
+        this.layerName = options?.layerName;
         this.projection = options?.projection;
     }
     clone() {
         const options = {
             projection: this.projection,
+            layerName: this.layerName,
             isDefaultChecked: this.isDefaultChecked,
             metadataUrl: this.metadataUrl,
             disclaimer: this.disclaimer,
             opacity: this.opacity,
             restricted: this.restricted
         };
-        const clonedObject = new LayerVectorTiles(this.id, this.name, this.order, this.style, this.source, options);
+        const clonedObject = new LayerVectorTiles(this.id, this.name, this.order, this.style, options);
         clonedObject.activeState = this.activeState;
         return clonedObject;
     }

package/package.json

@@ -5,7 +5,7 @@
     "name": "GeoGirafe PSC",
     "url": "https://doc.geomapfish.dev"
   },
-  "version": "1.1.0-dev.2299940648",
+  "version": "1.1.0-dev.2316166507",
   "type": "module",
   "engines": {
     "node": ">=20.19.0"
@@ -52,7 +52,7 @@
     "vanilla-picker": "2.12.3"
   },
   "peerDependencies": {
-    "@geoblocks/mapfishprint": "0.2",
+    "@geoblocks/mapfishprint": "0.3",
     "@types/geojson": "7946",
     "cesium": ">1.113",
     "ol": "8 || 9 || 10",
@@ -62,7 +62,7 @@
     "proj4": "2"
   },
   "devDependencies": {
-    "@geoblocks/mapfishprint": "0.2.20",
+    "@geoblocks/mapfishprint": "0.3.0",
     "@geoblocks/print": "0.7.9",
     "@types/babel__generator": "7.27.0",
     "@types/d3": "7.4.3",

package/templates/public/about.json

@@ -1 +1 @@
-{"version":"1.1.0-dev.2299940648", "build":"2299940648", "date":"02/02/2026"}
+{"version":"1.1.0-dev.2316166507", "build":"2316166507", "date":"10/02/2026"}

package/tools/functionalities.js

@@ -8,6 +8,4 @@
  * });
  * </code>
  */
-export const KNOWN_FUNCTIONALITIES = [
-    "default_basemap"
-];
+export const KNOWN_FUNCTIONALITIES = ['default_basemap'];

package/tools/themes/themeshelper.spec.js

@@ -193,7 +193,7 @@ describe('ThemesHelper.onSelectedThemeChanged', () => {
     it('should NOT trigger change in functionalities if functionality is not known', () => {
         stateManager.state.themes._allFunctionalities = {
             42: {
-                unknown_functionality: "Lorem Ipsum Dolor Sit Amet"
+                unknown_functionality: 'Lorem Ipsum Dolor Sit Amet'
             }
         };
         let subscriptionCalled = false;

package/tools/themes/themesmanager.js

@@ -371,12 +371,13 @@ class ThemesManager extends GirafeSingleton {
                 projection: 'EPSG:3857',
                 isDefaultChecked: elem.metadata?.isChecked,
                 disclaimer: elem.metadata?.disclaimer,
-                metadata: elem.metadata
+                metadata: elem.metadata,
+                layerName: elem.metadata.layerName
             };
             if (options.metadata?.metadataUrl) {
                 options.metadata.metadataUrl = this.calculateMetadataUrl(options.metadata.metadataUrl);
             }
-            return new LayerVectorTiles(elem.id, elem.name, order.value, elem.style, elem.metadata.layerName, options);
+            return new LayerVectorTiles(elem.id, elem.name, order.value, elem.style, options);
         }
         return null;
     }