@geogirafe/lib-geoportal 1.2.0-dev.2800201562 → 1.2.0-dev.2816732111

package/templates/vite.config.js

@@ -74,31 +74,49 @@ export default defineConfig(({ command, mode }) => {
           api: resolve(__dirname, 'api.html')
         },
         output: {
-          manualChunks: (id) => {
-            // lazy loading for not priritary libraries
-            const lazyDependencies = [
-              '@geoblocks/mapfishprint',
-              '@geoblocks/print',
-              'buffer',
-              'd3',
-              'error-stack-parser',
-              'file-saver',
-              'tabulator-tables',
-              'lz-string',
-              'qr-code-styling',
-              'source-map-js',
-              'tippy.js',
-              'vanilla-picker',
-              'driver.js'
-            ];
-            if (lazyDependencies.some((dep) => id.includes(`node_modules/${dep}`))) {
-              return 'lazy';
-            }
-            // lazy loading for cesium dependencies
-            const cesiumDependencies = ['cesium', 'olcs/OLCesium'];
-            if (cesiumDependencies.some((dep) => id.includes(`node_modules/${dep}`))) {
-              return 'cesium';
-            }
+          codeSplitting: {
+            groups: [
+              // Dependencies that the application needs on startup and on which Cesium also depends
+              // (OpenLayers and dompurify). They need their own chunk, otherwise they end up in the
+              // (huge) cesium chunk, which would then have to be loaded on startup and would defeat
+              // the lazy loading of Cesium below.
+              // minSize: 0 prevents the group from being merged back into another chunk.
+              {
+                name: 'shared',
+                test: (id) => ['dompurify', 'ol'].some((dep) => id.includes(`node_modules/${dep}/`)),
+                priority: 30,
+                minSize: 0
+              },
+              // lazy loading for cesium dependencies
+              {
+                name: 'cesium',
+                test: (id) => ['cesium', 'olcs/OLCesium'].some((dep) => id.includes(`node_modules/${dep}`)),
+                priority: 20,
+                minSize: 0
+              },
+              // lazy loading for not priritary libraries
+              {
+                name: 'lazy',
+                test: (id) =>
+                  [
+                    '@geoblocks/mapfishprint',
+                    '@geoblocks/print',
+                    'buffer',
+                    'd3',
+                    'error-stack-parser',
+                    'file-saver',
+                    'tabulator-tables',
+                    'lz-string',
+                    'qr-code-styling',
+                    'source-map-js',
+                    'tippy.js',
+                    'vanilla-picker',
+                    'driver.js'
+                  ].some((dep) => id.includes(`node_modules/${dep}`)),
+                priority: 10,
+                minSize: 0
+              }
+            ]
           },
           entryFileNames: (chunkInfo) => {
             if (chunkInfo.name === 'api') {

package/tools/app/geogirafeapp-mobile.js

@@ -8,7 +8,9 @@ import DrawingContainerMobile from '../../components/drawing-container-mobile/co
 import DrawingComponentMobile from '../../components/drawing/component-mobile.js';
 import GeolocationMobile from '../../components/geolocation-mobile/component.js';
 import InfoboxComponent from '../../components/infobox/component.js';
-import MapComponent from '../../components/map/component.js';
+import Map2dComponent from '../../components/map-2d/component.js';
+import DeprecatedMapComponent from '../../components/map-2d/deprecatedmapcomponent.js';
+import Map3dComponent from '../../components/map-3d/component.js';
 import MenuMobile3dButton from '../../components/menu-buttons-mobile/MenuMobile3dButton.js';
 import MenuMobileDrawingButton from '../../components/menu-buttons-mobile/MenuMobileDrawingButton.js';
 import MenuMobileOfflineButton from '../../components/menu-buttons-mobile/MenuMobileOfflineButton.js';
@@ -44,7 +46,10 @@ export default class GeoGirafeAppMobile extends GeoGirafeApp {
     }
     defineCoreComponents() {
         customElements.define('girafe-infobox', InfoboxComponent);
-        customElements.define('girafe-map', MapComponent);
+        customElements.define('girafe-map-2d', Map2dComponent);
+        customElements.define('girafe-map-3d', Map3dComponent);
+        // Deprecated alias of <girafe-map-2d>, kept for the applications that were not migrated yet.
+        customElements.define('girafe-map', DeprecatedMapComponent);
         customElements.define('girafe-search', MobileSearchComponent);
         customElements.define('girafe-offline', OfflineComponent);
         customElements.define('girafe-theme-select', MobileThemeComponent);

package/tools/app/geogirafeapp.js

@@ -17,7 +17,9 @@ import InfoboxComponent from '../../components/infobox/component.js';
 import InfoWindowComponent from '../../components/infowindow/component.js';
 import LayoutComponent from '../../components/layout/component.js';
 import LRPanelComponent from '../../components/lr-panel/component.js';
-import MapComponent from '../../components/map/component.js';
+import Map2dComponent from '../../components/map-2d/component.js';
+import DeprecatedMapComponent from '../../components/map-2d/deprecatedmapcomponent.js';
+import Map3dComponent from '../../components/map-3d/component.js';
 import MenuButtonComponent from '../../components/menubutton/component.js';
 import ModalsComponent from '../../components/modals/component.js';
 import NavigationComponent from '../../components/navigation/component.js';
@@ -116,7 +118,10 @@ export default class GeoGirafeApp {
         customElements.define('girafe-cross-section-settings', CrossSectionSettingsComponent);
         customElements.define('girafe-cross-section-view', CrossSectionViewComponent);
         customElements.define('girafe-lr-panel', LRPanelComponent);
-        customElements.define('girafe-map', MapComponent);
+        customElements.define('girafe-map-2d', Map2dComponent);
+        customElements.define('girafe-map-3d', Map3dComponent);
+        // Deprecated alias of <girafe-map-2d>, kept for the applications that were not migrated yet.
+        customElements.define('girafe-map', DeprecatedMapComponent);
         customElements.define('girafe-menu-button', MenuButtonComponent);
         customElements.define('girafe-modals', ModalsComponent);
         customElements.define('girafe-nav-history', NavigationComponent);

package/tools/context/context.d.ts

@@ -29,6 +29,8 @@ import UrlManager from '../url/urlmanager.js';
 import UserDataManager from '../userdata/userdatamanager.js';
 import WfsManager from '../wfs/wfsmanager.js';
 import WmsManager from '../wms/wmsmanager.js';
+import WmtsManager from '../wmts/wmtsmanager.js';
+import SelectionManager from '../selection/selectionmanager.js';
 import IGirafeContext from './icontext.js';
 import ThemeFavoritesManager from '../themes/themefavoritesmanager.js';
 import SearchManager from '../search/searchmanager.js';
@@ -62,6 +64,8 @@ export default class GirafeContext 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/context/context.js

@@ -30,6 +30,8 @@ import UrlManager from '../url/urlmanager.js';
 import UserDataManager from '../userdata/userdatamanager.js';
 import WfsManager from '../wfs/wfsmanager.js';
 import WmsManager from '../wms/wmsmanager.js';
+import WmtsManager from '../wmts/wmtsmanager.js';
+import SelectionManager from '../selection/selectionmanager.js';
 import ThemeFavoritesManager from '../themes/themefavoritesmanager.js';
 import SearchManager from '../search/searchmanager.js';
 import FeedbackManager from '../feedback/feedbackmanager.js';
@@ -62,6 +64,8 @@ export default class GirafeContext {
     orderingManager;
     userLayerManager;
     wmsManager;
+    wmtsManager;
+    selectionManager;
     ogcApiFeaturesManager;
     localFileManager;
     onBoardingManager;
@@ -97,6 +101,8 @@ export default class GirafeContext {
         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);
@@ -136,7 +142,9 @@ export default class GirafeContext {
         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/context/icontext.d.ts

@@ -29,6 +29,8 @@ import UrlManager from '../url/urlmanager.js';
 import UserDataManager from '../userdata/userdatamanager.js';
 import WfsManager from '../wfs/wfsmanager.js';
 import WmsManager from '../wms/wmsmanager.js';
+import WmtsManager from '../wmts/wmtsmanager.js';
+import SelectionManager from '../selection/selectionmanager.js';
 import ThemeFavoritesManager from '../themes/themefavoritesmanager.js';
 import SearchManager from '../search/searchmanager.js';
 import FeedbackManager from '../feedback/feedbackmanager.js';
@@ -61,11 +63,14 @@ export default interface 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;
     readonly themeFavoritesManager: ThemeFavoritesManager;
     readonly searchManager: SearchManager;
     readonly feedbackManager: FeedbackManager;
+    extendedContext?: unknown;
     initialize(): Promise<void>;
 }

package/tools/drawing/cesiumDrawing.d.ts

@@ -1,20 +1,24 @@
-import MapComponent from '../../components/map/component.js';
+import Map3dComponent from '../../components/map-3d/component.js';
 import IGirafeContext from '../context/icontext.js';
 export default class CesiumDrawing {
     private readonly stateLocation;
     private activeShapePoints;
     private activeShapes;
     private floatingPoint;
-    private scene;
-    private handler;
-    private entities;
+    private readonly scene;
+    private readonly handler;
+    private readonly entities;
     private fixedLineLength;
     private drawingText;
     private readonly context;
     private get state();
     private get drawingState();
     private get config();
-    constructor(map: MapComponent, stateLocation: string, context: IGirafeContext);
+    /**
+     * 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: Map3dComponent, stateLocation: string, context: IGirafeContext);
     setFixedLineLength(length: number): void;
     setDrawingText(text: string): void;
     /**

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/{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) => {