@geogirafe/lib-geoportal 1.2.0-dev.2813242211 → 1.2.0-dev.2829121016

package/tools/drawing/cesiumDrawing.js

@@ -26,17 +26,17 @@ export default class CesiumDrawing {
     get config() {
         return this.context.configManager.Config;
     }
+    /**
+     * The 3D Map has to be loaded before creating a CesiumDrawing.
+     * This class is loaded on demand, so that Cesium stays out of the initial bundle.
+     */
     constructor(map, stateLocation, context) {
         this.stateLocation = stateLocation;
         this.context = context;
-        map.subscribe('globe.loaded', () => {
-            if (this.state.globe.loaded) {
-                this.scene = map.map3d.getCesiumScene();
-                this.handler = new Cesium.ScreenSpaceEventHandler(this.scene.canvas);
-                this.entities = map.map3d.getDataSourceDisplay().defaultDataSource.entities;
-                map.subscribe(`extendedState.${this.stateLocation}.activeTool`, (_oldTool, newTool) => newTool === null ? this.deactivateTool() : this.activateTool(newTool));
-            }
-        });
+        this.scene = map.map3d.getCesiumScene();
+        this.handler = new Cesium.ScreenSpaceEventHandler(this.scene.canvas);
+        this.entities = map.map3d.getDataSourceDisplay().defaultDataSource.entities;
+        map.subscribe(`extendedState.${this.stateLocation}.activeTool`, (_oldTool, newTool) => newTool === null ? this.deactivateTool() : this.activateTool(newTool));
     }
     setFixedLineLength(length) {
         this.fixedLineLength = Number.isNaN(length) ? 0 : length;

package/tools/drawing/olDrawing.d.ts

@@ -1,5 +1,5 @@
 import DrawingFeature from './drawingFeature.js';
-import MapComponent from '../../components/map/component.js';
+import Map2dComponent from '../../components/map-2d/component.js';
 import { Feature } from 'ol';
 import { Geometry } from 'ol/geom.js';
 import VectorSource from 'ol/source/Vector.js';
@@ -36,7 +36,7 @@ export default class OlDrawing {
     private get state();
     private get drawingState();
     private get config();
-    constructor(mapComponent: MapComponent, stateLocation: string, context: IGirafeContext, deleteHandler: (featureId: string) => void);
+    constructor(mapComponent: Map2dComponent, stateLocation: string, context: IGirafeContext, deleteHandler: (featureId: string) => void);
     private addModifyInteraction;
     private addSnapInteraction;
     private addTranslateInteraction;

package/tools/drawing/olDrawing.js

@@ -11,7 +11,7 @@ import { getPointResolution } from 'ol/proj.js';
 import { always, never, platformModifierKeyOnly, primaryAction } from 'ol/events/condition.js';
 import { unByKey } from 'ol/Observable.js';
 import { ensurePolygonIsProperlyClosed, getAreaOfPolygon, getDistance, getHalfPoint, getLabelStyle, getLengthAsMetricText, getRadiusDataForCircle, unByKeyAll } from '../utils/olutils.js';
-import { ContextMenu, EntryInteractionType } from '../../components/map/tools/contextmenu.js';
+import { ContextMenu, EntryInteractionType } from '../../components/map-2d/tools/contextmenu.js';
 import { formatCoordinates } from '../geometrytools.js';
 import { v4 as uuidv4 } from 'uuid';
 import { isAlternateMouseClick, isPrimaryPointerAction } from '../state/userinteractionevent.js';

package/tools/main.d.ts

@@ -65,6 +65,7 @@ export type { GmfSearchConfig } from './search/gmfsearchclient.js';
 export { default as GmfSearchClient } from './search/gmfsearchclient.js';
 export type { SearchProviderConfig } from './search/searchmanager.js';
 export { default as SearchManager } from './search/searchmanager.js';
+export { default as SelectionManager } from './selection/selectionmanager.js';
 export type { default as ISessionManager } from './share/isessionmanager.js';
 export type { UrlShortenerResponse, IUrlShortener } from './share/iurlshortener.js';
 export { default as ActiveBasemapsSerializer } from './share/serializers/activebasemapsserializer.js';
@@ -148,3 +149,4 @@ export { default as WfsParser } from './wfs/wfsparser.js';
 export { default as WmsClient, WmsClientQgis, WmsClientMapServer, WmsClientDefault, WmsClientGeoServer } from './wms/wmsclient.js';
 export { default as WmsLegendHelper } from './wms/wmslegendhelper.js';
 export { default as WmsManager } from './wms/wmsmanager.js';
+export { default as WmtsManager } from './wmts/wmtsmanager.js';

package/tools/main.js

@@ -52,6 +52,7 @@ export { default as AbstractSearchClient, SEARCH_PROVIDER_DEFAULT, SEARCH_GROUP_
 export { default as GeoAdminChSearchClient } from './search/geoadminchsearchclient.js';
 export { default as GmfSearchClient } from './search/gmfsearchclient.js';
 export { default as SearchManager } from './search/searchmanager.js';
+export { default as SelectionManager } from './selection/selectionmanager.js';
 export { default as ActiveBasemapsSerializer } from './share/serializers/activebasemapsserializer.js';
 export { default as CustomLayersSerializer } from './share/serializers/customlayersserializer.js';
 export { default as GlobeSerializer } from './share/serializers/globeserializer.js';
@@ -113,3 +114,4 @@ export { default as WfsParser } from './wfs/wfsparser.js';
 export { default as WmsClient, WmsClientQgis, WmsClientMapServer, WmsClientDefault, WmsClientGeoServer } from './wms/wmsclient.js';
 export { default as WmsLegendHelper } from './wms/wmslegendhelper.js';
 export { default as WmsManager } from './wms/wmsmanager.js';
+export { default as WmtsManager } from './wmts/wmtsmanager.js';

package/tools/selection/selectionmanager.d.ts

@@ -0,0 +1,19 @@
+import GirafeSingleton from '../../base/GirafeSingleton.js';
+/**
+ * Handles the feature selection, independently from the map (2D or 3D) the selection was triggered from.
+ * The selection is done in two steps:
+ * 1. `select()` asks every layer manager to add its own <code>SelectionParam</code> to the state.
+ * 2. The change of <code>selection.selectionParameters</code> triggers the effective query
+ *    (WMS GetFeatureInfo and WFS GetFeature) and writes the resulting features into the state.
+ */
+export default class SelectionManager extends GirafeSingleton {
+    private get state();
+    initializeSingleton(): void;
+    /**
+     * Selects all the features of the queryable layers that are inside the given extent.
+     * Layers selectable today are WMS, WMTS (with wms layer) and Local files.
+     */
+    select(extent: number[]): void;
+    selectNone(): void;
+    private onSelectFeatures;
+}

package/tools/selection/selectionmanager.js

@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: Apache-2.0
+import GirafeSingleton from '../../base/GirafeSingleton.js';
+import { SelectionMode } from '../../models/selection.js';
+import { applyFeaturesToSelection } from '../utils/utils.js';
+/**
+ * Handles the feature selection, independently from the map (2D or 3D) the selection was triggered from.
+ * The selection is done in two steps:
+ * 1. `select()` asks every layer manager to add its own <code>SelectionParam</code> to the state.
+ * 2. The change of <code>selection.selectionParameters</code> triggers the effective query
+ *    (WMS GetFeatureInfo and WFS GetFeature) and writes the resulting features into the state.
+ */
+export default class SelectionManager extends GirafeSingleton {
+    get state() {
+        return this.context.stateManager.state;
+    }
+    initializeSingleton() {
+        this.context.stateManager.subscribe('selection.selectionParameters', (_, newParams) => {
+            // The querying is asynchronous and nobody awaits it here,
+            // so a failing request must not end up in an unhandled rejection.
+            this.onSelectFeatures(newParams).catch((error) => console.error('Could not select the features.', error));
+        });
+    }
+    /**
+     * Selects all the features of the queryable layers that are inside the given extent.
+     * Layers selectable today are WMS, WMTS (with wms layer) and Local files.
+     */
+    select(extent) {
+        // Reset current selection if SelectionMode is Replace
+        if (this.state.selection.selectionMode === SelectionMode.Replace) {
+            this.selectNone();
+        }
+        else if (this.state.selection.selectionMode === SelectionMode.Add) {
+            this.state.selection.selectionParameters = [];
+        }
+        // Use batch for changes to prevent multiple selection of objects
+        this.context.stateManager.batchChanges(() => {
+            this.context.wmsManager.selectFeatures(extent);
+            this.context.wmtsManager.selectFeatures(extent);
+            this.context.localFileManager.selectFeatures(extent);
+        });
+    }
+    selectNone() {
+        this.state.selection.selectedFeatures = [];
+        this.state.selection.selectionParameters = [];
+        this.state.selection.highlightedFeatures = [];
+    }
+    async onSelectFeatures(selectionParams) {
+        if (selectionParams.length === 0) {
+            return;
+        }
+        this.state.loading = true;
+        try {
+            // WMS GetFeatureInfo
+            const wmsPromises = selectionParams.map((param) => {
+                const wmsGetFeatureInfoSelectionParam = param.clone((l) => l.queryable && l.wmsQueryableOnly);
+                const client = this.context.wmsManager.getClient(wmsGetFeatureInfoSelectionParam.ogcServer);
+                return client.getFeatureInfo(wmsGetFeatureInfoSelectionParam);
+            });
+            // WFS GetFeature
+            const wfsPromises = selectionParams.map((param) => {
+                const wfsGetFeatureInfoSelectionParam = param.clone((l) => l.wfsQueryable);
+                const client = this.context.wfsManager.getClient(wfsGetFeatureInfoSelectionParam.ogcServer);
+                const features = client.getFeature(wfsGetFeatureInfoSelectionParam);
+                return features;
+            });
+            const wmsGmlFeatures = (await Promise.all(wmsPromises)).flat();
+            const wfsGmlFeatures = (await Promise.all(wfsPromises)).flat();
+            const gmlFeatures = [...wmsGmlFeatures, ...wfsGmlFeatures];
+            if (gmlFeatures.length === 0 && this.state.selection.selectedFeatures.length === 0) {
+                this.state.interface.selectionComponentVisible = false;
+            }
+            else {
+                applyFeaturesToSelection(gmlFeatures, this.state);
+            }
+        }
+        finally {
+            this.state.loading = false;
+        }
+    }
+}

package/tools/state/componentManager.d.ts

@@ -1,7 +1,7 @@
 import GirafeHTMLElement from '../../base/GirafeHTMLElement.js';
 import GirafeSingleton from '../../base/GirafeSingleton.js';
 type Callback = (elem: GirafeHTMLElement) => unknown;
-type Constructor<T> = new (...args: unknown[]) => T;
+type Constructor<T> = new (...args: never[]) => T;
 export default class ComponentManager extends GirafeSingleton {
     private readonly components;
     private readonly registeredCallbacks;

package/tools/tests/mockcontext.d.ts

@@ -29,6 +29,8 @@ import UrlManager from '../url/urlmanager';
 import UserDataManager from '../userdata/userdatamanager';
 import WfsManager from '../wfs/wfsmanager';
 import WmsManager from '../wms/wmsmanager';
+import WmtsManager from '../wmts/wmtsmanager';
+import SelectionManager from '../selection/selectionmanager';
 import OnBoardingManager from '../onboarding/onboardingmanager';
 import ThemeFavoritesManager from '../themes/themefavoritesmanager';
 import SearchManager from '../search/searchmanager';
@@ -62,6 +64,8 @@ export default class MockGirafeContext implements IGirafeContext {
     readonly orderingManager: OrderingManager;
     readonly userLayerManager: UserLayerManager;
     readonly wmsManager: WmsManager;
+    readonly wmtsManager: WmtsManager;
+    readonly selectionManager: SelectionManager;
     readonly ogcApiFeaturesManager: OgcApiFeaturesManager;
     readonly localFileManager: LocalFileManager;
     readonly onBoardingManager: OnBoardingManager;

package/tools/tests/mockcontext.js

@@ -30,6 +30,8 @@ import UrlManager from '../url/urlmanager';
 import UserDataManager from '../userdata/userdatamanager';
 import WfsManager from '../wfs/wfsmanager';
 import WmsManager from '../wms/wmsmanager';
+import WmtsManager from '../wmts/wmtsmanager';
+import SelectionManager from '../selection/selectionmanager';
 import { MockConfig } from './mockconfig';
 import OnBoardingManager from '../onboarding/onboardingmanager';
 import ThemeFavoritesManager from '../themes/themefavoritesmanager';
@@ -64,6 +66,8 @@ export default class MockGirafeContext {
     orderingManager;
     userLayerManager;
     wmsManager;
+    wmtsManager;
+    selectionManager;
     ogcApiFeaturesManager;
     localFileManager;
     onBoardingManager;
@@ -99,6 +103,8 @@ export default class MockGirafeContext {
         this.customThemesManager = new CustomThemesManager(this);
         this.themesManager = new ThemesManager(this);
         this.wmsManager = new WmsManager(this);
+        this.wmtsManager = new WmtsManager(this);
+        this.selectionManager = new SelectionManager(this);
         this.localFileManager = new LocalFileManager(this);
         this.ogcApiFeaturesManager = new OgcApiFeaturesManager(this);
         this.onBoardingManager = new OnBoardingManager(this);
@@ -143,7 +149,9 @@ export default class MockGirafeContext {
         this.customThemesManager.initializeSingleton();
         this.themesManager.initializeSingleton();
         this.wmsManager.initializeSingleton();
+        this.wmtsManager.initializeSingleton();
         this.localFileManager.initializeSingleton();
+        this.selectionManager.initializeSingleton();
         this.ogcApiFeaturesManager.initializeSingleton();
         this.onBoardingManager.initializeSingleton();
         this.themeFavoritesManager.initializeSingleton();

package/tools/themes/themeshelper.d.ts

@@ -11,13 +11,48 @@ export default class ThemesHelper extends GirafeSingleton {
     initializeSingleton(): void;
     private get state();
     findBaseLayerById(layerId: number): BaseLayer;
-    private findBaseLayerRecursiveById;
+    findBaseLayerRecursiveById(layers: BaseLayer[], layerId: number): BaseLayer | null;
     findThemeByName(themename: string): ThemeLayer | null;
     findGroupByName(groupname: string): GroupLayer | null;
     findLayerByName(layername: string): Layer | null;
     private findBaseLayerByName;
     private findLayerRecursive;
+    /**
+     * @param layer any layer or layer group (or theme) to find the related theme.
+     * @returns The original theme configuration.
+     */
+    getOriginalTheme(layer: BaseLayer): ThemeLayer | null;
+    /**
+     * Count the layer in both the given theme and the matching original theme.
+     * @param theme the theme to check.
+     * @returns true if the count is the same. False otherwise.
+     */
+    isThemeComplete(theme: ThemeLayer): boolean;
+    /**
+     * @return the number of all sublayers (recursively) of the given layer.
+     * @private
+     */
+    private countLayer;
+    /**
+     * Add the related theme if it's not already (even partially) in the layertree. If it's
+     * already in it, don't add it, warn the user, and highlight it.
+     * @returns true if the related theme is added to the layertree, false otherwise.
+     */
+    addThemeIfNotPresent(theme: ThemeLayer): boolean;
+    /**
+     * Add the missing layers of an in-use theme, from an original theme description.
+     * The added layers are deactivated.
+     * @param originalTheme a Theme object, or model, as initially defined.
+     */
+    completeTheme(originalTheme: ThemeLayer): void;
+    /**
+     * Deactivate all layers and sublayer recursively.
+     * Meaning state="off" and isDefaultChecked=false.
+     * @private
+     */
+    private deactivateAllLayers;
     private onSelectedThemeChanged;
+    private getThemeInLayersList;
     private onThemeChanged;
     getMinimalClonedThemeForLayer(layer: BaseLayer): ThemeLayer;
     private removeOthers;
@@ -50,6 +85,14 @@ export default class ThemesHelper extends GirafeSingleton {
     private addLayerToLayerTree;
     removeLayersFromLayerTree(layersToRemove: BaseLayer[]): void;
     private removeLayersFromExistingLayerTree;
+    /**
+     * Find the initial position of the layer (relative to its sibling layers) by looking
+     * at the original theme object and insert the layer following this original order.
+     * (The "layer.order" value is incremented with the user operations, that's why we can
+     * rely on it for new layers and must adapt it to the existing sibling layers.)
+     * @private
+     */
+    private insertLayerToLayerTreeAtInitialPosition;
     /**
      * Removes all layers from the layer tree except themes that are pinned.
      */

package/tools/themes/themeshelper.js

@@ -93,6 +93,97 @@ export default class ThemesHelper extends GirafeSingleton {
         }
         return null;
     }
+    /**
+     * @param layer any layer or layer group (or theme) to find the related theme.
+     * @returns The original theme configuration.
+     */
+    getOriginalTheme(layer) {
+        const hierarchy = this.getHierarchyFromLayer(layer);
+        const theme = hierarchy?.length ? hierarchy[0] : undefined;
+        return theme ? this.findThemeByName(theme.name) : null;
+    }
+    /**
+     * Count the layer in both the given theme and the matching original theme.
+     * @param theme the theme to check.
+     * @returns true if the count is the same. False otherwise.
+     */
+    isThemeComplete(theme) {
+        const originalTheme = this.getOriginalTheme(theme);
+        if (!originalTheme) {
+            return false;
+        }
+        const themeCount = this.countLayer(theme);
+        const originalThemeCount = this.countLayer(originalTheme);
+        return themeCount === originalThemeCount;
+    }
+    /**
+     * @return the number of all sublayers (recursively) of the given layer.
+     * @private
+     */
+    countLayer(layer) {
+        let count = 1;
+        const layerAsUnknownGroup = layer;
+        if (layerAsUnknownGroup.children) {
+            layerAsUnknownGroup.children.forEach((child) => {
+                count += this.countLayer(child);
+            });
+        }
+        return count;
+    }
+    /**
+     * Add the related theme if it's not already (even partially) in the layertree. If it's
+     * already in it, don't add it, warn the user, and highlight it.
+     * @returns true if the related theme is added to the layertree, false otherwise.
+     */
+    addThemeIfNotPresent(theme) {
+        const themeInLayersList = this.getThemeInLayersList(theme);
+        // The theme is not yet added, add it!
+        if (themeInLayersList === undefined) {
+            if (this.state.themes.lastSelectedTheme?.id === theme.id) {
+                this.state.themes.lastSelectedTheme = null;
+            }
+            this.state.themes.lastSelectedTheme = theme;
+            return true;
+        }
+        // The theme is in the layer tree, then warn the user.
+        themeInLayersList.isHighlighted = true;
+        const layerName = this.context.i18nManager.getTranslation(theme.name);
+        const msg = this.context.i18nManager
+            .getTranslation('The theme {name} is already present in the treeview.')
+            .replace('{name}', layerName);
+        this.state.infobox.elements.push({
+            id: theme.treeItemId,
+            text: msg,
+            type: 'info',
+            duration: 5000
+        });
+        return false;
+    }
+    /**
+     * Add the missing layers of an in-use theme, from an original theme description.
+     * The added layers are deactivated.
+     * @param originalTheme a Theme object, or model, as initially defined.
+     */
+    completeTheme(originalTheme) {
+        const clonedTheme = originalTheme.clone();
+        this.deactivateAllLayers(clonedTheme);
+        this.mergeLayerWithExistingLayerTree(clonedTheme, this.state.layers.layersList, false);
+    }
+    /**
+     * Deactivate all layers and sublayer recursively.
+     * Meaning state="off" and isDefaultChecked=false.
+     * @private
+     */
+    deactivateAllLayers(layer) {
+        layer.activeState = 'off';
+        layer.isDefaultChecked = false;
+        const layerAsUnknownGroup = layer;
+        if (layerAsUnknownGroup.children) {
+            layerAsUnknownGroup.children.forEach((child) => {
+                this.deactivateAllLayers(child);
+            });
+        }
+    }
     onSelectedThemeChanged(theme) {
         if (!theme) {
             // Theme is null, nothing to do here
@@ -108,7 +199,11 @@ export default class ThemesHelper extends GirafeSingleton {
             this.onThemeChanged(theme);
         }
     }
+    getThemeInLayersList(theme) {
+        return this.state.layers.layersList.find((l) => l.id == theme.id);
+    }
     onThemeChanged(theme) {
+        const themeInLayersList = this.getThemeInLayersList(theme);
         // Create a clone of the theme object to use it in the treeview.
         // This is essential, otherwise all changes are done in the layers
         // (For example, when expanding legend, expanding a group, or activating the layer).
@@ -116,20 +211,10 @@ export default class ThemesHelper extends GirafeSingleton {
         // 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) {
-            themeAlreadyInLayersList.isHighlighted = true;
-            const layername = this.context.i18nManager.getTranslation(clonedTheme.name);
-            const msg = this.context.i18nManager
-                .getTranslation('The theme {name} is already present in the treeview.')
-                .replace('{name}', layername);
-            this.state.infobox.elements.push({
-                id: theme.treeItemId,
-                text: msg,
-                type: 'info',
-                duration: 5000
-            });
-            return;
+        // Delete (replace) this theme if it already exists.
+        if (themeInLayersList !== undefined) {
+            this.context.stateManager.batchChanges(() => this.removeLayersFromLayerTree([themeInLayersList]));
+            clonedTheme.order = themeInLayersList.order;
         }
         if (this.context.configManager.Config.themes.selectionMode === 'replace') {
             // Mode is <replace>
@@ -138,7 +223,6 @@ export default class ThemesHelper extends GirafeSingleton {
         }
         else {
             // Mode is <add>
-            clonedTheme.order = this.getInitialOrderForNewTheme();
             this.state.layers.layersList.push(clonedTheme);
         }
         const themeFunctionalities = this.state.themes._allFunctionalities[theme.id];
@@ -384,7 +468,7 @@ export default class ThemesHelper extends GirafeSingleton {
         if (parent) {
             newLayer.parent = parent;
         }
-        existingList.push(newLayer);
+        this.insertLayerToLayerTreeAtInitialPosition(newLayer, existingList);
         if (activate) {
             this.context.layerManager.toggle(newLayer, 'on');
         }
@@ -411,6 +495,55 @@ export default class ThemesHelper extends GirafeSingleton {
             }
         }
     }
+    /**
+     * Find the initial position of the layer (relative to its sibling layers) by looking
+     * at the original theme object and insert the layer following this original order.
+     * (The "layer.order" value is incremented with the user operations, that's why we can
+     * rely on it for new layers and must adapt it to the existing sibling layers.)
+     * @private
+     */
+    insertLayerToLayerTreeAtInitialPosition(newLayer, existingList) {
+        const originalLayer = this.findBaseLayerById(newLayer.id);
+        const originalParent = originalLayer.parent;
+        if (!originalParent || existingList.length === 0) {
+            existingList.push(newLayer);
+            return;
+        }
+        // Following the original order, find the nearest previous or next sibling layer in the existingList.
+        const originalSiblings = originalParent.children;
+        const existingListIds = new Set(existingList.map((layer) => layer.id));
+        let previousOriginalSibling;
+        let nextOriginalSibling;
+        let originalLayerEncountered = false;
+        originalSiblings.some((oLayer) => {
+            if (originalLayerEncountered && (previousOriginalSibling || nextOriginalSibling)) {
+                return true;
+            }
+            if (oLayer.id === newLayer.id) {
+                originalLayerEncountered = true;
+            }
+            else if (existingListIds.has(oLayer.id)) {
+                if (originalLayerEncountered) {
+                    nextOriginalSibling = oLayer;
+                }
+                else {
+                    previousOriginalSibling = oLayer;
+                }
+            }
+        });
+        // Find back the matching sibling layer in the ExistingList and update the "newLayer.order"
+        // to be just before or just after the sibling layer.
+        if (previousOriginalSibling) {
+            const previousSibling = existingList.find((layer) => layer.id === previousOriginalSibling?.id);
+            newLayer.order = previousSibling?.order ? previousSibling.order : newLayer.order;
+        }
+        else if (nextOriginalSibling) {
+            const nextSibling = existingList.find((layer) => layer.id === nextOriginalSibling?.id);
+            newLayer.order = nextSibling?.order ? nextSibling.order - 1 : newLayer.order;
+        }
+        // Push the layer in the list. The orderManager will move the layer regarding the order values.
+        existingList.push(newLayer);
+    }
     /**
      * Removes all layers from the layer tree except themes that are pinned.
      */

package/{components/map/tools → tools/wmts}/wmtsmanager.d.ts

@@ -1,12 +1,9 @@
 import WMTS from 'ol/source/WMTS.js';
 import TileLayer from 'ol/layer/Tile.js';
-import type { Map as olMap } from 'ol';
 import type { Layer as OLayer } from 'ol/layer.js';
-import type LayerWmts from '../../../models/layers/layerwmts.js';
-import StateManager from '../../../tools/state/statemanager.js';
-declare class WmtsManager {
-    map: olMap;
-    private readonly stateManager;
+import type LayerWmts from '../../models/layers/layerwmts.js';
+import GirafeSingleton from '../../base/GirafeSingleton.js';
+declare class WmtsManager extends GirafeSingleton {
     wmtsCapabilitiesByServer: Record<string, Record<string, unknown>>;
     wmtsPromisesByServer: Record<string, Promise<Record<string, unknown>>>;
     wmtsAbortsByLayer: Record<string, AbortController>;
@@ -19,7 +16,7 @@ declare class WmtsManager {
         layerWmts: LayerWmts;
     }>;
     private get state();
-    constructor(map: olMap, stateManager: StateManager);
+    private get map();
     removeAllBasemapLayers(): void;
     addLayer(layer: LayerWmts): Promise<void>;
     addBasemapLayer(basemap: LayerWmts): void;

package/{components/map/tools → tools/wmts}/wmtsmanager.js

@@ -2,25 +2,22 @@
 import WMTS, { optionsFromCapabilities } from 'ol/source/WMTS.js';
 import WMTSCapabilities from 'ol/format/WMTSCapabilities.js';
 import TileLayer from 'ol/layer/Tile.js';
-import SelectionParam from '../../../models/selectionparam.js';
-import LayerWms from '../../../models/layers/layerwms.js';
+import SelectionParam from '../../models/selectionparam.js';
+import LayerWms from '../../models/layers/layerwms.js';
 import ImageWMS from 'ol/source/ImageWMS.js';
 import ImageLayer from 'ol/layer/Image.js';
-// TODO REG : Move to core, because we have a cross-dependency issue with the extlayers component
-class WmtsManager {
-    map;
-    stateManager;
+import GirafeSingleton from '../../base/GirafeSingleton.js';
+class WmtsManager extends GirafeSingleton {
     wmtsCapabilitiesByServer = {};
     wmtsPromisesByServer = {};
     wmtsAbortsByLayer = {};
     wmtsLayers = {};
     basemapLayers = {};
     get state() {
-        return this.stateManager.state;
+        return this.context.stateManager.state;
     }
-    constructor(map, stateManager) {
-        this.map = map;
-        this.stateManager = stateManager;
+    get map() {
+        return this.context.mapManager.getMap();
     }
     removeAllBasemapLayers() {
         Object.values(this.basemapLayers).forEach((basemap) => {