@geogirafe/lib-geoportal 1.1.0-dev.2273215791 → 1.1.0-dev.2312792329

package/components/basemap/component.d.ts

@@ -6,6 +6,7 @@ declare class BasemapComponent extends GirafeHTMLElement {
     changeBasemap(basemap: Basemap): void;
     isBasemapActive(basemap: Basemap): boolean;
     determineClassnames(basemap: Basemap): "basemap-container active-basemap" | "basemap-container";
+    findBasemapByName(name: string): Basemap | undefined;
     changeBasemapOpacity(basemap: Basemap, e: PointerEvent): void;
     toggleVisibility(visible: boolean): void;
     registerEvents(): void;

package/components/basemap/component.js

@@ -48,6 +48,9 @@ class BasemapComponent extends GirafeHTMLElement {
     determineClassnames(basemap) {
         return this.isBasemapActive(basemap) ? 'basemap-container active-basemap' : 'basemap-container';
     }
+    findBasemapByName(name) {
+        return Object.values(this.state.basemaps).find((basemap) => basemap.name == name);
+    }
     changeBasemapOpacity(basemap, e) {
         e.stopPropagation();
         if (basemap.opacityDisabled) {
@@ -77,6 +80,17 @@ class BasemapComponent extends GirafeHTMLElement {
             }
         });
         this.subscribe('interface.basemapComponentVisible', (_oldValue, newValue) => this.toggleVisibility(newValue));
+        this.subscribe('functionalities.default_basemap', (_oldValue, newValue) => {
+            for (const defaultBasemapName of newValue) {
+                const defaultBasemap = this.findBasemapByName(defaultBasemapName == 'blank' ? 'Empty' : defaultBasemapName);
+                if (defaultBasemap) {
+                    this.changeBasemap(defaultBasemap);
+                }
+                else {
+                    console.warn(`BasemapComponent: Could not find Basemap '${defaultBasemapName}' to set by Functionality 'functionalities.default_basemap'`);
+                }
+            }
+        });
     }
     connectedCallback() {
         super.connectedCallback();

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/gmf.d.ts

@@ -57,13 +57,15 @@ export interface GMFTreeItem {
     time?: ITimeOptions;
     public?: boolean;
 }
+export type GMFThemeFunctionality = string | string[] | number | number[] | boolean | boolean[];
+export interface GMFThemeFunctionalities {
+    [key: string]: GMFThemeFunctionality;
+}
 export interface GMFTheme {
     id: number;
     name: string;
     icon: string;
-    functionalities: {
-        [key: string]: string;
-    };
+    functionalities: GMFThemeFunctionalities;
     metadata: GMFMetadata;
     children: GMFTreeItem[];
 }

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/models/main.d.ts

@@ -3,7 +3,7 @@ export { default as BasemapEmpty } from './basemaps/basemapempty.js';
 export { default as BasemapOsm } from './basemaps/basemaposm.js';
 export { default as BasemapSwisstopoVectorTiles } from './basemaps/basemapswisstopovectortiles.js';
 export { default as CustomTheme } from './customtheme.js';
-export type { GMFMetadata, GMFChildLayer, GMFTreeItem, GMFTheme, GMFGroup, GMFBackgroundLayer, GMFServerOgc, GMFServerOgcAttributes, GMFServerOgcObjectAttributes, GMFServerOgcColumnAttributes } from './gmf.js';
+export type { GMFMetadata, GMFChildLayer, GMFTreeItem, GMFThemeFunctionality, GMFThemeFunctionalities, GMFTheme, GMFGroup, GMFBackgroundLayer, 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/package.json

@@ -5,7 +5,7 @@
     "name": "GeoGirafe PSC",
     "url": "https://doc.geomapfish.dev"
   },
-  "version": "1.1.0-dev.2273215791",
+  "version": "1.1.0-dev.2312792329",
   "type": "module",
   "engines": {
     "node": ">=20.19.0"
@@ -150,6 +150,7 @@
     "build-apk": "docker run -v ./dist:/geogirafe/dist -v ./buildtools:/geogirafe/buildtools geogirafe/cordova-builder bash -c \"cp /geogirafe/buildtools/cordova/apk-build.sh . && chmod u+x apk-build.sh && ./apk-build.sh\"",
     "build-apk-win": "docker run -v %cd%/dist:/geogirafe/dist -v %cd%/buildtools:/geogirafe/buildtools geogirafe/cordova-builder bash -c \"cp /geogirafe/buildtools/cordova/apk-build.sh . && chmod u+x apk-build.sh && ./apk-build.sh\"",
     "test": "vitest --run --coverage",
+    "test-without-coverage": "vitest --run",
     "test-watch": "vitest",
     "configure-demo": "bash -C './buildtools/configure-demo.sh'",
     "configure-demo-win": "buildtools\\configure-demo.cmd",

package/templates/public/about.json

@@ -1 +1 @@
-{"version":"1.1.0-dev.2273215791", "build":"2273215791", "date":"20/01/2026"}
+{"version":"1.1.0-dev.2312792329", "build":"2312792329", "date":"08/02/2026"}

package/templates/vite.config.js

@@ -22,7 +22,7 @@ function customDnsLookup(hostname, arg1, arg2) {
   const callback = typeof arg1 === 'function' ? arg1 : arg2;
   const options = typeof arg1 === 'function' ? undefined : arg1;
   if (hostname === 'app.localhost') {
-    callback(null, '127.0.0.1', 4); // use '0.0.0.0' for being accessible from other devices on the network
+    callback(null, '0.0.0.0', 4); // use '0.0.0.0' for being accessible from other devices on the network
   } else {
     originalDnsLookup(hostname, options, callback);
   }

package/tools/functionalities.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Known Functionalities which are allowed in <code>GMFTheme.functionalities</code> and are published to
+ * <code>State.functionalities</code>. Subscribe a Handler to get notified when a Theme which such a Functionality is
+ * selected by the User (e.g., Change the Basemap):
+ * <code>
+ * GirafeHTMLElement.subscribe('functionalities.default_basemap', (oldValue: string[], newValue: string[]) => {
+ *   ...
+ * });
+ * </code>
+ */
+export declare const KNOWN_FUNCTIONALITIES: string[];

package/tools/functionalities.js

@@ -0,0 +1,11 @@
+/**
+ * Known Functionalities which are allowed in <code>GMFTheme.functionalities</code> and are published to
+ * <code>State.functionalities</code>. Subscribe a Handler to get notified when a Theme which such a Functionality is
+ * selected by the User (e.g., Change the Basemap):
+ * <code>
+ * GirafeHTMLElement.subscribe('functionalities.default_basemap', (oldValue: string[], newValue: string[]) => {
+ *   ...
+ * });
+ * </code>
+ */
+export const KNOWN_FUNCTIONALITIES = ['default_basemap'];

package/tools/main.d.ts

@@ -17,6 +17,7 @@ export { default as CsvManager } from './export/csvmanager.js';
 export { download } from './export/download.js';
 export type { GridDataById, GridData, FeatureToGridDataOptions } from './featuretogriddatabyid.js';
 export { default as FeatureToGridDataById } from './featuretogriddatabyid.js';
+export { KNOWN_FUNCTIONALITIES } from './functionalities.js';
 export { default as GeoConsts } from './geoconsts.js';
 export { formatCoordinates, parseCoordinates, decimalToDMS, printCoordinate } from './geometrytools.js';
 export type { TranslationsDict } from './i18n/i18nmanager.js';

package/tools/main.js

@@ -15,6 +15,7 @@ export { default as ErrorManager } from './error/errormanager.js';
 export { default as CsvManager } from './export/csvmanager.js';
 export { download } from './export/download.js';
 export { default as FeatureToGridDataById } from './featuretogriddatabyid.js';
+export { KNOWN_FUNCTIONALITIES } from './functionalities.js';
 export { default as GeoConsts } from './geoconsts.js';
 export { formatCoordinates, parseCoordinates, decimalToDMS, printCoordinate } from './geometrytools.js';
 export { default as I18nManager } from './i18n/i18nmanager.js';

package/tools/state/state.d.ts

@@ -11,8 +11,10 @@ import type CustomTheme from '../../models/customtheme.js';
 import ObjectSelection from './objectselection.js';
 import type Theme from '../../models/theme.js';
 import GraphicalInterface from './graphicalInterface.js';
+import { GMFThemeFunctionalities, GMFThemeFunctionality } from '../../models/gmf.js';
 export type ThemesConfig = {
     _allThemes: Record<number, ThemeLayer>;
+    _allFunctionalities: Record<number, GMFThemeFunctionalities>;
     isLoaded: boolean;
     lastSelectedTheme: ThemeLayer | CustomTheme | null;
 };
@@ -85,6 +87,7 @@ export default class State {
      * For example, any method doing <this.xxx = value> is forbidden here, because the modification be known from the proxy
      */
     themes: ThemesConfig;
+    functionalities: Record<string, GMFThemeFunctionality>;
     basemaps: Record<number, Basemap>;
     ogcServers: Record<string, ServerOgc>;
     activeBasemaps: Basemap[];

package/tools/state/state.js

@@ -22,9 +22,11 @@ export default class State {
     // Dictionary where the key is the id of the theme
     themes = {
         _allThemes: {},
+        _allFunctionalities: {},
         isLoaded: false,
         lastSelectedTheme: null
     };
+    functionalities = {};
     // All basemaps from themes.json
     // Dictionary where the key is the id of the basemap
     basemaps = {};

package/tools/themes/themeshelper.d.ts

@@ -7,7 +7,7 @@ export default class ThemesHelper extends GirafeSingleton {
     initializeSingleton(): void;
     private get state();
     findBaseLayerById(layerId: number): BaseLayer;
-    private findBaseLayerRecurviveById;
+    private findBaseLayerRecursiveById;
     findThemeByName(themename: string): ThemeLayer | null;
     findGroupByName(groupname: string): GroupLayer | null;
     findLayerByName(layername: string): Layer | null;

package/tools/themes/themeshelper.js

@@ -6,6 +6,7 @@ import LayerWms from '../../models/layers/layerwms.js';
 import ThemeLayer from '../../models/layers/themelayer.js';
 import { isTimeAwareLayer } from '../../models/layers/timeawarelayer.js';
 import WfsFilter, { isWfsOperator } from '../wfs/wfsfilter.js';
+import { KNOWN_FUNCTIONALITIES } from '../functionalities.js';
 export default class ThemesHelper extends GirafeSingleton {
     initializeSingleton() {
         this.context.stateManager.subscribe('themes.lastSelectedTheme', (_oldTheme, newTheme) => this.onSelectedThemeChanged(newTheme));
@@ -18,20 +19,20 @@ export default class ThemesHelper extends GirafeSingleton {
             if (theme.id === layerId) {
                 return theme;
             }
-            const child = this.findBaseLayerRecurviveById(theme.children, layerId);
+            const child = this.findBaseLayerRecursiveById(theme.children, layerId);
             if (child) {
                 return child;
             }
         }
         throw new Error(`No BaseLayer with ID ${layerId} could be found.`);
     }
-    findBaseLayerRecurviveById(layers, layerId) {
+    findBaseLayerRecursiveById(layers, layerId) {
         for (const layer of layers) {
             if (layer.id === layerId) {
                 return layer;
             }
             if (layer instanceof GroupLayer || layer instanceof ThemeLayer) {
-                const child = this.findBaseLayerRecurviveById(layer.children, layerId);
+                const child = this.findBaseLayerRecursiveById(layer.children, layerId);
                 if (child) {
                     return child;
                 }
@@ -107,24 +108,37 @@ export default class ThemesHelper extends GirafeSingleton {
     }
     onThemeChanged(theme) {
         // Create a clone of the theme object to use it in the treeview.
-        // This is essential, otherwise all changes done in the layers
-        // (For example when expanding legend, expanding a group, or activating the layer)
-        // Will also be done in the default layer configuration that has been loaded from themes.json
-        // And when a theme will be selected aging from the themes-selector
+        // This is essential, otherwise all changes are done in the layers
+        // (For example, when expanding legend, expanding a group, or activating the layer).
+        // Will also be done in the default layer configuration that has been loaded from themes.json,
+        // And when a theme is selected aging from the themes-selector
         // The default configuration will have been overwritten.
         const clonedTheme = theme.clone();
+        const themeAlreadyInLayersList = this.state.layers.layersList.find((l) => l.id == clonedTheme.id);
+        if (themeAlreadyInLayersList) {
+            console.info(`The theme ${clonedTheme.name} is already present in the treeview.`);
+            return;
+        }
         if (this.context.configManager.Config.themes.selectionMode === 'replace') {
             // Mode is <replace>
             this.emptyLayerTree();
             this.state.layers.layersList.push(clonedTheme);
         }
-        else if (!this.state.layers.layersList.find((l) => l.id == clonedTheme.id)) {
+        else {
             // Mode is <add>
             clonedTheme.order = this.getInitialOrderForNewTheme();
             this.state.layers.layersList.push(clonedTheme);
         }
-        else {
-            console.info(`The theme ${clonedTheme.name} is already present in the treeview.`);
+        const themeFunctionalities = this.state.themes._allFunctionalities[theme.id];
+        if (themeFunctionalities) {
+            Object.keys(themeFunctionalities).forEach((functionality) => {
+                if (KNOWN_FUNCTIONALITIES.includes(functionality)) {
+                    this.state.functionalities[functionality] = themeFunctionalities[functionality];
+                }
+                else {
+                    console.warn(`Unknown functionality '${functionality}' found on Theme '${theme.name}'.`);
+                }
+            });
         }
     }
     getMinimalClonedThemeForLayer(layer) {

package/tools/themes/themeshelper.spec.js

@@ -167,3 +167,55 @@ describe('ThemesHelper.getInitialOrderForNewTheme', () => {
         expect(themesHelper.getInitialOrderForNewTheme()).toEqual(103);
     });
 });
+describe('ThemesHelper.onSelectedThemeChanged', () => {
+    let stateManager;
+    const callbacks = [];
+    beforeEach(() => {
+        stateManager = context.stateManager;
+        for (const callback of callbacks) {
+            stateManager.unsubscribe(callback);
+            callbacks.splice(callbacks.indexOf(callback), 1);
+        }
+    });
+    it('should trigger change in functionalities if functionality is known', () => {
+        stateManager.state.themes._allFunctionalities = {
+            42: {
+                default_basemap: ['blank']
+            }
+        };
+        let subscriptionCalled = false;
+        callbacks.push(stateManager.subscribe('functionalities.default_basemap', () => {
+            subscriptionCalled = true;
+        }));
+        stateManager.state.themes.lastSelectedTheme = new ThemeLayer(42, 'lastSelectedTheme', 101);
+        expect(subscriptionCalled).toBeTruthy();
+    });
+    it('should NOT trigger change in functionalities if functionality is not known', () => {
+        stateManager.state.themes._allFunctionalities = {
+            42: {
+                unknown_functionality: 'Lorem Ipsum Dolor Sit Amet'
+            }
+        };
+        let subscriptionCalled = false;
+        callbacks.push(stateManager.subscribe('functionalities.unknown_functionality', (_oldValue, newValue) => {
+            console.log(newValue);
+            subscriptionCalled = true;
+        }));
+        stateManager.state.themes.lastSelectedTheme = new ThemeLayer(42, 'lastSelectedTheme', 101);
+        expect(subscriptionCalled).toBeFalsy();
+    });
+    it('should trigger change in functionalities.default_basemap with expected params', () => {
+        stateManager.state.themes._allFunctionalities = {
+            42: {
+                default_basemap: ['blank']
+            }
+        };
+        let paramsCalledWith = undefined;
+        callbacks.push(stateManager.subscribe('functionalities.default_basemap', (_oldVal, newVal) => {
+            paramsCalledWith = newVal;
+        }));
+        stateManager.state.themes.lastSelectedTheme = new ThemeLayer(42, 'lastSelectedTheme', 101);
+        expect(paramsCalledWith).not.toBeUndefined();
+        expect(paramsCalledWith).toEqual(['blank']);
+    });
+});

package/tools/themes/themesmanager.d.ts

@@ -22,6 +22,9 @@ declare class ThemesManager extends GirafeSingleton {
      */
     private preloadWfsServer;
     private prepareBasemaps;
+    private addBasemapsFromConfig;
+    private applyOpacityToBasemaps;
+    private applyOpacityToBasemap;
     private prepareThemes;
     private calculateMetadataUrl;
     /**

package/tools/themes/themesmanager.js

@@ -96,7 +96,9 @@ class ThemesManager extends GirafeSingleton {
         const content = await response.json();
         this.state.ogcServers = this.prepareOgcServers(content['ogcServers']);
         this.state.basemaps = this.prepareBasemaps(content['background_layers']);
-        this.state.themes._allThemes = this.prepareThemes(content['themes']);
+        const themesAndFunctionalities = this.prepareThemes(content['themes']);
+        this.state.themes._allThemes = themesAndFunctionalities.themes;
+        this.state.themes._allFunctionalities = themesAndFunctionalities.themesFunctionalities;
         this.context.customThemesManager.loadCustomThemes();
         this.state.themes.isLoaded = true;
         if (this.context.configManager.Config.themes.showErrorsOnStart) {
@@ -170,7 +172,12 @@ class ThemesManager extends GirafeSingleton {
             const basemapSwisstopoVectorTiles = new BasemapSwisstopoVectorTiles();
             basemaps[basemapSwisstopoVectorTiles.id] = basemapSwisstopoVectorTiles;
         }
-        basemapJson.forEach((elem) => {
+        this.addBasemapsFromConfig(basemapJson, basemaps);
+        this.applyOpacityToBasemaps(basemaps);
+        return basemaps;
+    }
+    addBasemapsFromConfig(basemapsJson, basemaps) {
+        basemapsJson.forEach((elem) => {
             // Create basemap
             const basemap = new Basemap(elem);
             basemaps[basemap.id] = basemap;
@@ -193,34 +200,39 @@ class ThemesManager extends GirafeSingleton {
                 }
             }
         });
-        // Apply Opacity
+    }
+    applyOpacityToBasemaps(basemaps) {
         for (const basemap of Object.values(basemaps)) {
             if (this.context.configManager.Config.basemaps.opacityBasemaps.includes(basemap.name)) {
-                // If it is the default Basemap the Opacity should NOT be 0 as otherwise the User would end up seeing nothing
-                const isDefaultBasemap = this.context.configManager.Config.basemaps.defaultBasemap == basemap.name;
-                basemap.opacity = isDefaultBasemap ? OPACITY_FOR_DEFAULT_BASEMAP : DEFAULT_OPACITY;
-                for (const basemapLayer of basemap.layersList) {
-                    if (basemapLayer instanceof LayerVectorTiles) {
-                        // Vector tiles layers are not supported as opacitybasemap, because the tiles cannot reprojected on the fly
-                        // And displaying a basemap from some SRID with an VT from another SRID won't work
-                        // So for the moment we do not allow VT configured as opacitybasemaps
-                        // (But the opposite will still work : a VT basemap with a WMTS opacitybasemap)
-                    }
-                    if (basemapLayer instanceof Layer) {
-                        basemapLayer.opacity = basemap.opacity;
-                    }
-                }
+                this.applyOpacityToBasemap(basemap);
+            }
+        }
+    }
+    applyOpacityToBasemap(basemap) {
+        // If it is the default Basemap the Opacity should NOT be 0 as otherwise the User would end up seeing nothing
+        const isDefaultBasemap = this.context.configManager.Config.basemaps.defaultBasemap == basemap.name;
+        basemap.opacity = isDefaultBasemap ? OPACITY_FOR_DEFAULT_BASEMAP : DEFAULT_OPACITY;
+        for (const basemapLayer of basemap.layersList) {
+            if (basemapLayer instanceof LayerVectorTiles) {
+                // Vector tiles layers are not supported as opacitybasemap, because the tiles cannot reprojected on the fly
+                // And displaying a basemap from some SRID with an VT from another SRID won't work
+                // So for the moment we do not allow VT configured as opacitybasemaps
+                // (But the opposite will still work : a VT basemap with a WMTS opacitybasemap)
+            }
+            else if (basemapLayer instanceof Layer) {
+                basemapLayer.opacity = basemap.opacity;
             }
         }
-        return basemaps;
     }
     prepareThemes(themesJson) {
         const themes = {};
         const order = { value: 0 };
+        const themesFunctionalities = {};
         themesJson.forEach((themeJson, index) => {
             if (!themeJson.icon.startsWith('http') && this.context.configManager.Config.themes.imagesUrlPrefix) {
                 themeJson.icon = this.context.configManager.Config.themes.imagesUrlPrefix + themeJson.icon;
             }
+            themesFunctionalities[themeJson.id] = themeJson['functionalities'];
             const theme = new ThemeLayer(themeJson['id'], themeJson['name'], index, themeJson['icon'], themeJson['metadata']);
             themeJson.children.forEach((layerJson) => {
                 const layer = this.prepareThemeLayer(layerJson, null, order);
@@ -231,7 +243,7 @@ class ThemesManager extends GirafeSingleton {
             });
             themes[index] = theme;
         });
-        return themes;
+        return { themes, themesFunctionalities };
     }
     calculateMetadataUrl(metadataUrl) {
         if (!metadataUrl) {
@@ -359,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;
     }