@geogirafe/lib-geoportal 1.2.0-dev.2847697588 → 1.2.0-dev.2853894139

package/components/advancedfilter/component.d.ts

@@ -4,6 +4,7 @@ import ColumnAliasHelper from '../../tools/utils/aliases.js';
 import IGirafePanel from '../../tools/state/igirafepanel.js';
 import LayerFilterElement from './layerfilterelement.js';
 import FilterConditionElement from './filterconditionelement.js';
+import { LayerId } from '../../models/layerdefinitions.js';
 declare class AdvancedFilterComponent extends GirafeHTMLElement implements IGirafePanel {
     protected templateUrl: string | null;
     protected styleUrls: string[] | null;
@@ -16,7 +17,7 @@ declare class AdvancedFilterComponent extends GirafeHTMLElement implements IGira
     layers: LayerWms[];
     layerFilterElements: LayerFilterElement[];
     columnAliasHelper: ColumnAliasHelper;
-    layerIsRefreshing: Map<number, boolean>;
+    layerIsRefreshing: Map<LayerId, boolean>;
     private csvDownloader;
     constructor();
     render(): void;

package/components/advancedfilter/component.js

@@ -185,8 +185,9 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
             filterElement.addCondition();
             this.render();
         }
-        const layerId = Number(e.target.value);
-        const layer = this.layers.find((l) => l.id === layerId);
+        const layerId = e.target.value;
+        // Loose equality == is on purpose. layer.id can be of type number or string, but .value always returns a string
+        const layer = this.layers.find((l) => l.id == layerId);
         if (filterElement.hasAppliedConditions()) {
             // If the filter has already been applied to the layer, a new filter is created and the old one is deleted
             const newFilter = new LayerFilterElement(this.context, this.columnAliasHelper, this.layerFilterElements.length);

package/components/themes/component.d.ts

@@ -13,9 +13,9 @@ declare class ThemeComponent extends GirafeHTMLElement {
     activeThemeType: ThemeType;
     clickOutsideContainer: HTMLElement | null;
     get customThemes(): CustomTheme[];
-    get allThemes(): Record<number, ThemeLayer>;
+    get allThemes(): Record<import("../../models/layerdefinitions.js").LayerId, ThemeLayer>;
     get favoriteThemes(): (ThemeLayer | CustomTheme)[];
-    get activeThemes(): Record<number, ThemeLayer> | (ThemeLayer | CustomTheme)[];
+    get activeThemes(): Record<import("../../models/layerdefinitions.js").LayerId, ThemeLayer> | (ThemeLayer | CustomTheme)[];
     constructor();
     registerEvents(): void;
     render(): void;

package/components/themes-mobile/theme/component.js

@@ -28,8 +28,9 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
         this.refreshTheme();
     }
     refreshTheme() {
-        const themeId = Number(this.getAttribute('themeid'));
-        const theme = this.state.layers.layersList.find((layer) => layer.id === themeId);
+        const themeId = this.getAttribute('themeid');
+        //  Loose equality == is on purpose. layer.id can be of type number or string, but getAttribute() always returns a string
+        const theme = this.state.layers.layersList.find((layer) => layer.id == themeId);
         if (theme) {
             this.theme = this.context.layerManager.getTreeItem(theme.treeItemId);
         }

package/components/userpreferences/component.js

@@ -47,10 +47,7 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
                 }
             }),
             logLevel: new UserPreference('general.logLevel', null, 'system', 'select'),
-            theme: new UserPreference('themes.defaultTheme', 'theme', 'map', 'select', (themeName) => {
-                const themeId = Object.keys(this.state.themes._allThemes).find((themeKey) => this.state.themes._allThemes[Number(themeKey)].name === themeName);
-                return this.state.themes._allThemes[Number(themeId)];
-            }),
+            theme: new UserPreference('themes.defaultTheme', 'theme', 'map', 'select', (themeName) => Object.values(this.state.themes._allThemes).find((theme) => theme.name === themeName)),
             basemap: new UserPreference('basemaps.defaultBasemap', 'activeBasemaps', 'map', 'select', (bsName) => {
                 const newDefaultBasemap = Object.values(this.state.basemaps).find((basemap) => basemap.name === bsName);
                 if (newDefaultBasemap?.opacity == 0) {
@@ -151,9 +148,8 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
         }
         this.refreshThemeOptions();
         if (this.preferences.basemap) {
-            this.preferences.basemap.options = Object.keys(this.state.basemaps).map((key) => {
-                const baseMapName = this.state.basemaps[Number(key)].name;
-                return { label: baseMapName, value: baseMapName };
+            this.preferences.basemap.options = Object.values(this.state.basemaps).map((basemap) => {
+                return { label: basemap.name, value: basemap.name };
             });
         }
         if (this.preferences.selectionComponent) {
@@ -198,9 +194,8 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
             return;
         }
         let defaultThemes = [{ label: '-', value: '' }];
-        Object.keys(this.state.themes._allThemes).forEach((key) => {
-            const themeName = this.state.themes._allThemes[Number(key)].name;
-            defaultThemes.push({ label: themeName, value: themeName });
+        Object.values(this.state.themes._allThemes).forEach((theme) => {
+            defaultThemes.push({ label: theme.name, value: theme.name });
         });
         defaultThemes = defaultThemes.sort((a, b) => a.label.toUpperCase().localeCompare(b.label.toUpperCase()));
         const customThemes = this.context.customThemesManager.customThemes.map((ct) => {

package/models/basemaps/basemap.d.ts

@@ -1,12 +1,12 @@
-import { GMFBackgroundLayer } from '../gmf.js';
 import BaseLayer from '../layers/baselayer.js';
+import { BasemapDefinition, LayerId } from '../layerdefinitions.js';
 declare class Basemap {
-    id: number;
+    id: LayerId;
     name: string;
     thumbnail: string;
     opacity: number;
     layersList: BaseLayer[];
-    constructor(elem: GMFBackgroundLayer, opacity?: number);
+    constructor(elem: BasemapDefinition, opacity?: number);
     get projection(): string | undefined;
     get opacityDisabled(): boolean;
 }

package/models/customtheme.d.ts

@@ -1,6 +1,7 @@
 import ThemeLayer from './layers/themelayer.js';
+import { LayerId } from './layerdefinitions.js';
 export default class CustomTheme {
-    id: number;
+    id: LayerId;
     layers: ThemeLayer[];
     name: string;
     icon: string;

package/models/georama.d.ts

@@ -0,0 +1,10 @@
+import { GMFTreeItem, GMFTheme } from './gmf.js';
+/**
+ * These are the interfaces for a Georama backend that differ from GMF
+ */
+export interface GeoramaTreeItem extends Omit<GMFTreeItem, 'id'> {
+    id: string;
+}
+export interface GeoramaTheme extends Omit<GMFTheme, 'id'> {
+    id: string;
+}

package/models/georama.js

@@ -0,0 +1 @@
+export {};

package/models/gmf.d.ts

@@ -75,7 +75,6 @@ export interface GMFTheme {
 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;

package/models/layerdefinitions.d.ts

@@ -0,0 +1,13 @@
+import { GMFTheme, GMFTreeItem } from './gmf.js';
+import { GeoramaTheme, GeoramaTreeItem } from './georama.js';
+/**
+ * Unified interfaces for layer definitions from different backends.
+ */
+export type LayerId = number | string;
+export interface TreeItemDefinition extends Omit<GMFTreeItem, 'id'>, Omit<GeoramaTreeItem, 'id'> {
+    id: LayerId;
+}
+export interface ThemeDefinition extends Omit<GMFTheme, 'id'>, Omit<GeoramaTheme, 'id'> {
+    id: LayerId;
+}
+export type BasemapDefinition = TreeItemDefinition;

package/models/layerdefinitions.js

@@ -0,0 +1 @@
+export {};

package/models/layers/baselayer.d.ts

@@ -1,12 +1,13 @@
 import GroupLayer from './grouplayer.js';
 import ThemeLayer from './themelayer.js';
+import { LayerId } from '../layerdefinitions.js';
 type BaseLayerOptions = {
     isDefaultChecked?: boolean;
     disclaimer?: string;
     metadataUrl?: string;
 };
 declare abstract class BaseLayer {
-    id: number;
+    id: LayerId;
     treeItemId: string;
     name: string;
     order: number;
@@ -27,6 +28,6 @@ declare abstract class BaseLayer {
     abstract get inactive(): boolean;
     abstract clone(): BaseLayer;
     parent?: ThemeLayer | GroupLayer;
-    constructor(id: number, name: string, order: number, options?: BaseLayerOptions);
+    constructor(id: LayerId, name: string, order: number, options?: BaseLayerOptions);
 }
 export default BaseLayer;

package/models/layers/grouplayer.d.ts

@@ -1,4 +1,5 @@
 import BaseLayer from './baselayer.js';
+import { LayerId } from '../layerdefinitions.js';
 import ILayerWithTime from './ilayerwithtime.js';
 import ITimeOptions from '../../tools/time/itimeoptions.js';
 export type GroupLayerOptions = {
@@ -21,7 +22,7 @@ declare class GroupLayer extends BaseLayer implements ILayerWithTime {
     timeAttribute?: string;
     timeRestriction?: string;
     children: BaseLayer[];
-    constructor(id: number, name: string, order: number, options?: GroupLayerOptions);
+    constructor(id: LayerId, name: string, order: number, options?: GroupLayerOptions);
     clone(): GroupLayer;
     get active(): boolean;
     get inactive(): boolean;

package/models/layers/layer.d.ts

@@ -1,6 +1,7 @@
 import BaseLayer from './baselayer.js';
 import GroupLayer from './grouplayer.js';
 import ThemeLayer from './themelayer.js';
+import { LayerId } from '../layerdefinitions.js';
 type LayerOptions = {
     isDefaultChecked?: boolean;
     disclaimer?: string;
@@ -15,7 +16,7 @@ declare abstract class Layer extends BaseLayer {
     swiped: 'left' | 'right' | 'no';
     isLegendExpanded: boolean;
     parent: ThemeLayer | GroupLayer;
-    constructor(id: number, name: string, order: number, options?: LayerOptions);
+    constructor(id: LayerId, name: string, order: number, options?: LayerOptions);
     get isTransparent(): boolean;
     get hasValidOpacity(): boolean;
     get active(): boolean;

package/models/layers/layercog.d.ts

@@ -1,4 +1,4 @@
-import { GMFTreeItem } from '../gmf.js';
+import { LayerId, TreeItemDefinition } from '../layerdefinitions.js';
 import Layer from './layer.js';
 type LayerCogTilesOptions = {
     isDefaultChecked?: boolean;
@@ -9,9 +9,9 @@ type LayerCogTilesOptions = {
 };
 declare class LayerCog extends Layer {
     source: string;
-    constructor(id: number, name: string, order: number, source: string, options?: GMFTreeItem | LayerCogTilesOptions);
+    constructor(id: LayerId, name: string, order: number, source: string, options?: TreeItemDefinition | LayerCogTilesOptions);
     clone(): LayerCog;
-    private static isGMFTreeItem;
-    private static getOptionsFromGMFTreeItem;
+    private static isTreeItemDefinition;
+    private static getOptionsFromDefinition;
 }
 export default LayerCog;

package/models/layers/layercog.js

@@ -10,7 +10,7 @@ class LayerCog extends Layer {
     source;
     constructor(id, name, order, source, options) {
         let opts = options ?? {};
-        opts = LayerCog.isGMFTreeItem(opts) ? LayerCog.getOptionsFromGMFTreeItem(opts) : opts;
+        opts = LayerCog.isTreeItemDefinition(opts) ? LayerCog.getOptionsFromDefinition(opts) : opts;
         super(id, name, order, opts);
         this.source = source;
     }
@@ -26,10 +26,10 @@ class LayerCog extends Layer {
         clonedObject.activeState = this.activeState;
         return clonedObject;
     }
-    static isGMFTreeItem(options) {
+    static isTreeItemDefinition(options) {
         return 'id' in options;
     }
-    static getOptionsFromGMFTreeItem(options) {
+    static getOptionsFromDefinition(options) {
         return {
             isDefaultChecked: options.metadata?.isChecked,
             metadataUrl: options.metadata?.metadataUrl,

package/models/layers/layerlocalfile.d.ts

@@ -3,6 +3,7 @@ import Layer from './layer.js';
 import Geometry from 'ol/geom/Geometry.js';
 import { Extent } from 'ol/extent.js';
 import ILayerWithLegend from './ilayerwithlegend.js';
+import { LayerId } from '../layerdefinitions.js';
 declare class LayerLocalFile extends Layer implements ILayerWithLegend {
     _features: Feature<Geometry>[];
     lastModifiedDate: string;
@@ -12,7 +13,7 @@ declare class LayerLocalFile extends Layer implements ILayerWithLegend {
     extent: Extent;
     private readonly file;
     private readonly locale;
-    constructor(id: number, order: number, file: File, features: Feature<Geometry>[], extent: Extent, locale: string, options?: {
+    constructor(id: LayerId, order: number, file: File, features: Feature<Geometry>[], extent: Extent, locale: string, options?: {
         isDefaultChecked?: boolean;
     });
     clone(): LayerLocalFile;

package/models/layers/layervectortiles.d.ts

@@ -1,4 +1,5 @@
 import Layer from './layer.js';
+import { LayerId } from '../layerdefinitions.js';
 type LayerVectorTilesOptions = {
     projection?: string;
     layerName?: string;
@@ -12,7 +13,7 @@ declare class LayerVectorTiles extends Layer {
     style: string;
     layerName?: string;
     projection?: string;
-    constructor(id: number, name: string, order: number, style: string, options?: LayerVectorTilesOptions);
+    constructor(id: LayerId, name: string, order: number, style: string, options?: LayerVectorTilesOptions);
     clone(): LayerVectorTiles;
 }
 export default LayerVectorTiles;

package/models/layers/layerwms.d.ts

@@ -1,5 +1,5 @@
 import WfsFilter from '../../tools/wfs/wfsfilter.js';
-import { GMFTreeItem } from '../gmf.js';
+import { LayerId, TreeItemDefinition } from '../layerdefinitions.js';
 import ServerOgc from '../serverogc.js';
 import ILayerWithFilter from './ilayerwithfilter.js';
 import ILayerWithLegend from './ilayerwithlegend.js';
@@ -70,7 +70,7 @@ declare class LayerWms extends Layer implements ILayerWithLegend, ILayerWithFilt
     timeAttribute?: string;
     enumeratedAttributes?: string[];
     editable?: string;
-    constructor(id: number, name: string, order: number, ogcServer: ServerOgc, options?: GMFTreeItem | LayerWmsOptions);
+    constructor(id: LayerId, name: string, order: number, ogcServer: ServerOgc, options?: TreeItemDefinition | LayerWmsOptions);
     clone(): LayerWms;
     static isResolutionRangeRestricted(minResolution: number | undefined, maxResolution: number | undefined): boolean | 0 | undefined;
     hasRestrictedResolution(): boolean | 0 | undefined;
@@ -82,8 +82,8 @@ declare class LayerWms extends Layer implements ILayerWithLegend, ILayerWithFilt
     get serverUniqueQueryId(): string;
     get wfsQueryable(): boolean;
     get wmsQueryableOnly(): boolean;
-    private static isGMFTreeItem;
-    private static getOptionsFromGMFTreeItem;
+    private static isTreeItemDefinition;
+    private static getOptionsFromDefinition;
     private static getDefaultWmsInfoFormat;
 }
 export default LayerWms;

package/models/layers/layerwms.js

@@ -44,7 +44,7 @@ class LayerWms extends Layer {
     editable;
     constructor(id, name, order, ogcServer, options) {
         let opts = options ?? {};
-        opts = LayerWms.isGMFTreeItem(opts) ? LayerWms.getOptionsFromGMFTreeItem(opts) : opts;
+        opts = LayerWms.isTreeItemDefinition(opts) ? LayerWms.getOptionsFromDefinition(opts) : opts;
         super(id, name, order, opts);
         this.ogcServer = ogcServer;
         this.minResolution = opts?.minResolution;
@@ -152,10 +152,10 @@ class LayerWms extends Layer {
     get wmsQueryableOnly() {
         return this.queryable && !this.ogcServer.wfsSupport;
     }
-    static isGMFTreeItem(options) {
+    static isTreeItemDefinition(options) {
         return 'id' in options;
     }
-    static getOptionsFromGMFTreeItem(options) {
+    static getOptionsFromDefinition(options) {
         const opts = {
             isDefaultChecked: options.metadata?.isChecked,
             metadataUrl: options.metadata?.metadataUrl,

package/models/layers/layerwmts.d.ts

@@ -1,4 +1,4 @@
-import { GMFTreeItem } from '../gmf.js';
+import { LayerId, TreeItemDefinition } from '../layerdefinitions.js';
 import ServerOgc from '../serverogc.js';
 import ILayerWithLegend from './ilayerwithlegend.js';
 import Layer from './layer.js';
@@ -48,12 +48,12 @@ declare class LayerWmts extends Layer implements ILayerWithLegend {
     hiDPILegendImages?: Record<string, string>;
     /** Linked ol layer, starting with an underscore to not be part of the proxy. **/
     _olayer?: TileLayer<WMTS>;
-    constructor(id: number, name: string, order: number, url: string, layer: string, options?: GMFTreeItem | LayerWmtsOptions, ogcServer?: ServerOgc);
+    constructor(id: LayerId, name: string, order: number, url: string, layer: string, options?: TreeItemDefinition | LayerWmtsOptions, ogcServer?: ServerOgc);
     clone(): LayerWmts;
     get layerUniqueId(): string;
     hasRestrictedResolution(): boolean | 0 | undefined;
     isVisibleAtResolution(resolution: number): boolean;
-    private static isGMFTreeItem;
-    private static getOptionsFromGMFTreeItem;
+    private static isTreeItemDefinition;
+    private static getOptionsFromDefinition;
 }
 export default LayerWmts;

package/models/layers/layerwmts.js

@@ -39,7 +39,7 @@ class LayerWmts extends Layer {
     _olayer;
     constructor(id, name, order, url, layer, options, ogcServer) {
         let opts = options ?? {};
-        opts = LayerWmts.isGMFTreeItem(opts) ? LayerWmts.getOptionsFromGMFTreeItem(opts) : opts;
+        opts = LayerWmts.isTreeItemDefinition(opts) ? LayerWmts.getOptionsFromDefinition(opts) : opts;
         super(id, name, order, opts);
         this.url = url;
         this.layer = layer;
@@ -102,10 +102,10 @@ class LayerWmts extends Layer {
         }
         return resolution >= (this.minResolution ?? -1) && resolution <= (this.maxResolution ?? Infinity);
     }
-    static isGMFTreeItem(options) {
+    static isTreeItemDefinition(options) {
         return 'id' in options;
     }
-    static getOptionsFromGMFTreeItem(options) {
+    static getOptionsFromDefinition(options) {
         return {
             isDefaultChecked: options.metadata?.isChecked,
             metadataUrl: options.metadata?.metadataUrl,

package/models/layers/layerxyz.d.ts

@@ -1,4 +1,4 @@
-import { GMFTreeItem } from '../gmf.js';
+import { LayerId, TreeItemDefinition } from '../layerdefinitions.js';
 import Layer from './layer.js';
 type LayerXYZTilesOptions = {
     isDefaultChecked?: boolean;
@@ -9,9 +9,9 @@ type LayerXYZTilesOptions = {
 };
 declare class LayerXYZ extends Layer {
     source: string;
-    constructor(id: number, name: string, order: number, source: string, options?: GMFTreeItem | LayerXYZTilesOptions);
+    constructor(id: LayerId, name: string, order: number, source: string, options?: TreeItemDefinition | LayerXYZTilesOptions);
     clone(): LayerXYZ;
-    private static isGMFTreeItem;
-    private static getOptionsFromGMFTreeItem;
+    private static isTreeItemDefinition;
+    private static getOptionsFromDefinition;
 }
 export default LayerXYZ;

package/models/layers/layerxyz.js

@@ -10,7 +10,7 @@ class LayerXYZ extends Layer {
     source;
     constructor(id, name, order, source, options) {
         let opts = options ?? {};
-        opts = LayerXYZ.isGMFTreeItem(opts) ? LayerXYZ.getOptionsFromGMFTreeItem(opts) : opts;
+        opts = LayerXYZ.isTreeItemDefinition(opts) ? LayerXYZ.getOptionsFromDefinition(opts) : opts;
         super(id, name, order, opts);
         this.source = source;
     }
@@ -26,10 +26,10 @@ class LayerXYZ extends Layer {
         clonedObject.activeState = this.activeState;
         return clonedObject;
     }
-    static isGMFTreeItem(options) {
+    static isTreeItemDefinition(options) {
         return 'id' in options;
     }
-    static getOptionsFromGMFTreeItem(options) {
+    static getOptionsFromDefinition(options) {
         return {
             isDefaultChecked: options.metadata?.isChecked,
             metadataUrl: options.metadata?.metadataUrl,

package/models/layers/themelayer.d.ts

@@ -1,5 +1,6 @@
 import BaseLayer from './baselayer.js';
 import { Coordinate } from 'ol/coordinate.js';
+import { LayerId } from '../layerdefinitions.js';
 export type ThemeLayerOptions = {
     isDefaultChecked?: boolean;
     disclaimer?: string;
@@ -15,7 +16,7 @@ declare class ThemeLayer extends BaseLayer {
     location?: Coordinate;
     zoom?: number;
     children: BaseLayer[];
-    constructor(id: number, name: string, order: number, icon?: string, options?: ThemeLayerOptions);
+    constructor(id: LayerId, name: string, order: number, icon?: string, options?: ThemeLayerOptions);
     clone(): ThemeLayer;
     get active(): boolean;
     get inactive(): boolean;

package/models/main.d.ts

@@ -5,7 +5,9 @@ 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, GMFServerOgcType, GMFServerOgc, GMFServerOgcAttributes, GMFServerOgcObjectAttributes, GMFServerOgcColumnAttributes } from './gmf.js';
+export type { GeoramaTreeItem, GeoramaTheme } from './georama.js';
+export type { GMFMetadata, GMFChildLayer, GMFTreeItem, GMFThemeFunctionality, GMFThemeFunctionalities, GMFTheme, GMFGroup, GMFServerOgcType, GMFServerOgc, GMFServerOgcAttributes, GMFServerOgcObjectAttributes, GMFServerOgcColumnAttributes } from './gmf.js';
+export type { LayerId, TreeItemDefinition, ThemeDefinition, BasemapDefinition } from './layerdefinitions.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.geogirafe.org"
   },
-  "version": "1.2.0-dev.2847697588",
+  "version": "1.2.0-dev.2853894139",
   "type": "module",
   "engines": {
     "node": ">=20.19.0"

package/templates/public/about.json

@@ -1 +1 @@
-{"version":"1.2.0-dev.2847697588", "build":"2847697588", "date":"14/09/2026"}
+{"version":"1.2.0-dev.2853894139", "build":"2853894139", "date":"16/09/2026"}

package/tools/share/serializers/sharedtypes.d.ts

@@ -1,5 +1,6 @@
 import { FilterOperator, LogicalFilterOperator } from '../../../models/filter.js';
 import { GMFServerOgcType } from '../../../models/gmf.js';
+import { LayerId } from '../../../models/layerdefinitions.js';
 export type SharedFilterCondition = {
     property: string;
     propertyType?: string;
@@ -14,7 +15,7 @@ export type SharedFilter = {
 };
 export type SharedLayer = SharedInternalTheme | SharedInternalGroup | SharedInternalLayer | SharedExternalTheme | SharedExternalLayer;
 export type SharedInternalTheme = {
-    id: number;
+    id: LayerId;
     order: number;
     checked: number;
     isExpanded: number;
@@ -25,7 +26,7 @@ export type SharedInternalTheme = {
      * And should forcefully be added to the layer tree because the user just didn't know this layer when he has created this shared state
      * Or if it was explicitly removed from the user, and then we won't have to display it again
      */
-    excludedChildrenIds: number[];
+    excludedChildrenIds: Array<LayerId>;
     /**
      * When configuring the share with "preferNames=true", the name of the layer will be used to generate the sahred state
      * instead of the ID. But in this case, we also have to share the type os the layer, because tha layer name can be
@@ -38,7 +39,7 @@ export type SharedInternalTheme = {
     excludedChildrenNames: string[];
 };
 export type SharedInternalGroup = {
-    id: number;
+    id: LayerId;
     order: number;
     checked: number;
     isExpanded: number;
@@ -50,7 +51,7 @@ export type SharedInternalGroup = {
     excludedChildrenNames: string[];
 };
 export type SharedInternalLayer = {
-    id: number;
+    id: LayerId;
     order: number;
     checked: number;
     isExpanded: number;
@@ -87,7 +88,7 @@ export type SharedExternalLayer = {
     swiped?: 'left' | 'right' | 'no';
 };
 export type SharedBasemap = {
-    id: number;
+    id: LayerId;
     name: string;
     opacity: number;
 };

package/tools/state/state.d.ts

@@ -13,9 +13,10 @@ import ObjectSelection from './objectselection.js';
 import type Theme from '../../models/theme.js';
 import GraphicalInterface from './graphicalInterface.js';
 import { GMFThemeFunctionalities, GMFThemeFunctionality } from '../../models/gmf.js';
+import { LayerId } from '../../models/layerdefinitions.js';
 export type ThemesConfig = {
-    _allThemes: Record<number, ThemeLayer>;
-    _allFunctionalities: Record<number, GMFThemeFunctionalities>;
+    _allThemes: Record<LayerId, ThemeLayer>;
+    _allFunctionalities: Record<LayerId, GMFThemeFunctionalities>;
     isLoaded: boolean;
     lastSelectedTheme: ThemeLayer | CustomTheme | null;
 };
@@ -101,7 +102,7 @@ export default class State {
      */
     themes: ThemesConfig;
     functionalities: Record<string, GMFThemeFunctionality>;
-    basemaps: Record<number, Basemap>;
+    basemaps: Record<LayerId, Basemap>;
     ogcServers: Record<string, ServerOgc>;
     activeBasemaps: Basemap[];
     projection: string;

package/tools/themes/themeshelper.d.ts

@@ -1,5 +1,6 @@
 import GirafeSingleton from '../../base/GirafeSingleton.js';
 import BaseLayer from '../../models/layers/baselayer.js';
+import { LayerId } from '../../models/layerdefinitions.js';
 import GroupLayer from '../../models/layers/grouplayer.js';
 import Layer from '../../models/layers/layer.js';
 import ThemeLayer from '../../models/layers/themelayer.js';
@@ -10,8 +11,8 @@ export type LayerTreeChanges = {
 export default class ThemesHelper extends GirafeSingleton {
     initializeSingleton(): void;
     private get state();
-    findBaseLayerById(layerId: number): BaseLayer;
-    findBaseLayerRecursiveById(layers: BaseLayer[], layerId: number): BaseLayer | null;
+    findBaseLayerById(layerId: LayerId): BaseLayer;
+    findBaseLayerRecursiveById(layers: BaseLayer[], layerId: LayerId): BaseLayer | null;
     findThemeByName(themename: string): ThemeLayer | null;
     findGroupByName(groupname: string): GroupLayer | null;
     findLayerByName(layername: string): Layer | null;

package/tools/themes/themesmanager.js

@@ -246,7 +246,7 @@ class ThemesManager extends GirafeSingleton {
                     theme.children.push(layer);
                 }
             }
-            themes[index] = theme;
+            themes[themeJson.id] = theme;
         }
         return { themes, themesFunctionalities };
     }