@igo2/geo 18.0.0-next.9 → 18.0.0

package/lib/layer/shared/layers/layer.d.ts

@@ -1,62 +1,44 @@
 import { AuthInterceptor } from '@igo2/auth';
 import { MessageService } from '@igo2/core/message';
-import { SubjectStatus } from '@igo2/utils';
-import olLayer from 'ol/layer/Layer';
-import olSource from 'ol/source/Source';
-import { BehaviorSubject, Observable, Subject } from 'rxjs';
-import { DataSource } from '../../../datasource/shared/datasources/datasource';
-import { Legend } from '../../../datasource/shared/datasources/datasource.interface';
+import OlLayer from 'ol/layer/Layer';
+import { Source } from 'ol/source';
+import { BehaviorSubject } from 'rxjs';
+import { DataSource, Legend } from '../../../datasource/shared/datasources';
 import type { MapBase } from '../../../map/shared/map.abstract';
-import { LayerOptions } from './layer.interface';
-export declare abstract class Layer {
+import { LayerBase, LayerGroupBase } from './layer-base';
+import { type LayerGroup } from './layer-group';
+import { type LayerOptions } from './layer.interface';
+import { Linked } from './linked/linked-layer';
+export declare abstract class Layer extends LayerBase {
     options: LayerOptions;
     protected messageService?: MessageService;
     protected authInterceptor?: AuthInterceptor;
-    collapsed: boolean;
     dataSource: DataSource;
+    parent: LayerGroup;
+    ol: OlLayer<Source>;
+    hasBeenVisible$: BehaviorSubject<boolean>;
     legend: Legend[];
     legendCollapsed: boolean;
-    firstLoadComponent: boolean;
-    map: MapBase;
-    ol: olLayer<olSource>;
-    olLoadingProblem: boolean;
-    status$: Subject<SubjectStatus>;
-    hasBeenVisible$: BehaviorSubject<boolean>;
-    private hasBeenVisible$$;
+    link?: Linked;
+    linkMaster?: Linked;
     private resolution$$;
-    /**
-     * Define if a layer is generated by code OR defined by layer/context user layer.
-     * Useful for filtering layers list in mapOffline.directive or in the sharemap...
-     * return false by default.
-     */
-    get isIgoInternalLayer(): boolean;
     get id(): string;
-    get alias(): string;
-    get title(): string;
-    set title(title: string);
-    get zIndex(): number;
-    set zIndex(zIndex: number);
-    get baseLayer(): boolean;
-    set baseLayer(baseLayer: boolean);
-    get opacity(): number;
-    set opacity(opacity: number);
-    set isInResolutionsRange(value: boolean);
-    get isInResolutionsRange(): boolean;
-    readonly isInResolutionsRange$: BehaviorSubject<boolean>;
-    set maxResolution(value: number);
+    get visible(): boolean;
+    set visible(value: boolean);
     get maxResolution(): number;
-    set minResolution(value: number);
+    set maxResolution(value: number);
     get minResolution(): number;
-    set visible(value: boolean);
-    get visible(): boolean;
-    readonly visible$: BehaviorSubject<boolean>;
-    get displayed(): boolean;
-    readonly displayed$: Observable<boolean>;
-    get showInLayerList(): boolean;
-    get saveableOptions(): Partial<LayerOptions>;
+    set minResolution(value: number);
+    get saveableOptions(): Partial<LayerOptions> | undefined;
     constructor(options: LayerOptions, messageService?: MessageService, authInterceptor?: AuthInterceptor);
-    protected abstract createOlLayer(): olLayer<olSource>;
-    setMap(map: MapBase | undefined): void;
+    protected abstract createOlLayer(): OlLayer<Source>;
+    init(map: MapBase): void;
+    createLink(): void;
+    remove(): void;
+    add(parent?: LayerGroupBase): void;
+    moveTo(parent?: LayerGroup): void;
+    private createLinkWithParent;
+    private findParentByLinkId;
     private showMessage;
     private observeResolution;
     private unobserveResolution;

package/lib/layer/shared/layers/layer.interface.d.ts

@@ -1,40 +1,46 @@
 import { Message } from '@igo2/core/message';
 import olLayer from 'ol/layer/Layer';
 import olSource from 'ol/source/Source';
-import { AnyDataSourceOptions } from '../../../datasource/shared/datasources/any-datasource.interface';
-import { DataSource } from '../../../datasource/shared/datasources/datasource';
-import { MapExtent } from '../../../map/shared/map.interface';
-import { LegendOptions } from './legend.interface';
-export interface LayerOptions {
+import type { AnyDataSourceOptions, DataSource } from '../../../datasource/shared/datasources';
+import type { MapExtent } from '../../../map/shared/map.interface';
+import type { LegendOptions } from './legend.interface';
+import type { LayersLink } from './linked/linked-layer.interface';
+export interface LayerOptions extends LayerOptionsBase {
     isIgoInternalLayer?: boolean;
     source?: DataSource;
     sourceOptions?: AnyDataSourceOptions;
-    title?: string;
-    id?: string;
     alias?: string;
     security?: LayerSecurityOptions;
     baseLayer?: boolean;
-    opacity?: number;
-    visible?: boolean;
-    extent?: MapExtent;
-    zIndex?: number;
     messages?: Message[];
-    minResolution?: number;
-    maxResolution?: number;
     minScaleDenom?: number;
     maxScaleDenom?: number;
-    showInLayerList?: boolean;
     removable?: boolean;
     workspace?: GeoWorkspaceOptions;
     legendOptions?: LegendOptions;
     ol?: olLayer<olSource>;
     tooltip?: TooltipContent;
     _internal?: Record<string, string>;
-    active?: boolean;
-    check?: boolean;
     linkedLayers?: LayersLink;
     showButtonZoomToExtent?: boolean;
 }
+export interface LayerOptionsBase {
+    id?: string | number;
+    /**
+     * An unique identifier calculated client side
+     * The name prop provide a way to have a unique identifier between all layers
+     **/
+    name?: string;
+    title?: string;
+    opacity?: number;
+    visible?: boolean;
+    extent?: MapExtent;
+    zIndex?: number;
+    minResolution?: number;
+    maxResolution?: number;
+    showInLayerList?: boolean;
+    parentId?: string;
+}
 export interface LayerSecurityOptions {
     profils?: string[];
 }
@@ -54,31 +60,6 @@ export interface GeoWorkspaceQueryOptions {
     mapQueryOnOpenTab?: boolean;
     tabQuery?: boolean;
 }
-export interface LayersLink {
-    linkId: string;
-    /** Default value is true */
-    showInMiniBaseMap?: boolean;
-    links?: LayersLinkProperties[];
-}
-export interface LayersLinkProperties {
-    linkedIds: string[];
-    syncedDelete: boolean;
-    properties: LinkedProperties[];
-}
-export declare enum LinkedProperties {
-    OPACITY = "opacity",
-    VISIBLE = "visible",
-    OGCFILTERS = "ogcFilters",
-    MINRESOLUTION = "minResolution",
-    MAXRESOLUTION = "maxResolution",
-    ZINDEX = "zIndex",
-    TIMEFILTER = "timeFilter"
-}
-export interface GroupLayers {
-    title: string;
-    layers?: LayerOptions;
-    collapsed?: boolean;
-}
 export interface TooltipContent {
     type?: TooltipType;
     text?: string;
@@ -88,3 +69,4 @@ export declare enum TooltipType {
     ABSTRACT = "abstract",
     CUSTOM = "custom"
 }
+export type LayerType = 'vector' | 'raster' | 'group';

package/lib/layer/shared/layers/linked/index.d.ts

@@ -0,0 +1,3 @@
+export * from './linked-layer';
+export * from './linked-layer.interface';
+export * from './linked-layer.utils';

package/lib/layer/shared/layers/linked/linked-layer.d.ts

@@ -0,0 +1,35 @@
+import type { LayerController } from '../../layer-controller';
+import type { Layer } from '../layer';
+import type { LayerGroup } from '../layer-group';
+import { LayersLinkProperties } from './linked-layer.interface';
+export declare class Linked {
+    layer: Layer;
+    private children;
+    private watcher;
+    private bidirectionnalChildren;
+    private childrenByProperty;
+    private disabledProperties;
+    constructor(layer: Layer);
+    get options(): import("@igo2/geo").LayerOptions;
+    get links(): LayersLinkProperties[];
+    get map(): import("@igo2/geo").MapBase;
+    init(): void;
+    private initZIndexLinkOptions;
+    destroy(): void;
+    add(layer: Layer): void;
+    hasSyncDeletion(layer: Layer): boolean;
+    remove(layer: Layer): void;
+    deleteChildren(controller: LayerController): void;
+    move(layer: Layer, parent?: LayerGroup): void;
+    private disable;
+    private enable;
+    private getByProperty;
+    private propertyIsDisabled;
+    private getLayerLinks;
+    private removeArrayItem;
+    private getLinkedLayersOnZindex;
+    private unwatch;
+    private handleChange;
+    private handleDisplayChange;
+    private findChildren;
+}

package/lib/layer/shared/layers/linked/linked-layer.interface.d.ts

@@ -0,0 +1,32 @@
+import type { AnyLayer } from '../any-layer';
+import type { Layer } from '../layer';
+export type AnyPropertyOptions = ZindexPropertyOptions | BasePropertyOptions;
+export interface ZindexPropertyOptions extends BasePropertyOptions {
+    initialOrder: AnyLayer[];
+}
+interface BasePropertyOptions {
+    layers: Layer[];
+}
+export interface LayersLink {
+    linkId: string;
+    /** Default value is true */
+    showInMiniBaseMap?: boolean;
+    links?: LayersLinkProperties[];
+}
+export interface LayersLinkProperties {
+    bidirectionnal?: boolean;
+    linkedIds: string[];
+    syncedDelete: boolean;
+    properties: LinkedProperties[];
+}
+export declare enum LinkedProperties {
+    OPACITY = "opacity",
+    VISIBLE = "visible",
+    DISPLAYED = "displayed",
+    OGCFILTERS = "ogcFilters",
+    MINRESOLUTION = "minResolution",
+    MAXRESOLUTION = "maxResolution",
+    ZINDEX = "zIndex",
+    TIMEFILTER = "timeFilter"
+}
+export {};

package/lib/layer/shared/layers/linked/linked-layer.utils.d.ts

@@ -0,0 +1,9 @@
+import type { AnyLayer } from '../any-layer';
+import type { AnyLayerItemOptions, AnyLayerOptions } from '../any-layer.interface';
+import type { Layer } from '../layer';
+import type { LinkedProperties } from './linked-layer.interface';
+export declare function isLayerLinked(layer: AnyLayer): layer is Layer;
+export declare function isLinkMaster(layer: Layer): boolean;
+export declare function isLayerLinkedTogether(layerA: AnyLayer, layerB: AnyLayer, layers: AnyLayer[], property?: LinkedProperties): boolean;
+export declare function isLayerLinkedOptions(options: AnyLayerOptions): options is AnyLayerItemOptions;
+export declare function isBaseLayerLinked(layer: AnyLayer, allLayers: AnyLayer[]): layer is Layer;

package/lib/layer/shared/layers/tile-layer.d.ts

@@ -8,12 +8,14 @@ import { TileArcGISRestDataSource } from '../../../datasource/shared/datasources
 import { TileDebugDataSource } from '../../../datasource/shared/datasources/tiledebug-datasource';
 import { WMTSDataSource } from '../../../datasource/shared/datasources/wmts-datasource';
 import { XYZDataSource } from '../../../datasource/shared/datasources/xyz-datasource';
-import type { IgoMap } from '../../../map/shared/map';
+import type { MapBase } from '../../../map/shared/map.abstract';
 import { Layer } from './layer';
+import { LayerType } from './layer.interface';
 import { TileLayerOptions } from './tile-layer.interface';
 export declare class TileLayer extends Layer {
     messageService?: MessageService;
     authInterceptor?: AuthInterceptor;
+    type: LayerType;
     dataSource: OSMDataSource | WMTSDataSource | XYZDataSource | TileDebugDataSource | CartoDataSource | TileArcGISRestDataSource;
     options: TileLayerOptions;
     ol: olLayerTile<olSourceTile>;
@@ -27,5 +29,6 @@ export declare class TileLayer extends Layer {
      * @param url the url string or function to retrieve the data
      */
     customLoader(tile: any, url: string, interceptor: AuthInterceptor): void;
-    setMap(map: IgoMap | undefined): void;
+    init(map: MapBase | undefined): void;
+    remove(): void;
 }

package/lib/layer/shared/layers/vector-layer.d.ts

@@ -11,11 +11,13 @@ import { FeatureDataSource } from '../../../datasource/shared/datasources/featur
 import { WebSocketDataSource } from '../../../datasource/shared/datasources/websocket-datasource';
 import { WFSDataSource } from '../../../datasource/shared/datasources/wfs-datasource';
 import { WFSDataSourceOptions } from '../../../datasource/shared/datasources/wfs-datasource.interface';
-import type { IgoMap, MapExtent } from '../../../map/shared';
+import type { MapBase } from '../../../map/shared/map.abstract';
+import { MapExtent } from '../../../map/shared/map.interface';
 import { GeoDBService } from '../../../offline/geoDB/geoDB.service';
 import { LayerDBService } from '../../../offline/layerDB/layerDB.service';
 import { GeoNetworkService } from '../../../offline/shared/geo-network.service';
 import { Layer } from './layer';
+import { LayerType } from './layer.interface';
 import type { VectorLayerOptions } from './vector-layer.interface';
 export declare class VectorLayer extends Layer {
     messageService?: MessageService;
@@ -23,6 +25,7 @@ export declare class VectorLayer extends Layer {
     private geoNetworkService?;
     geoDBService?: GeoDBService;
     layerDBService?: LayerDBService;
+    type: LayerType;
     private previousLoadExtent;
     private previousLoadResolution;
     private previousOgcFilters;
@@ -36,11 +39,12 @@ export declare class VectorLayer extends Layer {
     get exportable(): boolean;
     constructor(options: VectorLayerOptions, messageService?: MessageService, authInterceptor?: AuthInterceptor, geoNetworkService?: GeoNetworkService, geoDBService?: GeoDBService, layerDBService?: LayerDBService);
     protected createOlLayer(): olLayerVector<olSourceVector>;
-    removeLayerFromIDB(): void;
+    remove(): void;
+    private removeLayerFromIDB;
     private maintainOptionsInIdb;
     private maintainFeaturesInIdb;
     protected flash(feature: any): void;
-    setMap(map: IgoMap | undefined): void;
+    init(map: MapBase | undefined): void;
     setExtent(extent: MapExtent): void;
     onUnwatch(): void;
     stopAnimation(): void;

package/lib/layer/shared/layers/vectortile-layer.d.ts

@@ -2,12 +2,14 @@ import { AuthInterceptor } from '@igo2/auth';
 import { MessageService } from '@igo2/core/message';
 import olLayerVectorTile from 'ol/layer/VectorTile';
 import { MVTDataSource } from '../../../datasource/shared/datasources/mvt-datasource';
-import type { IgoMap } from '../../../map/shared/map';
+import type { MapBase } from '../../../map/shared/map.abstract';
 import { Layer } from './layer';
+import { LayerType } from './layer.interface';
 import { VectorTileLayerOptions } from './vectortile-layer.interface';
 export declare class VectorTileLayer extends Layer {
     messageService?: MessageService;
     authInterceptor?: AuthInterceptor;
+    type: LayerType;
     dataSource: MVTDataSource;
     options: VectorTileLayerOptions;
     ol: olLayerVectorTile;
@@ -24,5 +26,6 @@ export declare class VectorTileLayer extends Layer {
      * @param failure On failure event action to trigger TODO
      */
     customLoader(url: any, format: any, interceptor: any, success: any, failure?: any): (extent: any, resolution: any, projection: any) => void;
-    setMap(map: IgoMap | undefined): void;
+    init(map: MapBase | undefined): void;
+    remove(): void;
 }

package/lib/layer/utils/layer.utils.d.ts

@@ -1,2 +1,12 @@
-import { AnyLayerOptions } from '../shared/layers/any-layer.interface';
-export declare function computeMVTOptionsOnHover(layerOptions: AnyLayerOptions): AnyLayerOptions;
+import type { AnyLayer, AnyLayerItemOptions, AnyLayerOptions, Layer, LayerGroup, LayerGroupOptions } from '../shared/layers';
+type SortDirection = 'asc' | 'desc';
+export declare function isLayerGroupOptions(option: AnyLayerOptions): option is LayerGroupOptions;
+export declare function isLayerItemOptions(options: AnyLayerOptions): options is AnyLayerItemOptions;
+export declare function isLayerGroup(layer: AnyLayer): layer is LayerGroup;
+export declare function isLayerItem(layer: AnyLayer): layer is Layer;
+export declare function isBaseLayer(layer: AnyLayer): layer is Layer;
+export declare function computeMVTOptionsOnHover(layerOptions: AnyLayerItemOptions): AnyLayerItemOptions;
+export declare function isSaveableLayer(layer: Layer): boolean;
+/** Recursive */
+export declare function sortLayersByZindex(layers: AnyLayer[], direction: SortDirection): AnyLayer[];
+export {};

package/lib/layer/utils/outputLegend.d.ts

@@ -1,7 +1,7 @@
-import { Layer } from '../shared/layers/layer';
+import { AnyLayer } from '../shared';
 import { OutputLayerLegend } from '../shared/layers/legend.interface';
 /**
  * Get all the layers legend
  * @return Array of legend
  */
-export declare function getLayersLegends(layers: Layer[]): OutputLayerLegend[];
+export declare function getLayersLegends(layers: AnyLayer[]): OutputLayerLegend[];

package/lib/map/shared/controllers/geolocation.interface.d.ts

@@ -1,3 +1,4 @@
+import { Coordinate } from 'ol/coordinate';
 import { ProjectionLike } from 'ol/proj';
 export interface GeolocationOptions {
     activateDefault?: boolean;
@@ -14,7 +15,7 @@ export interface MapGeolocationControllerOptions {
     buffer?: GeolocationBuffer;
 }
 export interface MapGeolocationState {
-    position: number[];
+    position: Coordinate;
     projection: string;
     accuracy: number;
     altitude: number;

package/lib/map/shared/hover-feature.directive.d.ts

@@ -25,7 +25,6 @@ export declare class HoverFeatureDirective implements OnInit, OnDestroy {
     private pointerHoverFeatureStore;
     private lastTimeoutRequest;
     private store$$;
-    private layers$$;
     private selectionLayer;
     private selectionMVT;
     private mvtStyleOptions;

package/lib/map/shared/linkedLayers.utils.d.ts

@@ -1,17 +1,13 @@
-import { ObjectEvent } from 'ol/Object';
-import { Layer, LinkedProperties } from '../../layer/shared/layers';
-import type { MapBase } from '../shared/map.abstract';
-export declare function getLinkedLayersOptions(layer: Layer): import("../../layer/shared/layers").LayersLink;
-export declare function getIgoLayerByLinkId(map: MapBase, id: string): Layer;
-export declare function layerHasLinkWithProperty(layer: Layer, property: LinkedProperties): boolean;
-export declare function layerHasLinkDeletion(layer: Layer): boolean;
-export declare function getRootParentByProperty(map: MapBase, layer: Layer, property: LinkedProperties): Layer;
-export declare function getDirectParentLayerByProperty(map: MapBase, layer: Layer, property: LinkedProperties): Layer;
-export declare function getDirectChildLayersByProperty(map: MapBase, layer: Layer, property: LinkedProperties): Layer[];
-export declare function getAllChildLayersByProperty(map: MapBase, layer: Layer, knownChildLayers: Layer[], property: LinkedProperties): Layer[];
-export declare function getRootParentByDeletion(map: MapBase, layer: Layer): Layer;
-export declare function getDirectParentLayerByDeletion(map: MapBase, layer: Layer): Layer;
-export declare function getDirectChildLayersByDeletion(map: MapBase, layer: Layer): Layer[];
-export declare function getAllChildLayersByDeletion(map: MapBase, layer: Layer, knownChildLayers: Layer[]): Layer[];
-export declare function initLayerSyncFromRootParentLayers(map: MapBase, layers: Layer[]): void;
-export declare function handleLayerPropertyChange(map: MapBase, propertyChange: ObjectEvent, initiatorIgoLayer: Layer): void;
+import type { AnyLayer } from '../../layer/shared/layers/any-layer';
+import type { Layer } from '../../layer/shared/layers/layer';
+import { LayersLinkProperties, LinkedProperties } from '../../layer/shared/layers/linked/linked-layer.interface';
+import { MapViewController } from '../../map/shared/controllers/view';
+import { LayerWatcherChange } from '../utils/layer-watcher';
+export declare function getRootParentByProperty(layers: AnyLayer[], layer: Layer, property: LinkedProperties): Layer;
+export declare function getAllChildLayersByProperty(layers: AnyLayer[], layer: Layer, knownChildLayers: AnyLayer[], property: LinkedProperties): AnyLayer[];
+export declare function getRootParentByDeletion(layer: Layer, layers: AnyLayer[]): Layer;
+export declare function getAllChildLayersByDeletion(layers: Layer[], layer: Layer, knownChildLayers: Layer[]): Layer[];
+export declare function getLinkedLayersOptions(layer: Layer): import("../../layer/shared/layers/linked/linked-layer.interface").LayersLink;
+export declare function findLayerByLinkId(layers: Layer[], id: string): Layer;
+export declare function getLayersByDeletion(layers: Layer[], links: LayersLinkProperties[]): Layer[];
+export declare function handleLayerPropertyChange(layers: AnyLayer[], change: LayerWatcherChange, viewController: MapViewController): void;

package/lib/map/shared/map.abstract.d.ts

@@ -1,25 +1,21 @@
 import { SubjectStatus } from '@igo2/utils';
-import { ObjectEvent } from 'ol/Object';
-import { Layer as OlLayer } from 'ol/layer';
 import { Projection } from 'ol/proj';
-import { Source } from 'ol/source';
 import { Map } from 'ol';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { FeatureDataSource } from '../../datasource/shared/datasources';
-import { Layer } from '../../layer/shared/layers/layer';
+import { LayerController } from '../../layer/shared/layer-controller';
+import type { AnyLayer } from '../../layer/shared/layers/any-layer';
+import type { Layer } from '../../layer/shared/layers/layer';
 import { Overlay } from '../../overlay/shared/overlay';
 import { MapGeolocationController, MapViewController } from '../shared/controllers';
-import { MapControlsOptions, MapExtent, MapViewOptions } from '../shared/map.interface';
+import { MapControlsOptions, MapExtent, MapOptions, MapViewOptions } from '../shared/map.interface';
+import { LayerWatcher, LayerWatcherChange } from '../utils';
 export declare abstract class MapBase {
     ol: Map;
     forcedOffline$: BehaviorSubject<boolean>;
-    layers$: BehaviorSubject<Layer[]>;
-    layersAddedByClick$: BehaviorSubject<Layer[]>;
+    layersAddedByClick$: BehaviorSubject<AnyLayer[]>;
     status$: Subject<SubjectStatus>;
-    propertyChange$: Subject<{
-        event: ObjectEvent;
-        layer: Layer;
-    }>;
+    propertyChange$: Subject<LayerWatcherChange>;
     overlay: Overlay;
     queryResultsOverlay: Overlay;
     searchResultsOverlay: Overlay;
@@ -29,11 +25,12 @@ export declare abstract class MapBase {
     mapCenter$: BehaviorSubject<boolean>;
     selectedFeatures$: BehaviorSubject<Layer[]>;
     bufferDataSource: FeatureDataSource;
-    layers: Layer[];
+    layerWatcher: LayerWatcher;
+    readonly options: MapOptions;
+    layerController: LayerController;
     projection: string;
     viewProjection: Projection;
     projectionCode: string;
-    abstract init(): void;
     abstract setTarget(id: string): void;
     abstract updateView(options: MapViewOptions): void;
     abstract setView(options: MapViewOptions): void;
@@ -41,20 +38,6 @@ export declare abstract class MapBase {
     abstract getCenter(projection?: string | Projection): [number, number];
     abstract getExtent(projection?: string | Projection): MapExtent;
     abstract getZoom(): number;
-    abstract changeBaseLayer(baseLayer: Layer): void;
-    abstract getBaseLayers(): Layer[];
-    abstract getLayerById(id: string): Layer | undefined;
-    abstract getLayerByAlias(alias: string): Layer;
-    abstract getLayerByOlUId(olUId: string): Layer;
-    abstract getLayerByOlLayer(olLayer: OlLayer<Source>): Layer;
-    abstract addLayer(layer: Layer, push: boolean): void;
-    abstract addLayers(layers: Layer[], push?: boolean): void;
-    abstract removeLayer(layer: Layer): void;
-    abstract removeLayers(layers: Layer[]): void;
-    abstract removeAllLayers(): void;
-    abstract raiseLayer(layer: Layer): void;
-    abstract raiseLayers(layers: Layer[]): void;
-    abstract lowerLayer(layer: Layer): void;
-    abstract lowerLayers(layers: Layer[]): void;
-    abstract moveLayer(layer: Layer, from: number, to: number): void;
+    /** @deprecated find a way to remove this method. For now we discourage to use it until we find the way to remove it */
+    abstract getLayerByOlUId(olUId: string): AnyLayer;
 }

package/lib/map/shared/map.d.ts

@@ -2,15 +2,14 @@ import { ConfigService } from '@igo2/core/config';
 import { StorageService } from '@igo2/core/storage';
 import { SubjectStatus } from '@igo2/utils';
 import olMap from 'ol/Map';
-import { ObjectEvent } from 'ol/Object';
-import olLayer from 'ol/layer/Layer';
 import * as olproj from 'ol/proj';
 import OlProjection from 'ol/proj/Projection';
-import olSource from 'ol/source/Source';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { FeatureDataSource } from '../../datasource/shared/datasources/feature-datasource';
-import type { Layer } from '../../layer/shared/layers';
+import { LayerController } from '../../layer';
+import type { AnyLayer, Layer } from '../../layer/shared/layers';
 import { Overlay } from '../../overlay/shared/overlay';
+import { LayerWatcher, LayerWatcherChange } from '../utils/layer-watcher';
 import { MapGeolocationController } from './controllers/geolocation';
 import { MapViewController } from './controllers/view';
 import type { MapBase } from './map.abstract';
@@ -20,27 +19,23 @@ export declare class IgoMap implements MapBase {
     private configService?;
     ol: olMap;
     forcedOffline$: BehaviorSubject<boolean>;
-    layers$: BehaviorSubject<Layer[]>;
-    layersAddedByClick$: BehaviorSubject<Layer[]>;
+    layersAddedByClick$: BehaviorSubject<AnyLayer[]>;
     status$: Subject<SubjectStatus>;
-    propertyChange$: Subject<{
-        event: ObjectEvent;
-        layer: Layer;
-    }>;
+    propertyChange$: Subject<LayerWatcherChange>;
     overlay: Overlay;
     queryResultsOverlay: Overlay;
     searchResultsOverlay: Overlay;
     viewController: MapViewController;
+    layerController: LayerController;
     geolocationController: MapGeolocationController;
     swipeEnabled$: BehaviorSubject<boolean>;
     mapCenter$: BehaviorSubject<boolean>;
     selectedFeatures$: BehaviorSubject<Layer[]>;
     bufferDataSource: FeatureDataSource;
-    private layerWatcher;
-    private options;
+    layerWatcher: LayerWatcher;
+    readonly options: MapOptions;
     private mapViewOptions;
     private defaultOptions;
-    get layers(): Layer[];
     /** @deprecated use projectionCode */
     get projection(): string;
     get viewProjection(): olproj.Projection;
@@ -70,76 +65,6 @@ export declare class IgoMap implements MapBase {
      * TODO: Move to ViewController and update every place it's used
      */
     getZoom(): number;
-    changeBaseLayer(baseLayer: Layer): void;
-    getBaseLayers(): Layer[];
-    getLayerById(id: string): Layer;
-    getLayerByAlias(alias: string): Layer;
-    getLayerByOlUId(olUId: string): Layer;
-    getLayerByOlLayer(olLayer: olLayer<olSource>): Layer;
-    /**
-     * Add a single layer
-     * @param layer Layer to add
-     * @param push DEPRECATED
-     */
-    addLayer(layer: Layer): void;
-    /**
-     * Add many layers
-     * @param layers Layers to add
-     * @param push DEPRECATED
-     */
-    addLayers(layers: Layer[]): void;
-    /**
-     * Remove a single layer
-     * @param layer Layer to remove
-     */
-    removeLayer(layer: Layer): void;
-    /**
-     * Remove many layers
-     * @param layers Layers to remove
-     */
-    removeLayers(layers: Layer[]): void;
-    /**
-     * Build a list of linked layers to delete
-     * @param srcLayer Layer that has triggered the deletion
-     * @param layersToRemove list to append the layer to delete into
-     */
-    handleLinkedLayersDeletion(srcLayer: Layer, layersToRemove: Layer[]): void;
-    /**
-     * Remove all layers
-     */
-    removeAllLayers(): void;
-    raiseLayer(layer: Layer): void;
-    raiseLayers(layers: Layer[]): void;
-    lowerLayer(layer: Layer): void;
-    lowerLayers(layers: Layer[]): void;
-    moveLayer(layer: Layer, from: number, to: number): void;
-    /**
-     * Add a layer to the OL map and start watching. If the layer is already
-     * added to this map, make it visible but don't add it one again.
-     * @param layer Layer
-     * @returns The layer added, if any
-     */
-    private doAddLayer;
-    /**
-     * Remove a layer from the OL map and stop watching
-     * @param layer Layer
-     */
-    private doRemoveLayer;
-    /**
-     * Update the layers observable
-     * @param layers Layers
-     */
-    private setLayers;
-    /**
-     * Sort layers by descending zIndex
-     * @param layers Array of layers
-     * @returns The original array, sorted by zIndex
-     */
-    private sortLayersByZIndex;
-    /**
-     * Get layer index in the map's inenr array of layers
-     * @param layer Layer
-     * @returns The layer index
-     */
-    private getLayerIndex;
+    /** @deprecated find a way to remove this method. For now we discourage to use it until we find the way to remove it */
+    getLayerByOlUId(olUId: string): AnyLayer;
 }

package/lib/map/shared/map.service.d.ts

@@ -1,4 +1,4 @@
-import { IgoMap } from './map';
+import type { IgoMap } from './map';
 import * as i0 from "@angular/core";
 /**
  * MapService