@igo2/geo 21.0.0-next.20 → 21.0.0-next.21

package/fesm2022/igo2-geo.mjs

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { Injectable, inject, Optional, DOCUMENT, input, output, Component, ChangeDetectorRef, InjectionToken, makeEnvironmentProviders, computed, ChangeDetectionStrategy, HostBinding, viewChildren, signal, model, effect, DestroyRef, Directive, viewChild, contentChild, TemplateRef, HostListener, Input, ApplicationRef, NgModule, Pipe, ElementRef, Self, EventEmitter, Output, ViewEncapsulation, Inject, Injector, APP_INITIALIZER } from '@angular/core';
+import { Injectable, inject, Optional, InjectionToken, makeEnvironmentProviders, DOCUMENT, input, output, Component, ChangeDetectorRef, Injector, runInInjectionContext, computed, ChangeDetectionStrategy, HostBinding, viewChildren, signal, model, effect, DestroyRef, Directive, viewChild, contentChild, TemplateRef, HostListener, Input, ApplicationRef, NgModule, Pipe, ElementRef, Self, EventEmitter, Output, ViewEncapsulation, Inject } from '@angular/core';
 import { Clipboard } from '@angular/cdk/clipboard';
 import * as i1 from '@angular/material/button';
 import { MatButtonModule } from '@angular/material/button';
@@ -10,7 +10,7 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { LanguageService, IgoLanguageModule } from '@igo2/core/language';
 import { MessageService } from '@igo2/core/message';
 import { RouteService } from '@igo2/core/route';
-import { NumberUtils, TimeFrame, uuid, ObjectUtils, isTimeFrame, resolveDate, Watcher, SubjectStatus, Compression, strEnum, Tree, TREE_SEPERATOR, ChangeUtils, downloadContent, createExcelWorkBook, addExcelSheetToWorkBook, writeExcelFile, isIsoDate, downloadBlob, customCacheHasher, removeQueryParameters } from '@igo2/utils';
+import { NumberUtils, TimeFrame, uuid, ObjectUtils, isTimeFrame, resolveDate, Watcher, SubjectStatus, strEnum, Tree, TREE_SEPERATOR, ChangeUtils, downloadContent, createExcelWorkBook, addExcelSheetToWorkBook, writeExcelFile, isIsoDate, downloadBlob, customCacheHasher, removeQueryParameters } from '@igo2/utils';
 import { MAC } from 'ol/has';
 import * as olproj from 'ol/proj';
 import { transform } from 'ol/proj';
@@ -20,12 +20,12 @@ import html2canvas from 'html2canvas';
 import jsPDF, { jsPDF as jsPDF$1 } from 'jspdf';
 import { autoTable } from 'jspdf-autotable';
 import moment from 'moment';
-import { Observable, of, combineLatest, BehaviorSubject, interval, tap, merge, fromEvent, from, switchMap, first, concatMap as concatMap$1, map as map$1, mergeMap, zip, firstValueFrom, Subject, forkJoin, catchError as catchError$1, debounceTime as debounceTime$1, EMPTY, timer, filter as filter$1, pairwise, Subscription, lastValueFrom, throwError } from 'rxjs';
+import { Observable, of, combineLatest, BehaviorSubject, interval, tap, merge, fromEvent, firstValueFrom, Subject, forkJoin, map as map$1, catchError as catchError$1, debounceTime as debounceTime$1, switchMap, EMPTY, timer, filter as filter$1, from, pairwise, Subscription, lastValueFrom, throwError, first as first$1, zip } from 'rxjs';
 import { HttpClient, HttpParams, HttpHeaders } from '@angular/common/http';
 import { fetchImageFromDepotUrl, ImageErrorDirective, SecureImagePipe } from '@igo2/common/image';
 import { saveAs } from 'file-saver';
 import JSZip from 'jszip';
-import { concatMap, distinctUntilChanged, map, switchMap as switchMap$1, first as first$1, mergeMap as mergeMap$1, tap as tap$1, debounceTime, catchError, delay, timeout, skip, filter, debounce, skipWhile, takeUntil, take, finalize, startWith } from 'rxjs/operators';
+import { concatMap, distinctUntilChanged, map, timeout, first, catchError, debounceTime, skip, filter, switchMap as switchMap$1, debounce, mergeMap, skipWhile, takeUntil, take, finalize, startWith } from 'rxjs/operators';
 import { getUid } from 'ol/util';
 import { __decorate, __param, __metadata } from 'tslib';
 import olSourceImageWMS from 'ol/source/ImageWMS';
@@ -41,28 +41,39 @@ import olFormatGML3 from 'ol/format/GML3';
 import olFormatGML32 from 'ol/format/GML32';
 import olFormatOSMXML from 'ol/format/OSMXML';
 import LayerGroup$1 from 'ol/layer/Group';
-import { AuthInterceptor, AuthService } from '@igo2/auth';
+import { XHR_INTERCEPTOR } from '@igo2/core/auth';
+import Style from 'ol/style/Style';
+import OlFeature from 'ol/Feature';
+import { toString, asArray } from 'ol/color';
+import * as olextent from 'ol/extent';
+import { getCenter, equals } from 'ol/extent';
+import OlPoint from 'ol/geom/Point';
+import Circle from 'ol/style/Circle';
+import Fill from 'ol/style/Fill';
+import Icon from 'ol/style/Icon';
+import Stroke from 'ol/style/Stroke';
+import Text from 'ol/style/Text';
+import { getEntityId, getEntityTitle, getEntityProperty, getEntityRevision, getEntityIcon, EntityStoreStrategy, EntityStore, EntityStoreWatcher, EntityTableColumnRenderer, EntityTableComponent, EntityStoreFilterSelectionStrategy, EntityService, isChoiceField, getColumnKeyWithoutPropertiesTag as getColumnKeyWithoutPropertiesTag$1, getEntityTitleHtml, EntityStoreFilterCustomFuncStrategy, isChoiceFieldWithLabelField } from '@igo2/common/entity';
+import OlGeoJSON from 'ol/format/GeoJSON';
+import OlLineString from 'ol/geom/LineString';
+import OlPolygon, { fromCircle, circular } from 'ol/geom/Polygon';
+import * as olstyle from 'ol/style';
 import olLayerImage from 'ol/layer/Image';
 import olLayerTile from 'ol/layer/Tile';
 import * as olObservable from 'ol/Observable';
 import { unByKey } from 'ol/Observable';
-import { asArray, toString } from 'ol/color';
+import OlVectorLayer from 'ol/layer/Vector';
+import olSourceCluster from 'ol/source/Cluster';
+import OlVectorSource from 'ol/source/Vector';
 import * as oleasing from 'ol/easing';
 import { easeOut } from 'ol/easing';
-import OlVectorLayer from 'ol/layer/Vector';
 import { getVectorContext, getRenderPixel } from 'ol/render';
-import OlVectorSource from 'ol/source/Vector';
-import { openDB } from 'idb';
-import Style from 'ol/style/Style';
-import olSourceCluster from 'ol/source/Cluster';
+import RegularShape from 'ol/style/RegularShape';
 import olLayerVectorTile from 'ol/layer/VectorTile';
 import { BehaviorSubject as BehaviorSubject$1 } from 'rxjs/internal/BehaviorSubject';
 import { Group } from 'ol/layer.js';
-import OlFeature from 'ol/Feature';
-import OlGeoJSON from 'ol/format/GeoJSON';
 import * as olgeom from 'ol/geom';
 import { Point } from 'ol/geom';
-import * as olstyle from 'ol/style';
 import olSourceOSM from 'ol/source/OSM';
 import olSourceXYZ from 'ol/source/XYZ';
 import * as OlLoadingStrategy from 'ol/loadingstrategy';
@@ -77,18 +88,7 @@ import TileDebug from 'ol/source/TileDebug';
 import TileGrid from 'ol/tilegrid/TileGrid';
 import olFormatMVT from 'ol/format/MVT';
 import olSourceVectorTile from 'ol/source/VectorTile';
-import { EntityStoreStrategy, getEntityId, getEntityTitle, getEntityProperty, getEntityRevision, getEntityIcon, EntityStore, EntityStoreWatcher, EntityTableColumnRenderer, EntityTableComponent, EntityStoreFilterSelectionStrategy, EntityService, isChoiceField, getColumnKeyWithoutPropertiesTag as getColumnKeyWithoutPropertiesTag$1, getEntityTitleHtml, EntityStoreFilterCustomFuncStrategy, isChoiceFieldWithLabelField } from '@igo2/common/entity';
 import OlDragBoxInteraction from 'ol/interaction/DragBox';
-import * as olextent from 'ol/extent';
-import { getCenter } from 'ol/extent';
-import OlLineString from 'ol/geom/LineString';
-import OlPoint from 'ol/geom/Point';
-import OlPolygon, { fromCircle, circular } from 'ol/geom/Polygon';
-import Circle from 'ol/style/Circle';
-import Fill from 'ol/style/Fill';
-import Icon from 'ol/style/Icon';
-import Stroke from 'ol/style/Stroke';
-import Text from 'ol/style/Text';
 import * as i4 from '@ngx-translate/core';
 import { moveItemInArray, CdkDropList, CdkDrag, CdkDragHandle } from '@angular/cdk/drag-drop';
 import { AsyncPipe, NgTemplateOutlet, NgClass, KeyValuePipe, JsonPipe, CommonModule, DOCUMENT as DOCUMENT$1 } from '@angular/common';
@@ -112,9 +112,12 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 import * as olCondition from 'ol/events/condition';
 import { doubleClick } from 'ol/events/condition';
 import * as olInteraction from 'ol/interaction';
+import olAttribution from 'ol/control/Attribution';
+import { optionsFromCapabilities } from 'ol/source/WMTS.js';
+import { Cacheable } from 'ts-cacheable';
+import { SelectionModel } from '@angular/cdk/collections';
 import olMap from 'ol/Map';
 import olView from 'ol/View';
-import olAttribution from 'ol/control/Attribution';
 import olControlScaleLine from 'ol/control/ScaleLine';
 import * as olproj4 from 'ol/proj/proj4';
 import proj4 from 'proj4';
@@ -126,10 +129,7 @@ import { MatBadgeModule } from '@angular/material/badge';
 import { DomSanitizer } from '@angular/platform-browser';
 import { IgoBadgeIconDirective } from '@igo2/common/badge';
 import { IgoIconComponent, VECTOR_SQUARE_ICON, KEYBOARD_ESC_ICON } from '@igo2/common/icon';
-import { optionsFromCapabilities } from 'ol/source/WMTS.js';
-import { Cacheable } from 'ts-cacheable';
 import { NetworkService } from '@igo2/core/network';
-import { SelectionModel } from '@angular/cdk/collections';
 import { CollapseDirective, CollapsibleComponent } from '@igo2/common/collapsible';
 import { SanitizeHtmlPipe, CustomHtmlComponent } from '@igo2/common/custom-html';
 import { ListComponent, ListItemDirective } from '@igo2/common/list';
@@ -647,6 +647,80 @@ function mtmZoneFromLonLat(lonLat) {
     return mtmZone;
 }
 
+class LayerExtensionManager {
+    _instances = [];
+    _instancesByExtension = new Map();
+    _attached = false;
+    attach(extensions, options, context) {
+        if (this._attached) {
+            throw new Error('Layer extensions are already attached');
+        }
+        const sorted = extensions
+            .map((extension, registrationIndex) => ({ extension, registrationIndex }))
+            .filter(({ extension }) => extension.supports(options))
+            .sort((left, right) => {
+            const leftPriority = left.extension.priority ?? 0;
+            const rightPriority = right.extension.priority ?? 0;
+            if (leftPriority !== rightPriority) {
+                return rightPriority - leftPriority;
+            }
+            return left.registrationIndex - right.registrationIndex;
+        })
+            .map(({ extension }) => extension);
+        const instances = [];
+        const instancesByExtension = new Map();
+        try {
+            for (const extension of sorted) {
+                const instance = extension.attach(context);
+                instances.push(instance);
+                instancesByExtension.set(extension, instance);
+            }
+        }
+        catch (error) {
+            try {
+                destroyInReverse(instances);
+            }
+            catch {
+                // Preserve the attachment error.
+            }
+            throw error;
+        }
+        this._instances = instances;
+        this._instancesByExtension = instancesByExtension;
+        this._attached = true;
+    }
+    getInstances() {
+        return this._instances;
+    }
+    getInstance(extension) {
+        return this._instancesByExtension.get(extension);
+    }
+    destroy() {
+        if (!this._attached) {
+            return;
+        }
+        const instances = this._instances;
+        this._instances = [];
+        this._instancesByExtension.clear();
+        this._attached = false;
+        destroyInReverse(instances);
+    }
+}
+function destroyInReverse(instances) {
+    let firstError;
+    for (let i = instances.length - 1; i >= 0; i--) {
+        try {
+            instances[i].destroy();
+        }
+        catch (error) {
+            firstError ??= error;
+        }
+    }
+    if (firstError) {
+        throw firstError;
+    }
+}
+
 /**
  * @param date: string
  * @example date = <[2014-08-25, 2018-08-25]>
@@ -1810,6 +1884,7 @@ class DataSource {
     id;
     ol;
     legend = [];
+    destroyed = false;
     get saveableOptions() {
         return {
             id: this.id,
@@ -1866,9 +1941,12 @@ class DataSource {
         this.events.set(name, obs.subscribe());
     }
     destroy() {
-        this.events.forEach((listener) => {
-            listener.unsubscribe();
-        });
+        if (this.destroyed) {
+            return;
+        }
+        this.destroyed = true;
+        this.removeEvents();
+        this.onUnwatch();
     }
 }
 class DatasourceProperties {
@@ -2009,8 +2087,9 @@ function formatWFSQueryString(dataSourceOptions, count, epsg, properties, startI
     const getCapabilities = `${url}${separator}service=WFS&request=GetCapabilities&${version}`;
     let getFeature = `${url}${separator}service=WFS&request=GetFeature&${version}&${featureTypes}&`;
     getFeature += `${outputFormat}&${srs}&${cnt}&${propertyName}&${effectiveStartIndex}`;
-    if (dataSourceOptions[EventRefresh]) {
-        getFeature += `&${EventRefresh}=${dataSourceOptions[EventRefresh]}`;
+    const refreshValue = dataSourceOptions[EventRefresh];
+    if (refreshValue !== undefined) {
+        getFeature += `&${EventRefresh}=${String(refreshValue)}`;
     }
     let getpropertyvalue = `${url}?service=WFS&request=GetPropertyValue&version=${versionWfs200}&${featureTypes}&`;
     getpropertyvalue += `&${cnt}&${valueReference}`;
@@ -3431,6 +3510,629 @@ function _isLinkedMaster(layer, layerToCheck) {
     return false;
 }
 
+const FLAT_STYLE_KEYS = [
+    'fill-color',
+    'fill-opacity',
+    'stroke-color',
+    'stroke-width',
+    'stroke-opacity',
+    'circle-radius',
+    'circle-fill-color',
+    'icon-src',
+    'icon-scale',
+    'text-field',
+    'text-font',
+    'text-size'
+];
+function isEngineLayerStyle(value) {
+    return isRecord(value) && typeof value['type'] === 'string';
+}
+function isOlFlatStyleLike(value) {
+    if (!value)
+        return false;
+    if (isOlRuleArray(value))
+        return true;
+    if (Array.isArray(value)) {
+        return value.length > 0 && value.every(isOlFlatStyleLike);
+    }
+    return isRecord(value) && hasAnyFlatStyleKey(value);
+}
+function isAnyOlStyle(value) {
+    return (!isEngineLayerStyle(value) &&
+        (isOlStyleLike(value) || isOlFlatStyleLike(value)));
+}
+// Analyser les méthodes exporter ou non, enlever les export si elles sont utilisé localement.
+function isRecord(value) {
+    return typeof value === 'object' && value !== null;
+}
+function isOlStyleInstance(value) {
+    return value instanceof Style;
+}
+function isOlStyleInstanceArray(value) {
+    return Array.isArray(value) && value.every(isOlStyleInstance);
+}
+function isOlStyleFunction(value) {
+    return typeof value === 'function';
+}
+function isOlRule(value) {
+    if (!isRecord(value) || !('style' in value))
+        return false;
+    const styleValue = value.style;
+    return (isOlFlatStyleLike(styleValue) ||
+        (Array.isArray(styleValue) && styleValue.every(isOlFlatStyleLike)));
+}
+function isOlRuleArray(value) {
+    return Array.isArray(value) && value.every(isOlRule);
+}
+function hasAnyFlatStyleKey(value) {
+    return FLAT_STYLE_KEYS.some((key) => Object.prototype.hasOwnProperty.call(value, key));
+}
+function isOlStyleLike(value) {
+    return (!!value &&
+        (isOlStyleInstance(value) ||
+            isOlStyleInstanceArray(value) ||
+            isOlStyleFunction(value)));
+}
+
+const FEATURE = 'Feature';
+var FeatureMotion;
+(function (FeatureMotion) {
+    FeatureMotion[FeatureMotion["None"] = 0] = "None";
+    FeatureMotion[FeatureMotion["Move"] = 1] = "Move";
+    FeatureMotion[FeatureMotion["Zoom"] = 2] = "Zoom";
+    FeatureMotion[FeatureMotion["Default"] = 3] = "Default";
+})(FeatureMotion || (FeatureMotion = {}));
+
+/**
+ * Create an Openlayers feature object out of a feature definition.
+ * The output object has a reference to the feature id.
+ * @param feature Feature definition
+ * @param projectionOut Feature object projection
+ * @returns OpenLayers feature object
+ */
+function featureToOl(feature, projectionOut, getId) {
+    getId = getId ? getId : getEntityId;
+    const olFormat = new OlGeoJSON();
+    const olFeature = olFormat.readFeature(feature, {
+        dataProjection: feature.projection,
+        featureProjection: projectionOut
+    });
+    olFeature.setId(getId(feature));
+    const title = getEntityTitle(feature);
+    if (title !== undefined) {
+        olFeature.set('_title', title, true);
+    }
+    if (feature.extent !== undefined) {
+        olFeature.set('_extent', feature.extent, true);
+    }
+    if (feature.projection !== undefined) {
+        olFeature.set('_projection', feature.projection, true);
+    }
+    const mapTitle = getEntityProperty(feature, 'meta.mapTitle');
+    if (mapTitle !== undefined) {
+        olFeature.set('_mapTitle', mapTitle, true);
+    }
+    olFeature.set('_entityRevision', getEntityRevision(feature), true);
+    const icon = getEntityIcon(feature);
+    if (icon !== undefined) {
+        olFeature.set('_icon', icon, true);
+    }
+    if (feature.meta && feature.meta.style) {
+        olFeature.set('_style', feature.meta.style, true);
+    }
+    if (feature.sourceId) {
+        olFeature.set('_sourceId', feature.sourceId, true);
+    }
+    return olFeature;
+}
+function renderFeatureFromOl(olRenderFeature, projectionIn, olLayer, projectionOut = 'EPSG:4326') {
+    let geom;
+    let title;
+    let exclude;
+    let excludeOffline;
+    if (olLayer) {
+        title = olLayer.get('title');
+        if (olLayer.get('sourceOptions')) {
+            exclude = olLayer.get('sourceOptions').excludeAttribute;
+            excludeOffline = olLayer.get('sourceOptions').excludeAttributeOffline;
+        }
+    }
+    else {
+        title = olRenderFeature.get('_title');
+    }
+    const olFormat = new OlGeoJSON();
+    const properties = olRenderFeature.getProperties();
+    const geometryType = olRenderFeature.getType();
+    if (geometryType === 'Polygon') {
+        const ends = olRenderFeature.getEnds();
+        geom = new OlPolygon(olRenderFeature.getFlatCoordinates(), 'XY', ends);
+    }
+    else if (geometryType === 'Point') {
+        geom = new OlPoint(olRenderFeature.getFlatCoordinates(), 'XY');
+    }
+    else if (geometryType === 'LineString') {
+        geom = new OlLineString(olRenderFeature.getFlatCoordinates(), 'XY');
+    }
+    const geometry = olFormat.writeGeometryObject(geom, {
+        dataProjection: projectionOut,
+        featureProjection: projectionIn
+    });
+    const id = (olRenderFeature.getId() ?? uuid());
+    const mapTitle = olRenderFeature.get('_mapTitle');
+    const extent = olproj.transformExtent(olRenderFeature.getExtent(), projectionIn, projectionOut);
+    return {
+        type: FEATURE,
+        projection: projectionOut,
+        extent,
+        meta: {
+            id,
+            title: title ? title : mapTitle ? mapTitle : id,
+            mapTitle,
+            excludeAttribute: exclude,
+            excludeAttributeOffline: excludeOffline
+        },
+        properties,
+        geometry,
+        ol: olRenderFeature
+    };
+}
+/**
+ * Create a feature object out of an OL feature
+ * The output object has a reference to the feature id.
+ * @param olFeature OL Feature
+ * @param projectionIn OL feature projection
+ * @param olLayer OL Layer
+ * @param projectionOut Feature projection
+ * @returns Feature
+ */
+function featureFromOl(olFeature, projectionIn, olLayer, projectionOut = 'EPSG:4326') {
+    let title;
+    let exclude;
+    let excludeOffline;
+    let idColumn; // for arcgisrest and tilearcgisrest source
+    const olFormat = new OlGeoJSON();
+    const keys = olFeature.getKeys().filter((key) => {
+        return !key.startsWith('_') && key !== 'geometry';
+    });
+    const properties = keys.reduce((acc, key) => {
+        acc[key] = olFeature.get(key);
+        return acc;
+    }, {});
+    const geometry = olFormat.writeGeometryObject(olFeature.getGeometry(), {
+        dataProjection: projectionOut,
+        featureProjection: projectionIn
+    });
+    if (olLayer) {
+        title = olLayer.get('title');
+        const sourceOptions = olLayer.get('sourceOptions');
+        if (sourceOptions) {
+            exclude = sourceOptions.excludeAttribute;
+            excludeOffline = sourceOptions.excludeAttributeOffline;
+            idColumn =
+                sourceOptions.idColumn ||
+                    (sourceOptions.type === 'arcgisrest' ||
+                        sourceOptions.type === 'tilearcgisrest'
+                        ? 'OBJECTID'
+                        : undefined);
+        }
+    }
+    else {
+        title = olFeature.get('_title');
+    }
+    const mapTitle = olFeature.get('_mapTitle');
+    const id = olFeature.getId()
+        ? olFeature.getId()
+        : olFeature.get(idColumn)
+            ? olFeature.get(idColumn)
+            : uuid();
+    return {
+        type: FEATURE,
+        projection: projectionOut,
+        extent: olFeature.get('_extent'),
+        meta: {
+            id,
+            title: title ? title : mapTitle ? mapTitle : id,
+            mapTitle,
+            revision: olFeature.getRevision(),
+            style: olFeature.get('_style'),
+            excludeAttribute: exclude,
+            excludeAttributeOffline: excludeOffline
+        },
+        properties,
+        geometry,
+        ol: olFeature
+    };
+}
+/**
+ * Compute an OL feature extent in it's map projection
+ * @param map Map
+ * @param olFeature OL feature
+ * @returns Extent in the map projection
+ */
+function computeOlFeatureExtent(olFeature, projection) {
+    let olExtent = olextent.createEmpty();
+    const olFeatureExtent = olFeature.get('_extent');
+    const olFeatureProjection = olFeature.get('_projection');
+    if (olFeatureExtent !== undefined && olFeatureProjection !== undefined) {
+        olExtent = olproj.transformExtent(olFeatureExtent, olFeatureProjection, projection);
+    }
+    else {
+        const olGeometry = olFeature.getGeometry();
+        if (olGeometry !== null && olGeometry !== undefined) {
+            olExtent = olGeometry.getExtent();
+        }
+    }
+    return olExtent;
+}
+/**
+ * Compute a multiple OL features extent in their map projection
+ * @param map Map
+ * @param olFeatures OL features
+ * @returns Extent in the map projection
+ */
+function computeOlFeaturesExtent(olFeatures, projection) {
+    const extent = olextent.createEmpty();
+    olFeatures.forEach((olFeature) => {
+        const featureExtent = computeOlFeatureExtent(olFeature, projection);
+        olextent.extend(extent, featureExtent);
+    });
+    return extent;
+}
+/**
+ * Scale an extent.
+ * @param extent Extent
+ * @param Scaling factors for top, right, bottom and left directions, in that order
+ * @returns Scaled extent
+ */
+function scaleExtent(extent, scale) {
+    const [width, height] = olextent.getSize(extent);
+    return [
+        scale[3] ? extent[0] - width * scale[3] : extent[0],
+        scale[2] ? extent[1] - height * scale[2] : extent[1],
+        scale[1] ? extent[2] + width * scale[1] : extent[2],
+        scale[0] ? extent[3] + height * scale[0] : extent[3]
+    ];
+}
+/**
+ * Return true if features are out of view.
+ * If features are too close to the edge, they are considered out of view.
+ * By default, we define the edge as 5% (0.05) of the extent size.
+ * @param map Map
+ * @param featuresExtent The features's extent
+ * @param edgeRatio Number or Number[] Single value OR an array =>
+ *  [top,right,bottom,left] directions, in that order
+ * @returns Return true if features are out of view
+ */
+function featuresAreOutOfView(extent, featuresExtent, edgeRatio = 0.05) {
+    const edgesRatio = Array.isArray(edgeRatio)
+        ? edgeRatio
+        : [edgeRatio, edgeRatio, edgeRatio, edgeRatio];
+    const scale = [-1, -1, -1, -1].map((x, i) => x * edgesRatio[i]);
+    const viewExtent = scaleExtent(extent, scale);
+    return !olextent.containsExtent(viewExtent, featuresExtent);
+}
+/**
+ * Return true if features are too deep into the view. This results
+ * in features being too small.
+ * Features are considered too small if their extent occupies less than
+ * 1% of the map extent.
+ * @param map Map
+ * @param featuresExtent The features's extent
+ * @param areaRatio The features extent to view extent acceptable ratio
+ * @returns Return true if features are too deep in the view
+ */
+function featuresAreTooDeepInView(viewController, featuresExtent, areaRatio) {
+    // An area ratio of 0.004 means that the feature extent's width and height
+    // should be about 1/16 of the map extent's width and height
+    areaRatio = areaRatio ? areaRatio : 0.004;
+    const mapExtent = viewController.getExtent();
+    const mapExtentArea = olextent.getArea(mapExtent);
+    const featuresExtentArea = olextent.getArea(featuresExtent);
+    if (featuresExtentArea === 0 && viewController.getZoom() > 13) {
+        // In case it's a point
+        return false;
+    }
+    return featuresExtentArea / mapExtentArea < areaRatio;
+}
+/**
+ * Fit view to include the features extent.
+ * By default, this method will let the features occupy about 50% of the viewport.
+ * @param map Map
+ * @param olFeatures OL features
+ * @param motion To motion to the new map view
+ * @param scale If this is defined, the original view will be scaled
+ *  by that factor before any logic is applied.
+ */
+function moveToOlFeatures(viewController, olFeatures, motion = FeatureMotion.Default, scale, areaRatio) {
+    const extent = viewController.getExtent();
+    const projection = viewController.getOlProjection();
+    const featuresExtent = computeOlFeaturesExtent(Array.isArray(olFeatures) ? olFeatures : [olFeatures], projection);
+    let viewExtent = featuresExtent;
+    if (scale !== undefined) {
+        viewExtent = scaleExtent(viewExtent, scale);
+    }
+    if (motion === FeatureMotion.Zoom) {
+        viewController.zoomToExtent(viewExtent);
+    }
+    else if (motion === FeatureMotion.Move) {
+        viewController.moveToExtent(viewExtent);
+    }
+    else if (motion === FeatureMotion.Default) {
+        if (featuresAreOutOfView(extent, featuresExtent) ||
+            featuresAreTooDeepInView(viewController, featuresExtent, areaRatio)) {
+            viewController.zoomToExtent(viewExtent);
+        }
+    }
+}
+/**
+ * Hide an OL feature
+ * @param olFeature OL feature
+ */
+function hideOlFeature(olFeature) {
+    olFeature.setStyle(new olstyle.Style({}));
+}
+/**
+ * Compute a diff between a source array of Ol features and a target array
+ * @param source Source array of OL features
+ * @param starget Target array of OL features
+ * @returns Features to add and remove
+ */
+function computeOlFeaturesDiff(source, target) {
+    const olFeaturesMap = new Map();
+    target.forEach((olFeature) => {
+        olFeaturesMap.set(olFeature.getId(), olFeature);
+    });
+    const olFeaturesToRemove = [];
+    source.forEach((olFeature) => {
+        const newOlFeature = olFeaturesMap.get(olFeature.getId());
+        if (newOlFeature === undefined) {
+            olFeaturesToRemove.push(olFeature);
+        }
+        else if (newOlFeature.get('_entityRevision') !== olFeature.get('_entityRevision')) {
+            olFeaturesToRemove.push(olFeature);
+        }
+        else {
+            olFeaturesMap.delete(newOlFeature.getId());
+        }
+    });
+    const olFeaturesToAddIds = Array.from(olFeaturesMap.keys());
+    const olFeaturesToAdd = target.filter((olFeature) => {
+        return olFeaturesToAddIds.indexOf(olFeature.getId()) >= 0;
+    });
+    return {
+        add: olFeaturesToAdd,
+        remove: olFeaturesToRemove
+    };
+}
+
+const STYLES_VARIANT = {
+    base: {
+        fill: 'rgba(0, 161, 222, 0.15)',
+        stroke: 'rgba(0, 161, 222, 0.5)',
+        strokeWidth: 2,
+        markerColor: 'rgba(0, 161, 222, 0.5)',
+        markerOutlineColor: 'rgba(255, 255, 255, 1)'
+    },
+    focus: {
+        fill: 'rgba(207, 222, 0, 0.15)',
+        stroke: 'rgba(11, 220, 228, 0.5)',
+        strokeWidth: 4,
+        markerColor: 'rgba(207, 222, 0, 1)',
+        markerOutlineColor: 'rgba(11, 220, 228, 1)'
+    },
+    selection: {
+        fill: 'rgba(0, 161, 222, 0.15)',
+        stroke: 'rgba(0, 255, 255, 0.5)',
+        strokeWidth: 4,
+        markerColor: 'rgba(0, 161, 222, 1)',
+        markerOutlineColor: 'rgba(0, 255, 255, 1)'
+    }
+};
+const NEAR_TRANSPARENT_COLOR = 'rgba(255, 255, 255, 0.01)';
+const DEFAULT_MARKER_COLOR = 'rgba(0, 161, 222, 1)';
+const DEFAULT_MARKER_OUTLINE_COLOR = 'rgba(255, 255, 255, 1)';
+const DEFAULT_CLUSTER_COLOR = 'rgba(24, 134, 45)';
+const DEFAULT_CLUSTER_FILL_COLOR = 'rgba(24, 134, 45, 0.5)';
+const DEFAULT_TEXT_COLOR = '#000';
+const DEFAULT_TEXT_OUTLINE_COLOR = '#fff';
+const DEFAULT_TEXT_FONT = '12px Calibri,sans-serif';
+const DEFAULT_TEXT_STROKE_WIDTH = 3;
+const DEFAULT_MARKER_ANCHOR = [0.5, 0.92];
+const GEOMETRY_THRESHOLD = 0.0025;
+const RANDOM_STYLE_MAX_CHANNEL = 255;
+const CLUSTER_MIN_RADIUS = 6;
+const CLUSTER_RADIUS_FACTOR = 5;
+function styleVariant(viewController, type = 'base') {
+    return (featureLike) => {
+        const { _mapTitle: mapTitle } = featureLike.getProperties();
+        const imposedGeometry = featureLike instanceof OlFeature
+            ? createStyleGeometry(viewController, featureLike)
+            : undefined;
+        return createStyleVariant(type, mapTitle, imposedGeometry);
+    };
+}
+function baseOlStyle(text, imposedGeometry) {
+    return createStyleVariant('base', text, imposedGeometry);
+}
+function selectionOlStyle(text, imposedGeometry) {
+    return createStyleVariant('selection', text, imposedGeometry);
+}
+/**
+ * Invisible-but-interactive style (hit detection, event capture).
+ */
+function nearTransparentOlStyle() {
+    return new Style({
+        fill: new Fill({ color: NEAR_TRANSPARENT_COLOR }),
+        stroke: new Stroke({ width: 10, color: NEAR_TRANSPARENT_COLOR }),
+        image: new Circle({
+            stroke: new Stroke({ width: 10, color: NEAR_TRANSPARENT_COLOR }),
+            fill: new Fill({ color: NEAR_TRANSPARENT_COLOR }),
+            radius: 5
+        })
+    });
+}
+function markerOlStyle({ text, markerColor = DEFAULT_MARKER_COLOR, markerOutlineColor = DEFAULT_MARKER_OUTLINE_COLOR, imposedGeometry }) {
+    const svg = createMarkerSvg(markerColor, markerOutlineColor);
+    const style = new Style({
+        image: new Icon({
+            src: `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svg)}`,
+            opacity: 1,
+            anchor: DEFAULT_MARKER_ANCHOR
+        })
+    });
+    if (text) {
+        style.setText(new Text({
+            text,
+            font: DEFAULT_TEXT_FONT,
+            fill: new Fill({ color: DEFAULT_TEXT_COLOR }),
+            stroke: new Stroke({
+                color: DEFAULT_TEXT_OUTLINE_COLOR,
+                width: DEFAULT_TEXT_STROKE_WIDTH
+            }),
+            overflow: true
+        }));
+    }
+    return setGeometryIfNeeded(style, imposedGeometry);
+}
+function randomOlFlatStyle() {
+    const red = randomChannel();
+    const green = randomChannel();
+    const blue = randomChannel();
+    return {
+        'stroke-color': [red, green, blue, 1],
+        'stroke-width': 2,
+        'fill-color': [red, green, blue, 0.4],
+        'circle-radius': 5,
+        'circle-stroke-color': [red, green, blue, 1],
+        'circle-stroke-width': 2,
+        'circle-fill-color': [red, green, blue, 0.4],
+        'text-value': ['case', ['has', '_mapTitle'], ['get', '_mapTitle'], ''],
+        'text-offset-x': 5,
+        'text-offset-y': -5,
+        'text-font': DEFAULT_TEXT_FONT,
+        'text-fill-color': DEFAULT_TEXT_COLOR,
+        'text-stroke-color': DEFAULT_TEXT_OUTLINE_COLOR,
+        'text-stroke-width': DEFAULT_TEXT_STROKE_WIDTH,
+        'text-overflow': true
+    };
+}
+function clusterOlStyleFunction(clusterParam = {}) {
+    return (feature) => {
+        const size = feature.get('features')
+            ?.length ?? 0;
+        if (size <= 1) {
+            return markerOlStyle({ markerColor: DEFAULT_CLUSTER_COLOR });
+        }
+        const clusterRadius = clusterParam.radiusCalc?.(size) ??
+            Math.max(CLUSTER_MIN_RADIUS, CLUSTER_RADIUS_FACTOR * Math.log(size));
+        return [
+            new Style({
+                image: new Circle({
+                    radius: clusterRadius,
+                    stroke: new Stroke({ color: DEFAULT_CLUSTER_COLOR }),
+                    fill: new Fill({ color: DEFAULT_CLUSTER_FILL_COLOR })
+                }),
+                text: new Text({
+                    text: String(size),
+                    fill: new Fill({ color: DEFAULT_TEXT_OUTLINE_COLOR })
+                })
+            })
+        ];
+    };
+}
+function createMarkerSvg(markerColor, markerOutlineColor) {
+    return `<svg version="1.1" xmlns="http://www.w3.org/2000/svg" height="36" width="36" viewBox="0 0 36 36">
+  <path fill="${toString(asArray(markerColor))}" stroke="${toString(asArray(markerOutlineColor))}" stroke-width="2"
+  d="M 17.692635,32.565644 C 15.71852,30.330584 13.290925,27.058065 11.6766,24.455732 9.3398623,20.688851 7.8905694,17.205334 7.6297492,14.728733 7.5616025,14.081649 7.5739557,12.528552 7.6513363,12.014724 8.1013861,9.0262716 9.8047068,6.3655569 12.310675,4.7364878 c 1.113691,-0.7239832 2.508083,-1.2834131 3.776687,-1.5152052 0.242945,-0.044389 0.451656,-0.09393 0.463804,-0.1100911 0.01215,-0.016161 0.638282,-0.025502 1.391411,-0.02076 1.088235,0.00685 1.450932,0.024316 1.766871,0.085071 2.650763,0.5097353 4.947142,1.8701891 6.498786,3.8501033 0.628018,0.8013587 1.297046,2.0200608 1.640967,2.9891872 0.191065,0.538399 0.427644,1.447408 0.477391,1.834287 0.0164,0.127546 0.0434,0.231902 0.06,0.231902 0.0166,0 0.03122,0.626135 0.03249,1.391411 0.0013,0.765276 -0.011,1.391411 -0.02726,1.391411 -0.01626,0 -0.05449,0.154049 -0.08495,0.342331 -0.08815,0.544879 -0.387235,1.721449 -0.604837,2.379406 -1.209421,3.656888 -4.014463,8.349762 -7.849521,13.132357 -0.790496,0.985807 -1.795217,2.167992 -1.842543,2.167992 -0.01896,0 -0.161766,-0.144111 -0.317336,-0.320246 z m 1.066937,-15.36525 c 0.133519,-0.02121 0.248766,-0.05657 0.256105,-0.07859 0.0073,-0.02202 0.04918,-0.03066 0.09298,-0.0192 0.0438,0.01145 0.107628,-0.0072 0.141834,-0.04137 0.03421,-0.03421 0.08456,-0.05474 0.111888,-0.04563 0.02733,0.0091 0.07703,-0.01077 0.110429,-0.04417 0.03341,-0.03341 0.08416,-0.05293 0.112796,-0.04338 0.02863,0.0095 0.08974,-0.01867 0.135802,-0.06271 0.04606,-0.04403 0.111902,-0.08625 0.146319,-0.09381 0.204084,-0.04483 0.762371,-0.519108 1.079463,-0.917027 0.26749,-0.335672 0.570987,-0.878795 0.529019,-0.946701 -0.01496,-0.0242 -0.0067,-0.044 0.01835,-0.044 0.05645,0 0.196809,-0.467982 0.158801,-0.529481 -0.01521,-0.02461 -0.0043,-0.04475 0.02427,-0.04475 0.03157,0 0.04365,-0.04329 0.03082,-0.11043 -0.01161,-0.06074 -0.0066,-0.110429 0.01124,-0.110429 0.01779,0 0.03235,-0.258405 0.03235,-0.574233 0,-0.315829 -0.01545,-0.574234 -0.03434,-0.574234 -0.01889,0 -0.02437,-0.03811 -0.01219,-0.08469 0.04412,-0.168712 -0.336329,-1.152668 -0.481536,-1.245401 -0.02327,-0.01486 -0.04022,-0.03992 -0.03765,-0.05568 0.01222,-0.07498 -0.156557,-0.318365 -0.406379,-0.586027 -0.295921,-0.317054 -0.773059,-0.690104 -0.83427,-0.652274 -0.0206,0.01273 -0.03745,0.0024 -0.03745,-0.02289 0,-0.06107 -0.433076,-0.2789369 -0.487546,-0.245273 -0.02338,0.01445 -0.04251,0.0068 -0.04251,-0.01695 0,-0.056281 -0.393995,-0.1865457 -0.613804,-0.2029397 -0.0943,-0.00703 -0.188579,-0.023183 -0.209503,-0.035888 -0.02092,-0.012705 -0.276571,-0.023337 -0.568105,-0.023627 -0.534044,-5.301e-4 -1.12638,0.091025 -1.12638,0.1741017 0,0.023781 -0.01713,0.032648 -0.03808,0.019705 -0.05054,-0.031232 -0.403641,0.1088602 -0.403641,0.1601422 0,0.02204 -0.01988,0.02779 -0.04417,0.01278 -0.0243,-0.01501 -0.04417,-0.0051 -0.04417,0.02209 0,0.02716 -0.01988,0.0371 -0.04417,0.02209 -0.0243,-0.01501 -0.04417,-0.0051 -0.04417,0.02209 0,0.02716 -0.01915,0.03755 -0.04256,0.02308 -0.02341,-0.01447 -0.08138,0.01252 -0.128834,0.05997 -0.04745,0.04745 -0.0974,0.07515 -0.111001,0.06155 -0.0136,-0.0136 -0.03722,0.0078 -0.05248,0.0476 -0.01526,0.03978 -0.0411,0.06408 -0.0574,0.054 -0.03277,-0.02025 -0.462299,0.323995 -0.491977,0.394291 -0.01026,0.02429 -0.07454,0.0912 -0.142856,0.148686 -0.248033,0.208705 -0.730279,0.974169 -0.672565,1.067553 0.0145,0.02346 0.0059,0.04266 -0.01914,0.04266 -0.05907,0 -0.241471,0.599428 -0.208527,0.685278 0.01385,0.0361 0.0044,0.06564 -0.02098,0.06564 -0.02539,0 -0.04169,0.0646 -0.03622,0.143558 0.0055,0.07896 -0.0042,0.213129 -0.02144,0.29816 -0.04741,0.233576 0.0511,1.055502 0.167516,1.397721 0.126048,0.370516 0.310099,0.740163 0.426484,0.856548 0.04776,0.04776 0.07554,0.08684 0.06174,0.08684 -0.0138,0 0.01516,0.05653 0.06436,0.125632 0.131301,0.184396 0.499365,0.587266 0.518785,0.567846 0.0092,-0.0092 0.09821,0.06081 0.197812,0.155562 0.09961,0.09475 0.190589,0.162786 0.202187,0.151188 0.0116,-0.0116 0.05991,0.01774 0.107361,0.06519 0.04745,0.04745 0.105426,0.07444 0.128834,0.05997 0.02341,-0.01447 0.04256,-0.0057 0.04256,0.01958 0,0.06106 0.344664,0.23496 0.399061,0.201341 0.02346,-0.0145 0.04266,-0.0059 0.04266,0.01914 0,0.05907 0.599429,0.241471 0.685279,0.208527 0.0361,-0.01385 0.06564,-0.0065 0.06564,0.01645 0,0.05196 1.079115,0.04833 1.413314,-0.0048 z"></path>
+  </svg>`;
+}
+function randomChannel() {
+    return Math.floor(Math.random() * RANDOM_STYLE_MAX_CHANNEL);
+}
+function setGeometryIfNeeded(style, geometry) {
+    if (geometry)
+        style.setGeometry(geometry);
+    return style;
+}
+function createStyleGeometry(viewController, feature) {
+    if (!viewController || !feature)
+        return undefined;
+    const geometry = feature.getGeometry();
+    const extent = geometry?.getExtent();
+    if (!extent)
+        return undefined;
+    if (!featuresAreTooDeepInView(viewController, extent, GEOMETRY_THRESHOLD)) {
+        return undefined;
+    }
+    return new OlPoint(getCenter(extent));
+}
+function createStyleVariant(variant, text, imposedGeometry) {
+    const config = STYLES_VARIANT[variant];
+    return [
+        markerOlStyle({
+            text,
+            markerColor: config.markerColor,
+            markerOutlineColor: config.markerOutlineColor,
+            imposedGeometry
+        }),
+        setGeometryIfNeeded(new Style({
+            fill: new Fill({ color: config.fill }),
+            stroke: new Stroke({ width: config.strokeWidth, color: config.stroke })
+        }), imposedGeometry)
+    ];
+}
+
+const STYLE_ENGINES = new InjectionToken('STYLE_ENGINES');
+function provideStyle(...features) {
+    const providers = [];
+    for (const feature of features) {
+        providers.push(...feature.providers);
+    }
+    return makeEnvironmentProviders(providers);
+}
+
+const ENGINE_PROVIDER_HINT = {
+    Geostyler: 'withGeostyler()',
+    Mapbox: 'withMapbox()'
+};
+class StyleService {
+    engines = inject(STYLE_ENGINES, { optional: true }) ?? [];
+    async getStyle(options, ol) {
+        if (isAnyOlStyle(options)) {
+            return options;
+        }
+        const engine = this.findEngine(options);
+        return engine?.getStyle(options, ol) ?? randomOlFlatStyle();
+    }
+    async getLegend(options) {
+        if (isAnyOlStyle(options)) {
+            return undefined;
+        }
+        const engine = this.findEngine(options);
+        if (!engine?.getLegend) {
+            return undefined;
+        }
+        return engine.getLegend(options);
+    }
+    findEngine(options) {
+        const engine = this.engines.find((e) => e.supports(options));
+        if (!engine) {
+            const hint = ENGINE_PROVIDER_HINT[options.type];
+            const hintMsg = hint
+                ? ` Did you forget to add ${hint} to provideStyle(...)?`
+                : ` No registered provider handles type "${options.type}".`;
+            console.warn(`[StyleService]${hintMsg}`);
+        }
+        return engine;
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.19", ngImport: i0, type: StyleService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.19", ngImport: i0, type: StyleService, providedIn: 'root' });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.19", ngImport: i0, type: StyleService, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }] });
+
 class LayerBase {
     options;
     collapsed;
@@ -3644,9 +4346,6 @@ class LayerGroupBase extends LayerBase {
 
 class Layer extends LayerBase {
     options;
-    messageService;
-    authInterceptor;
-    styleService;
     ol;
     hasBeenVisible$ = new BehaviorSubject(false);
     legend;
@@ -3654,6 +4353,10 @@ class Layer extends LayerBase {
     link;
     linkMaster;
     resolution$$;
+    /** Do not remove those injections, they are needed in the other layer class. Without that they are not injected. */
+    messageService = inject(MessageService, { optional: true });
+    xhrInterceptor = inject(XHR_INTERCEPTOR, { optional: true });
+    styleService = inject(StyleService, { optional: true });
     get visible() {
         return super.visible;
     }
@@ -3695,12 +4398,9 @@ class Layer extends LayerBase {
             sourceOptions: this.dataSource.saveableOptions
         };
     }
-    constructor(options, messageService, authInterceptor, styleService) {
+    constructor(options) {
         super(options);
         this.options = options;
-        this.messageService = messageService;
-        this.authInterceptor = authInterceptor;
-        this.styleService = styleService;
         if (!options.id) {
             options.id = uuid();
         }
@@ -3721,6 +4421,9 @@ class Layer extends LayerBase {
         this.ol.set('_layer', this, true);
         super.afterCreated();
     }
+    refresh() {
+        this.dataSource.refresh();
+    }
     init(map) {
         super.init(map);
         map.layerWatcher.watchLayer(this);
@@ -3894,16 +4597,12 @@ ImageWatcher = __decorate([
     __metadata("design:paramtypes", [Function, MessageService])
 ], ImageWatcher);
 
-let ImageLayer = class ImageLayer extends Layer {
-    messageService;
-    authInterceptor;
+class ImageLayer extends Layer {
     type = 'raster';
     watcher;
-    constructor(options, messageService, authInterceptor) {
-        super(options, messageService, authInterceptor);
-        this.messageService = messageService;
-        this.authInterceptor = authInterceptor;
-        this.watcher = new ImageWatcher(this, this.messageService);
+    constructor(options) {
+        super(options);
+        this.watcher = new ImageWatcher(this, this.messageService ?? undefined);
         this.status$ = this.watcher.status$;
         this.status$.subscribe((valStatus) => {
             if (valStatus === 0) {
@@ -3916,9 +4615,9 @@ let ImageLayer = class ImageLayer extends Layer {
             source: this.options.source.ol
         });
         const image = new olLayerImage(olOptions);
-        if (this.authInterceptor) {
+        if (this.xhrInterceptor) {
             image.getSource().setImageLoadFunction((tile, src) => {
-                this.customLoader(tile, src, this.authInterceptor, this.messageService);
+                this.customLoader(tile, src, this.xhrInterceptor, this.messageService ?? undefined);
             });
         }
         return image;
@@ -3966,13 +4665,7 @@ let ImageLayer = class ImageLayer extends Layer {
         };
         xhr.send();
     }
-};
-ImageLayer = __decorate([
-    __param(1, Optional()),
-    __param(2, Optional()),
-    __metadata("design:paramtypes", [Object, MessageService,
-        AuthInterceptor])
-], ImageLayer);
+}
 
 class TileWatcher extends Watcher {
     id;
@@ -4026,14 +4719,10 @@ class TileWatcher extends Watcher {
 }
 
 class TileLayer extends Layer {
-    messageService;
-    authInterceptor;
     type = 'raster';
     watcher;
-    constructor(options, messageService, authInterceptor) {
-        super(options, messageService);
-        this.messageService = messageService;
-        this.authInterceptor = authInterceptor;
+    constructor(options) {
+        super(options);
         this.watcher = new TileWatcher(this);
         this.status$ = this.watcher.status$;
     }
@@ -4045,7 +4734,7 @@ class TileLayer extends Layer {
         const tileSource = tileLayer.getSource();
         if (tileSource !== null && 'setTileLoadFunction' in tileSource) {
             tileSource.setTileLoadFunction((tile, url) => {
-                this.customLoader(tile, url, this.authInterceptor);
+                this.customLoader(tile, url, this.xhrInterceptor);
             });
         }
         return tileLayer;
@@ -4058,7 +4747,7 @@ class TileLayer extends Layer {
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     customLoader(tile, url, interceptor) {
-        const alteredUrlWithKeyAuth = interceptor.alterUrlWithKeyAuth(url);
+        const alteredUrlWithKeyAuth = interceptor?.alterUrlWithKeyAuth(url);
         let modifiedUrl = url;
         if (alteredUrlWithKeyAuth) {
             modifiedUrl = alteredUrlWithKeyAuth;
@@ -4081,6 +4770,13 @@ class TileLayer extends Layer {
     }
 }
 
+function hasVectorSourceLoader(dataSource) {
+    return (typeof dataSource === 'object' &&
+        dataSource !== null &&
+        'createVectorSourceLoader' in dataSource &&
+        typeof dataSource.createVectorSourceLoader === 'function');
+}
+
 class FeatureDataSource extends DataSource {
     get saveableOptions() {
         const baseOptions = super.saveableOptions;
@@ -4130,291 +4826,6 @@ class FeatureDataSource extends DataSource {
     }
 }
 
-function createIndexedDb() {
-    return from(openDB('igo2DB', undefined, {
-        upgrade(db) {
-            const geoDataStore = db.createObjectStore('geoData', {
-                keyPath: 'url',
-                autoIncrement: false
-            });
-            geoDataStore.createIndex('regionID-idx', 'regionID', {
-                unique: false
-            });
-            db.createObjectStore('layerData', {
-                keyPath: 'layerId',
-                autoIncrement: false
-            });
-        }
-    }));
-}
-
-class GeoDB {
-    db$;
-    compression = new Compression();
-    collisionsMap = new Map();
-    _newData = 0;
-    revertObservablesSubscription;
-    constructor() {
-        this.db$ = createIndexedDb();
-    }
-    /**
-     * Only blob can be compressed
-     * @param url
-     * @param regionID
-     * @param object object to handle
-     * @param insertSource type of event user or system
-     * @param insertEvent Name of the event where the insert has been triggered
-     * @returns
-     */
-    update(url, regionID, object, insertSource, insertEvent) {
-        const object$ = (object instanceof Blob
-            ? this.compression.compressBlob(object)
-            : of(object));
-        const compress = object instanceof Blob ? true : false;
-        let geoDBData;
-        const a = this.db$.pipe(switchMap((db) => {
-            return object$.pipe(first(), switchMap((object) => {
-                geoDBData = {
-                    url,
-                    regionID,
-                    object: object,
-                    compressed: compress,
-                    insertSource,
-                    insertEvent
-                };
-                return this.getGeoDBData(url);
-            }), concatMap$1((res) => {
-                const dbObject = res;
-                if (!dbObject) {
-                    this._newData++;
-                    return from(db.add('geoData', geoDBData)).pipe(map$1(() => geoDBData));
-                }
-                else {
-                    const currentRegionID = dbObject.regionID;
-                    if (currentRegionID !== regionID) {
-                        const collisions = this.collisionsMap.get(currentRegionID);
-                        if (collisions !== undefined) {
-                            collisions.push(dbObject.url);
-                            this.collisionsMap.set(currentRegionID, collisions);
-                        }
-                        else {
-                            this.collisionsMap.set(currentRegionID, [dbObject.url]);
-                        }
-                    }
-                    return this.customUpdate(geoDBData);
-                }
-            }));
-        }));
-        return a;
-    }
-    customUpdate(geoDBData) {
-        const b = this.delete(geoDBData.url).pipe(mergeMap(() => this.add(geoDBData)));
-        return b;
-    }
-    add(geoDBData) {
-        return this.db$.pipe(switchMap((db) => from(db?.add('geoData', geoDBData)).pipe(map$1(() => geoDBData))));
-    }
-    put(geoDBData) {
-        return this.db$.pipe(switchMap((db) => from(db?.put('geoData', geoDBData)).pipe(map$1(() => geoDBData))));
-    }
-    getGeoDBData(url) {
-        return this.db$.pipe(switchMap((db) => from(db?.get('geoData', url))));
-    }
-    get(url) {
-        return this.getGeoDBData(url).pipe(mergeMap((data) => {
-            const rObj = !data?.compressed
-                ? data?.object
-                : this.compression.decompressBlob(data?.object);
-            return of(rObj);
-        }));
-    }
-    delete(key) {
-        return this.db$.pipe(switchMap((db) => from(db?.delete('geoData', key))), map$1(() => {
-            {
-                return { key };
-            }
-        }));
-    }
-    getRegionCountByID(id) {
-        return this.getRegionByID(id).pipe(switchMap((datas) => {
-            return of(datas.length);
-        }));
-    }
-    getRegionByID(id) {
-        if (!id) {
-            return of([]);
-        }
-        const IDBKey = IDBKeyRange.only(id);
-        return this.db$.pipe(switchMap((db) => from(db?.getAllFromIndex('geoData', 'regionID-idx', IDBKey))));
-    }
-    deleteByRegionID(id) {
-        if (!id) {
-            return of([]);
-        }
-        return this.db$.pipe(switchMap((db) => {
-            const tx = db.transaction('geoData', 'readwrite');
-            return of(tx);
-        }), mergeMap((tx) => this.getRegionByID(id).pipe(concatMap$1((datas) => {
-            const promises = datas.map((data) => tx.store.delete(data.url));
-            promises.push(tx.done);
-            return from(Promise.all(promises));
-        }))));
-    }
-    resetCounters() {
-        this.resetCollisionsMap();
-        this._newData = 0;
-    }
-    resetCollisionsMap() {
-        this.collisionsMap = new Map();
-    }
-    revertCollisions() {
-        if (this.revertObservablesSubscription) {
-            this.revertObservablesSubscription.unsubscribe();
-        }
-        const revertObservables = [];
-        for (const [regionID, collisions] of this.collisionsMap) {
-            for (const url of collisions) {
-                revertObservables.push(this.getGeoDBData(url).pipe(first(), concatMap$1((dbObject) => {
-                    const updatedObject = dbObject;
-                    updatedObject.regionID = regionID;
-                    return this.customUpdate(updatedObject);
-                })));
-            }
-        }
-        this.revertObservablesSubscription = zip(...revertObservables).subscribe();
-    }
-    get newData() {
-        return this._newData;
-    }
-}
-
-var InsertSourceInsertDBEnum;
-(function (InsertSourceInsertDBEnum) {
-    InsertSourceInsertDBEnum["System"] = "system";
-    InsertSourceInsertDBEnum["User"] = "user";
-})(InsertSourceInsertDBEnum || (InsertSourceInsertDBEnum = {}));
-
-class LayerDB {
-    db$;
-    constructor() {
-        this.db$ = createIndexedDb();
-    }
-    /**
-     * This method allow to update the stored layer into the indexeddb (layerData)
-     * @param layerDBData
-     * @returns
-     */
-    update(layerDBData) {
-        return this.db$.pipe(switchMap$1((db) => this.getByID(layerDBData.layerId).pipe(first$1(), concatMap((dbObject) => {
-            if (!dbObject) {
-                return from(db.add('layerData', layerDBData)).pipe(map(() => layerDBData));
-            }
-            else {
-                return this.customUpdate(layerDBData);
-            }
-        }))));
-    }
-    customUpdate(layerDBData) {
-        const b = this.delete(layerDBData.layerId).pipe(mergeMap$1(() => this.add(layerDBData)));
-        return b;
-    }
-    add(layerDBData) {
-        return this.db$.pipe(switchMap$1((db) => from(db?.add('layerData', layerDBData)).pipe(map(() => layerDBData))));
-    }
-    /**
-     * This method retrieve an idb layer definition
-     * @param layerId
-     * @returns
-     */
-    getByID(layerId) {
-        return this.db$.pipe(switchMap$1((db) => from(db?.get('layerData', layerId))));
-    }
-    /**
-     * This method delete an idb layer definition
-     * @param key
-     * @returns
-     */
-    delete(key) {
-        return this.db$.pipe(switchMap$1((db) => from(db?.delete('layerData', key))), map(() => {
-            {
-                return { key };
-            }
-        }));
-    }
-    /**
-     * This method retrive all idb layer definition
-     * @param layerId
-     * @returns
-     */
-    getAll() {
-        return this.db$.pipe(switchMap$1((db) => from(db?.getAll('layerData'))));
-    }
-}
-
-const FLAT_STYLE_KEYS = [
-    'fill-color',
-    'fill-opacity',
-    'stroke-color',
-    'stroke-width',
-    'stroke-opacity',
-    'circle-radius',
-    'circle-fill-color',
-    'icon-src',
-    'icon-scale',
-    'text-field',
-    'text-font',
-    'text-size'
-];
-function isEngineLayerStyle(value) {
-    return isRecord(value) && typeof value['type'] === 'string';
-}
-function isOlFlatStyleLike(value) {
-    if (!value)
-        return false;
-    if (isOlRuleArray(value))
-        return true;
-    if (Array.isArray(value)) {
-        return value.length > 0 && value.every(isOlFlatStyleLike);
-    }
-    return isRecord(value) && hasAnyFlatStyleKey(value);
-}
-function isAnyOlStyle(value) {
-    return (!isEngineLayerStyle(value) &&
-        (isOlStyleLike(value) || isOlFlatStyleLike(value)));
-}
-// Analyser les méthodes exporter ou non, enlever les export si elles sont utilisé localement.
-function isRecord(value) {
-    return typeof value === 'object' && value !== null;
-}
-function isOlStyleInstance(value) {
-    return value instanceof Style;
-}
-function isOlStyleInstanceArray(value) {
-    return Array.isArray(value) && value.every(isOlStyleInstance);
-}
-function isOlStyleFunction(value) {
-    return typeof value === 'function';
-}
-function isOlRule(value) {
-    if (!isRecord(value) || !('style' in value))
-        return false;
-    const styleValue = value.style;
-    return (isOlFlatStyleLike(styleValue) ||
-        (Array.isArray(styleValue) && styleValue.every(isOlFlatStyleLike)));
-}
-function isOlRuleArray(value) {
-    return Array.isArray(value) && value.every(isOlRule);
-}
-function hasAnyFlatStyleKey(value) {
-    return FLAT_STYLE_KEYS.some((key) => Object.prototype.hasOwnProperty.call(value, key));
-}
-function isOlStyleLike(value) {
-    return (!!value &&
-        (isOlStyleInstance(value) ||
-            isOlStyleInstanceArray(value) ||
-            isOlStyleFunction(value)));
-}
-
 class ClusterDataSource extends FeatureDataSource {
     get saveableOptions() {
         const baseOptions = super.saveableOptions;
@@ -4440,6 +4851,8 @@ class VectorWatcher extends Watcher {
     id;
     loaded = 0;
     loading = 0;
+    onFeatureLoadStart = () => this.handleLoadStart();
+    onFeatureLoadEnd = () => this.handleLoadEnd();
     layer;
     constructor(layer) {
         super();
@@ -4447,27 +4860,29 @@ class VectorWatcher extends Watcher {
         this.id = uuid();
     }
     watch() {
-        let olSource = this.layer.options.source.ol;
-        if (this.layer.dataSource instanceof ClusterDataSource) {
-            olSource = this.layer.options.source.options.source;
-        }
+        const olSource = this.getWatchableSource();
         if (olSource.getUrl()) {
-            olSource.on(`featuresloadstart`, () => this.handleLoadStart());
-            olSource.on(`featuresloadend`, () => this.handleLoadEnd());
-            olSource.on(`featuresloaderror`, () => this.handleLoadEnd());
+            olSource.on('featuresloadstart', this.onFeatureLoadStart);
+            olSource.on('featuresloadend', this.onFeatureLoadEnd);
+            olSource.on('featuresloaderror', this.onFeatureLoadEnd);
         }
     }
     unwatch() {
-        let olSource = this.layer.options.source.ol;
-        if (this.layer.dataSource instanceof ClusterDataSource) {
-            olSource = this.layer.options.source.options.source;
-        }
+        const olSource = this.getWatchableSource();
         if (olSource.getUrl()) {
-            olSource.un(`featuresloadstart`, () => this.handleLoadStart());
-            olSource.un(`featuresloadend`, () => this.handleLoadEnd());
-            olSource.un(`featuresloaderror`, () => this.handleLoadEnd());
+            olSource.un('featuresloadstart', this.onFeatureLoadStart);
+            olSource.un('featuresloadend', this.onFeatureLoadEnd);
+            olSource.un('featuresloaderror', this.onFeatureLoadEnd);
         }
     }
+    getWatchableSource() {
+        const source = this.layer.options.source;
+        if (this.layer.dataSource instanceof ClusterDataSource) {
+            const clusterOptions = source.options;
+            return clusterOptions.source ?? source.ol;
+        }
+        return source.ol;
+    }
     handleLoadStart() {
         this.loading += 1;
         this.status = SubjectStatus.Working;
@@ -4484,23 +4899,342 @@ class VectorWatcher extends Watcher {
     }
 }
 
+class VectorLayerFlashAnimator {
+    layer;
+    render;
+    listenerKeys = new Set();
+    constructor(layer, render) {
+        this.layer = layer;
+        this.render = render;
+    }
+    flash(feature, options) {
+        const start = Date.now();
+        const duration = options.duration ?? 1000;
+        const animate = (event) => {
+            if (!event.frameState) {
+                return;
+            }
+            const elapsed = event.frameState.time - start;
+            const elapsedRatio = elapsed / duration;
+            const style = this.resolveRenderableStyle(feature, event.frameState.viewState.resolution);
+            if (style) {
+                const styleClone = style.clone();
+                this.updateStyle(styleClone, feature.getGeometry()?.getType(), elapsedRatio, options);
+                const geometry = feature.getGeometry()?.clone();
+                if (geometry) {
+                    const vectorContext = getVectorContext(event);
+                    vectorContext.setStyle(styleClone);
+                    vectorContext.drawGeometry(geometry);
+                }
+            }
+            if (elapsed > duration) {
+                this.removeListener(listenerKey);
+            }
+            this.render();
+        };
+        const listenerKey = this.layer.on('postrender', animate);
+        this.listenerKeys.add(listenerKey);
+    }
+    destroy() {
+        unByKey([...this.listenerKeys]);
+        this.listenerKeys.clear();
+    }
+    updateStyle(style, geometryType, elapsedRatio, options) {
+        const opacity = easeOut(1 - elapsedRatio);
+        const color = [...asArray(options.color ?? [255, 0, 0, 1])];
+        color[3] = opacity;
+        const image = style.getImage();
+        if (geometryType === 'Point' && image instanceof RegularShape) {
+            image.setRadius(easeOut(elapsedRatio) * image.getRadius() * 3);
+            image.setOpacity(opacity);
+            return;
+        }
+        if (geometryType === 'LineString') {
+            if (image instanceof RegularShape) {
+                const imageStroke = image.getStroke();
+                if (imageStroke) {
+                    imageStroke.setColor(color);
+                    imageStroke.setWidth(easeOut(elapsedRatio) * (imageStroke.getWidth() ?? 1) * 3);
+                }
+            }
+            const stroke = style.getStroke();
+            if (stroke) {
+                stroke.setColor(color);
+                stroke.setWidth(easeOut(elapsedRatio) * (stroke.getWidth() ?? 1) * 3);
+            }
+            return;
+        }
+        if (geometryType === 'Polygon') {
+            if (image instanceof RegularShape) {
+                image.getFill()?.setColor(color);
+            }
+            style.getFill()?.setColor(color);
+        }
+    }
+    resolveRenderableStyle(feature, resolution) {
+        const styleResult = this.layer.getStyleFunction()?.(feature, resolution);
+        if (!styleResult) {
+            return undefined;
+        }
+        const styles = Array.isArray(styleResult) ? styleResult : [styleResult];
+        return styles.find((style) => !!style.getImage()) ?? styles[0];
+    }
+    removeListener(listenerKey) {
+        unByKey(listenerKey);
+        this.listenerKeys.delete(listenerKey);
+    }
+}
+
+const vectorLayerAnimationExtension = {
+    id: 'vector-animation',
+    supports: (options) => options.animation !== undefined,
+    attach: (context) => {
+        const animator = new VectorLayerFlashAnimator(context.layer, context.requestRender);
+        let listenerKey = context.source.on('addfeature', (event) => {
+            if (event.feature && context.options.animation) {
+                animator.flash(event.feature, context.options.animation);
+            }
+        });
+        const stopAnimation = () => {
+            if (listenerKey) {
+                unByKey(listenerKey);
+                listenerKey = undefined;
+            }
+        };
+        return {
+            stopAnimation,
+            destroy: () => {
+                stopAnimation();
+                animator.destroy();
+            }
+        };
+    }
+};
+
+const VECTOR_LAYER_EXTENSIONS = new InjectionToken('VECTOR_LAYER_EXTENSIONS');
+
+class VectorSourceLoader {
+    dependencies;
+    ongoingRequests = [];
+    requestGroups = new WeakMap();
+    constructor(dependencies) {
+        this.dependencies = dependencies;
+    }
+    execute(request) {
+        this.dependencies.executeLoadExtensions(request, (nextRequest) => {
+            if (this.shouldAbortRequests(nextRequest.extent, nextRequest.resolution)) {
+                this.abortRequests();
+            }
+            const resolvedUrl = typeof nextRequest.url === 'function'
+                ? nextRequest.url(nextRequest.extent, nextRequest.resolution, nextRequest.projection)
+                : nextRequest.url;
+            const urls = request.resolveUrls?.(resolvedUrl) ?? [resolvedUrl];
+            const readOptions = {
+                ...request.readOptions,
+                extent: nextRequest.extent,
+                featureProjection: nextRequest.projection
+            };
+            this.loadFeatures(urls, nextRequest.source, nextRequest.extent, nextRequest.resolution, readOptions, nextRequest.success, nextRequest.failure);
+        });
+    }
+    loadFeatures(urls, vectorSource, extent, resolution, readOptions, success, failure) {
+        if (!urls.length) {
+            success([]);
+            return;
+        }
+        if (urls.length === 1) {
+            this.loadUrl(urls[0], vectorSource, extent, resolution, readOptions, success, failure);
+            return;
+        }
+        this.loadFeatureBatches(urls, vectorSource, extent, resolution, readOptions, success, failure);
+    }
+    loadFeatureBatches(urls, vectorSource, extent, resolution, readOptions, success, failure) {
+        const loadedFeatures = [];
+        const requestGroup = {};
+        let completedBatches = 0;
+        let hasFailed = false;
+        const rollback = () => {
+            loadedFeatures
+                .flat()
+                .forEach((feature) => vectorSource.removeFeature(feature));
+        };
+        urls.forEach((url, index) => {
+            if (hasFailed) {
+                return;
+            }
+            this.loadUrl(url, vectorSource, extent, resolution, readOptions, (features) => {
+                if (hasFailed) {
+                    features.forEach((feature) => vectorSource.removeFeature(feature));
+                    return;
+                }
+                loadedFeatures[index] = features;
+                completedBatches++;
+                if (completedBatches === urls.length) {
+                    success(loadedFeatures.flat());
+                }
+            }, () => {
+                if (hasFailed) {
+                    return;
+                }
+                hasFailed = true;
+                rollback();
+                this.abortRequestGroup(requestGroup);
+                failure();
+            }, requestGroup);
+        });
+    }
+    abortRequests() {
+        this.abortMatchingRequests(() => true);
+    }
+    abortRequestGroup(requestGroup) {
+        this.abortMatchingRequests((request) => this.requestGroups.get(request) === requestGroup);
+    }
+    abortMatchingRequests(predicate) {
+        const requests = this.ongoingRequests.filter(predicate);
+        for (const request of requests) {
+            request.source.removeLoadedExtent(request.extent);
+            request.xhr?.abort();
+            this.removeRequest(request);
+        }
+    }
+    shouldAbortRequests(currentExtent, resolution) {
+        return this.ongoingRequests.some((request) => !equals(request.extent, currentExtent) ||
+            request.resolution !== resolution);
+    }
+    loadUrl(url, vectorSource, extent, resolution, readOptions, success, failure, requestGroup) {
+        const request = this.createVectorRequest(vectorSource, extent, resolution);
+        if (requestGroup) {
+            this.requestGroups.set(request, requestGroup);
+        }
+        const responseType = vectorSource.getFormat()?.getType() === 'arraybuffer'
+            ? 'arraybuffer'
+            : undefined;
+        this.executeXhrRequest({
+            request,
+            url,
+            readOptions,
+            success,
+            failure,
+            responseType
+        });
+    }
+    executeXhrRequest(options) {
+        const { xhr, resolvedUrl } = this.createConfiguredXhr(options.url, options.responseType);
+        const onError = () => this.handleRequestError(options);
+        xhr.onerror = onError;
+        xhr.onload = () => this.handleRequestLoadEvent(options, xhr, onError);
+        this.trackRequest(options.request, xhr);
+        try {
+            this.dependencies.xhrInterceptor?.interceptXhr(xhr, resolvedUrl);
+            xhr.send();
+        }
+        catch {
+            onError();
+        }
+    }
+    createConfiguredXhr(url, responseType) {
+        const xhr = new XMLHttpRequest();
+        const resolvedUrl = this.dependencies.xhrInterceptor?.alterUrlWithKeyAuth(url) ?? url;
+        xhr.open('GET', resolvedUrl);
+        if (responseType) {
+            xhr.responseType = responseType;
+        }
+        return { xhr, resolvedUrl };
+    }
+    handleRequestError(options) {
+        options.request.source.removeLoadedExtent(options.request.extent);
+        this.removeRequest(options.request);
+        options.failure();
+    }
+    handleRequestLoadEvent(options, xhr, onError) {
+        if (xhr.status && (xhr.status < 200 || xhr.status >= 300)) {
+            onError();
+            return;
+        }
+        let content;
+        try {
+            content = this.getResponseContent(xhr, options.responseType);
+        }
+        catch {
+            onError();
+            return;
+        }
+        this.handleResponse(options, content, onError);
+    }
+    handleResponse(options, content, onError) {
+        if (!content) {
+            this.removeRequest(options.request);
+            options.success([]);
+            return;
+        }
+        try {
+            const format = options.request.source.getFormat();
+            if (!format) {
+                onError();
+                return;
+            }
+            const source = format.getType() === 'xml'
+                ? new DOMParser().parseFromString(content.toString(), 'application/xml')
+                : content;
+            const features = format.readFeatures(source, options.readOptions);
+            options.request.source.addFeatures(features);
+            this.removeRequest(options.request);
+            options.success(features);
+        }
+        catch {
+            onError();
+        }
+    }
+    getResponseContent(xhr, responseType) {
+        if (responseType !== 'arraybuffer') {
+            return xhr.responseText;
+        }
+        if (xhr.response instanceof ArrayBuffer) {
+            return xhr.response;
+        }
+        throw new TypeError('Expected an ArrayBuffer response');
+    }
+    createVectorRequest(source, extent, resolution) {
+        return {
+            xhr: undefined,
+            extent,
+            resolution,
+            source
+        };
+    }
+    trackRequest(request, xhr) {
+        request.xhr = xhr;
+        this.ongoingRequests.push(request);
+    }
+    removeRequest(request) {
+        const index = this.ongoingRequests.indexOf(request);
+        if (index > -1) {
+            this.ongoingRequests.splice(index, 1);
+        }
+    }
+}
+
 class VectorLayer extends Layer {
-    messageService;
-    authInterceptor;
-    geoNetworkService;
-    styleService;
     type = 'vector';
-    lastRequest;
-    ongoingRequests = [];
     watcher;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    trackFeatureListenerId;
+    styleRevision = 0;
+    preloadState;
+    preloadListenerKey;
     get browsable() {
         return this.options.browsable !== false;
     }
     get exportable() {
         return this.options.exportable !== false;
     }
+    get saveableOptions() {
+        const baseOptions = super.saveableOptions;
+        return {
+            ...baseOptions,
+            visible: this.preloadState?.visible ?? baseOptions.visible,
+            opacity: this.preloadState?.opacity ?? baseOptions.opacity,
+            preload: this.options.preload
+        };
+    }
     get style() {
         return this._style$.getValue();
     }
@@ -4510,12 +5244,12 @@ class VectorLayer extends Layer {
     }
     _style$ = new BehaviorSubject(undefined);
     style$ = this._style$.asObservable();
-    constructor(options, messageService, authInterceptor, geoNetworkService, styleService) {
-        super(options, messageService, authInterceptor, styleService);
-        this.messageService = messageService;
-        this.authInterceptor = authInterceptor;
-        this.geoNetworkService = geoNetworkService;
-        this.styleService = styleService;
+    constructor(options) {
+        super(options);
+        const preloadOptions = this.options.preload;
+        if (preloadOptions) {
+            this.configurePreload(preloadOptions);
+        }
         this.watcher = new VectorWatcher(this);
         this.status$ = this.watcher.status$;
         this.style = this.options.style;
@@ -4536,16 +5270,6 @@ class VectorLayer extends Layer {
             source: this.options.source?.ol,
             sourceOptions: this.options.sourceOptions || this.options.source?.options
         });
-        if (this.options.sourceOptions?.preload?.bypassResolution ||
-            this.options.sourceOptions?.preload?.bypassVisible) {
-            this.handlePreload();
-        }
-        if (this.options.animation) {
-            this.dataSource.ol.on('addfeature', (e) => {
-                if (e.feature)
-                    this.flash(e.feature);
-            });
-        }
         if (this.options.trackFeature) {
             this.enableTrackFeature(this.options.trackFeature);
         }
@@ -4556,227 +5280,118 @@ class VectorLayer extends Layer {
             style: isOlStyle ? layerStyle : undefined
         });
         const vectorSource = vector.getSource();
-        let url = vectorSource.getUrl();
-        if (typeof url === 'function') {
-            return vector;
-        }
-        let loader;
-        const wfsOptions = olOptions.sourceOptions;
-        if (wfsOptions?.type === 'wfs' &&
-            (wfsOptions.params || wfsOptions.paramsWFS)) {
-            loader = (extent, resolution, proj, success, failure) => {
-                this.customWFSLoader(vectorSource, wfsOptions, extent, resolution, proj, success, failure);
-            };
-        }
-        else {
-            if (!url &&
-                this.options.idbInfo?.storeToIdb &&
-                this.options.idbInfo?._firstLoad === false) {
-                url = this.id.toString();
-            }
-            if (url) {
-                const loaderUrl = url;
-                loader = (extent, resolution, proj, success, failure) => {
-                    this.customLoader(vectorSource, loaderUrl, extent, resolution, proj, success, failure);
-                };
-            }
+        this.configureVectorSourceLoader(vectorSource);
+        this.attachExtensions(vector, vectorSource);
+        return vector;
+    }
+    configureVectorSourceLoader(vectorSource) {
+        const loader = this.createSourceLoader(vectorSource);
+        if (!loader) {
+            return;
         }
-        if (loader) {
-            vectorSource.setLoader(loader);
+        const layerLoader = this.createCompletionSafeLoader(loader);
+        vectorSource.setLoader(layerLoader);
+    }
+    createSourceLoader(vectorSource) {
+        if (hasVectorSourceLoader(this.dataSource)) {
+            return this.dataSource.createVectorSourceLoader(this.getSourceLoader());
         }
-        if (this.options.idbInfo?.storeToIdb) {
-            this.handleIdbStorage(vector);
+        const sourceUrl = vectorSource.getUrl();
+        if (!sourceUrl) {
+            return undefined;
         }
-        return vector;
+        return this.createGenericSourceLoader(vectorSource, sourceUrl);
+    }
+    createGenericSourceLoader(vectorSource, url) {
+        return (extent, resolution, projection, success, failure) => {
+            this.getSourceLoader().execute({
+                source: vectorSource,
+                url,
+                extent,
+                resolution,
+                projection,
+                readOptions: {
+                    extent,
+                    featureProjection: projection
+                },
+                success: success ?? (() => void 0),
+                failure: failure ?? (() => void 0)
+            });
+        };
     }
     async setStyle(value) {
+        const revision = ++this.styleRevision;
         if (!value) {
             this.ol.setStyle(undefined);
         }
         else if (this.styleService) {
             const olStyle = await this.styleService.getStyle(value, this.ol);
-            this.ol.setStyle(olStyle);
+            if (revision === this.styleRevision) {
+                this.ol.setStyle(olStyle);
+            }
         }
         else if (isAnyOlStyle(value)) {
             this.ol.setStyle(value);
         }
         // else: no service and non-OL style — silently ignore
     }
-    handleIdbStorage(vector) {
-        fromEvent(vector, 'sourceready')
-            .pipe(tap$1(() => {
-            if (this.options.idbInfo?._firstLoad !== false) {
-                this.maintainFeaturesInIdb();
-                this.maintainOptionsInIdb();
-            }
-        }), switchMap$1(() => merge(fromEvent(vector.getSource(), 'featuresloadend'), fromEvent(vector.getSource(), 'addfeature'), fromEvent(vector.getSource(), 'changefeature'), fromEvent(vector.getSource(), 'clear'), fromEvent(vector.getSource(), 'removefeature'))))
-            .pipe(debounceTime(750))
-            .subscribe(() => this.maintainFeaturesInIdb());
-        fromEvent(vector, 'sourceready')
-            .pipe(switchMap$1(() => merge(fromEvent(vector, 'change'), fromEvent(vector, 'change:visible'), fromEvent(vector, 'change:opacity'), fromEvent(vector, 'change:zIndex'))))
-            .pipe(debounceTime(750))
-            .subscribe(() => {
-            this.maintainOptionsInIdb();
-        });
-    }
-    handlePreload() {
-        const preloadOptions = this.options.sourceOptions?.preload;
-        if (this.dataSource instanceof FeatureDataSource) {
-            const initialOpacityValue = this.options.opacity || 1;
-            const initialVisibleValue = this.options.visible !== false;
-            const initialMinResValue = this.options.minResolution ||
-                getResolutionFromScale(Number(this.options.minScaleDenom));
-            const initialMaxResValue = this.options.maxResolution ||
-                getResolutionFromScale(Number(this.options.maxScaleDenom));
-            this.options.opacity = 0;
-            if (preloadOptions?.bypassResolution &&
-                (this.options.minResolution || this.options.maxResolution)) {
-                this.options.minResolution = 0;
-                this.options.maxResolution = Infinity;
+    configurePreload(preloadOptions) {
+        this.preloadState = {
+            opacity: this.opacity,
+            visible: this.visible,
+            minResolution: this.minResolution,
+            maxResolution: this.maxResolution
+        };
+        this.opacity = 0;
+        if (preloadOptions.bypass === 'resolution' ||
+            preloadOptions.bypass === 'all') {
+            this.minResolution = 0;
+            this.maxResolution = Infinity;
+        }
+        if (preloadOptions.bypass === 'visibility' ||
+            preloadOptions.bypass === 'all') {
+            this.visible = true;
+        }
+        const restoreLayerState = () => {
+            const state = this.preloadState;
+            if (!state) {
+                return;
             }
-            if (preloadOptions?.bypassVisible && !initialVisibleValue) {
-                this.options.visible = true;
+            this.preloadState = undefined;
+            if (this.preloadListenerKey) {
+                unByKey(this.preloadListenerKey);
+                this.preloadListenerKey = undefined;
             }
-            this.dataSource.ol.once('featuresloadend', () => {
-                if (initialOpacityValue) {
-                    this.opacity = initialOpacityValue;
-                }
-                if (preloadOptions?.bypassResolution) {
-                    this.minResolution = initialMinResValue;
-                    this.maxResolution = initialMaxResValue;
-                }
-                if (preloadOptions?.bypassVisible) {
-                    this.visible = initialVisibleValue;
-                }
-            });
-        }
+            this.opacity = state.opacity;
+            if (preloadOptions.bypass === 'resolution' ||
+                preloadOptions.bypass === 'all') {
+                this.minResolution = state.minResolution;
+                this.maxResolution = state.maxResolution;
+            }
+            if (preloadOptions.bypass === 'visibility' ||
+                preloadOptions.bypass === 'all') {
+                this.visible = state.visible;
+            }
+        };
+        this.preloadListenerKey = this.dataSource.ol.on(['featuresloadend', 'featuresloaderror'], restoreLayerState);
     }
     remove() {
-        this.watcher.unsubscribe();
-        if (this.options.idbInfo?.storeToIdb &&
-            this.options.idbInfo?._deleteFromIdb) {
-            this.removeLayerFromIDB();
+        try {
+            this.cleanupVectorLifecycle();
+        }
+        finally {
+            super.remove();
         }
-        super.remove();
-    }
-    removeLayerFromIDB() {
-        const geoDB = new GeoDB();
-        const layerDB = new LayerDB();
-        merge(geoDB.delete(this.id.toString()), layerDB.delete(this.id.toString())).subscribe();
-    }
-    maintainOptionsInIdb() {
-        const layerData = ObjectUtils.removeUndefined({
-            layerId: this.id,
-            detailedContextUri: this.options.idbInfo?.contextUri,
-            sourceOptions: {
-                id: this.id,
-                type: 'vector',
-                queryable: true,
-                url: this.options.sourceOptions?.url
-            },
-            layerOptions: {
-                workspace: this.options.workspace,
-                zIndex: this.ol ? this.zIndex : 1000000,
-                id: this.id,
-                isIgoInternalLayer: this.isIgoInternalLayer,
-                title: this.title,
-                visible: this.visible,
-                opacity: this.opacity,
-                style: isOlFlatStyleLike(this.style) ? this.style : undefined,
-                idbInfo: Object.assign({ contextUri: '*' }, this.options.idbInfo, {
-                    _firstLoad: false
-                })
-            },
-            insertEvent: `${this.title}-${this.id}-${new Date()}`
-        });
-        const layerDB = new LayerDB();
-        layerDB.update(layerData).pipe(first$1()).subscribe();
     }
-    maintainFeaturesInIdb() {
-        const dsFeatures = this.dataSource.ol.getFeatures();
-        dsFeatures.forEach((f) => f.unset('_featureStore', true));
-        const geojsonObject = JSON.parse(new olformat.GeoJSON().writeFeatures(dsFeatures, {
-            dataProjection: 'EPSG:4326',
-            featureProjection: this.dataSource.ol.getProjection() || 'EPSG:3857'
-        }));
-        const geoDB = new GeoDB();
-        geoDB
-            .update(this.options.sourceOptions?.url || this.id.toString(), this.id, geojsonObject, InsertSourceInsertDBEnum.User, `${this.title}-${this.id}-${new Date()}`)
-            .pipe(first$1())
-            .subscribe();
-    }
-    flash(feature) {
-        const start = new Date().getTime();
-        const listenerKey = this.ol.on('postrender', animate.bind(this));
-        function animate(event) {
-            const vectorContext = getVectorContext(event);
-            const frameState = event.frameState;
-            const flashGeom = feature?.getGeometry()?.clone();
-            const elapsed = frameState.time - start;
-            const elapsedRatio = elapsed / (this.options.animation.duration ?? 1000);
-            const opacity = easeOut(1 - elapsedRatio);
-            const newColor = asArray(this.options.animation?.color || 'red');
-            newColor[3] = opacity;
-            let style = this.ol.getStyleFunction()
-                ?.call(this, feature)
-                ?.find((style2) => {
-                return style2.getImage();
-            });
-            if (!style) {
-                style = this.ol.getStyleFunction()?.call(this, feature)?.[0];
-            }
-            const styleClone = style.clone();
-            switch (feature?.getGeometry()?.getType()) {
-                case 'Point':
-                    if (styleClone.getImage() !== null &&
-                        typeof styleClone.getImage().getRadius === 'function') {
-                        const radius = easeOut(elapsedRatio) * (styleClone.getImage().getRadius() * 3);
-                        styleClone.getImage().setRadius(radius);
-                        styleClone.getImage().setOpacity(opacity);
-                    }
-                    break;
-                case 'LineString':
-                    // TODO
-                    if (styleClone.getImage()) {
-                        styleClone.getImage().getStroke().setColor(newColor);
-                        styleClone
-                            .getImage()
-                            .getStroke()
-                            .setWidth(easeOut(elapsedRatio) *
-                            (styleClone.getImage().getStroke().getWidth() * 3));
-                    }
-                    if (styleClone.getStroke()) {
-                        styleClone.getStroke().setColor(newColor);
-                        styleClone
-                            .getStroke()
-                            .setWidth(easeOut(elapsedRatio) * (styleClone.getStroke().getWidth() * 3));
-                    }
-                    break;
-                case 'Polygon':
-                    // TODO
-                    if (styleClone.getImage()) {
-                        styleClone.getImage().getFill().setColor(newColor);
-                    }
-                    if (styleClone.getFill()) {
-                        styleClone.getFill().setColor(newColor);
-                    }
-                    break;
-            }
-            styleClone.setText('');
-            vectorContext.setStyle(styleClone);
-            if (flashGeom) {
-                vectorContext.drawGeometry(flashGeom);
-            }
-            if (elapsed > (this.options.animation?.duration ?? 1000)) {
-                unByKey(listenerKey);
-                // remove last geometry
-                // there is a little flash before feature disappear, better solution ?
-                this.map?.ol.render();
-                return;
-            }
-            // tell OpenLayers to continue postcompose animation
-            this.map?.ol.render();
+    cleanupVectorLifecycle() {
+        this.watcher.unsubscribe();
+        this.disableTrackFeature();
+        if (this.preloadListenerKey) {
+            unByKey(this.preloadListenerKey);
+            this.preloadListenerKey = undefined;
         }
+        this.sourceLoader?.abortRequests();
+        this.extensionManager.destroy();
     }
     init(map) {
         if (map === undefined) {
@@ -4796,253 +5411,98 @@ class VectorLayer extends Layer {
         this.stopAnimation();
     }
     stopAnimation() {
-        this.dataSource.ol.un('addfeature', (e) => {
-            if (this.visible && e.feature) {
-                this.flash(e.feature);
-            }
-        });
+        this.extensionManager
+            .getInstance(vectorLayerAnimationExtension)
+            ?.stopAnimation();
     }
     enableTrackFeature(id) {
-        this.trackFeatureListenerId = this.dataSource.ol.on('addfeature', this.trackFeature.bind(this, id));
+        this.disableTrackFeature();
+        this.trackFeatureListenerKey = this.dataSource.ol.on('addfeature', (event) => this.trackFeature(id, event));
     }
     centerMapOnFeature(id) {
         const feat = this.dataSource.ol.getFeatureById(id);
         if (feat) {
-            this.map.ol.getView().setCenter(feat.getGeometry()?.getCoordinates());
+            const geometry = feat.getGeometry();
+            if (!geometry) {
+                return;
+            }
+            const center = geometry instanceof OlPoint
+                ? geometry.getCoordinates()
+                : getCenter(geometry.getExtent());
+            this.map.ol.getView().setCenter(center);
         }
     }
-    trackFeature(id, feat) {
-        if (feat.feature.getId() === id && this.visible) {
+    trackFeature(id, event) {
+        if (event.feature?.getId() === id && this.visible) {
             this.centerMapOnFeature(id);
         }
     }
     disableTrackFeature() {
-        unByKey(this.trackFeatureListenerId);
-    }
-    /**
-     * Custom loader for a WFS datasource
-     * @internal
-     * @param vectorSource the vector source to be created
-     * @param options olOptions from source
-     * @param extent the extent of the requested data
-     * @param resolution the current resolution
-     * @param proj the projection to retrieve the data
-     * @param success success callback
-     * @param failure failure callback
-     * @param randomParam random parameter to ensure cache is not causing problems in retrieving new data
-     */
-    customWFSLoader(vectorSource, options, extent, resolution, proj, success, failure, randomParam) {
-        const paramsWFS = options.paramsWFS;
-        const wfsProj = this.getProjection(proj, paramsWFS);
-        const currentExtent = olproj.transformExtent(extent, proj, wfsProj);
-        if (this.lastRequest &&
-            (this.lastRequest.extent !== currentExtent ||
-                this.lastRequest.resolution !== resolution)) {
-            this.abortRequests(vectorSource);
-        }
-        const properties = this.dataSource.properties.getAll();
-        const url = buildUrl({ ...options, ...properties }, currentExtent, wfsProj, randomParam);
-        const request = {
-            xhr: undefined,
-            extent,
-            resolution
-        };
-        const readOptions = {
-            dataProjection: wfsProj,
-            featureProjection: proj
-        };
-        if (paramsWFS.version === '2.0.0' &&
-            (paramsWFS.maxFeatures ?? 0) > defaultMaxFeatures) {
-            this.batchGetFeatures(url, request, vectorSource, paramsWFS, readOptions, success, failure);
-        }
-        else {
-            this.getFeatures(url, request, vectorSource, readOptions, success, failure);
-        }
-    }
-    abortRequests(vectorSource) {
-        if (this.lastRequest) {
-            vectorSource.removeLoadedExtent(this.lastRequest.extent);
-        }
-        for (const request of this.ongoingRequests) {
-            request.xhr?.abort();
-            this.removeRequest(request);
-        }
-    }
-    getProjection(proj, params) {
-        const newProj = params.srsName
-            ? new olProjection({ code: params.srsName })
-            : proj;
-        params.srsName = newProj.getCode();
-        return newProj;
-    }
-    batchGetFeatures(url, request, vectorSource, paramsWFS, readOptions, success, failure) {
-        const nbOfFeature = 1000;
-        let startIndex = 0;
-        while (startIndex < (paramsWFS.maxFeatures ?? 0)) {
-            let alteredUrl = url.replace('count=' + paramsWFS.maxFeatures, 'count=' + nbOfFeature);
-            alteredUrl = alteredUrl.replace('startIndex=0', '0');
-            alteredUrl += '&startIndex=' + startIndex;
-            alteredUrl.replace(/&&/g, '&');
-            this.getFeatures(alteredUrl, request, vectorSource, readOptions, success, failure);
-            startIndex += nbOfFeature;
-        }
-    }
-    /**
-     * Custom loader to get feature from a WFS datasource
-     * @internal
-     * @param vectorSource the vector source to be created
-     * @param extent the extent of the requested data
-     * @param dataProjection the projection of the retrieved data
-     * @param featureProjection the projection of the created features
-     * @param url the url string to retrieve the data
-     * @param success success callback
-     * @param failure failure callback
-     */
-    getFeatures(url, request, vectorSource, readOptions, success, failure) {
-        const xhr = new XMLHttpRequest();
-        const alteredUrlWithKeyAuth = this.authInterceptor?.alterUrlWithKeyAuth(url);
-        let modifiedUrl = url;
-        if (alteredUrlWithKeyAuth) {
-            modifiedUrl = alteredUrlWithKeyAuth;
-        }
-        xhr.open('GET', modifiedUrl);
-        if (this.authInterceptor) {
-            this.authInterceptor.interceptXhr(xhr, modifiedUrl);
-        }
-        const onError = () => {
-            vectorSource.removeLoadedExtent(request.extent);
-            this.removeRequest(request);
-            failure();
-        };
-        xhr.onerror = onError;
-        xhr.onload = () => {
-            if (xhr.status === 200 && xhr.responseText.length > 0) {
-                this.handleOnLoad(vectorSource, xhr.responseText, request, readOptions, success, onError);
-            }
-            else {
-                onError();
-            }
-        };
-        request.xhr = xhr;
-        this.lastRequest = request;
-        this.ongoingRequests.push(request);
-        xhr.send();
-    }
-    removeRequest(request) {
-        if (request === this.lastRequest) {
-            this.lastRequest = undefined;
-        }
-        const index = this.ongoingRequests.indexOf(request);
-        if (index > -1) {
-            this.ongoingRequests.splice(index, 1);
-        }
-    }
-    handleOnLoad(vectorSource, content, request, readOptions, success, onError) {
-        const format = vectorSource.getFormat();
-        const type = format.getType();
-        if (content) {
-            let source;
-            switch (type) {
-                case 'xml':
-                    source = new DOMParser().parseFromString(content.toString(), 'application/xml');
-                    break;
-                case 'json':
-                case 'text':
-                case 'arraybuffer':
-                default:
-                    source = content;
-                    break;
-            }
-            if (source) {
-                const features = format.readFeatures(source, readOptions);
-                if (features) {
-                    vectorSource.addFeatures(features);
-                    success(features);
-                }
-                else {
-                    success([]);
-                }
-                this.removeRequest(request);
-            }
-            else {
-                onError();
-            }
+        if (this.trackFeatureListenerKey) {
+            unByKey(this.trackFeatureListenerKey);
+            this.trackFeatureListenerKey = undefined;
         }
     }
-    /**
-     * Custom loader for vector layer.
-     * @internal
-     * @param vectorSource the vector source to be created
-     * @param url the url string or function to retrieve the data
-     * @param extent the extent of the requested data
-     * @param projection the projection to retrieve the data
-     */
-    customLoader(vectorSource, url, extent, resolution, projection, success, failure) {
-        const onError = () => {
-            vectorSource.removeLoadedExtent(extent);
-            failure();
-        };
-        const xhr = new XMLHttpRequest();
-        const request = {
-            xhr,
-            extent,
-            resolution
-        };
-        const readOptions = {
-            extent,
-            featureProjection: projection
+    attachExtensions(layer, source) {
+        this.extensionManager = new LayerExtensionManager();
+        const context = {
+            id: this.id,
+            options: this.options,
+            layer,
+            source,
+            requestRender: () => this.map?.ol.render(),
+            getStateSnapshot: () => ({
+                mapAttached: this.map !== undefined,
+                visible: this.visible
+            })
         };
-        let modifiedUrl = url;
-        if (typeof url !== 'function') {
-            const alteredUrlWithKeyAuth = this.authInterceptor?.alterUrlWithKeyAuth(url);
-            if (alteredUrlWithKeyAuth) {
-                modifiedUrl = alteredUrlWithKeyAuth;
-            }
-        }
-        const format = vectorSource.getFormat();
-        const type = format.getType();
-        if (this.geoNetworkService && typeof url !== 'function') {
-            const options = { responseType: type };
-            const getVectorObs$ = this.geoNetworkService
-                .get(modifiedUrl, options)
-                .pipe(first$1(), catchError((res) => {
-                onError();
-                throw res;
-            }));
-            const geoDB = new GeoDB();
-            const idbGetVectorObsObs$ = geoDB.get(url).pipe(delay(750), concatMap((r) => (r ? of(r) : getVectorObs$)));
-            (this.options.idbInfo?.storeToIdb
-                ? idbGetVectorObsObs$
-                : getVectorObs$).subscribe((content) => {
-                this.handleOnLoad(vectorSource, content, request, readOptions, success, onError);
-            });
-        }
-        else {
-            xhr.open('GET', modifiedUrl);
-            if (type === 'arraybuffer') {
-                xhr.responseType = 'arraybuffer';
-            }
-            if (this.authInterceptor) {
-                this.authInterceptor.interceptXhr(xhr, modifiedUrl);
-            }
-            xhr.onerror = onError;
-            xhr.onload = () => {
-                if (!xhr.status || (xhr.status >= 200 && xhr.status < 300)) {
-                    this.handleOnLoad(vectorSource, xhr.responseText, request, readOptions, success, onError);
+        this.extensionManager.attach([vectorLayerAnimationExtension, ...this.getRegisteredExtensions()], this.options, context);
+    }
+    getRegisteredExtensions() {
+        return inject(VECTOR_LAYER_EXTENSIONS, { optional: true }) ?? [];
+    }
+    createCompletionSafeLoader(loader) {
+        return (extent, resolution, projection, success, failure) => {
+            const onSuccess = success ?? (() => void 0);
+            const onFailure = failure ?? (() => void 0);
+            let completed = false;
+            const successOnce = (features) => {
+                if (completed) {
+                    return;
                 }
-                else {
-                    onError();
+                completed = true;
+                onSuccess(features);
+            };
+            const failureOnce = () => {
+                if (completed) {
+                    return;
                 }
+                completed = true;
+                onFailure();
             };
-            xhr.send();
-        }
+            loader(extent, resolution, projection, successOnce, failureOnce);
+        };
+    }
+    executeLoadExtensions(request, baseLoader) {
+        const interceptors = this.extensionManager
+            .getInstances()
+            .filter((instance) => !!instance.interceptLoad)
+            .map((instance) => (nextRequest, next) => instance.interceptLoad(nextRequest, next));
+        const chain = interceptors.reduceRight((next, intercept) => {
+            return (nextRequest) => intercept(nextRequest, next);
+        }, baseLoader);
+        chain(request);
+    }
+    getSourceLoader() {
+        this.sourceLoader ??= new VectorSourceLoader({
+            executeLoadExtensions: (request, baseLoader) => this.executeLoadExtensions(request, baseLoader),
+            xhrInterceptor: this.xhrInterceptor
+        });
+        return this.sourceLoader;
     }
 }
 
 class VectorTileLayer extends Layer {
-    messageService;
-    authInterceptor;
-    styleService;
     type = 'vector';
     watcher;
     get style() {
@@ -5054,11 +5514,8 @@ class VectorTileLayer extends Layer {
     }
     _style$ = new BehaviorSubject$1(undefined);
     style$ = this._style$.asObservable();
-    constructor(options, messageService, authInterceptor, styleService) {
-        super(options, messageService, authInterceptor, styleService);
-        this.messageService = messageService;
-        this.authInterceptor = authInterceptor;
-        this.styleService = styleService;
+    constructor(options) {
+        super(options);
         this.watcher = new TileWatcher(this);
         this.status$ = this.watcher.status$;
         this.style = this.options.style;
@@ -5086,7 +5543,7 @@ class VectorTileLayer extends Layer {
         });
         const vectorTileSource = vectorTile.getSource();
         vectorTileSource.setTileLoadFunction(((tile, url) => {
-            const loader = this.customLoader(url, tile.getFormat(), this.authInterceptor, tile.onLoad.bind(tile));
+            const loader = this.customLoader(url, tile.getFormat(), this.xhrInterceptor, tile.onLoad.bind(tile));
             if (loader) {
                 tile.setLoader(loader);
             }
@@ -5117,12 +5574,12 @@ class VectorTileLayer extends Layer {
      * @param failure On failure event action to trigger TODO
      */
     customLoader(url, format, interceptor, success, failure) {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         return (extent, resolution, projection) => {
             const xhr = new XMLHttpRequest();
-            let modifiedUrl = url;
+            let modifiedUrl;
             if (typeof url !== 'function') {
-                const alteredUrlWithKeyAuth = interceptor.alterUrlWithKeyAuth(url);
+                modifiedUrl = url;
+                const alteredUrlWithKeyAuth = interceptor?.alterUrlWithKeyAuth(url);
                 if (alteredUrlWithKeyAuth) {
                     modifiedUrl = alteredUrlWithKeyAuth;
                 }
@@ -5131,9 +5588,7 @@ class VectorTileLayer extends Layer {
                 modifiedUrl = url(extent, resolution, projection);
             }
             xhr.open('GET', modifiedUrl);
-            if (interceptor) {
-                interceptor.interceptXhr(xhr, modifiedUrl);
-            }
+            interceptor?.interceptXhr(xhr, modifiedUrl);
             if (format.getType() === 'arraybuffer') {
                 xhr.responseType = 'arraybuffer';
             }
@@ -6561,7 +7016,7 @@ class PrintService {
         return n * k;
     }
     mapRenderCompleteEvent$(map, mapSize, viewResolution, status$) {
-        return fromEvent(map.ol, 'rendercomplete').pipe(timeout(PRINT_TIMEOUT), first$1(), catchError((error) => {
+        return fromEvent(map.ol, 'rendercomplete').pipe(timeout(PRINT_TIMEOUT), first(), catchError((error) => {
             const translate = this.languageService.translate;
             const message = translate.instant('igo.geo.printForm.timeout', {
                 value: PRINT_TIMEOUT / 1000
@@ -6644,7 +7099,6 @@ class WFSDataSource extends DataSource {
     options;
     wfsService;
     ogcFilterService;
-    authInterceptor;
     set ogcFilters(value) {
         this.options.ogcFilters = value;
     }
@@ -6661,12 +7115,11 @@ class WFSDataSource extends DataSource {
             })
         };
     }
-    constructor(options, wfsService, ogcFilterService, authInterceptor) {
+    constructor(options, wfsService, ogcFilterService) {
         super(checkWfsParams(options, 'wfs'));
         this.options = options;
         this.wfsService = wfsService;
         this.ogcFilterService = ogcFilterService;
-        this.authInterceptor = authInterceptor;
         const ogcFilters = this.options
             .ogcFilters;
         const fieldNameGeometry = this.options.paramsWFS?.fieldNameGeometry || defaultFieldNameGeometry;
@@ -6719,47 +7172,76 @@ class WFSDataSource extends DataSource {
         super.refresh();
     }
     fetchFeatures({ extent, projection, httpClient }) {
-        const paramsWFS = this.options.paramsWFS;
-        const wfsProj = paramsWFS.srsName
+        const requestContext = this.createRequestContext({
+            extent,
+            projection,
+            omitBboxWhenNoExtent: true
+        });
+        const urls = this.buildRequestUrls(requestContext.baseUrl, requestContext.paramsWFS);
+        return forkJoin(urls.map((batchUrl) => this._fetchFeatures(requestContext.wfsProjection, batchUrl, {
+            extent: requestContext.transformedExtent,
+            projection,
+            httpClient
+        }))).pipe(map$1((featureBatches) => featureBatches.flat()));
+    }
+    createRequestContext({ extent, projection, options, randomParam, omitBboxWhenNoExtent = false }) {
+        const effectiveOptions = options ?? this.options;
+        const paramsWFS = effectiveOptions.paramsWFS;
+        const wfsProjection = paramsWFS.srsName
             ? new olProjection({ code: paramsWFS.srsName })
             : projection;
-        const currentExtent = extent
-            ? olproj.transformExtent(extent, projection, wfsProj)
+        const transformedExtent = extent
+            ? olproj.transformExtent(extent, projection, wfsProjection)
             : undefined;
         paramsWFS.srsName = paramsWFS.srsName || projection.getCode();
-        let url = buildUrl(this.options, currentExtent, wfsProj);
-        // Exportation want to fetch without extent/bbox restrictions
-        if (!extent && url.includes('bbox')) {
-            const [baseUrl, params] = url.split('?');
+        let baseUrl = buildUrl(effectiveOptions, transformedExtent, wfsProjection, randomParam);
+        // Exportation wants to fetch without extent/bbox restrictions.
+        if (omitBboxWhenNoExtent && !extent && baseUrl.includes('bbox')) {
+            const [urlBase, params] = baseUrl.split('?');
             const paramSegments = params.split('&');
             const paramsWithoutBbox = paramSegments.filter((segment) => !segment.includes('bbox'));
-            url = `${baseUrl}?${paramsWithoutBbox.join('&')}`;
-        }
-        let startIndex = 0;
-        if (paramsWFS.version === '2.0.0' &&
-            paramsWFS.maxFeatures !== undefined &&
-            paramsWFS.maxFeatures > defaultMaxFeatures) {
-            const nbOfFeature = 1000;
-            while (startIndex < paramsWFS.maxFeatures) {
-                let alteredUrl = url.replace('count=' + paramsWFS.maxFeatures, 'count=' + nbOfFeature);
-                alteredUrl = alteredUrl.replace('startIndex=0', '0');
-                alteredUrl += '&startIndex=' + startIndex;
-                alteredUrl.replace(/&&/g, '&');
-                return this._fetchFeatures(wfsProj, alteredUrl, {
-                    extent: currentExtent,
-                    projection,
-                    httpClient
-                }).pipe(map$1((res) => {
-                    startIndex += nbOfFeature;
-                    return res;
-                }));
-            }
+            baseUrl = `${urlBase}?${paramsWithoutBbox.join('&')}`;
         }
-        return this._fetchFeatures(wfsProj, url, {
-            extent: currentExtent,
-            projection,
-            httpClient
-        });
+        return {
+            baseUrl,
+            paramsWFS,
+            wfsProjection,
+            transformedExtent
+        };
+    }
+    buildRequestUrls(url, paramsWFS) {
+        if (!this.shouldBatchWfsRequest(paramsWFS)) {
+            return [url];
+        }
+        return buildWfsBatchUrls(url, paramsWFS.maxFeatures ?? 0);
+    }
+    shouldBatchWfsRequest(paramsWFS) {
+        return (paramsWFS.version === '2.0.0' &&
+            (paramsWFS.maxFeatures ?? 0) > defaultMaxFeatures);
+    }
+    createVectorSourceLoader(host, options = this.options, randomParam = false) {
+        return (extent, resolution, projection, success, failure) => {
+            const requestContext = this.createRequestContext({
+                extent,
+                projection,
+                options: { ...options, ...this.properties.getAll() },
+                randomParam
+            });
+            host.execute({
+                source: this.ol,
+                url: requestContext.baseUrl,
+                extent,
+                resolution,
+                projection,
+                readOptions: {
+                    dataProjection: requestContext.wfsProjection,
+                    featureProjection: projection
+                },
+                resolveUrls: (url) => this.buildRequestUrls(url, requestContext.paramsWFS),
+                success: success ?? (() => void 0),
+                failure: failure ?? (() => void 0)
+            });
+        };
     }
     _fetchFeatures(featureProjection, url, { extent, projection, httpClient }) {
         return httpClient.get(url, { responseType: 'text' }).pipe(map$1((response) => {
@@ -6778,6 +7260,32 @@ class WFSDataSource extends DataSource {
         return features;
     }
 }
+function buildWfsBatchUrls(url, maxFeatures, batchSize = 1000) {
+    if (maxFeatures <= batchSize) {
+        return [url];
+    }
+    // Dummy base only to satisfy URL() when `url` is relative; discarded below if so.
+    const isProtocolRelativeUrl = url.startsWith('//');
+    const parsedUrl = new URL(isProtocolRelativeUrl ? `http:${url}` : url, 'http://igo.local');
+    const isAbsoluteUrl = /^[a-zA-Z][a-zA-Z\d+.-]*:/.test(url);
+    const pathEnd = [url.indexOf('?'), url.indexOf('#')]
+        .filter((index) => index >= 0)
+        .reduce((lowest, index) => Math.min(lowest, index), url.length);
+    const originalPath = url.slice(0, pathEnd);
+    const urls = [];
+    for (let startIndex = 0; startIndex < maxFeatures; startIndex += batchSize) {
+        const batchCount = Math.min(batchSize, maxFeatures - startIndex);
+        parsedUrl.searchParams.set('count', batchCount.toString());
+        parsedUrl.searchParams.set('startIndex', startIndex.toString());
+        parsedUrl.searchParams.delete('maxFeatures');
+        urls.push(isAbsoluteUrl
+            ? parsedUrl.toString()
+            : isProtocolRelativeUrl
+                ? `//${parsedUrl.host}${parsedUrl.pathname}${parsedUrl.search}${parsedUrl.hash}`
+                : `${originalPath}${parsedUrl.search}${parsedUrl.hash}`);
+    }
+    return urls;
+}
 
 function createDefaultTileGrid(epsg) {
     const projection = epsg ? olproj.get(epsg) : olproj.get('EPSG:3857');
@@ -7363,18 +7871,21 @@ class MVTDataSource extends DataSource {
  * @param store The store to bind the layer
  * @param layer An optional VectorLayer
  */
-function tryBindStoreLayer(store, layer) {
+function tryBindStoreLayer(store, layer, layerService) {
     if (store.layer !== undefined) {
         if (!store.map.layerController.getById(store.layer.id)) {
             store.map.layerController.add(store.layer);
         }
         return store.layer;
     }
-    layer = layer
-        ? layer
-        : new VectorLayer({
+    if (!layer) {
+        if (!layerService) {
+            throw new Error('LayerService is required to create a store layer.');
+        }
+        layer = layerService.createLayer({
             source: new FeatureDataSource()
         });
+    }
     store.bindLayer(layer);
     if (!store.map.layerController.getById(layer.id)) {
         store.map.layerController.add(store.layer);
@@ -7382,15 +7893,6 @@ function tryBindStoreLayer(store, layer) {
     return layer;
 }
 
-const FEATURE = 'Feature';
-var FeatureMotion;
-(function (FeatureMotion) {
-    FeatureMotion[FeatureMotion["None"] = 0] = "None";
-    FeatureMotion[FeatureMotion["Move"] = 1] = "Move";
-    FeatureMotion[FeatureMotion["Zoom"] = 2] = "Zoom";
-    FeatureMotion[FeatureMotion["Default"] = 3] = "Default";
-})(FeatureMotion || (FeatureMotion = {}));
-
 /**
  * This strategy loads a store's features into it's layer counterpart.
  * The store -> layer binding is a one-way binding. That means any entity
@@ -7527,328 +8029,6 @@ class FeatureStoreLoadingStrategy extends EntityStoreStrategy {
     }
 }
 
-/**
- * Create an Openlayers feature object out of a feature definition.
- * The output object has a reference to the feature id.
- * @param feature Feature definition
- * @param projectionOut Feature object projection
- * @returns OpenLayers feature object
- */
-function featureToOl(feature, projectionOut, getId) {
-    getId = getId ? getId : getEntityId;
-    const olFormat = new OlGeoJSON();
-    const olFeature = olFormat.readFeature(feature, {
-        dataProjection: feature.projection,
-        featureProjection: projectionOut
-    });
-    olFeature.setId(getId(feature));
-    const title = getEntityTitle(feature);
-    if (title !== undefined) {
-        olFeature.set('_title', title, true);
-    }
-    if (feature.extent !== undefined) {
-        olFeature.set('_extent', feature.extent, true);
-    }
-    if (feature.projection !== undefined) {
-        olFeature.set('_projection', feature.projection, true);
-    }
-    const mapTitle = getEntityProperty(feature, 'meta.mapTitle');
-    if (mapTitle !== undefined) {
-        olFeature.set('_mapTitle', mapTitle, true);
-    }
-    olFeature.set('_entityRevision', getEntityRevision(feature), true);
-    const icon = getEntityIcon(feature);
-    if (icon !== undefined) {
-        olFeature.set('_icon', icon, true);
-    }
-    if (feature.meta && feature.meta.style) {
-        olFeature.set('_style', feature.meta.style, true);
-    }
-    if (feature.sourceId) {
-        olFeature.set('_sourceId', feature.sourceId, true);
-    }
-    return olFeature;
-}
-function renderFeatureFromOl(olRenderFeature, projectionIn, olLayer, projectionOut = 'EPSG:4326') {
-    let geom;
-    let title;
-    let exclude;
-    let excludeOffline;
-    if (olLayer) {
-        title = olLayer.get('title');
-        if (olLayer.get('sourceOptions')) {
-            exclude = olLayer.get('sourceOptions').excludeAttribute;
-            excludeOffline = olLayer.get('sourceOptions').excludeAttributeOffline;
-        }
-    }
-    else {
-        title = olRenderFeature.get('_title');
-    }
-    const olFormat = new OlGeoJSON();
-    const properties = olRenderFeature.getProperties();
-    const geometryType = olRenderFeature.getType();
-    if (geometryType === 'Polygon') {
-        const ends = olRenderFeature.getEnds();
-        geom = new OlPolygon(olRenderFeature.getFlatCoordinates(), 'XY', ends);
-    }
-    else if (geometryType === 'Point') {
-        geom = new OlPoint(olRenderFeature.getFlatCoordinates(), 'XY');
-    }
-    else if (geometryType === 'LineString') {
-        geom = new OlLineString(olRenderFeature.getFlatCoordinates(), 'XY');
-    }
-    const geometry = olFormat.writeGeometryObject(geom, {
-        dataProjection: projectionOut,
-        featureProjection: projectionIn
-    });
-    const id = (olRenderFeature.getId() ?? uuid());
-    const mapTitle = olRenderFeature.get('_mapTitle');
-    const extent = olproj.transformExtent(olRenderFeature.getExtent(), projectionIn, projectionOut);
-    return {
-        type: FEATURE,
-        projection: projectionOut,
-        extent,
-        meta: {
-            id,
-            title: title ? title : mapTitle ? mapTitle : id,
-            mapTitle,
-            excludeAttribute: exclude,
-            excludeAttributeOffline: excludeOffline
-        },
-        properties,
-        geometry,
-        ol: olRenderFeature
-    };
-}
-/**
- * Create a feature object out of an OL feature
- * The output object has a reference to the feature id.
- * @param olFeature OL Feature
- * @param projectionIn OL feature projection
- * @param olLayer OL Layer
- * @param projectionOut Feature projection
- * @returns Feature
- */
-function featureFromOl(olFeature, projectionIn, olLayer, projectionOut = 'EPSG:4326') {
-    let title;
-    let exclude;
-    let excludeOffline;
-    let idColumn; // for arcgisrest and tilearcgisrest source
-    const olFormat = new OlGeoJSON();
-    const keys = olFeature.getKeys().filter((key) => {
-        return !key.startsWith('_') && key !== 'geometry';
-    });
-    const properties = keys.reduce((acc, key) => {
-        acc[key] = olFeature.get(key);
-        return acc;
-    }, {});
-    const geometry = olFormat.writeGeometryObject(olFeature.getGeometry(), {
-        dataProjection: projectionOut,
-        featureProjection: projectionIn
-    });
-    if (olLayer) {
-        title = olLayer.get('title');
-        const sourceOptions = olLayer.get('sourceOptions');
-        if (sourceOptions) {
-            exclude = sourceOptions.excludeAttribute;
-            excludeOffline = sourceOptions.excludeAttributeOffline;
-            idColumn =
-                sourceOptions.idColumn ||
-                    (sourceOptions.type === 'arcgisrest' ||
-                        sourceOptions.type === 'tilearcgisrest'
-                        ? 'OBJECTID'
-                        : undefined);
-        }
-    }
-    else {
-        title = olFeature.get('_title');
-    }
-    const mapTitle = olFeature.get('_mapTitle');
-    const id = olFeature.getId()
-        ? olFeature.getId()
-        : olFeature.get(idColumn)
-            ? olFeature.get(idColumn)
-            : uuid();
-    return {
-        type: FEATURE,
-        projection: projectionOut,
-        extent: olFeature.get('_extent'),
-        meta: {
-            id,
-            title: title ? title : mapTitle ? mapTitle : id,
-            mapTitle,
-            revision: olFeature.getRevision(),
-            style: olFeature.get('_style'),
-            excludeAttribute: exclude,
-            excludeAttributeOffline: excludeOffline
-        },
-        properties,
-        geometry,
-        ol: olFeature
-    };
-}
-/**
- * Compute an OL feature extent in it's map projection
- * @param map Map
- * @param olFeature OL feature
- * @returns Extent in the map projection
- */
-function computeOlFeatureExtent(olFeature, projection) {
-    let olExtent = olextent.createEmpty();
-    const olFeatureExtent = olFeature.get('_extent');
-    const olFeatureProjection = olFeature.get('_projection');
-    if (olFeatureExtent !== undefined && olFeatureProjection !== undefined) {
-        olExtent = olproj.transformExtent(olFeatureExtent, olFeatureProjection, projection);
-    }
-    else {
-        const olGeometry = olFeature.getGeometry();
-        if (olGeometry !== null && olGeometry !== undefined) {
-            olExtent = olGeometry.getExtent();
-        }
-    }
-    return olExtent;
-}
-/**
- * Compute a multiple OL features extent in their map projection
- * @param map Map
- * @param olFeatures OL features
- * @returns Extent in the map projection
- */
-function computeOlFeaturesExtent(olFeatures, projection) {
-    const extent = olextent.createEmpty();
-    olFeatures.forEach((olFeature) => {
-        const featureExtent = computeOlFeatureExtent(olFeature, projection);
-        olextent.extend(extent, featureExtent);
-    });
-    return extent;
-}
-/**
- * Scale an extent.
- * @param extent Extent
- * @param Scaling factors for top, right, bottom and left directions, in that order
- * @returns Scaled extent
- */
-function scaleExtent(extent, scale) {
-    const [width, height] = olextent.getSize(extent);
-    return [
-        scale[3] ? extent[0] - width * scale[3] : extent[0],
-        scale[2] ? extent[1] - height * scale[2] : extent[1],
-        scale[1] ? extent[2] + width * scale[1] : extent[2],
-        scale[0] ? extent[3] + height * scale[0] : extent[3]
-    ];
-}
-/**
- * Return true if features are out of view.
- * If features are too close to the edge, they are considered out of view.
- * By default, we define the edge as 5% (0.05) of the extent size.
- * @param map Map
- * @param featuresExtent The features's extent
- * @param edgeRatio Number or Number[] Single value OR an array =>
- *  [top,right,bottom,left] directions, in that order
- * @returns Return true if features are out of view
- */
-function featuresAreOutOfView(extent, featuresExtent, edgeRatio = 0.05) {
-    const edgesRatio = Array.isArray(edgeRatio)
-        ? edgeRatio
-        : [edgeRatio, edgeRatio, edgeRatio, edgeRatio];
-    const scale = [-1, -1, -1, -1].map((x, i) => x * edgesRatio[i]);
-    const viewExtent = scaleExtent(extent, scale);
-    return !olextent.containsExtent(viewExtent, featuresExtent);
-}
-/**
- * Return true if features are too deep into the view. This results
- * in features being too small.
- * Features are considered too small if their extent occupies less than
- * 1% of the map extent.
- * @param map Map
- * @param featuresExtent The features's extent
- * @param areaRatio The features extent to view extent acceptable ratio
- * @returns Return true if features are too deep in the view
- */
-function featuresAreTooDeepInView(viewController, featuresExtent, areaRatio) {
-    // An area ratio of 0.004 means that the feature extent's width and height
-    // should be about 1/16 of the map extent's width and height
-    areaRatio = areaRatio ? areaRatio : 0.004;
-    const mapExtent = viewController.getExtent();
-    const mapExtentArea = olextent.getArea(mapExtent);
-    const featuresExtentArea = olextent.getArea(featuresExtent);
-    if (featuresExtentArea === 0 && viewController.getZoom() > 13) {
-        // In case it's a point
-        return false;
-    }
-    return featuresExtentArea / mapExtentArea < areaRatio;
-}
-/**
- * Fit view to include the features extent.
- * By default, this method will let the features occupy about 50% of the viewport.
- * @param map Map
- * @param olFeatures OL features
- * @param motion To motion to the new map view
- * @param scale If this is defined, the original view will be scaled
- *  by that factor before any logic is applied.
- */
-function moveToOlFeatures(viewController, olFeatures, motion = FeatureMotion.Default, scale, areaRatio) {
-    const extent = viewController.getExtent();
-    const projection = viewController.getOlProjection();
-    const featuresExtent = computeOlFeaturesExtent(Array.isArray(olFeatures) ? olFeatures : [olFeatures], projection);
-    let viewExtent = featuresExtent;
-    if (scale !== undefined) {
-        viewExtent = scaleExtent(viewExtent, scale);
-    }
-    if (motion === FeatureMotion.Zoom) {
-        viewController.zoomToExtent(viewExtent);
-    }
-    else if (motion === FeatureMotion.Move) {
-        viewController.moveToExtent(viewExtent);
-    }
-    else if (motion === FeatureMotion.Default) {
-        if (featuresAreOutOfView(extent, featuresExtent) ||
-            featuresAreTooDeepInView(viewController, featuresExtent, areaRatio)) {
-            viewController.zoomToExtent(viewExtent);
-        }
-    }
-}
-/**
- * Hide an OL feature
- * @param olFeature OL feature
- */
-function hideOlFeature(olFeature) {
-    olFeature.setStyle(new olstyle.Style({}));
-}
-/**
- * Compute a diff between a source array of Ol features and a target array
- * @param source Source array of OL features
- * @param starget Target array of OL features
- * @returns Features to add and remove
- */
-function computeOlFeaturesDiff(source, target) {
-    const olFeaturesMap = new Map();
-    target.forEach((olFeature) => {
-        olFeaturesMap.set(olFeature.getId(), olFeature);
-    });
-    const olFeaturesToRemove = [];
-    source.forEach((olFeature) => {
-        const newOlFeature = olFeaturesMap.get(olFeature.getId());
-        if (newOlFeature === undefined) {
-            olFeaturesToRemove.push(olFeature);
-        }
-        else if (newOlFeature.get('_entityRevision') !== olFeature.get('_entityRevision')) {
-            olFeaturesToRemove.push(olFeature);
-        }
-        else {
-            olFeaturesMap.delete(newOlFeature.getId());
-        }
-    });
-    const olFeaturesToAddIds = Array.from(olFeaturesMap.keys());
-    const olFeaturesToAdd = target.filter((olFeature) => {
-        return olFeaturesToAddIds.indexOf(olFeature.getId()) >= 0;
-    });
-    return {
-        add: olFeaturesToAdd,
-        remove: olFeaturesToRemove
-    };
-}
-
 /**
  * The class is a specialized version of an EntityStore that stores
  * features and the map layer to display them on. Synchronization
@@ -8344,7 +8524,10 @@ class FeatureStoreSelectionStrategy extends EntityStoreStrategy {
      * @returns Overlay layer
      */
     createOverlayLayer() {
-        return new VectorLayer({
+        if (!this.options.layerService) {
+            throw new Error('LayerService is required when no selection layer is provided.');
+        }
+        return this.options.layerService.createLayer({
             zIndex: 300,
             source: new FeatureDataSource(),
             style: undefined,
@@ -8398,192 +8581,10 @@ function tryAddSelectionStrategy(store, strategy) {
         store.activateStrategyOfType(FeatureStoreSelectionStrategy);
         return;
     }
-    strategy = strategy
-        ? strategy
-        : new FeatureStoreSelectionStrategy({
-            map: store.map
-        });
     store.addStrategy(strategy);
     strategy.activate();
 }
 
-const STYLES_VARIANT = {
-    base: {
-        fill: 'rgba(0, 161, 222, 0.15)',
-        stroke: 'rgba(0, 161, 222, 0.5)',
-        strokeWidth: 2,
-        markerColor: 'rgba(0, 161, 222, 0.5)',
-        markerOutlineColor: 'rgba(255, 255, 255, 1)'
-    },
-    focus: {
-        fill: 'rgba(207, 222, 0, 0.15)',
-        stroke: 'rgba(11, 220, 228, 0.5)',
-        strokeWidth: 4,
-        markerColor: 'rgba(207, 222, 0, 1)',
-        markerOutlineColor: 'rgba(11, 220, 228, 1)'
-    },
-    selection: {
-        fill: 'rgba(0, 161, 222, 0.15)',
-        stroke: 'rgba(0, 255, 255, 0.5)',
-        strokeWidth: 4,
-        markerColor: 'rgba(0, 161, 222, 1)',
-        markerOutlineColor: 'rgba(0, 255, 255, 1)'
-    }
-};
-const NEAR_TRANSPARENT_COLOR = 'rgba(255, 255, 255, 0.01)';
-const DEFAULT_MARKER_COLOR = 'rgba(0, 161, 222, 1)';
-const DEFAULT_MARKER_OUTLINE_COLOR = 'rgba(255, 255, 255, 1)';
-const DEFAULT_CLUSTER_COLOR = 'rgba(24, 134, 45)';
-const DEFAULT_CLUSTER_FILL_COLOR = 'rgba(24, 134, 45, 0.5)';
-const DEFAULT_TEXT_COLOR = '#000';
-const DEFAULT_TEXT_OUTLINE_COLOR = '#fff';
-const DEFAULT_TEXT_FONT = '12px Calibri,sans-serif';
-const DEFAULT_TEXT_STROKE_WIDTH = 3;
-const DEFAULT_MARKER_ANCHOR = [0.5, 0.92];
-const GEOMETRY_THRESHOLD = 0.0025;
-const RANDOM_STYLE_MAX_CHANNEL = 255;
-const CLUSTER_MIN_RADIUS = 6;
-const CLUSTER_RADIUS_FACTOR = 5;
-function styleVariant(viewController, type = 'base') {
-    return (featureLike) => {
-        const { _mapTitle: mapTitle } = featureLike.getProperties();
-        const imposedGeometry = featureLike instanceof OlFeature
-            ? createStyleGeometry(viewController, featureLike)
-            : undefined;
-        return createStyleVariant(type, mapTitle, imposedGeometry);
-    };
-}
-function baseOlStyle(text, imposedGeometry) {
-    return createStyleVariant('base', text, imposedGeometry);
-}
-function selectionOlStyle(text, imposedGeometry) {
-    return createStyleVariant('selection', text, imposedGeometry);
-}
-/**
- * Invisible-but-interactive style (hit detection, event capture).
- */
-function nearTransparentOlStyle() {
-    return new Style({
-        fill: new Fill({ color: NEAR_TRANSPARENT_COLOR }),
-        stroke: new Stroke({ width: 10, color: NEAR_TRANSPARENT_COLOR }),
-        image: new Circle({
-            stroke: new Stroke({ width: 10, color: NEAR_TRANSPARENT_COLOR }),
-            fill: new Fill({ color: NEAR_TRANSPARENT_COLOR }),
-            radius: 5
-        })
-    });
-}
-function markerOlStyle({ text, markerColor = DEFAULT_MARKER_COLOR, markerOutlineColor = DEFAULT_MARKER_OUTLINE_COLOR, imposedGeometry }) {
-    const svg = createMarkerSvg(markerColor, markerOutlineColor);
-    const style = new Style({
-        image: new Icon({
-            src: `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svg)}`,
-            opacity: 1,
-            anchor: DEFAULT_MARKER_ANCHOR
-        })
-    });
-    if (text) {
-        style.setText(new Text({
-            text,
-            font: DEFAULT_TEXT_FONT,
-            fill: new Fill({ color: DEFAULT_TEXT_COLOR }),
-            stroke: new Stroke({
-                color: DEFAULT_TEXT_OUTLINE_COLOR,
-                width: DEFAULT_TEXT_STROKE_WIDTH
-            }),
-            overflow: true
-        }));
-    }
-    return setGeometryIfNeeded(style, imposedGeometry);
-}
-function randomOlFlatStyle() {
-    const red = randomChannel();
-    const green = randomChannel();
-    const blue = randomChannel();
-    return {
-        'stroke-color': [red, green, blue, 1],
-        'stroke-width': 2,
-        'fill-color': [red, green, blue, 0.4],
-        'circle-radius': 5,
-        'circle-stroke-color': [red, green, blue, 1],
-        'circle-stroke-width': 2,
-        'circle-fill-color': [red, green, blue, 0.4],
-        'text-value': ['case', ['has', '_mapTitle'], ['get', '_mapTitle'], ''],
-        'text-offset-x': 5,
-        'text-offset-y': -5,
-        'text-font': DEFAULT_TEXT_FONT,
-        'text-fill-color': DEFAULT_TEXT_COLOR,
-        'text-stroke-color': DEFAULT_TEXT_OUTLINE_COLOR,
-        'text-stroke-width': DEFAULT_TEXT_STROKE_WIDTH,
-        'text-overflow': true
-    };
-}
-function clusterOlStyleFunction(clusterParam = {}) {
-    return (feature) => {
-        const size = feature.get('features')
-            ?.length ?? 0;
-        if (size <= 1) {
-            return markerOlStyle({ markerColor: DEFAULT_CLUSTER_COLOR });
-        }
-        const clusterRadius = clusterParam.radiusCalc?.(size) ??
-            Math.max(CLUSTER_MIN_RADIUS, CLUSTER_RADIUS_FACTOR * Math.log(size));
-        return [
-            new Style({
-                image: new Circle({
-                    radius: clusterRadius,
-                    stroke: new Stroke({ color: DEFAULT_CLUSTER_COLOR }),
-                    fill: new Fill({ color: DEFAULT_CLUSTER_FILL_COLOR })
-                }),
-                text: new Text({
-                    text: String(size),
-                    fill: new Fill({ color: DEFAULT_TEXT_OUTLINE_COLOR })
-                })
-            })
-        ];
-    };
-}
-function createMarkerSvg(markerColor, markerOutlineColor) {
-    return `<svg version="1.1" xmlns="http://www.w3.org/2000/svg" height="36" width="36" viewBox="0 0 36 36">
-  <path fill="${toString(asArray(markerColor))}" stroke="${toString(asArray(markerOutlineColor))}" stroke-width="2"
-  d="M 17.692635,32.565644 C 15.71852,30.330584 13.290925,27.058065 11.6766,24.455732 9.3398623,20.688851 7.8905694,17.205334 7.6297492,14.728733 7.5616025,14.081649 7.5739557,12.528552 7.6513363,12.014724 8.1013861,9.0262716 9.8047068,6.3655569 12.310675,4.7364878 c 1.113691,-0.7239832 2.508083,-1.2834131 3.776687,-1.5152052 0.242945,-0.044389 0.451656,-0.09393 0.463804,-0.1100911 0.01215,-0.016161 0.638282,-0.025502 1.391411,-0.02076 1.088235,0.00685 1.450932,0.024316 1.766871,0.085071 2.650763,0.5097353 4.947142,1.8701891 6.498786,3.8501033 0.628018,0.8013587 1.297046,2.0200608 1.640967,2.9891872 0.191065,0.538399 0.427644,1.447408 0.477391,1.834287 0.0164,0.127546 0.0434,0.231902 0.06,0.231902 0.0166,0 0.03122,0.626135 0.03249,1.391411 0.0013,0.765276 -0.011,1.391411 -0.02726,1.391411 -0.01626,0 -0.05449,0.154049 -0.08495,0.342331 -0.08815,0.544879 -0.387235,1.721449 -0.604837,2.379406 -1.209421,3.656888 -4.014463,8.349762 -7.849521,13.132357 -0.790496,0.985807 -1.795217,2.167992 -1.842543,2.167992 -0.01896,0 -0.161766,-0.144111 -0.317336,-0.320246 z m 1.066937,-15.36525 c 0.133519,-0.02121 0.248766,-0.05657 0.256105,-0.07859 0.0073,-0.02202 0.04918,-0.03066 0.09298,-0.0192 0.0438,0.01145 0.107628,-0.0072 0.141834,-0.04137 0.03421,-0.03421 0.08456,-0.05474 0.111888,-0.04563 0.02733,0.0091 0.07703,-0.01077 0.110429,-0.04417 0.03341,-0.03341 0.08416,-0.05293 0.112796,-0.04338 0.02863,0.0095 0.08974,-0.01867 0.135802,-0.06271 0.04606,-0.04403 0.111902,-0.08625 0.146319,-0.09381 0.204084,-0.04483 0.762371,-0.519108 1.079463,-0.917027 0.26749,-0.335672 0.570987,-0.878795 0.529019,-0.946701 -0.01496,-0.0242 -0.0067,-0.044 0.01835,-0.044 0.05645,0 0.196809,-0.467982 0.158801,-0.529481 -0.01521,-0.02461 -0.0043,-0.04475 0.02427,-0.04475 0.03157,0 0.04365,-0.04329 0.03082,-0.11043 -0.01161,-0.06074 -0.0066,-0.110429 0.01124,-0.110429 0.01779,0 0.03235,-0.258405 0.03235,-0.574233 0,-0.315829 -0.01545,-0.574234 -0.03434,-0.574234 -0.01889,0 -0.02437,-0.03811 -0.01219,-0.08469 0.04412,-0.168712 -0.336329,-1.152668 -0.481536,-1.245401 -0.02327,-0.01486 -0.04022,-0.03992 -0.03765,-0.05568 0.01222,-0.07498 -0.156557,-0.318365 -0.406379,-0.586027 -0.295921,-0.317054 -0.773059,-0.690104 -0.83427,-0.652274 -0.0206,0.01273 -0.03745,0.0024 -0.03745,-0.02289 0,-0.06107 -0.433076,-0.2789369 -0.487546,-0.245273 -0.02338,0.01445 -0.04251,0.0068 -0.04251,-0.01695 0,-0.056281 -0.393995,-0.1865457 -0.613804,-0.2029397 -0.0943,-0.00703 -0.188579,-0.023183 -0.209503,-0.035888 -0.02092,-0.012705 -0.276571,-0.023337 -0.568105,-0.023627 -0.534044,-5.301e-4 -1.12638,0.091025 -1.12638,0.1741017 0,0.023781 -0.01713,0.032648 -0.03808,0.019705 -0.05054,-0.031232 -0.403641,0.1088602 -0.403641,0.1601422 0,0.02204 -0.01988,0.02779 -0.04417,0.01278 -0.0243,-0.01501 -0.04417,-0.0051 -0.04417,0.02209 0,0.02716 -0.01988,0.0371 -0.04417,0.02209 -0.0243,-0.01501 -0.04417,-0.0051 -0.04417,0.02209 0,0.02716 -0.01915,0.03755 -0.04256,0.02308 -0.02341,-0.01447 -0.08138,0.01252 -0.128834,0.05997 -0.04745,0.04745 -0.0974,0.07515 -0.111001,0.06155 -0.0136,-0.0136 -0.03722,0.0078 -0.05248,0.0476 -0.01526,0.03978 -0.0411,0.06408 -0.0574,0.054 -0.03277,-0.02025 -0.462299,0.323995 -0.491977,0.394291 -0.01026,0.02429 -0.07454,0.0912 -0.142856,0.148686 -0.248033,0.208705 -0.730279,0.974169 -0.672565,1.067553 0.0145,0.02346 0.0059,0.04266 -0.01914,0.04266 -0.05907,0 -0.241471,0.599428 -0.208527,0.685278 0.01385,0.0361 0.0044,0.06564 -0.02098,0.06564 -0.02539,0 -0.04169,0.0646 -0.03622,0.143558 0.0055,0.07896 -0.0042,0.213129 -0.02144,0.29816 -0.04741,0.233576 0.0511,1.055502 0.167516,1.397721 0.126048,0.370516 0.310099,0.740163 0.426484,0.856548 0.04776,0.04776 0.07554,0.08684 0.06174,0.08684 -0.0138,0 0.01516,0.05653 0.06436,0.125632 0.131301,0.184396 0.499365,0.587266 0.518785,0.567846 0.0092,-0.0092 0.09821,0.06081 0.197812,0.155562 0.09961,0.09475 0.190589,0.162786 0.202187,0.151188 0.0116,-0.0116 0.05991,0.01774 0.107361,0.06519 0.04745,0.04745 0.105426,0.07444 0.128834,0.05997 0.02341,-0.01447 0.04256,-0.0057 0.04256,0.01958 0,0.06106 0.344664,0.23496 0.399061,0.201341 0.02346,-0.0145 0.04266,-0.0059 0.04266,0.01914 0,0.05907 0.599429,0.241471 0.685279,0.208527 0.0361,-0.01385 0.06564,-0.0065 0.06564,0.01645 0,0.05196 1.079115,0.04833 1.413314,-0.0048 z"></path>
-  </svg>`;
-}
-function randomChannel() {
-    return Math.floor(Math.random() * RANDOM_STYLE_MAX_CHANNEL);
-}
-function setGeometryIfNeeded(style, geometry) {
-    if (geometry)
-        style.setGeometry(geometry);
-    return style;
-}
-function createStyleGeometry(viewController, feature) {
-    if (!viewController || !feature)
-        return undefined;
-    const geometry = feature.getGeometry();
-    const extent = geometry?.getExtent();
-    if (!extent)
-        return undefined;
-    if (!featuresAreTooDeepInView(viewController, extent, GEOMETRY_THRESHOLD)) {
-        return undefined;
-    }
-    return new OlPoint(getCenter(extent));
-}
-function createStyleVariant(variant, text, imposedGeometry) {
-    const config = STYLES_VARIANT[variant];
-    return [
-        markerOlStyle({
-            text,
-            markerColor: config.markerColor,
-            markerOutlineColor: config.markerOutlineColor,
-            imposedGeometry
-        }),
-        setGeometryIfNeeded(new Style({
-            fill: new Fill({ color: config.fill }),
-            stroke: new Stroke({ width: config.strokeWidth, color: config.stroke })
-        }), imposedGeometry)
-    ];
-}
-
 var DirectionsFormat;
 (function (DirectionsFormat) {
     DirectionsFormat[DirectionsFormat["GeoJSON"] = 0] = "GeoJSON";
@@ -8779,11 +8780,11 @@ function directionsStyle(feature) {
  * @param {StopsFeatureStore} stopsFeatureStore - The stops feature store to initialize.
  * @param {LanguageService} languageService - The language service used for translations.
  */
-function initStopsFeatureStore(stopsFeatureStore, languageService) {
+function initStopsFeatureStore(stopsFeatureStore, languageService, layerService) {
     const loadingStrategy = new FeatureStoreLoadingStrategy({
         motion: FeatureMotion.None
     });
-    const stopsLayer = new VectorLayer({
+    const stopsLayer = layerService.createLayer({
         isIgoInternalLayer: true,
         id: 'igo-direction-stops-layer',
         title: languageService.translate.instant('igo.geo.directions.layer.stops'),
@@ -8817,11 +8818,11 @@ function initStopsFeatureStore(stopsFeatureStore, languageService) {
  * @param {StopsFeatureStore} routesFeatureStore - The routes feature store to initialize.
  * @param {LanguageService} languageService - The language service used for translations.
  */
-function initRoutesFeatureStore(routesFeatureStore, languageService) {
+function initRoutesFeatureStore(routesFeatureStore, languageService, layerService) {
     const loadingStrategy = new FeatureStoreLoadingStrategy({
         motion: FeatureMotion.None
     });
-    const routeLayer = new VectorLayer({
+    const routeLayer = layerService.createLayer({
         isIgoInternalLayer: true,
         id: 'igo-direction-route-layer',
         title: languageService.translate.instant('igo.geo.directions.layer.route'),
@@ -8847,11 +8848,11 @@ function initRoutesFeatureStore(routesFeatureStore, languageService) {
  *
  * @param {StopsFeatureStore} stepsFeatureStore - The steps feature store to initialize.
  */
-function initStepsFeatureStore(stepsFeatureStore) {
+function initStepsFeatureStore(stepsFeatureStore, layerService) {
     const loadingStrategy = new FeatureStoreLoadingStrategy({
         motion: FeatureMotion.None
     });
-    const stepLayer = new VectorLayer({
+    const stepLayer = layerService.createLayer({
         isIgoInternalLayer: true,
         id: 'igo-direction-step-layer',
         title: '',
@@ -10884,7 +10885,7 @@ class DataSourceService {
     ogcFilterService = inject(OGCFilterService);
     languageService = inject(LanguageService);
     messageService = inject(MessageService);
-    authInterceptor = inject(AuthInterceptor);
+    xhrInterceptor = inject(XHR_INTERCEPTOR, { optional: true });
     createAsyncDataSource(options, detailedContextUri) {
         if (!options.type) {
             console.error(options);
@@ -10953,7 +10954,7 @@ class DataSourceService {
         return new Observable((d) => d.next(new WebSocketDataSource(options)));
     }
     createWFSDataSource(options) {
-        return new Observable((d) => d.next(new WFSDataSource(options, this.wfsDataSourceService, this.ogcFilterService, this.authInterceptor)));
+        return new Observable((d) => d.next(new WFSDataSource(options, this.wfsDataSourceService, this.ogcFilterService)));
     }
     createWMSDataSource(options, detailedContextUri) {
         const observables = [];
@@ -11116,236 +11117,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.19", ngImpo
                 }]
         }] });
 
-class ConfigFileToGeoDBService {
-    http = inject(HttpClient);
-    messageService = inject(MessageService);
-    load(urlFile) {
-        const geoDB = new GeoDB();
-        let downloadMessage;
-        this.http
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            .get(urlFile)
-            .pipe(catchError((error) => {
-            this.messageService.error(`GeoData file ${urlFile} could not be read`);
-            error.error.caught = true;
-            throw error;
-        }), concatMap((datasToIDB) => {
-            const datas$ = [];
-            let firstDownload = true;
-            if (datasToIDB?.geoDatas) {
-                const currentDate = new Date();
-                datasToIDB?.geoDatas.forEach((geoData) => {
-                    if (typeof geoData.triggerDate === 'string') {
-                        geoData.triggerDate = new Date(Date.parse(geoData.triggerDate));
-                    }
-                    if (currentDate >= geoData.triggerDate) {
-                        if (geoData.action === 'update') {
-                            const insertEvent = `${geoData.source || InsertSourceInsertDBEnum.System} (${geoData.triggerDate})`;
-                            geoData.urls.forEach((url) => {
-                                datas$.push(geoDB.getGeoDBData(url).pipe(concatMap((res) => {
-                                    if (res?.insertEvent !== insertEvent) {
-                                        if (firstDownload) {
-                                            downloadMessage = this.messageService.info('igo.geo.indexedDb.data-download-start', undefined, {
-                                                disableTimeOut: true,
-                                                progressBar: false,
-                                                closeButton: true,
-                                                tapToDismiss: false
-                                            });
-                                            firstDownload = false;
-                                        }
-                                        let responseType = 'json';
-                                        const isZip = this.isZip(url);
-                                        if (isZip) {
-                                            responseType = 'arraybuffer';
-                                        }
-                                        return this.http.get(url, { responseType }).pipe(catchError((error) => {
-                                            this.messageService.remove(downloadMessage.toastId);
-                                            this.messageService.error('igo.geo.indexedDb.data-download-failed', undefined, { timeOut: 40000 });
-                                            error.error.caught = true;
-                                            throw error;
-                                        }), concatMap((r) => {
-                                            if (isZip) {
-                                                const observables$ = [
-                                                    geoDB.update(url, url, {}, InsertSourceInsertDBEnum.System, insertEvent)
-                                                ];
-                                                JSZip.loadAsync(r).then((zipped) => {
-                                                    zipped.forEach((relativePath) => {
-                                                        if (relativePath
-                                                            .toLocaleLowerCase()
-                                                            .endsWith('.geojson')) {
-                                                            zipped
-                                                                .file(relativePath)
-                                                                .async('text')
-                                                                .then((r) => {
-                                                                const geojson = JSON.parse(r);
-                                                                const subUrl = geoData.zippedBaseUrl || '';
-                                                                const zippedUrl = subUrl +
-                                                                    (subUrl.endsWith('/')
-                                                                        ? ''
-                                                                        : '/') +
-                                                                    relativePath;
-                                                                observables$.push(geoDB.update(zippedUrl, url, geojson, InsertSourceInsertDBEnum.System, insertEvent));
-                                                            });
-                                                        }
-                                                    });
-                                                });
-                                                return zip(observables$);
-                                            }
-                                            return geoDB.update(url, url, r, InsertSourceInsertDBEnum.System, insertEvent);
-                                        }));
-                                    }
-                                    else {
-                                        return of(false);
-                                    }
-                                })));
-                            });
-                        }
-                        else if (geoData.action === 'delete') {
-                            geoData.urls.forEach((url) => {
-                                datas$.push(geoDB.delete(url));
-                            });
-                        }
-                    }
-                });
-            }
-            return zip(...datas$);
-        }))
-            .subscribe(() => {
-            if (downloadMessage) {
-                setTimeout(() => {
-                    this.messageService.remove(downloadMessage.toastId);
-                    this.messageService.success('igo.geo.indexedDb.data-download-completed', undefined, { timeOut: 40000 });
-                }, 2500);
-            }
-        });
-    }
-    isZip(value) {
-        const regex = /(zip)$/;
-        return typeof value === 'string' && regex.test(value.toLowerCase());
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.19", ngImport: i0, type: ConfigFileToGeoDBService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.19", ngImport: i0, type: ConfigFileToGeoDBService });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.19", ngImport: i0, type: ConfigFileToGeoDBService, decorators: [{
-            type: Injectable
-        }] });
-
-class GeoNetworkService {
-    http = inject(HttpClient);
-    networkService = inject(NetworkService);
-    networkOnline = true;
-    constructor() {
-        this.networkService.currentState().subscribe((state) => {
-            this.networkOnline = state.connection;
-        });
-    }
-    get(url, simpleGetOptions) {
-        if (window.navigator.onLine && this.networkOnline) {
-            return this.getOnline(url, simpleGetOptions);
-        }
-        return this.getOffline(url);
-    }
-    getOnline(url, simpleGetOptions) {
-        let request;
-        switch (simpleGetOptions.responseType) {
-            case 'arraybuffer':
-                request = this.http.get(url, {
-                    responseType: 'arraybuffer',
-                    withCredentials: simpleGetOptions.withCredentials
-                });
-                break;
-            case 'text':
-                request = this.http.get(url, {
-                    responseType: 'text',
-                    withCredentials: simpleGetOptions.withCredentials
-                });
-                break;
-            case 'json':
-                request = this.http.get(url, {
-                    responseType: 'json',
-                    withCredentials: simpleGetOptions.withCredentials
-                });
-                break;
-            default:
-                request = this.http.get(url, {
-                    responseType: 'blob',
-                    withCredentials: simpleGetOptions.withCredentials
-                });
-                break;
-        }
-        return request;
-    }
-    getOffline(url) {
-        const geoDB = new GeoDB();
-        return geoDB?.get(url);
-    }
-    isOnline() {
-        return this.networkOnline && window.navigator.onLine;
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.19", ngImport: i0, type: GeoNetworkService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.19", ngImport: i0, type: GeoNetworkService });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.19", ngImport: i0, type: GeoNetworkService, decorators: [{
-            type: Injectable
-        }], ctorParameters: () => [] });
-
-const STYLE_ENGINES = new InjectionToken('STYLE_ENGINES');
-function provideStyle(...features) {
-    const providers = [];
-    for (const feature of features) {
-        providers.push(...feature.providers);
-    }
-    return makeEnvironmentProviders(providers);
-}
-
-const ENGINE_PROVIDER_HINT = {
-    Geostyler: 'withGeostyler()',
-    Mapbox: 'withMapbox()'
-};
-class StyleService {
-    engines = inject(STYLE_ENGINES, { optional: true }) ?? [];
-    async getStyle(options, ol) {
-        if (isAnyOlStyle(options)) {
-            return options;
-        }
-        const engine = this.findEngine(options);
-        return engine?.getStyle(options, ol) ?? randomOlFlatStyle();
-    }
-    async getLegend(options) {
-        if (isAnyOlStyle(options)) {
-            return undefined;
-        }
-        const engine = this.findEngine(options);
-        if (!engine?.getLegend) {
-            return undefined;
-        }
-        return engine.getLegend(options);
-    }
-    findEngine(options) {
-        const engine = this.engines.find((e) => e.supports(options));
-        if (!engine) {
-            const hint = ENGINE_PROVIDER_HINT[options.type];
-            const hintMsg = hint
-                ? ` Did you forget to add ${hint} to provideStyle(...)?`
-                : ` No registered provider handles type "${options.type}".`;
-            console.warn(`[StyleService]${hintMsg}`);
-        }
-        return engine;
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.19", ngImport: i0, type: StyleService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.19", ngImport: i0, type: StyleService, providedIn: 'root' });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.19", ngImport: i0, type: StyleService, decorators: [{
-            type: Injectable,
-            args: [{ providedIn: 'root' }]
-        }] });
+const OFFLINE_LAYER_RESTORE = new InjectionToken('OFFLINE_LAYER_RESTORE');
 
 class LayerService {
     dataSourceService = inject(DataSourceService);
-    messageService = inject(MessageService);
-    geoNetworkService = inject(GeoNetworkService, { optional: true });
-    authInterceptor = inject(AuthInterceptor, { optional: true });
-    styleService = inject(StyleService, { optional: true });
+    injector = inject(Injector);
+    offlineLayerRestore = inject(OFFLINE_LAYER_RESTORE, {
+        optional: true
+    });
     unavailableLayers = [];
     createLayers(layersOption, contextUri) {
         const arrayObsLayers = layersOption.map((option) => {
@@ -11418,10 +11197,10 @@ class LayerService {
         return group;
     }
     createImageLayer(layerOptions) {
-        return new ImageLayer(layerOptions, this.messageService, this.authInterceptor ?? undefined);
+        return runInInjectionContext(this.injector, () => new ImageLayer(layerOptions));
     }
     createTileLayer(layerOptions) {
-        return new TileLayer(layerOptions, this.messageService, this.authInterceptor ?? undefined);
+        return runInInjectionContext(this.injector, () => new TileLayer(layerOptions));
     }
     createVectorLayer(layerOptions) {
         if (layerOptions.source instanceof ArcGISRestDataSource) {
@@ -11432,23 +11211,16 @@ class LayerService {
             layerOptions.style =
                 layerOptions.style ?? clusterOlStyleFunction();
         }
-        const vectorLayer = new VectorLayer(layerOptions, this.messageService, this.authInterceptor ?? undefined, this.geoNetworkService ?? undefined, this.styleService ?? undefined);
-        return vectorLayer;
+        return runInInjectionContext(this.injector, () => new VectorLayer(layerOptions));
     }
     createVectorTileLayer(layerOptions) {
-        return new VectorTileLayer(layerOptions, this.messageService, this.authInterceptor ?? undefined, this.styleService ?? undefined);
-    }
-    createAsyncIdbLayers(contextUri = '*') {
-        const layerDB = new LayerDB();
-        return layerDB.getAll().pipe(concatMap((res) => {
-            const idbLayers = contextUri !== '*'
-                ? res.filter((l) => l.detailedContextUri === contextUri)
-                : res;
-            const layersOptions = idbLayers.map((idbl) => Object.assign({}, idbl.layerOptions, {
-                sourceOptions: idbl.sourceOptions
-            }));
-            return combineLatest(layersOptions.map((layerOptions) => this.createAsyncLayer(layerOptions))).pipe(map((ls) => ls.filter(Boolean)));
-        }));
+        return runInInjectionContext(this.injector, () => new VectorTileLayer(layerOptions));
+    }
+    createAsyncOfflineLayers(contextUri = '*') {
+        if (!this.offlineLayerRestore) {
+            return of([]);
+        }
+        return this.offlineLayerRestore.createAsyncLayers(contextUri);
     }
     deleteUnavailableLayers(anyLayerOptions) {
         const anyLayerSourceOptions = anyLayerOptions.sourceOptions;
@@ -11485,6 +11257,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.19", ngImpo
 
 const LAYER = 'Layer';
 
+const LAYER_PERSISTENCE = new InjectionToken('LAYER_PERSISTENCE');
+
 class LayerSelectionModel {
     selection = new SelectionModel(true);
     descendantSelection = new SelectionModel(true);
@@ -13128,14 +12902,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.19", ngImpo
             args: [{ selector: 'igo-layer-unavailable-list', changeDetection: ChangeDetectionStrategy.OnPush, imports: [ListComponent, ListItemDirective, LayerUnavailableComponent], template: "<igo-list [navigation]=\"false\" [selection]=\"false\">\n  @for (layer of layersOptions(); track layer) {\n    <igo-layer-unavailable\n      igoListItem\n      [layerOptions]=\"layer\"\n      (remove)=\"deleteUnavailableLayer($event)\"\n    />\n  }\n</igo-list>\n", styles: ["igo-list{height:auto}igo-list ::ng-deep mat-list{padding-bottom:0}\n"] }]
         }], propDecorators: { layersOptions: [{ type: i0.Input, args: [{ isSignal: true, alias: "layersOptions", required: false }] }] } });
 
-function isIdbLayer(layer) {
-    return (isLayerItem(layer) &&
-        layer.type === 'vector' &&
-        layer.options.idbInfo?.storeToIdb === true);
-}
-
 class LayerViewerBottomActionsComponent {
     layerListToolService = inject(LayerListToolService);
+    layerPersistence = inject(LAYER_PERSISTENCE, { optional: true });
     orderable = true;
     map = input.required(...(ngDevMode ? [{ debugName: "map" }] : /* istanbul ignore next */ []));
     controller = input.required(...(ngDevMode ? [{ debugName: "controller" }] : /* istanbul ignore next */ []));
@@ -13192,11 +12961,12 @@ class LayerViewerBottomActionsComponent {
         return layers?.every((l) => this.isLayerRemovable(l));
     }
     removeLayers() {
-        this.selected
-            .filter((layer) => isIdbLayer(layer))
-            .forEach((layer) => {
-            layer.options.idbInfo._deleteFromIdb = true;
-        });
+        const layerPersistence = this.layerPersistence;
+        if (layerPersistence) {
+            this.selected
+                .filter((layer) => layerPersistence.isPersistent(layer))
+                .forEach((layer) => layerPersistence.removePersistedData(layer));
+        }
         this.controller().remove(...this.selected);
         this.controller().clearSelection();
     }
@@ -13526,148 +13296,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.19", ngImpo
             args: [{ selector: 'igo-track-feature-button', changeDetection: ChangeDetectionStrategy.OnPush, imports: [MatButtonModule, MatTooltipModule, MatIconModule, IgoLanguageModule], template: "@if (layer().options.trackFeature) {\n  <button\n    mat-icon-button\n    collapsibleButton\n    tooltip-position=\"below\"\n    matTooltipShowDelay=\"500\"\n    [matTooltip]=\"'igo.geo.layer.trackFeature' | translate\"\n    [color]=\"color\"\n    (click)=\"toggleTrackFeature()\"\n  >\n    <mat-icon>my_location</mat-icon>\n  </button>\n}\n" }]
         }], propDecorators: { layer: [{ type: i0.Input, args: [{ isSignal: true, alias: "layer", required: true }] }], trackFeature: [{ type: i0.Input, args: [{ isSignal: true, alias: "trackFeature", required: false }] }, { type: i0.Output, args: ["trackFeatureChange"] }] } });
 
-/**
- * This class is simply a shortcut for adding features to a map.
- * It does nothing more than a standard layer but it's shipped with
- * a defautl style based on the geometry type of the features it contains.
- * @todo Enhance that by using a FeatureStore and strategies.
- */
-class Overlay {
-    /**
-     * The map to add the layer to
-     */
-    map;
-    /**
-     * Overlay layer
-     */
-    layer;
-    /**
-     * Overlay layer's data source
-     */
-    get dataSource() {
-        return this.layer.dataSource;
-    }
-    constructor(map, style) {
-        this.layer = new VectorLayer({
-            title: 'Overlay',
-            zIndex: 300,
-            source: new FeatureDataSource(),
-            style: style ?? baseOlStyle()
-        });
-        this.setMap(map);
-    }
-    /**
-     * Bind this to a map and add the overlay layer to that map
-     * @param map Map
-     */
-    setMap(map) {
-        if (map === undefined) {
-            if (this.map !== undefined) {
-                this.map.ol.removeLayer(this.layer.ol);
-            }
-        }
-        else {
-            map.ol.addLayer(this.layer.ol);
-        }
-        this.map = map;
-    }
-    /**
-     * Set the overlay features and, optionally, move to them
-     * @param features Features
-     * @param motion Optional: Apply this motion to the map view
-     * @param sourceId Optional: Remove features of certain sourceId (ex: 'Map' for query features)
-     */
-    setFeatures(features, motion = FeatureMotion.Default, sourceId) {
-        if (sourceId) {
-            for (const olFeature of this.dataSource.ol.getFeatures()) {
-                if (olFeature.get('_sourceId') === sourceId) {
-                    this.removeOlFeature(olFeature);
-                }
-            }
-        }
-        else {
-            this.clear();
-        }
-        this.addFeatures(features, motion);
-    }
-    /**
-     * Add a feature to the  overlay and, optionally, move to it
-     * @param feature Feature
-     * @param motion Optional: Apply this motion to the map view (default on FeatureMotion.Default)
-     */
-    addFeature(feature, motion = FeatureMotion.Default) {
-        this.addFeatures([feature], motion);
-    }
-    /**
-     * Add features to the  overlay and, optionally, move to them
-     * @param features Features
-     * @param motion Optional: Apply this motion to the map view
-     */
-    addFeatures(features, motion = FeatureMotion.Default) {
-        const olFeatures = [];
-        features.forEach((feature) => {
-            const olFeature = featureToOl(feature, this.map.projectionCode);
-            const olGeometry = olFeature.getGeometry();
-            if (olGeometry === null) {
-                return;
-            }
-            olFeatures.push(olFeature);
-        });
-        this.addOlFeatures(olFeatures, motion);
-    }
-    /**
-     * Add a OpenLayers feature to the  overlay and, optionally, move to it
-     * @param olFeature OpenLayers Feature
-     * @param motion Optional: Apply this motion to the map view
-     */
-    addOlFeature(olFeature, motion = FeatureMotion.Default) {
-        this.addOlFeatures([olFeature], motion);
-    }
-    /**
-     * Add OpenLayers features to the overlay and, optionally, move to them
-     * @param olFeatures OpenLayers Features
-     * @param motion Optional: Apply this motion to the map view
-     */
-    addOlFeatures(olFeatures, motion = FeatureMotion.Default) {
-        this.dataSource.ol.addFeatures(olFeatures);
-        moveToOlFeatures(this.map.viewController, olFeatures, motion);
-    }
-    /**
-     * Remove a feature from the overlay
-     * @param feature Feature
-     */
-    removeFeature(feature) {
-        this.removeFeatures([feature]);
-    }
-    /**
-     * Remove features from the overlay
-     * @param features Features
-     */
-    removeFeatures(features) {
-        features.forEach((feature) => {
-            if (feature.meta) {
-                const olFeature = this.dataSource.ol.getFeatureById(feature.meta.id);
-                if (olFeature) {
-                    this.removeOlFeature(olFeature);
-                }
-            }
-        });
-    }
-    /**
-     * Remove an OpenLayers feature from the overlay
-     * @param olFeature OpenLayers Feature
-     */
-    removeOlFeature(olFeature) {
-        this.dataSource.ol.removeFeature(olFeature);
-    }
-    /**
-     * Clear the overlay
-     */
-    clear() {
-        this.dataSource.ol.clear();
-    }
-}
-
 /**
  * Base map controller
  */
@@ -13864,13 +13492,13 @@ class MapGeolocationController extends MapController {
         return this._followPosition;
     }
     _followPosition;
-    constructor(map, options, storageService, configService) {
+    constructor(map, overlayService, options, storageService, configService) {
         super();
         this.map = map;
         this.options = options;
         this.storageService = storageService;
         this.configService = configService;
-        this.geolocationOverlay = new Overlay(this.map);
+        this.geolocationOverlay = overlayService.create(this.map);
         this._followPosition =
             this.options && this.options.followPosition
                 ? this.options.followPosition
@@ -14511,6 +14139,7 @@ class IgoMap {
     layerWatcher;
     options;
     mapViewOptions;
+    overlayService;
     defaultOptions = {
         controls: { attribution: false }
     };
@@ -14569,9 +14198,11 @@ class IgoMap {
             stateHistory: true
         });
         this.viewController.setOlMap(this.ol);
-        this.overlay = new Overlay(this);
         this.ol.once('rendercomplete', () => {
-            this.geolocationController = new MapGeolocationController(this, {
+            if (!this.overlayService) {
+                return;
+            }
+            this.geolocationController = new MapGeolocationController(this, this.overlayService, {
                 projection: this.viewController.getOlProjection()
             }, this.storageService, this.configService);
             this.geolocationController.setOlMap(this.ol);
@@ -14581,6 +14212,13 @@ class IgoMap {
             this.viewController.monitorRotation();
         });
     }
+    initializeOverlays(overlayService) {
+        if (this.overlayService) {
+            return;
+        }
+        this.overlayService = overlayService;
+        this.overlay = overlayService.create(this);
+    }
     setTarget(id) {
         this.ol.setTarget(id);
         if (id !== undefined) {
@@ -14670,8 +14308,165 @@ class MapBase {
     viewProjection;
 }
 
+/**
+ * This class is simply a shortcut for adding features to a map.
+ * It does nothing more than a standard layer but it's shipped with
+ * a defautl style based on the geometry type of the features it contains.
+ * @todo Enhance that by using a FeatureStore and strategies.
+ */
+class Overlay {
+    /**
+     * The map to add the layer to
+     */
+    map;
+    /**
+     * Overlay layer
+     */
+    layer;
+    /**
+     * Overlay layer's data source
+     */
+    get dataSource() {
+        return this.layer.dataSource;
+    }
+    constructor(map, layer) {
+        this.layer = layer;
+        this.setMap(map);
+    }
+    /**
+     * Bind this to a map and add the overlay layer to that map
+     * @param map Map
+     */
+    setMap(map) {
+        if (map === undefined) {
+            if (this.map !== undefined) {
+                this.map.ol.removeLayer(this.layer.ol);
+            }
+        }
+        else {
+            map.ol.addLayer(this.layer.ol);
+        }
+        this.map = map;
+    }
+    /**
+     * Set the overlay features and, optionally, move to them
+     * @param features Features
+     * @param motion Optional: Apply this motion to the map view
+     * @param sourceId Optional: Remove features of certain sourceId (ex: 'Map' for query features)
+     */
+    setFeatures(features, motion = FeatureMotion.Default, sourceId) {
+        if (sourceId) {
+            for (const olFeature of this.dataSource.ol.getFeatures()) {
+                if (olFeature.get('_sourceId') === sourceId) {
+                    this.removeOlFeature(olFeature);
+                }
+            }
+        }
+        else {
+            this.clear();
+        }
+        this.addFeatures(features, motion);
+    }
+    /**
+     * Add a feature to the  overlay and, optionally, move to it
+     * @param feature Feature
+     * @param motion Optional: Apply this motion to the map view (default on FeatureMotion.Default)
+     */
+    addFeature(feature, motion = FeatureMotion.Default) {
+        this.addFeatures([feature], motion);
+    }
+    /**
+     * Add features to the  overlay and, optionally, move to them
+     * @param features Features
+     * @param motion Optional: Apply this motion to the map view
+     */
+    addFeatures(features, motion = FeatureMotion.Default) {
+        const olFeatures = [];
+        features.forEach((feature) => {
+            const olFeature = featureToOl(feature, this.map.projectionCode);
+            const olGeometry = olFeature.getGeometry();
+            if (olGeometry === null) {
+                return;
+            }
+            olFeatures.push(olFeature);
+        });
+        this.addOlFeatures(olFeatures, motion);
+    }
+    /**
+     * Add a OpenLayers feature to the  overlay and, optionally, move to it
+     * @param olFeature OpenLayers Feature
+     * @param motion Optional: Apply this motion to the map view
+     */
+    addOlFeature(olFeature, motion = FeatureMotion.Default) {
+        this.addOlFeatures([olFeature], motion);
+    }
+    /**
+     * Add OpenLayers features to the overlay and, optionally, move to them
+     * @param olFeatures OpenLayers Features
+     * @param motion Optional: Apply this motion to the map view
+     */
+    addOlFeatures(olFeatures, motion = FeatureMotion.Default) {
+        this.dataSource.ol.addFeatures(olFeatures);
+        moveToOlFeatures(this.map.viewController, olFeatures, motion);
+    }
+    /**
+     * Remove a feature from the overlay
+     * @param feature Feature
+     */
+    removeFeature(feature) {
+        this.removeFeatures([feature]);
+    }
+    /**
+     * Remove features from the overlay
+     * @param features Features
+     */
+    removeFeatures(features) {
+        features.forEach((feature) => {
+            if (feature.meta) {
+                const olFeature = this.dataSource.ol.getFeatureById(feature.meta.id);
+                if (olFeature) {
+                    this.removeOlFeature(olFeature);
+                }
+            }
+        });
+    }
+    /**
+     * Remove an OpenLayers feature from the overlay
+     * @param olFeature OpenLayers Feature
+     */
+    removeOlFeature(olFeature) {
+        this.dataSource.ol.removeFeature(olFeature);
+    }
+    /**
+     * Clear the overlay
+     */
+    clear() {
+        this.dataSource.ol.clear();
+    }
+}
+
+class OverlayService {
+    layerService = inject(LayerService);
+    create(map, style) {
+        const layer = this.layerService.createLayer({
+            title: 'Overlay',
+            zIndex: 300,
+            source: new FeatureDataSource(),
+            style: style ?? baseOlStyle()
+        });
+        return new Overlay(map, layer);
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.19", ngImport: i0, type: OverlayService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.19", ngImport: i0, type: OverlayService, providedIn: 'root' });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.19", ngImport: i0, type: OverlayService, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }] });
+
 class MapBrowserComponent {
     activityService = inject(ActivityService);
+    overlayService = inject(OverlayService);
     activityId;
     status$$;
     map = input.required(...(ngDevMode ? [{ debugName: "map" }] : /* istanbul ignore next */ []));
@@ -14698,6 +14493,7 @@ class MapBrowserComponent {
         });
     }
     ngOnInit() {
+        this.map().initializeOverlays?.(this.overlayService);
         this.status$$ = this.map().status$.subscribe((status) => this.handleStatusChange(status));
     }
     ngAfterViewInit() {
@@ -14975,7 +14771,7 @@ class HoverFeatureDirective {
     }
     ngOnInit() {
         this.map.status$
-            .pipe(first$1((status) => status === SubjectStatus.Done))
+            .pipe(first((status) => status === SubjectStatus.Done))
             .subscribe(() => {
             this.initStore();
             this.listenToMapPointerMove();
@@ -16076,7 +15872,7 @@ class QueryService {
             QueryFormat.HTMLGML2) {
             if (typeof url === 'string') {
                 const urlGml = this.getQueryUrl(layer.dataSource, options, true);
-                return this.http.get(urlGml, { responseType: 'text' }).pipe(mergeMap$1((gmlRes) => {
+                return this.http.get(urlGml, { responseType: 'text' }).pipe(mergeMap((gmlRes) => {
                     const mergedGML = this.mergeGML(gmlRes, url, layer);
                     const imposedGeom = mergedGML[0];
                     const imposedProperties = mergedGML[1];
@@ -16112,7 +15908,7 @@ class QueryService {
         }
     }
     requestDataForHTMLGML2(urlGml, url, layer, options) {
-        return this.http.get(urlGml, { responseType: 'text' }).pipe(mergeMap$1((gmlRes) => {
+        return this.http.get(urlGml, { responseType: 'text' }).pipe(mergeMap((gmlRes) => {
             const mergedGML = this.mergeGML(gmlRes, url, layer);
             const imposedGeom = mergedGML[0];
             const imposedProperties = mergedGML[1];
@@ -17067,6 +16863,7 @@ class DirectionsComponent {
     directionsSourceService = inject(DirectionsSourceService);
     searchService = inject(SearchService);
     queryService = inject(QueryService);
+    layerService = inject(LayerService);
     projection = 'EPSG:4326';
     storeEmpty$$;
     storeChange$$;
@@ -17119,9 +16916,9 @@ class DirectionsComponent {
         this.queryService.queryEnabled = false;
         this.initEntityStores();
         setTimeout(() => {
-            initStopsFeatureStore(this.stopsFeatureStore(), this.languageService);
-            initRoutesFeatureStore(this.routesFeatureStore(), this.languageService);
-            initStepsFeatureStore(this.stepsFeatureStore());
+            initStopsFeatureStore(this.stopsFeatureStore(), this.languageService, this.layerService);
+            initRoutesFeatureStore(this.routesFeatureStore(), this.languageService, this.layerService);
+            initStepsFeatureStore(this.stepsFeatureStore(), this.layerService);
             this.initOlInteraction();
         }, 1);
     }
@@ -23682,6 +23479,7 @@ class DrawComponent {
     drawStyleService = inject(DrawStyleService);
     dialog = inject(MatDialog);
     drawIconService = inject(DrawIconService);
+    layerService = inject(LayerService);
     /**
      * Table template
      * @internal
@@ -23817,7 +23615,7 @@ class DrawComponent {
                     .manyBy$((record) => {
                     return record.state.selected === true;
                 })
-                    .pipe(first$1())
+                    .pipe(first())
                     .subscribe((records) => {
                     records.forEach((record) => {
                         record.state.selected = false;
@@ -24299,7 +24097,7 @@ class DrawComponent {
             const numberId = Number(layer.id.toString().replace('igo-draw-layer', ''));
             this.layerCounterID = Math.max(numberId, this.layerCounterID);
         }
-        this.activeDrawingLayer.set(new VectorLayer({
+        this.activeDrawingLayer.set(this.layerService.createLayer({
             isIgoInternalLayer: true,
             id: 'igo-draw-layer' + ++this.layerCounterID,
             title: isNewLayer
@@ -24322,6 +24120,7 @@ class DrawComponent {
             motion: FeatureMotion.None
         }));
         tryAddSelectionStrategy(this.activeStore, new FeatureStoreSelectionStrategy({
+            layerService: this.layerService,
             map: this.map(),
             motion: FeatureMotion.None,
             many: true
@@ -25566,10 +25365,6 @@ class MeasurerItemComponent {
      * Placeholder
      */
     placeholder = input(...(ngDevMode ? [undefined, { debugName: "placeholder" }] : /* istanbul ignore next */ []));
-    /**
-     * Event emitted when the measure unit changes
-     */
-    measureUnitChange = output();
     /**
      * Available measure units for the measure type given
      * @internal
@@ -25593,7 +25388,6 @@ class MeasurerItemComponent {
      */
     onMeasureUnitChange(unit) {
         this.measureUnit.set(unit);
-        this.measureUnitChange.emit(unit);
     }
     toggleAutoUnit(toggle) {
         if (this.measure$$ !== undefined) {
@@ -25620,7 +25414,7 @@ class MeasurerItemComponent {
         }
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.19", ngImport: i0, type: MeasurerItemComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.19", type: MeasurerItemComponent, isStandalone: true, selector: "igo-measurer-item", inputs: { measureType: { classPropertyName: "measureType", publicName: "measureType", isSignal: true, isRequired: true, transformFunction: null }, measureUnit: { classPropertyName: "measureUnit", publicName: "measureUnit", isSignal: true, isRequired: true, transformFunction: null }, measure: { classPropertyName: "measure", publicName: "measure", isSignal: false, isRequired: false, transformFunction: null }, auto: { classPropertyName: "auto", publicName: "auto", isSignal: false, isRequired: false, transformFunction: null }, placeholder: { classPropertyName: "placeholder", publicName: "placeholder", isSignal: true, isRequired: false, transformFunction: null } }, outputs: { measureUnit: "measureUnitChange", measureUnitChange: "measureUnitChange" }, ngImport: i0, template: "<mat-form-field class=\"measure-field\" floatLabel=\"always\">\n  <mat-label>{{ placeholder() }}</mat-label>\n  <input\n    matInput\n    [disabled]=\"true\"\n    [readonly]=\"true\"\n    [value]=\"(measure$ | async) || 0 | measureFormat: measureUnit()\"\n  />\n</mat-form-field>\n<mat-form-field class=\"unit-field\">\n  <mat-select\n    [value]=\"measureUnit()\"\n    [disabled]=\"auto\"\n    (selectionChange)=\"onMeasureUnitChange($event.value)\"\n  >\n    @for (measureUnit of measureUnits; track measureUnit) {\n      <mat-option [value]=\"measureUnit\">\n        {{ 'igo.geo.measure.' + measureUnit | translate }}\n      </mat-option>\n    }\n  </mat-select>\n</mat-form-field>\n", styles: [":host{display:flex;width:100%;padding:5px 10px}:host .measure-field{pointer-events:none;flex:2}:host .unit-field{margin-left:8px;flex:1}:host ::ng-deep mat-form-field .mat-mdc-form-field-subscript-wrapper{display:none}\n"], dependencies: [{ kind: "ngmodule", type: MatFormFieldModule }, { kind: "component", type: i3$1.MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i3$1.MatLabel, selector: "mat-label" }, { kind: "ngmodule", type: MatInputModule }, { kind: "directive", type: i4$1.MatInput, selector: "input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]", inputs: ["disabled", "id", "placeholder", "name", "required", "type", "errorStateMatcher", "aria-describedby", "value", "readonly", "disabledInteractive"], exportAs: ["matInput"] }, { kind: "ngmodule", type: MatSelectModule }, { kind: "component", type: i4$3.MatSelect, selector: "mat-select", inputs: ["aria-describedby", "panelClass", "disabled", "disableRipple", "tabIndex", "hideSingleSelectionIndicator", "placeholder", "required", "multiple", "disableOptionCentering", "compareWith", "value", "aria-label", "aria-labelledby", "errorStateMatcher", "typeaheadDebounceInterval", "sortComparator", "id", "panelWidth", "canSelectNullableOptions"], outputs: ["openedChange", "opened", "closed", "selectionChange", "valueChange"], exportAs: ["matSelect"] }, { kind: "component", type: i4$3.MatOption, selector: "mat-option", inputs: ["value", "id", "disabled"], outputs: ["onSelectionChange"], exportAs: ["matOption"] }, { kind: "ngmodule", type: MatOptionModule }, { kind: "ngmodule", type: IgoLanguageModule }, { kind: "pipe", type: AsyncPipe, name: "async" }, { kind: "pipe", type: i4.TranslatePipe, name: "translate" }, { kind: "pipe", type: MeasureFormatPipe, name: "measureFormat" }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.19", type: MeasurerItemComponent, isStandalone: true, selector: "igo-measurer-item", inputs: { measureType: { classPropertyName: "measureType", publicName: "measureType", isSignal: true, isRequired: true, transformFunction: null }, measureUnit: { classPropertyName: "measureUnit", publicName: "measureUnit", isSignal: true, isRequired: true, transformFunction: null }, measure: { classPropertyName: "measure", publicName: "measure", isSignal: false, isRequired: false, transformFunction: null }, auto: { classPropertyName: "auto", publicName: "auto", isSignal: false, isRequired: false, transformFunction: null }, placeholder: { classPropertyName: "placeholder", publicName: "placeholder", isSignal: true, isRequired: false, transformFunction: null } }, outputs: { measureUnit: "measureUnitChange" }, ngImport: i0, template: "<mat-form-field class=\"measure-field\" floatLabel=\"always\">\n  <mat-label>{{ placeholder() }}</mat-label>\n  <input\n    matInput\n    [disabled]=\"true\"\n    [readonly]=\"true\"\n    [value]=\"(measure$ | async) || 0 | measureFormat: measureUnit()\"\n  />\n</mat-form-field>\n<mat-form-field class=\"unit-field\">\n  <mat-select\n    [value]=\"measureUnit()\"\n    [disabled]=\"auto\"\n    (selectionChange)=\"onMeasureUnitChange($event.value)\"\n  >\n    @for (measureUnit of measureUnits; track measureUnit) {\n      <mat-option [value]=\"measureUnit\">\n        {{ 'igo.geo.measure.' + measureUnit | translate }}\n      </mat-option>\n    }\n  </mat-select>\n</mat-form-field>\n", styles: [":host{display:flex;width:100%;padding:5px 10px}:host .measure-field{pointer-events:none;flex:2}:host .unit-field{margin-left:8px;flex:1}:host ::ng-deep mat-form-field .mat-mdc-form-field-subscript-wrapper{display:none}\n"], dependencies: [{ kind: "ngmodule", type: MatFormFieldModule }, { kind: "component", type: i3$1.MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i3$1.MatLabel, selector: "mat-label" }, { kind: "ngmodule", type: MatInputModule }, { kind: "directive", type: i4$1.MatInput, selector: "input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]", inputs: ["disabled", "id", "placeholder", "name", "required", "type", "errorStateMatcher", "aria-describedby", "value", "readonly", "disabledInteractive"], exportAs: ["matInput"] }, { kind: "ngmodule", type: MatSelectModule }, { kind: "component", type: i4$3.MatSelect, selector: "mat-select", inputs: ["aria-describedby", "panelClass", "disabled", "disableRipple", "tabIndex", "hideSingleSelectionIndicator", "placeholder", "required", "multiple", "disableOptionCentering", "compareWith", "value", "aria-label", "aria-labelledby", "errorStateMatcher", "typeaheadDebounceInterval", "sortComparator", "id", "panelWidth", "canSelectNullableOptions"], outputs: ["openedChange", "opened", "closed", "selectionChange", "valueChange"], exportAs: ["matSelect"] }, { kind: "component", type: i4$3.MatOption, selector: "mat-option", inputs: ["value", "id", "disabled"], outputs: ["onSelectionChange"], exportAs: ["matOption"] }, { kind: "ngmodule", type: MatOptionModule }, { kind: "ngmodule", type: IgoLanguageModule }, { kind: "pipe", type: AsyncPipe, name: "async" }, { kind: "pipe", type: i4.TranslatePipe, name: "translate" }, { kind: "pipe", type: MeasureFormatPipe, name: "measureFormat" }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.19", ngImport: i0, type: MeasurerItemComponent, decorators: [{
             type: Component,
@@ -25637,7 +25431,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.19", ngImpo
                 type: Input
             }], auto: [{
                 type: Input
-            }], placeholder: [{ type: i0.Input, args: [{ isSignal: true, alias: "placeholder", required: false }] }], measureUnitChange: [{ type: i0.Output, args: ["measureUnitChange"] }] } });
+            }], placeholder: [{ type: i0.Input, args: [{ isSignal: true, alias: "placeholder", required: false }] }] } });
 
 /**
  * Tool to measure lengths and areas
@@ -25647,6 +25441,7 @@ class MeasurerComponent {
     dialog = inject(MatDialog);
     storageService = inject(StorageService);
     document = inject(DOCUMENT);
+    layerService = inject(LayerService);
     /**
      * Table template
      * @internal
@@ -26095,7 +25890,7 @@ class MeasurerComponent {
      */
     initStore() {
         const store = this.store();
-        let layer = new VectorLayer({
+        let layer = this.layerService.createLayer({
             title: this.languageService.translate.instant('igo.geo.measure.layerTitle'),
             isIgoInternalLayer: true,
             id: `igo-measures-${uuid()}`,
@@ -26123,6 +25918,7 @@ class MeasurerComponent {
         tryAddSelectionStrategy(
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         store, new FeatureStoreSelectionStrategy({
+            layerService: this.layerService,
             map: this.map(),
             many: true
         }));
@@ -27090,6 +26886,7 @@ class SpatialFilterItemComponent {
     spatialFilterService = inject(SpatialFilterService);
     messageService = inject(MessageService);
     languageService = inject(LanguageService);
+    layerService = inject(LayerService);
     map = input.required(...(ngDevMode ? [{ debugName: "map" }] : /* istanbul ignore next */ []));
     get type() {
         return this._type;
@@ -27420,7 +27217,7 @@ class SpatialFilterItemComponent {
         });
         const selectedRecordStrategy = new EntityStoreFilterSelectionStrategy({});
         const selectionStrategy = new FeatureStoreSelectionStrategy({
-            layer: new VectorLayer({
+            layer: this.layerService.createLayer({
                 zIndex: 300,
                 source: new FeatureDataSource(),
                 style: undefined,
@@ -29716,7 +29513,7 @@ function addLayerAndFeaturesToMap(features, map, contextUri, layerTitle, layerSe
         isIgoInternalLayer: true,
         source,
         style: randomOlFlatStyle(),
-        idbInfo: { storeToIdb, contextUri: contextUri }
+        offline: { enabled: storeToIdb, contextUri }
     });
     layer.setExtent(computeOlFeaturesExtent(olFeatures, map.viewProjection));
     map.layerController.add(layer);
@@ -29735,7 +29532,7 @@ function handleFileImportSuccess(file, features, map, contextUri, messageService
     const obs$ = confirmDialogService
         ? confirmDialogService.open('igo.geo.import.promptStoreToIdb')
         : of(false);
-    obs$.pipe(first()).subscribe((confirm) => {
+    obs$.pipe(first$1()).subscribe((confirm) => {
         const d = new Date();
         const dformat = [
             d.getFullYear(),
@@ -30837,7 +30634,7 @@ class DropGeoFileDirective extends DragAndDropDirective {
     onFilesDropped(files) {
         for (const file of files) {
             this.epsgCode$$.push(detectFileEPSG({ file })
-                .pipe(skipWhile((code) => !code), first$1(), concatMap((epsgCode) => {
+                .pipe(skipWhile((code) => !code), first(), concatMap((epsgCode) => {
                 if (!epsgCode || epsgCode === 'epsgNotDefined') {
                     return this.openEPSGModal(file).pipe(filter((selectedCode) => !!selectedCode), // user must select
                     concatMap((selectedCode) => this.importService.import(file, selectedCode)));
@@ -32588,7 +32385,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.19", ngImpo
 class SearchResultAddButtonComponent {
     layerService = inject(LayerService);
     dialog = inject(MatDialog);
-    dataSourceService = inject(DataSourceService);
     mediaService = inject(MediaService);
     tooltip$ = new BehaviorSubject('igo.geo.catalog.layer.addToMap');
     addFeatureToLayerTooltip$ = new BehaviorSubject('igo.geo.search.addToLayer');
@@ -32891,6 +32687,7 @@ class SearchResultAddButtonComponent {
             motion: FeatureMotion.None
         }));
         tryAddSelectionStrategy(activeStore, new FeatureStoreSelectionStrategy({
+            layerService: this.layerService,
             map: this.map(),
             motion: FeatureMotion.None,
             many: true
@@ -33302,7 +33099,7 @@ class SearchPointerSummaryDirective {
     ngOnInit() {
         this.listenToMapPointerMove();
         this.map.status$
-            .pipe(first((status) => status === SubjectStatus.Done))
+            .pipe(first$1((status) => status === SubjectStatus.Done))
             .subscribe(() => {
             this.store = new FeatureStore([], { map: this.map });
             this.initStore();
@@ -33954,16 +33751,8 @@ class IChercheSearchSource extends SearchSource {
         const config = inject(ConfigService, { optional: true });
         const options = ObjectUtils.mergeDeep(config?.getConfig(`searchSources.${IChercheSearchSource.id}`) ?? {}, directOptions ?? {});
         super(options, storageService);
-        const authService = inject(AuthService);
         if (this.settings.length) {
-            if (!authService) {
-                this.getAllowedTypes();
-            }
-            else {
-                authService.authenticate$.subscribe(() => {
-                    this.getAllowedTypes();
-                });
-            }
+            this.getAllowedTypes();
         }
         this.languageService.language$.subscribe(() => {
             this.title$.next(this.languageService.translate.instant(this.options.title ?? ''));
@@ -34494,21 +34283,12 @@ class IChercheReverseSearchSource extends SearchSource {
         });
         const config = inject(ConfigService, { optional: true });
         const options = ObjectUtils.mergeDeep(config?.getConfig(`searchSources.${IChercheReverseSearchSource.id}`) ?? {}, directOptions ?? {});
-        const injector = inject(Injector);
         super(options, storageService);
         this.languageService.language$.subscribe(() => {
             this.title$.next(this.languageService.translate.instant(this.options.title ?? ''));
         });
-        const authService = injector.get(AuthService);
         if (this.settings.length) {
-            if (!authService) {
-                this.getAllowedTypes();
-            }
-            else {
-                authService.authenticate$.subscribe(() => {
-                    this.getAllowedTypes();
-                });
-            }
+            this.getAllowedTypes();
         }
     }
     getId() {
@@ -35996,6 +35776,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.19", ngImpo
 class EditionWorkspace extends Workspace {
     configService;
     adding$;
+    layerService;
     options;
     inResolutionRange$ = new BehaviorSubject(true);
     get layer() {
@@ -36043,10 +35824,11 @@ class EditionWorkspace extends Workspace {
     fillColor;
     strokeColor;
     strokeWidth;
-    constructor(configService, adding$, options) {
+    constructor(configService, adding$, layerService, options) {
         super(options);
         this.configService = configService;
         this.adding$ = adding$;
+        this.layerService = layerService;
         this.options = options;
         this.map.viewController.resolution$.subscribe((mapResolution) => {
             if ((mapResolution ?? 0) > this.layer.minResolution &&
@@ -36059,7 +35841,7 @@ class EditionWorkspace extends Workspace {
         });
         this.drawControl = this.createDrawControl();
         this.drawControl.setGeometryType(this.geometryType.Point);
-        this.olDrawingLayer = new VectorLayer({
+        this.olDrawingLayer = this.layerService.createLayer({
             id: 'igo-draw-layer',
             title: 'edition',
             zIndex: 300,
@@ -36454,7 +36236,6 @@ class EditionWorkspaceService {
     messageService = inject(MessageService);
     http = inject(HttpClient);
     dialog = inject(MatDialog);
-    authInterceptor = inject(AuthInterceptor);
     ws$ = new BehaviorSubject(undefined);
     adding$ = new BehaviorSubject(false);
     relationLayers$ = new BehaviorSubject(undefined);
@@ -36571,7 +36352,7 @@ class EditionWorkspaceService {
                 }
             }, false);
             workspaceLayer.dataSource.ol.refresh();
-            wks = new EditionWorkspace(this.configService, this.adding$, {
+            wks = new EditionWorkspace(this.configService, this.adding$, this.layerService, {
                 id: layer.id,
                 title: layer.title,
                 layer: workspaceLayer,
@@ -37007,14 +36788,7 @@ class EditionWorkspaceService {
      * WMS params are updated to ensure layer is correctly refreshed
      */
     refreshMap(layer, map) {
-        const wfsOlLayer = layer.dataSource.ol;
-        const loader = (extent, resolution, proj, success, failure) => {
-            layer.customWFSLoader(layer.ol.getSource(), layer.options.sourceOptions, extent, resolution, proj, 
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            success, failure, true);
-        };
-        wfsOlLayer.setLoader(loader);
-        wfsOlLayer.refresh();
+        layer.refresh();
         const id = String(layer.id);
         for (const lay of map.layerController.all) {
             const layId = String(lay.id);
@@ -38881,7 +38655,7 @@ class CatalogBrowserLayerComponent {
         this.layerLegendShown$.next(!this.layerLegendShown$.value);
         this.layerService
             .createAsyncLayer(this.layer().options)
-            .pipe(first$1())
+            .pipe(first())
             .subscribe((layer) => this.igoLayer$.next(layer));
     }
     /**
@@ -39353,7 +39127,7 @@ class CatalogBrowserComponent {
     removeLayersFromMap(layers) {
         if (this.isAddingLayers.value) {
             this.isAddingLayers
-                .pipe(first((value) => value === false))
+                .pipe(first$1((value) => value === false))
                 .subscribe((_isReady) => {
                 this._removeLayersFromMap(layers);
             });
@@ -40682,28 +40456,6 @@ function withOsrmSource() {
     };
 }
 
-/** Ensure to create the indexDB on app initialisation and provide
- * GeoNetworkService, ConfigFileToGeoDBService */
-function provideOffline(options) {
-    return makeEnvironmentProviders(options?.enable
-        ? [
-            {
-                provide: APP_INITIALIZER,
-                useFactory: idbFactory,
-                multi: true,
-                deps: [GeoDB, LayerDB]
-            },
-            GeoDB,
-            LayerDB,
-            GeoNetworkService,
-            ConfigFileToGeoDBService
-        ]
-        : []);
-}
-function idbFactory() {
-    return () => createIndexedDb();
-}
-
 var OverlayAction;
 (function (OverlayAction) {
     OverlayAction[OverlayAction["None"] = 0] = "None";
@@ -42243,5 +41995,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.19", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { AddCatalogDialogComponent, ArcGISRestCapabilitiesLayerTypes, ArcGISRestDataSource, BaseLayersSwitcherComponent, CADASTRE_SEARCH_SOURCE_OPTIONS, CATALOG_DIRECTIVES, CATALOG_LIBRARY_DIRECTIVES, COORDINATES_REVERSE_SEARCH_SOURCE_OPTIONS, COORDINATES_REVERSE_SEARCH_SOURCE_PROJECTIONS, CadastreSearchSource, CapabilitiesService, CartoDataSource, Catalog, CatalogBrowserComponent, CatalogItemType, CatalogLibraryComponent, CatalogService, ClusterDataSource, ConfigFileToGeoDBService, ConfirmationPopupComponent, CoordinatesReverseSearchSource, CoordinatesReverseSearchSourceFactory, CoordinatesSearchResultFormatter, CoordinatesUnit, CsvSeparator, DDtoDMS, DataService, DataSource, DataSourceService, DirectionRelativePositionType, DirectionSourceKind, DirectionsButtonsComponent, DirectionsComponent, DirectionsFormat, DirectionsInputsComponent, DirectionsResultsComponent, DirectionsService, DirectionsSource, DirectionsType, DownloadButtonComponent, DownloadService, DrawComponent, DrawControl, DrawIconService, DrawStyleService, DropGeoFileDirective, EditionWorkspace, EditionWorkspaceService, EpsgSelectorModalComponent, EsriStyleGenerator, EventRefresh, ExportButtonComponent, ExportError, ExportFormat, ExportFormatLegacy, ExportInvalidFileError, ExportNothingToExportError, ExportService, FEATURE, FEATURE_DETAILS_DIRECTIVES, FEATURE_DIRECTIVES, FILTER_DIRECTIVES, FeatureDataSource, FeatureDetailsComponent, FeatureDetailsDirective, FeatureDetailsPanelComponent, FeatureFormComponent, FeatureMotion, FeatureStore, FeatureStoreInMapExtentStrategy, FeatureStoreInMapResolutionStrategy, FeatureStoreLoadingLayerStrategy, FeatureStoreLoadingStrategy, FeatureStoreSearchIndexStrategy, FeatureStoreSelectionStrategy, FeatureWorkspace, FeatureWorkspaceService, FilterableDataSourcePipe, FontType, GEOMETRY_FORM_FIELD_DIRECTIVES, GeoDB, GeoNetworkService, GeoPropertiesStrategy, GeolocateButtonComponent, GeolocationOverlayType, GeometryFormFieldComponent, GeometryFormFieldInputComponent, GeometrySliceError, GeometrySliceLineStringError, GeometrySliceMultiPolygonError, GeometrySliceTooManyIntersectionError, GeometryType, GeostylerService, GetCapabilitiesParams, GoogleLinks, HomeExtentButtonComponent, HoverFeatureDirective, ICHERCHE_REVERSE_SEARCH_SOURCE_OPTIONS, ICHERCHE_SEARCH_SOURCE_OPTIONS, IChercheReverseSearchSource, IChercheSearchResultFormatter, IChercheSearchSource, ID_GROUP_PREFIX, ILAYER_SEARCH_SOURCE_OPTIONS, ILayerSearchResultFormatter, ILayerSearchSource, IMPORT_EXPORT_DIRECTIVES, IgoCatalogBrowserModule, IgoCatalogLibraryModule, IgoCatalogModule, IgoConfirmationPopupModule, IgoDirectionsModule, IgoDownloadModule, IgoDrawModule, IgoDrawingToolModule, IgoFeatureDetailsModule, IgoFeatureFormModule, IgoFeatureModule, IgoFilterModule, IgoGeoModule, IgoGeoWorkspaceModule, IgoGeometryFormFieldModule, IgoGeometryModule, IgoHttpParameterCodec, IgoImportExportModule, IgoLayerModule, IgoMap, IgoMapModule, IgoMeasureModule, IgoMeasurerModule, IgoMetadataModule, IgoOgcFilterModule, IgoPrintModule, IgoQueryModule, IgoSearchBarModule, IgoSearchModule, IgoSearchResultsModule, IgoSearchSelectorModule, IgoSearchSettingsModule, IgoStyleModule, IgoToastModule, IgoWktModule, IgoWorkspaceSelectorModule, IgoWorkspaceUpdatorModule, ImageArcGISRestDataSource, ImageLayer, ImageWatcher, ImportError, ImportExportComponent, ImportInvalidFileError, ImportNothingToImportError, ImportOgreServerError, ImportSRSError, ImportService, ImportSizeError, ImportUnreadableFileError, InfoSectionComponent, InsertSourceInsertDBEnum, InteractiveSelectionFormWidget, LAYER, LAYER_DIRECTIVES, LabelType, LaneType, Layer, LayerBase, LayerController, LayerDB, LayerGroup, LayerGroupBase, LayerGroupComponent, LayerItemComponent, LayerLegendComponent, LayerLegendItemComponent, LayerLegendListBindingDirective, LayerLegendListComponent, LayerListComponent, LayerListControlsEnum, LayerListToolComponent, LayerListToolService, LayerSearchComponent, LayerService, LayerUnavailableComponent, LayerUnavailableListComponent, LayerViewerBottomActionsComponent, LayerViewerComponent, LayerVisibilityButtonComponent, Linked, LinkedProperties, MAP_DIRECTIVES, MEASURER_DIRECTIVES, MEASURE_UNIT_AUTO, METADATA_DIRECTIVES, MVTDataSource, ManeuverModifier, ManeuverType, MapBase, MapBrowserComponent, MapCenterComponent, MapController, MapGeolocationController, MapOfflineDirective, MapService, MapViewAction, MapViewController, MapboxService, MeasureAreaUnit, MeasureAreaUnitAbbreviation, MeasureFormatPipe, MeasureLengthUnit, MeasureLengthUnitAbbreviation, MeasureType, MeasurerComponent, MenuButtonComponent, MetadataAbstractComponent, MetadataButtonComponent, MetadataService, MiniBaseMapComponent, ModifyControl, NOMINATIM_SEARCH_SOURCE_OPTIONS, NominatimSearchSource, OGCFilterService, OSMDataSource, OfflineButtonComponent, OgcFilterButtonComponent, OgcFilterComponent, OgcFilterFormComponent, OgcFilterOperator, OgcFilterOperatorType, OgcFilterSelectionComponent, OgcFilterTimeComponent, OgcFilterTimeSliderComponent, OgcFilterWidget, OgcFilterWriter, OgcFilterableFormComponent, OgcFilterableItemComponent, OgcFilterableListBindingDirective, OgcFilterableListComponent, OgcSelectorFields, OlDragSelectInteraction, OptionsApiService, OptionsService, OsmLinks, OsrmDirectionsSource, Overlay, OverlayAction, PointerPositionDirective, PrintComponent, PrintFormComponent, PrintLegendPosition, PrintOrientation, PrintOutputFormat, PrintPaperFormat, PrintResolution, PrintSaveImageFormat, PrintService, ProjectionService, PropertyTypeDetectorService, ProposalType, QueryDirective, QueryFormat, QueryFormatMimeType, QueryHtmlTarget, QuerySearchSource, QueryService, RADIUS_NAME, RotationButtonComponent, RoutesFeatureStore, SEARCH_DIRECTIVES, SEARCH_RESULTS_DIRECTIVES, SEARCH_TYPES, STORED_QUERIES_REVERSE_SEARCH_SOURCE_OPTIONS, STORED_QUERIES_SEARCH_SOURCE_OPTIONS, STYLE_ENGINES, SearchBarComponent, SearchPointerSummaryDirective, SearchResultAddButtonComponent, SearchResultMode, SearchResultsComponent, SearchSelectorComponent, SearchService, SearchSettingsComponent, SearchSource, SearchSourceKind, SearchSourceService, SliceControl, SourceDirectionsType, SpatialFilterItemComponent, SpatialFilterItemType, SpatialFilterListComponent, SpatialFilterQueryType, SpatialFilterService, SpatialFilterType, SpatialFilterTypeComponent, StepsFeatureStore, StopsFeatureStore, StopsStore, StoredQueriesReverseSearchSource, StoredQueriesSearchSource, StyleEngineKind, StyleModalDrawingComponent, StyleModalLayerButtonComponent, StyleModalLayerComponent, StyleService, SwipeControlComponent, TileArcGISRestDataSource, TileDebugDataSource, TileLayer, TileWatcher, TimeFilterButtonComponent, TimeFilterFormComponent, TimeFilterItemComponent, TimeFilterListBindingDirective, TimeFilterListComponent, TimeFilterService, TimeFilterStyle, TimeFilterType, TooltipType, TrackFeatureButtonComponent, TypeCapabilities, TypeCatalog, VectorLayer, VectorTileLayer, VectorWatcher, WFSDataSource, WFSService, WMSDataSource, WMTSDataSource, WORKSPACE_SEARCH_SOURCE_OPTIONS, WakeLockButtonComponent, WebSocketDataSource, WfsWorkspace, WfsWorkspaceService, WktService, WorkspaceSearchSource, WorkspaceSelectorDirective, WorkspaceUpdatorDirective, XYZDataSource, ZoomButtonComponent, addLayerAndFeaturesToMap, addLinearRingToOlPolygon, addOrRemoveLayer, addRouteToRoutesFeatureStore, addStopToStopsFeatureStore, addStopToStore, baseOlStyle, bufferOlGeometry, buildUrl, cadastreSearchSourceFactory, checkWfsParams, clearOlGeometryMidpoints, clusterOlStyleFunction, computeBestAreaUnit, computeBestLengthUnit, computeLayerTitleFromFile, computeOlFeatureExtent, computeOlFeaturesDiff, computeOlFeaturesExtent, computeProjectionsConstraints, computeRelativePosition, computeStopsPosition, computeTermSimilarity, convertDDToDMS, createDefaultTileGrid, createDrawHoleInteractionStyle, createDrawInteractionStyle, createFilterInMapExtentOrResolutionStrategy, createInteractionStyle, createMeasureInteractionStyle, createMeasureLayerStyle, createOlTooltipAtPoint, createOlTooltipDrawAtPoint, createTableTemplate, ctrlKeyDown, defaultCoordinatesSearchResultFormatterFactory, defaultEpsg, defaultFieldNameGeometry, defaultIChercheSearchResultFormatterFactory, defaultMaxFeatures, defaultWfsVersion, detectFileEPSG, directionsStyle, doesOlGeometryIntersects, entitiesToRowData, exportToCSV, featureFromOl, featureToOl, featureToSearchResult, featuresAreOutOfView, featuresAreTooDeepInView, findDiff, findLayerByLinkId, findParentId, formatDistance, formatDuration, formatMeasure, formatScale, formatStep, formatWFSQueryString, generateArcgisRestIdFromSourceOptions, generateFeatureIdFromSourceOptions, generateId, generateIdFromSourceOptions, generateWMSIdFromSourceOptions, generateWMTSIdFromSourceOptions, generateWfsIdFromSourceOptions, generateXYZIdFromSourceOptions, getAllChildLayersByDeletion, getAllChildLayersByProperty, getFileExtension, getFilterBadge, getFormatFromOptions, getGeoServiceAction, getLayerOptionIdentifier, getLayersByDeletion, getLayersLegends, getLinkedLayersOptions, getMousePositionFromOlGeometryEvent, getOlTooltipAtCenter, getOlTooltipsAtMidpoints, getResolutionFromScale, getRootParentByDeletion, getRootParentByProperty, getRowsInMapExtent, getSaveableOgcParams, getScaleFromResolution, getSelectedOnly, getTooltipsOfOlGeometry, gmlRegex, handleFileExportError, handleFileExportSuccess, handleFileImportError, handleFileImportSuccess, handleInvalidFileImportError, handleLayerPropertyChange, handleNothingToExportError, handleNothingToImportError, handleOgreServerImportError, handleSRSImportError, handleSizeFileImportError, handleUnreadbleFileImportError, hideOlFeature, ichercheReverseSearchSourceFactory, ichercheSearchSourceFactory, ilayerSearchResultFormatterFactory, ilayerSearchSourceFactory, initRoutesFeatureStore, initStepsFeatureStore, initStopsFeatureStore, interactiveSelectionFormWidgetFactory, isAnyOlStyle, isBaseLayer, isBaseLayerLinked, isCsvExport, isEngineLayerStyle, isLayerGroup, isLayerGroupOptions, isLayerItem, isLayerItemOptions, isLayerLinked, isLayerLinkedOptions, isLayerLinkedTogether, isLinkMaster, isOlFlatStyleLike, isSaveableLayer, jsonRegex, layerFeatureIsQueryable, layerIsQueryable, lonLatConversion, mapExtentStrategyActiveToolTip, markerOlStyle, measureOlGeometry, measureOlGeometryArea, measureOlGeometryLength, mergeLayersOptions, metersToFeet, metersToKilometers, metersToMiles, metersToUnit, moveToOlFeatures, mtmZoneFromLonLat, nearTransparentOlStyle, noElementSelected, nominatimSearchSourceFactory, ogcFilterWidgetFactory, olLayerFeatureIsQueryable, olLayerIsQueryable, optionsApiFactory, osrmDirectionsSourcesFactory, provideCadastreSearchSource, provideCoordinatesReverseSearchSource, provideDefaultCoordinatesSearchResultFormatter, provideDefaultIChercheSearchResultFormatter, provideDirection, provideIChercheReverseSearchSource, provideIChercheSearchSource, provideILayerSearchResultFormatter, provideILayerSearchSource, provideInteractiveSelectionFormWidget, provideNominatimSearchSource, provideOffline, provideOgcFilterWidget, provideOptionsApi, provideOsrmDirectionsSource, provideQuerySearchSource, provideSearch, provideSearchSourceService, provideStoredQueriesReverseSearchSource, provideStoredQueriesSearchSource, provideStyle, provideWorkspaceSearchSource, querySearchSourceFactory, randomOlFlatStyle, removeStopFromStore, renderFeatureFromOl, roundCoordTo, roundCoordToString, scaleExtent, searchSourceServiceFactory, selectionOlStyle, setRowsInMapExtent, setSelectedOnly, sliceOlGeometry, sliceOlPolygon, sortLayersByZindex, sourceCanReverseSearch, sourceCanReverseSearchAsSummary, sourceCanSearch, squareMetersToAcres, squareMetersToHectares, squareMetersToSquareFeet, squareMetersToSquareKilometers, squareMetersToSquareMiles, squareMetersToUnit, standardizeUrl, storedqueriesReverseSearchSourceFactory, storedqueriesSearchSourceFactory, stringToLonLat, styleVariant, translateManeuverBearing, translateManeuverModifier, tryAddLoadingStrategy, tryAddSelectionStrategy, tryBindStoreLayer, updateOlGeometryCenter, updateOlGeometryMidpoints, updateOlTooltipAtCenter, updateOlTooltipDrawAtCenter, updateOlTooltipsAtMidpoints, updateOlTooltipsDrawAtMidpoints, updateStoreSorting, utmZoneFromLonLat, viewStatesAreEqual, withCadastreSource, withCoordinatesReverseSource, withGeostyler, withIChercheReverseSource, withIChercheSource, withILayerSource, withMapbox, withNominatimSource, withOsrmSource, withStoredQueriesReverseSource, withStoredQueriesSource, withWorkspaceSource, workspaceSearchSourceFactory, zoneMtm, zoneUtm };
+export { AddCatalogDialogComponent, ArcGISRestCapabilitiesLayerTypes, ArcGISRestDataSource, BaseLayersSwitcherComponent, CADASTRE_SEARCH_SOURCE_OPTIONS, CATALOG_DIRECTIVES, CATALOG_LIBRARY_DIRECTIVES, COORDINATES_REVERSE_SEARCH_SOURCE_OPTIONS, COORDINATES_REVERSE_SEARCH_SOURCE_PROJECTIONS, CadastreSearchSource, CapabilitiesService, CartoDataSource, Catalog, CatalogBrowserComponent, CatalogItemType, CatalogLibraryComponent, CatalogService, ClusterDataSource, ConfirmationPopupComponent, CoordinatesReverseSearchSource, CoordinatesReverseSearchSourceFactory, CoordinatesSearchResultFormatter, CoordinatesUnit, CsvSeparator, DDtoDMS, DataService, DataSource, DataSourceService, DirectionRelativePositionType, DirectionSourceKind, DirectionsButtonsComponent, DirectionsComponent, DirectionsFormat, DirectionsInputsComponent, DirectionsResultsComponent, DirectionsService, DirectionsSource, DirectionsType, DownloadButtonComponent, DownloadService, DrawComponent, DrawControl, DrawIconService, DrawStyleService, DropGeoFileDirective, EditionWorkspace, EditionWorkspaceService, EpsgSelectorModalComponent, EsriStyleGenerator, EventRefresh, ExportButtonComponent, ExportError, ExportFormat, ExportFormatLegacy, ExportInvalidFileError, ExportNothingToExportError, ExportService, FEATURE, FEATURE_DETAILS_DIRECTIVES, FEATURE_DIRECTIVES, FILTER_DIRECTIVES, FeatureDataSource, FeatureDetailsComponent, FeatureDetailsDirective, FeatureDetailsPanelComponent, FeatureFormComponent, FeatureMotion, FeatureStore, FeatureStoreInMapExtentStrategy, FeatureStoreInMapResolutionStrategy, FeatureStoreLoadingLayerStrategy, FeatureStoreLoadingStrategy, FeatureStoreSearchIndexStrategy, FeatureStoreSelectionStrategy, FeatureWorkspace, FeatureWorkspaceService, FilterableDataSourcePipe, FontType, GEOMETRY_FORM_FIELD_DIRECTIVES, GeoPropertiesStrategy, GeolocateButtonComponent, GeolocationOverlayType, GeometryFormFieldComponent, GeometryFormFieldInputComponent, GeometrySliceError, GeometrySliceLineStringError, GeometrySliceMultiPolygonError, GeometrySliceTooManyIntersectionError, GeometryType, GeostylerService, GetCapabilitiesParams, GoogleLinks, HomeExtentButtonComponent, HoverFeatureDirective, ICHERCHE_REVERSE_SEARCH_SOURCE_OPTIONS, ICHERCHE_SEARCH_SOURCE_OPTIONS, IChercheReverseSearchSource, IChercheSearchResultFormatter, IChercheSearchSource, ID_GROUP_PREFIX, ILAYER_SEARCH_SOURCE_OPTIONS, ILayerSearchResultFormatter, ILayerSearchSource, IMPORT_EXPORT_DIRECTIVES, IgoCatalogBrowserModule, IgoCatalogLibraryModule, IgoCatalogModule, IgoConfirmationPopupModule, IgoDirectionsModule, IgoDownloadModule, IgoDrawModule, IgoDrawingToolModule, IgoFeatureDetailsModule, IgoFeatureFormModule, IgoFeatureModule, IgoFilterModule, IgoGeoModule, IgoGeoWorkspaceModule, IgoGeometryFormFieldModule, IgoGeometryModule, IgoHttpParameterCodec, IgoImportExportModule, IgoLayerModule, IgoMap, IgoMapModule, IgoMeasureModule, IgoMeasurerModule, IgoMetadataModule, IgoOgcFilterModule, IgoPrintModule, IgoQueryModule, IgoSearchBarModule, IgoSearchModule, IgoSearchResultsModule, IgoSearchSelectorModule, IgoSearchSettingsModule, IgoStyleModule, IgoToastModule, IgoWktModule, IgoWorkspaceSelectorModule, IgoWorkspaceUpdatorModule, ImageArcGISRestDataSource, ImageLayer, ImageWatcher, ImportError, ImportExportComponent, ImportInvalidFileError, ImportNothingToImportError, ImportOgreServerError, ImportSRSError, ImportService, ImportSizeError, ImportUnreadableFileError, InfoSectionComponent, InteractiveSelectionFormWidget, LAYER, LAYER_DIRECTIVES, LAYER_PERSISTENCE, LabelType, LaneType, Layer, LayerBase, LayerController, LayerExtensionManager, LayerGroup, LayerGroupBase, LayerGroupComponent, LayerItemComponent, LayerLegendComponent, LayerLegendItemComponent, LayerLegendListBindingDirective, LayerLegendListComponent, LayerListComponent, LayerListControlsEnum, LayerListToolComponent, LayerListToolService, LayerSearchComponent, LayerService, LayerUnavailableComponent, LayerUnavailableListComponent, LayerViewerBottomActionsComponent, LayerViewerComponent, LayerVisibilityButtonComponent, Linked, LinkedProperties, MAP_DIRECTIVES, MEASURER_DIRECTIVES, MEASURE_UNIT_AUTO, METADATA_DIRECTIVES, MVTDataSource, ManeuverModifier, ManeuverType, MapBase, MapBrowserComponent, MapCenterComponent, MapController, MapGeolocationController, MapOfflineDirective, MapService, MapViewAction, MapViewController, MapboxService, MeasureAreaUnit, MeasureAreaUnitAbbreviation, MeasureFormatPipe, MeasureLengthUnit, MeasureLengthUnitAbbreviation, MeasureType, MeasurerComponent, MenuButtonComponent, MetadataAbstractComponent, MetadataButtonComponent, MetadataService, MiniBaseMapComponent, ModifyControl, NOMINATIM_SEARCH_SOURCE_OPTIONS, NominatimSearchSource, OFFLINE_LAYER_RESTORE, OGCFilterService, OSMDataSource, OfflineButtonComponent, OgcFilterButtonComponent, OgcFilterComponent, OgcFilterFormComponent, OgcFilterOperator, OgcFilterOperatorType, OgcFilterSelectionComponent, OgcFilterTimeComponent, OgcFilterTimeSliderComponent, OgcFilterWidget, OgcFilterWriter, OgcFilterableFormComponent, OgcFilterableItemComponent, OgcFilterableListBindingDirective, OgcFilterableListComponent, OgcSelectorFields, OlDragSelectInteraction, OptionsApiService, OptionsService, OsmLinks, OsrmDirectionsSource, Overlay, OverlayAction, OverlayService, PointerPositionDirective, PrintComponent, PrintFormComponent, PrintLegendPosition, PrintOrientation, PrintOutputFormat, PrintPaperFormat, PrintResolution, PrintSaveImageFormat, PrintService, ProjectionService, PropertyTypeDetectorService, ProposalType, QueryDirective, QueryFormat, QueryFormatMimeType, QueryHtmlTarget, QuerySearchSource, QueryService, RADIUS_NAME, RotationButtonComponent, RoutesFeatureStore, SEARCH_DIRECTIVES, SEARCH_RESULTS_DIRECTIVES, SEARCH_TYPES, STORED_QUERIES_REVERSE_SEARCH_SOURCE_OPTIONS, STORED_QUERIES_SEARCH_SOURCE_OPTIONS, STYLE_ENGINES, SearchBarComponent, SearchPointerSummaryDirective, SearchResultAddButtonComponent, SearchResultMode, SearchResultsComponent, SearchSelectorComponent, SearchService, SearchSettingsComponent, SearchSource, SearchSourceKind, SearchSourceService, SliceControl, SourceDirectionsType, SpatialFilterItemComponent, SpatialFilterItemType, SpatialFilterListComponent, SpatialFilterQueryType, SpatialFilterService, SpatialFilterType, SpatialFilterTypeComponent, StepsFeatureStore, StopsFeatureStore, StopsStore, StoredQueriesReverseSearchSource, StoredQueriesSearchSource, StyleEngineKind, StyleModalDrawingComponent, StyleModalLayerButtonComponent, StyleModalLayerComponent, StyleService, SwipeControlComponent, TileArcGISRestDataSource, TileDebugDataSource, TileLayer, TileWatcher, TimeFilterButtonComponent, TimeFilterFormComponent, TimeFilterItemComponent, TimeFilterListBindingDirective, TimeFilterListComponent, TimeFilterService, TimeFilterStyle, TimeFilterType, TooltipType, TrackFeatureButtonComponent, TypeCapabilities, TypeCatalog, VECTOR_LAYER_EXTENSIONS, VectorLayer, VectorTileLayer, VectorWatcher, WFSDataSource, WFSService, WMSDataSource, WMTSDataSource, WORKSPACE_SEARCH_SOURCE_OPTIONS, WakeLockButtonComponent, WebSocketDataSource, WfsWorkspace, WfsWorkspaceService, WktService, WorkspaceSearchSource, WorkspaceSelectorDirective, WorkspaceUpdatorDirective, XYZDataSource, ZoomButtonComponent, addLinearRingToOlPolygon, addOrRemoveLayer, addRouteToRoutesFeatureStore, addStopToStopsFeatureStore, addStopToStore, baseOlStyle, bufferOlGeometry, buildUrl, buildWfsBatchUrls, cadastreSearchSourceFactory, checkWfsParams, clearOlGeometryMidpoints, clusterOlStyleFunction, computeBestAreaUnit, computeBestLengthUnit, computeLayerTitleFromFile, computeOlFeatureExtent, computeOlFeaturesDiff, computeOlFeaturesExtent, computeProjectionsConstraints, computeRelativePosition, computeStopsPosition, computeTermSimilarity, convertDDToDMS, createDefaultTileGrid, createDrawHoleInteractionStyle, createDrawInteractionStyle, createFilterInMapExtentOrResolutionStrategy, createInteractionStyle, createMeasureInteractionStyle, createMeasureLayerStyle, createOlTooltipAtPoint, createOlTooltipDrawAtPoint, createTableTemplate, ctrlKeyDown, defaultCoordinatesSearchResultFormatterFactory, defaultEpsg, defaultFieldNameGeometry, defaultIChercheSearchResultFormatterFactory, defaultMaxFeatures, defaultWfsVersion, detectFileEPSG, directionsStyle, doesOlGeometryIntersects, entitiesToRowData, exportToCSV, featureFromOl, featureToOl, featureToSearchResult, featuresAreOutOfView, featuresAreTooDeepInView, findDiff, findLayerByLinkId, findParentId, formatDistance, formatDuration, formatMeasure, formatScale, formatStep, formatWFSQueryString, generateArcgisRestIdFromSourceOptions, generateFeatureIdFromSourceOptions, generateId, generateIdFromSourceOptions, generateWMSIdFromSourceOptions, generateWMTSIdFromSourceOptions, generateWfsIdFromSourceOptions, generateXYZIdFromSourceOptions, getAllChildLayersByDeletion, getAllChildLayersByProperty, getFileExtension, getFilterBadge, getFormatFromOptions, getGeoServiceAction, getLayerOptionIdentifier, getLayersByDeletion, getLayersLegends, getLinkedLayersOptions, getMousePositionFromOlGeometryEvent, getOlTooltipAtCenter, getOlTooltipsAtMidpoints, getResolutionFromScale, getRootParentByDeletion, getRootParentByProperty, getRowsInMapExtent, getSaveableOgcParams, getScaleFromResolution, getSelectedOnly, getTooltipsOfOlGeometry, gmlRegex, handleFileExportError, handleFileExportSuccess, handleFileImportError, handleFileImportSuccess, handleInvalidFileImportError, handleLayerPropertyChange, handleNothingToExportError, handleNothingToImportError, handleOgreServerImportError, handleSRSImportError, handleSizeFileImportError, handleUnreadbleFileImportError, hideOlFeature, ichercheReverseSearchSourceFactory, ichercheSearchSourceFactory, ilayerSearchResultFormatterFactory, ilayerSearchSourceFactory, initRoutesFeatureStore, initStepsFeatureStore, initStopsFeatureStore, interactiveSelectionFormWidgetFactory, isAnyOlStyle, isBaseLayer, isBaseLayerLinked, isCsvExport, isEngineLayerStyle, isLayerGroup, isLayerGroupOptions, isLayerItem, isLayerItemOptions, isLayerLinked, isLayerLinkedOptions, isLayerLinkedTogether, isLinkMaster, isOlFlatStyleLike, isSaveableLayer, jsonRegex, layerFeatureIsQueryable, layerIsQueryable, lonLatConversion, mapExtentStrategyActiveToolTip, markerOlStyle, measureOlGeometry, measureOlGeometryArea, measureOlGeometryLength, mergeLayersOptions, metersToFeet, metersToKilometers, metersToMiles, metersToUnit, moveToOlFeatures, mtmZoneFromLonLat, nearTransparentOlStyle, noElementSelected, nominatimSearchSourceFactory, ogcFilterWidgetFactory, olLayerFeatureIsQueryable, olLayerIsQueryable, optionsApiFactory, osrmDirectionsSourcesFactory, provideCadastreSearchSource, provideCoordinatesReverseSearchSource, provideDefaultCoordinatesSearchResultFormatter, provideDefaultIChercheSearchResultFormatter, provideDirection, provideIChercheReverseSearchSource, provideIChercheSearchSource, provideILayerSearchResultFormatter, provideILayerSearchSource, provideInteractiveSelectionFormWidget, provideNominatimSearchSource, provideOgcFilterWidget, provideOptionsApi, provideOsrmDirectionsSource, provideQuerySearchSource, provideSearch, provideSearchSourceService, provideStoredQueriesReverseSearchSource, provideStoredQueriesSearchSource, provideStyle, provideWorkspaceSearchSource, querySearchSourceFactory, randomOlFlatStyle, removeStopFromStore, renderFeatureFromOl, roundCoordTo, roundCoordToString, scaleExtent, searchSourceServiceFactory, selectionOlStyle, setRowsInMapExtent, setSelectedOnly, sliceOlGeometry, sliceOlPolygon, sortLayersByZindex, sourceCanReverseSearch, sourceCanReverseSearchAsSummary, sourceCanSearch, squareMetersToAcres, squareMetersToHectares, squareMetersToSquareFeet, squareMetersToSquareKilometers, squareMetersToSquareMiles, squareMetersToUnit, standardizeUrl, storedqueriesReverseSearchSourceFactory, storedqueriesSearchSourceFactory, stringToLonLat, styleVariant, translateManeuverBearing, translateManeuverModifier, tryAddLoadingStrategy, tryAddSelectionStrategy, tryBindStoreLayer, updateOlGeometryCenter, updateOlGeometryMidpoints, updateOlTooltipAtCenter, updateOlTooltipDrawAtCenter, updateOlTooltipsAtMidpoints, updateOlTooltipsDrawAtMidpoints, updateStoreSorting, utmZoneFromLonLat, viewStatesAreEqual, withCadastreSource, withCoordinatesReverseSource, withGeostyler, withIChercheReverseSource, withIChercheSource, withILayerSource, withMapbox, withNominatimSource, withOsrmSource, withStoredQueriesReverseSource, withStoredQueriesSource, withWorkspaceSource, workspaceSearchSourceFactory, zoneMtm, zoneUtm };
 //# sourceMappingURL=igo2-geo.mjs.map