@geogirafe/lib-geoportal 1.2.0-dev.2847659248 → 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/treeview/treeviewitem/component.js

@@ -26,7 +26,7 @@ header{border-top:1px solid #ddd;align-items:center;height:2rem;display:flex}.to
 .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}button,input,select,textarea{font:inherit}.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);cursor:pointer;width:1.2rem}.gg-range{accent-color:var(--text-color)}.gg-button{padding:0 .5rem}.gg-button.active{border:solid 1px var(--text-color-grad1);background-color:var(--bkg-color-grad2)}.gg-button:disabled{background-color:var(--bkg-color-grad1);color:var(--text-color-grad2);cursor:not-allowed;border:none}.gg-button:disabled img{filter:opacity(.6)}.gg-input:disabled,.gg-select:disabled,.gg-textarea:disabled{background-color:var(--bkg-color-grad1);color:var(--text-color-grad2);cursor:not-allowed}.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:not(:disabled),.gg-select:hover:not(:disabled),.gg-input:hover:not(:disabled),.gg-textarea:hover:not(:disabled),.gg-icon-button:hover:not(:disabled){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}.tippy-box{background-color:var(--bkg-color)!important;border:var(--app-standard-border)!important}.tippy-content{color:var(--text-color)!important}.tippy-arrow{color:var(--bkg-color)!important}.tippy-box[data-theme~=error]{background-color:var(--error-color);white-space:pre-line}div.tippy-box[data-theme=image-popup]{border:var(--app-standard-border)!important;& div.tippy-content{background-color:var(--bkg-color)!important;& img{max-width:20rem;max-height:20rem}}& div.tippy-arrow{color:var(--bkg-color)!important}}
 </style>
 <style>${this.customStyle}</style>
-<link rel="stylesheet" href="lib/tippy.js/tippy.css"><link rel="stylesheet" href="lib/tippy.js/backdrop.css"><link rel="stylesheet" href="lib/tippy.js/border.css"><link rel="stylesheet" href="lib/tippy.js/svg-arrow.css"><div id="container"><header><div class="gg-spacer gg-small"><img class="${this.layer.restricted ? (this.layer.active ? 'gg-small gg-lock gg-selected' : 'gg-small gg-lock gg-opacity') : 'hidden'}" alt="Protected layer" src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KICA8bWFzayBpZD0ibWFzazBfMzdfNDUxNyIgc3R5bGU9Im1hc2stdHlwZTphbHBoYSIgbWFza1VuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeD0iMCIgeT0iMCIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0Ij4KICA8cmVjdCB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIGZpbGw9IiNEOUQ5RDkiLz4KICA8L21hc2s+CiAgPGcgbWFzaz0idXJsKCNtYXNrMF8zN180NTE3KSI+CiAgPHBhdGggZD0iTTYgMjJDNS40NSAyMiA0Ljk3OTE3IDIxLjgwNDIgNC41ODc1IDIxLjQxMjVDNC4xOTU4MyAyMS4wMjA4IDQgMjAuNTUgNCAyMFYxMEM0IDkuNDUgNC4xOTU4MyA4Ljk3OTE3IDQuNTg3NSA4LjU4NzVDNC45NzkxNyA4LjE5NTgzIDUuNDUgOCA2IDhIN1Y2QzcgNC42MTY2NyA3LjQ4NzUgMy40Mzc1IDguNDYyNSAyLjQ2MjVDOS40Mzc1IDEuNDg3NSAxMC42MTY3IDEgMTIgMUMxMy4zODMzIDEgMTQuNTYyNSAxLjQ4NzUgMTUuNTM3NSAyLjQ2MjVDMTYuNTEyNSAzLjQzNzUgMTcgNC42MTY2NyAxNyA2VjhIMThDMTguNTUgOCAxOS4wMjA4IDguMTk1ODMgMTkuNDEyNSA4LjU4NzVDMTkuODA0MiA4Ljk3OTE3IDIwIDkuNDUgMjAgMTBWMjBDMjAgMjAuNTUgMTkuODA0MiAyMS4wMjA4IDE5LjQxMjUgMjEuNDEyNUMxOS4wMjA4IDIxLjgwNDIgMTguNTUgMjIgMTggMjJINlpNNiAyMEgxOFYxMEg2VjIwWk0xMiAxN0MxMi41NSAxNyAxMy4wMjA4IDE2LjgwNDIgMTMuNDEyNSAxNi40MTI1QzEzLjgwNDIgMTYuMDIwOCAxNCAxNS41NSAxNCAxNUMxNCAxNC40NSAxMy44MDQyIDEzLjk3OTIgMTMuNDEyNSAxMy41ODc1QzEzLjAyMDggMTMuMTk1OCAxMi41NSAxMyAxMiAxM0MxMS40NSAxMyAxMC45NzkyIDEzLjE5NTggMTAuNTg3NSAxMy41ODc1QzEwLjE5NTggMTMuOTc5MiAxMCAxNC40NSAxMCAxNUMxMCAxNS41NSAxMC4xOTU4IDE2LjAyMDggMTAuNTg3NSAxNi40MTI1QzEwLjk3OTIgMTYuODA0MiAxMS40NSAxNyAxMiAxN1pNOSA4SDE1VjZDMTUgNS4xNjY2NyAxNC43MDgzIDQuNDU4MzMgMTQuMTI1IDMuODc1QzEzLjU0MTcgMy4yOTE2NyAxMi44MzMzIDMgMTIgM0MxMS4xNjY3IDMgMTAuNDU4MyAzLjI5MTY3IDkuODc1IDMuODc1QzkuMjkxNjcgNC40NTgzMyA5IDUuMTY2NjcgOSA2VjhaIiBmaWxsPSIjMUMxQjFGIi8+CiAgPC9nPgo8L3N2Zz4KICA="></div><button class="${this.layer.active ? 'gg-icon-button gg-small gg-selected' : 'gg-icon-button gg-small gg-opacity'}" tip="Activate / Deactivate" onclick="${() => this.toggle()}"><img class="${this.layer.active ? 'gg-checkbox' : 'hidden'}" alt="Expand/Collapse button" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0NDggNTEyIj48IS0tIUZvbnQgQXdlc29tZSBGcmVlIDYuNi4wIGJ5IEBmb250YXdlc29tZSAtIGh0dHBzOi8vZm9udGF3ZXNvbWUuY29tIExpY2Vuc2UgLSBodHRwczovL2ZvbnRhd2Vzb21lLmNvbS9saWNlbnNlL2ZyZWUgQ29weXJpZ2h0IDIwMjQgRm9udGljb25zLCBJbmMuLS0+PHBhdGggZD0iTTY0IDMyQzI4LjcgMzIgMCA2MC43IDAgOTZMMCA0MTZjMCAzNS4zIDI4LjcgNjQgNjQgNjRsMzIwIDBjMzUuMyAwIDY0LTI4LjcgNjQtNjRsMC0zMjBjMC0zNS4zLTI4LjctNjQtNjQtNjRMNjQgMzJ6TTMzNyAyMDlMMjA5IDMzN2MtOS40IDkuNC0yNC42IDkuNC0zMy45IDBsLTY0LTY0Yy05LjQtOS40LTkuNC0yNC42IDAtMzMuOXMyNC42LTkuNCAzMy45IDBsNDcgNDdMMzAzIDE3NWM5LjQtOS40IDI0LjYtOS40IDMzLjkgMHM5LjQgMjQuNiAwIDMzLjl6Ii8+PC9zdmc+"> <img class="${!this.layer.active ? 'gg-checkbox' : 'hidden'}" alt="Expand/Collapse button" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0NDggNTEyIj48IS0tIUZvbnQgQXdlc29tZSBGcmVlIDYuNi4wIGJ5IEBmb250YXdlc29tZSAtIGh0dHBzOi8vZm9udGF3ZXNvbWUuY29tIExpY2Vuc2UgLSBodHRwczovL2ZvbnRhd2Vzb21lLmNvbS9saWNlbnNlL2ZyZWUgQ29weXJpZ2h0IDIwMjQgRm9udGljb25zLCBJbmMuLS0+PHBhdGggZD0iTTM4NCA4MGM4LjggMCAxNiA3LjIgMTYgMTZsMCAzMjBjMCA4LjgtNy4yIDE2LTE2IDE2TDY0IDQzMmMtOC44IDAtMTYtNy4yLTE2LTE2TDQ4IDk2YzAtOC44IDcuMi0xNiAxNi0xNmwzMjAgMHpNNjQgMzJDMjguNyAzMiAwIDYwLjcgMCA5NkwwIDQxNmMwIDM1LjMgMjguNyA2NCA2NCA2NGwzMjAgMGMzNS4zIDAgNjQtMjguNyA2NC02NGwwLTMyMGMwLTM1LjMtMjguNy02NC02NC02NEw2NCAzMnoiLz48L3N2Zz4="></button><div class="${this.layer.hasError ? 'gg-icon gg-small gg-opacity' : 'hidden'}" tip="${this.layer.errorMessage ? this.layer.errorMessage : 'Error on layer'}"><img alt="Error on layer" src="icons/error.svg"></div><div class="${this.isVisibleInCurrentResolution() ? 'label-container' : 'label-container label-out-resolution'}"><button class="${this.layer.active ? 'gg-icon-button gg-small gg-selected' : 'gg-icon-button gg-small gg-opacity'}" onclick="${() => this.toggle()}"><span i18n="${this.layer.name}" class="gg-tree-label">${this.layer.name}</span></button> <button class="${this.layer.active && this.layer instanceof LayerWms && !this.isVisibleInCurrentResolution() ? 'gg-icon-button gg-small resolution-tool' : 'hidden'}" tip="Zoom to visible resolution" onclick="${() => this.zoomToVisibleResolution()}"><img alt="Zoom to visible resolution" src="icons/zoom.svg"></button> <img class="${this.layer.active && this.iconUrl ? 'legend-icon' : 'hidden'}" alt="${'Icon for ' + this.layer.name}" src="${this.iconUrl}" loading="lazy" crossorigin="${this.getCrossOrigin(this.iconUrl)}"></div><button class="${this.layer.active && this.layer instanceof LayerLocalFile ? 'gg-icon-button gg-small gg-opacity tool' : 'hidden'}" tip="Zoom to full extent" onclick="${() => this.zoomToFullExtent()}"><img alt="Zoom to full extent" src="icons/zoom.svg"></button> <button class="${this.layer.active && this.layer instanceof LayerLocalFile ? 'gg-icon-button gg-small gg-opacity tool' : 'hidden'}" tip="Convert to drawing" onclick="${() => this.convertToDrawing()}"><img alt="draw-icon" src="icons/draw.svg"></button> <button class="${this.getButtonClass('swipedLeft')}" tip="Swipe layer to the left" onclick="${() => this.layer.swiped = (this.layer.swiped === 'left') ? 'no' : 'left'}"><img alt="Swipe layer to the left" src="icons/swipe-left.svg"></button> <button class="${this.getButtonClass('swipedRight')}" tip="Swipe layer to the right" onclick="${() => this.layer.swiped = (this.layer.swiped === 'right') ? 'no' : 'right'}"><img alt="Swipe layer to the right" src="icons/swipe-right.svg"></button> <button id="opacity" class="${this.getButtonClass('opacity')}" tip="Control opacity"><img alt="Control opacity" src="icons/opacity.svg"></button> <button id="filter" class="${this.getButtonClass('filter')}" tip="Filter layer"><img alt="Filter layer" src="icons/filter.svg"></button> <button id="advanced-filter" class="${this.getButtonClass('advanced-filter')}" tip="Open advanced filter tool" onclick="${() => this.state.interface.advancedFilterPanelVisible = !this.state.interface.advancedFilterPanelVisible}"><img alt="Advanced filter" src="icons/advanced-filter.svg"></button> <button id="timeRestriction" class="${this.getButtonClass('timeRestriction')}" tip="Define time restriction on layer"><img alt="Define time restriction on layer" src="icons/clock.svg"></button> <button class="${this.getButtonClass('snappable')}" onclick="${() => this.toggleSnap()}" tip="Snap to layer features"><img alt="Enable snapping" src="icons/snapping.svg"></button> <button class="${this.hasLegend ? (this.layer.isLegendExpanded ? 'gg-icon-button gg-small tool' : 'gg-icon-button gg-small gg-opacity tool') : 'hidden'}" tip="Toggle legend" onclick="${() => this.toggleLegend()}"><img alt="Toggle legend" src="icons/legend.svg" loading="lazy"></button> <button class="${this.layer.hasMetadata ? 'metadata gg-icon-button gg-small gg-opacity tool' : 'hidden'}" onclick="${() => this.showMetadata()}"><img alt="Metadata" src="icons/info.svg"></button> <button id="drag-button" class="${this.getButtonClass('draggable')}" tip="Move"><img alt="Move layer" src="icons/drag.svg"></button> <button class="${this.getButtonClass('removable')}" tip="Remove layer" onclick="${() => this.deleteLayer()}"><img alt="Remove layer" src="icons/trash.svg"></button></header>${Object.keys(this.legendUrls).map((l) => uHtml `<div class="${this.isLegendExpanded ? 'legend' : 'hidden'}"><div class="gg-spacer gg-small"></div><img alt="${'Legend for ' + l}" src="${this.legendUrls[l]}" loading="lazy" crossorigin="${this.getCrossOrigin(this.legendUrls[l])}"></div>`)}<div class="${this.layer instanceof LayerLocalFile && this.isLegendExpanded ? 'legend-file' : 'legend-file hidden'}"><div class="gg-spacer gg-small"></div><div class="gg-spacer gg-small"></div><div><span i18n="File from">File from</span> <span>${this.layer.lastModifiedDate}</span> <span>[</span> <span>${this.layer._features?.length}</span> <span i18n="features">features</span> <span>]</span></div></div></div>
+<link rel="stylesheet" href="lib/tippy.js/tippy.css"><link rel="stylesheet" href="lib/tippy.js/backdrop.css"><link rel="stylesheet" href="lib/tippy.js/border.css"><link rel="stylesheet" href="lib/tippy.js/svg-arrow.css"><div id="container"><header><div class="gg-spacer gg-small"><img class="${this.layer.restricted ? (this.layer.active ? 'gg-small gg-lock gg-selected' : 'gg-small gg-lock gg-opacity') : 'hidden'}" alt="Protected layer" src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KICA8bWFzayBpZD0ibWFzazBfMzdfNDUxNyIgc3R5bGU9Im1hc2stdHlwZTphbHBoYSIgbWFza1VuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeD0iMCIgeT0iMCIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0Ij4KICA8cmVjdCB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIGZpbGw9IiNEOUQ5RDkiLz4KICA8L21hc2s+CiAgPGcgbWFzaz0idXJsKCNtYXNrMF8zN180NTE3KSI+CiAgPHBhdGggZD0iTTYgMjJDNS40NSAyMiA0Ljk3OTE3IDIxLjgwNDIgNC41ODc1IDIxLjQxMjVDNC4xOTU4MyAyMS4wMjA4IDQgMjAuNTUgNCAyMFYxMEM0IDkuNDUgNC4xOTU4MyA4Ljk3OTE3IDQuNTg3NSA4LjU4NzVDNC45NzkxNyA4LjE5NTgzIDUuNDUgOCA2IDhIN1Y2QzcgNC42MTY2NyA3LjQ4NzUgMy40Mzc1IDguNDYyNSAyLjQ2MjVDOS40Mzc1IDEuNDg3NSAxMC42MTY3IDEgMTIgMUMxMy4zODMzIDEgMTQuNTYyNSAxLjQ4NzUgMTUuNTM3NSAyLjQ2MjVDMTYuNTEyNSAzLjQzNzUgMTcgNC42MTY2NyAxNyA2VjhIMThDMTguNTUgOCAxOS4wMjA4IDguMTk1ODMgMTkuNDEyNSA4LjU4NzVDMTkuODA0MiA4Ljk3OTE3IDIwIDkuNDUgMjAgMTBWMjBDMjAgMjAuNTUgMTkuODA0MiAyMS4wMjA4IDE5LjQxMjUgMjEuNDEyNUMxOS4wMjA4IDIxLjgwNDIgMTguNTUgMjIgMTggMjJINlpNNiAyMEgxOFYxMEg2VjIwWk0xMiAxN0MxMi41NSAxNyAxMy4wMjA4IDE2LjgwNDIgMTMuNDEyNSAxNi40MTI1QzEzLjgwNDIgMTYuMDIwOCAxNCAxNS41NSAxNCAxNUMxNCAxNC40NSAxMy44MDQyIDEzLjk3OTIgMTMuNDEyNSAxMy41ODc1QzEzLjAyMDggMTMuMTk1OCAxMi41NSAxMyAxMiAxM0MxMS40NSAxMyAxMC45NzkyIDEzLjE5NTggMTAuNTg3NSAxMy41ODc1QzEwLjE5NTggMTMuOTc5MiAxMCAxNC40NSAxMCAxNUMxMCAxNS41NSAxMC4xOTU4IDE2LjAyMDggMTAuNTg3NSAxNi40MTI1QzEwLjk3OTIgMTYuODA0MiAxMS40NSAxNyAxMiAxN1pNOSA4SDE1VjZDMTUgNS4xNjY2NyAxNC43MDgzIDQuNDU4MzMgMTQuMTI1IDMuODc1QzEzLjU0MTcgMy4yOTE2NyAxMi44MzMzIDMgMTIgM0MxMS4xNjY3IDMgMTAuNDU4MyAzLjI5MTY3IDkuODc1IDMuODc1QzkuMjkxNjcgNC40NTgzMyA5IDUuMTY2NjcgOSA2VjhaIiBmaWxsPSIjMUMxQjFGIi8+CiAgPC9nPgo8L3N2Zz4KICA="></div><button class="${this.layer.active ? 'gg-icon-button gg-small gg-selected' : 'gg-icon-button gg-small gg-opacity'}" tip="Activate / Deactivate" onclick="${() => this.toggle()}"><img class="${this.layer.active ? 'gg-checkbox' : 'hidden'}" alt="Expand/Collapse button" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0NDggNTEyIj48IS0tIUZvbnQgQXdlc29tZSBGcmVlIDYuNi4wIGJ5IEBmb250YXdlc29tZSAtIGh0dHBzOi8vZm9udGF3ZXNvbWUuY29tIExpY2Vuc2UgLSBodHRwczovL2ZvbnRhd2Vzb21lLmNvbS9saWNlbnNlL2ZyZWUgQ29weXJpZ2h0IDIwMjQgRm9udGljb25zLCBJbmMuLS0+PHBhdGggZD0iTTY0IDMyQzI4LjcgMzIgMCA2MC43IDAgOTZMMCA0MTZjMCAzNS4zIDI4LjcgNjQgNjQgNjRsMzIwIDBjMzUuMyAwIDY0LTI4LjcgNjQtNjRsMC0zMjBjMC0zNS4zLTI4LjctNjQtNjQtNjRMNjQgMzJ6TTMzNyAyMDlMMjA5IDMzN2MtOS40IDkuNC0yNC42IDkuNC0zMy45IDBsLTY0LTY0Yy05LjQtOS40LTkuNC0yNC42IDAtMzMuOXMyNC42LTkuNCAzMy45IDBsNDcgNDdMMzAzIDE3NWM5LjQtOS40IDI0LjYtOS40IDMzLjkgMHM5LjQgMjQuNiAwIDMzLjl6Ii8+PC9zdmc+"> <img class="${!this.layer.active ? 'gg-checkbox' : 'hidden'}" alt="Expand/Collapse button" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0NDggNTEyIj48IS0tIUZvbnQgQXdlc29tZSBGcmVlIDYuNi4wIGJ5IEBmb250YXdlc29tZSAtIGh0dHBzOi8vZm9udGF3ZXNvbWUuY29tIExpY2Vuc2UgLSBodHRwczovL2ZvbnRhd2Vzb21lLmNvbS9saWNlbnNlL2ZyZWUgQ29weXJpZ2h0IDIwMjQgRm9udGljb25zLCBJbmMuLS0+PHBhdGggZD0iTTM4NCA4MGM4LjggMCAxNiA3LjIgMTYgMTZsMCAzMjBjMCA4LjgtNy4yIDE2LTE2IDE2TDY0IDQzMmMtOC44IDAtMTYtNy4yLTE2LTE2TDQ4IDk2YzAtOC44IDcuMi0xNiAxNi0xNmwzMjAgMHpNNjQgMzJDMjguNyAzMiAwIDYwLjcgMCA5NkwwIDQxNmMwIDM1LjMgMjguNyA2NCA2NCA2NGwzMjAgMGMzNS4zIDAgNjQtMjguNyA2NC02NGwwLTMyMGMwLTM1LjMtMjguNy02NC02NC02NEw2NCAzMnoiLz48L3N2Zz4="></button><div class="${this.layer.hasError ? 'gg-icon gg-small gg-opacity' : 'hidden'}" tip="${this.layer.errorMessage ? this.layer.errorMessage : 'Error on layer'}"><img alt="Error on layer" src="icons/error.svg"></div><div class="${this.isVisibleInCurrentResolution() ? 'label-container' : 'label-container label-out-resolution'}"><button class="${this.layer.active ? 'gg-icon-button gg-small gg-selected' : 'gg-icon-button gg-small gg-opacity'}" onclick="${() => this.toggle()}"><span i18n="${this.layer.name}" class="gg-tree-label">${this.layer.name}</span></button> <button class="${this.layer.active && this.layer instanceof LayerWms && !this.isVisibleInCurrentResolution() ? 'gg-icon-button gg-small resolution-tool' : 'hidden'}" tip="Zoom to visible resolution" onclick="${() => this.zoomToVisibleResolution()}"><img alt="Zoom to visible resolution" src="icons/zoom.svg"></button> <img class="${this.layer.active && this.iconUrl ? 'legend-icon' : 'hidden'}" alt="${'Icon for ' + this.layer.name}" src="${this.iconUrl}" loading="lazy" crossorigin="${this.getCrossOrigin(this.iconUrl)}"></div><button class="${this.layer.active && this.layer instanceof LayerLocalFile ? 'gg-icon-button gg-small gg-opacity tool' : 'hidden'}" tip="Zoom to full extent" onclick="${() => this.zoomToFullExtent()}"><img alt="Zoom to full extent" src="icons/zoom.svg"></button> <button class="${this.layer.active && this.layer instanceof LayerLocalFile ? 'gg-icon-button gg-small gg-opacity tool' : 'hidden'}" tip="Convert to drawing" onclick="${() => this.convertToDrawing()}"><img alt="draw-icon" src="icons/draw.svg"></button> <button class="${this.getButtonClass('swipedLeft')}" tip="Swipe layer to the left" onclick="${() => this.layer.swiped = (this.layer.swiped === 'left') ? 'no' : 'left'}"><img alt="Swipe layer to the left" src="icons/swipe-left.svg"></button> <button class="${this.getButtonClass('swipedRight')}" tip="Swipe layer to the right" onclick="${() => this.layer.swiped = (this.layer.swiped === 'right') ? 'no' : 'right'}"><img alt="Swipe layer to the right" src="icons/swipe-right.svg"></button> <button id="opacity" class="${this.getButtonClass('opacity')}" tip="Control opacity"><img alt="Control opacity" src="icons/opacity.svg"></button> <button id="filter" class="${this.getButtonClass('filter')}" tip="Filter layer"><img alt="Filter layer" src="icons/filter.svg"></button> <button id="advanced-filter" class="${this.getButtonClass('advanced-filter')}" tip="Open advanced filter tool" onclick="${() => this.state.interface.advancedFilterPanelVisible = !this.state.interface.advancedFilterPanelVisible}"><img alt="Advanced filter" src="icons/advanced-filter.svg"></button> <button id="timeRestriction" class="${this.getButtonClass('timeRestriction')}" tip="Define time restriction on layer"><img alt="Define time restriction on layer" src="icons/clock.svg"></button> <button class="${this.getButtonClass('snappable')}" onclick="${() => this.toggleSnap()}" tip="Snap to layer features"><img alt="Enable snapping" src="icons/snapping.svg"></button> <button class="${this.hasLegend ? (this.layer.isLegendExpanded ? 'gg-icon-button gg-small tool' : 'gg-icon-button gg-small gg-opacity tool') : 'hidden'}" tip="Toggle legend" onclick="${() => this.toggleLegend()}"><img alt="Toggle legend" src="icons/legend.svg" loading="lazy"></button> <button class="${this.layer.hasMetadata ? 'metadata gg-icon-button gg-small gg-opacity tool' : 'hidden'}" tip="Show metadata" onclick="${() => this.showMetadata()}"><img alt="Metadata" src="icons/info.svg"></button> <button id="drag-button" class="${this.getButtonClass('draggable')}" tip="Move"><img alt="Move layer" src="icons/drag.svg"></button> <button class="${this.getButtonClass('removable')}" tip="Remove layer" onclick="${() => this.deleteLayer()}"><img alt="Remove layer" src="icons/trash.svg"></button></header>${Object.keys(this.legendUrls).map((l) => uHtml `<div class="${this.isLegendExpanded ? 'legend' : 'hidden'}"><div class="gg-spacer gg-small"></div><img alt="${'Legend for ' + l}" src="${this.legendUrls[l]}" loading="lazy" crossorigin="${this.getCrossOrigin(this.legendUrls[l])}"></div>`)}<div class="${this.layer instanceof LayerLocalFile && this.isLegendExpanded ? 'legend-file' : 'legend-file hidden'}"><div class="gg-spacer gg-small"></div><div class="gg-spacer gg-small"></div><div><span i18n="File from">File from</span> <span>${this.layer.lastModifiedDate}</span> <span>[</span> <span>${this.layer._features?.length}</span> <span i18n="features">features</span> <span>]</span></div></div></div>
 ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
     };
     iconUrl = null;

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.2847659248",
+  "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.2847659248", "build":"2847659248", "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 };
     }