Merge branch 'feature/layer-group-from-msp' of https://github.com/inf…

…ra-geo-ouverte/igo2-lib into feature/layer-group-from-msp

packages/common/drag-drop/src/tree-drag-drop/tree-drag-drop.directive.ts

@@ -23,6 +23,7 @@ import {
   TreeFlatNode
 } from './tree-drag-drop.interface';
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export interface TreeDropEvent<T = any> {
   node: TreeFlatNode<T>;
   ref: TreeFlatNode<T>;
@@ -79,11 +80,11 @@ export class TreeDragDropDirective implements AfterContentInit, OnDestroy {
   // eslint-disable-next-line @angular-eslint/no-output-on-prefix
   @Output() onDropError = new EventEmitter<DropPermission>();
 
-  @HostListener('dragover', ['$event']) hostDragOver(event: any): void {
+  @HostListener('dragover', ['$event']) hostDragOver(event: Event): void {
     event.preventDefault();
   }
 
-  @HostListener('drop', ['$event']) hostDrop(event: any): void {
+  @HostListener('drop', ['$event']) hostDrop(event: DragEvent): void {
     this.drop(event);
   }
 

packages/common/src/locale/en.common.json

@@ -12,7 +12,7 @@
       "dragDrop": {
         "cannot": {
           "dropInsideItself": "Unable to move the item inside itself",
-          "maxLevel": "The maximum hierarchical level is {{value}}"
+          "maxLevel": "The maximum hierarchical level is reached ({{value}})"
         }
       },
       "selectValueDialog": {

packages/common/src/locale/fr.common.json

@@ -12,7 +12,7 @@
       "dragDrop": {
         "cannot": {
           "dropInsideItself": "Impossible de bouger l'item à l'intérieur de lui même",
-          "maxLevel": "Le maximum de niveau hiérarchique est de {{value}}"
+          "maxLevel": "Le maximum de niveau hiérarchique est atteint ({{value}})"
         }
       },
       "selectValueDialog": {

packages/context/src/lib/context-import-export/context-import-export/context-import-export.component.ts

@@ -1,5 +1,5 @@
 import { AsyncPipe, NgFor, NgIf } from '@angular/common';
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import {
   FormsModule,
   ReactiveFormsModule,
@@ -21,8 +21,8 @@ import { IgoLanguageModule } from '@igo2/core/language';
 import { MessageService } from '@igo2/core/message';
 import { type AnyLayer, type IgoMap, VectorLayer } from '@igo2/geo';
 
-import { BehaviorSubject, Subscription } from 'rxjs';
-import { filter, take } from 'rxjs/operators';
+import { BehaviorSubject } from 'rxjs';
+import { take } from 'rxjs/operators';
 
 import { DetailedContext } from '../../context-manager/shared/context.interface';
 import { ContextService } from '../../context-manager/shared/context.service';
@@ -57,21 +57,19 @@ import {
     IgoLanguageModule
   ]
 })
-export class ContextImportExportComponent implements OnInit, OnDestroy {
+export class ContextImportExportComponent implements OnInit {
   public form: UntypedFormGroup;
   public layers: VectorLayer[];
   public inputProj = 'EPSG:4326';
   public loading$ = new BehaviorSubject(false);
   public forceNaming = false;
   public layerList: AnyLayer[];
-  public userControlledLayerList: AnyLayer[];
+  public userControlledLayerList: readonly AnyLayer[];
   public res: DetailedContext;
   private clientSideFileSizeMax: number;
   public fileSizeMb: number;
   public activeImportExport = 'import';
 
-  private layers$$: Subscription;
-
   @Input() map: IgoMap;
 
   constructor(
@@ -92,12 +90,9 @@ export class ContextImportExportComponent implements OnInit, OnDestroy {
     this.clientSideFileSizeMax =
       (configFileSizeMb ? configFileSizeMb : 30) * Math.pow(1024, 2);
     this.fileSizeMb = this.clientSideFileSizeMax / Math.pow(1024, 2);
-    this.layers$$ = this.map.layerController.layers$
-      .pipe(filter((layers) => !!layers))
-      .subscribe((layers) => {
-        this.layerList = layers;
-        this.userControlledLayerList = layers;
-      });
+
+    this.layerList = this.map.layerController.all;
+    this.userControlledLayerList = this.map.layerController.treeLayers;
   }
 
   importFiles(files: File[]) {
@@ -180,8 +175,4 @@ export class ContextImportExportComponent implements OnInit, OnDestroy {
   onImportExportChange(event) {
     this.activeImportExport = event.value;
   }
-
-  ngOnDestroy(): void {
-    this.layers$$.unsubscribe();
-  }
 }

packages/context/src/lib/context-import-export/shared/context-import.utils.ts

@@ -177,7 +177,7 @@ export function addImportedFeaturesToMap(
     visible: extraFeatures.visible,
     opacity: extraFeatures.opacity
   });
-  map.addLayer(layer);
+  map.layerController.add(layer);
 
   return layer;
 }
@@ -268,7 +268,7 @@ export function addImportedFeaturesStyledToMap(
     opacity: extraFeatures.opacity,
     visible: extraFeatures.visible
   });
-  map.addLayer(layer);
+  map.layerController.add(layer);
 
   return layer;
 }

packages/context/src/lib/context-manager/shared/context.service.ts

@@ -8,7 +8,7 @@ import { LanguageService } from '@igo2/core/language';
 import { Message, MessageService } from '@igo2/core/message';
 import { RouteService } from '@igo2/core/route';
 import { StorageService } from '@igo2/core/storage';
-import type { AnyLayer, Layer, MapBase } from '@igo2/geo';
+import type { AnyLayer, IgoMap, Layer } from '@igo2/geo';
 import { ExportService, isLayerGroup } from '@igo2/geo';
 import { ObjectUtils, uuid } from '@igo2/utils';
 
@@ -434,7 +434,7 @@ export class ContextService {
     this.editedContext$.next(context);
   }
 
-  getContextFromMap(igoMap: MapBase, empty?: boolean): DetailedContext {
+  getContextFromMap(igoMap: IgoMap, empty?: boolean): DetailedContext {
     const view = igoMap.ol.getView();
     const proj = view.getProjection().getCode();
     const center = new olPoint(view.getCenter()).transform(proj, 'EPSG:4326');
@@ -480,7 +480,7 @@ export class ContextService {
   }
 
   getContextFromLayers(
-    igoMap: MapBase,
+    igoMap: IgoMap,
     layers: AnyLayer[],
     name: string,
     keepCurrentView?: boolean
@@ -633,7 +633,7 @@ export class ContextService {
     }
   }
 
-  getContextLayers(map: MapBase) {
+  getContextLayers(map: IgoMap) {
     return map.layerController.treeLayers;
   }
 

packages/context/src/lib/context-manager/shared/layer-context.directive.ts

@@ -81,7 +81,7 @@ export class LayerContextDirective implements OnInit, OnDestroy {
     if (this.removeLayersOnContextChange === true) {
       this.map.layerController.reset();
     } else {
-      this.map.removeLayer(...this.contextLayers);
+      this.map.layerController.remove(...this.contextLayers);
     }
     this.contextLayers = [];
     this.layerService.unavailableLayers = [];
@@ -139,7 +139,7 @@ export class LayerContextDirective implements OnInit, OnDestroy {
 
     const layersSorted = sortLayersByZindex(layersFiltrered, 'asc');
     this.contextLayers.concat(layersSorted);
-    this.map.addLayer(...layersSorted);
+    this.map.layerController.add(...layersSorted);
   }
 
   private computeLayerVisibilityFromUrl(layer: AnyLayer): boolean {

packages/geo/src/lib/catalog/catalog-browser/catalog-browser-layer.component.ts

@@ -257,7 +257,7 @@ export class CatalogBrowserLayerComponent implements OnInit, OnDestroy {
 
   isVisible() {
     if (this.layer?.id) {
-      const layer = this.map.layerController.getBySourceId(this.layer?.id);
+      const layer = this.map.layerController.getById(this.layer?.id);
       this.isVisible$.next(layer?.displayed);
     }
   }

packages/geo/src/lib/catalog/catalog-browser/catalog-browser.component.ts

@@ -197,7 +197,7 @@ export class CatalogBrowserComponent implements OnInit, OnDestroy {
         this.map.layersAddedByClick$.next(layers);
       }
       this.store.state.updateMany(catalogLayers, { added: true });
-      this.map.addLayer(...layers.filter(Boolean));
+      this.map.layerController.add(...layers.filter(Boolean));
     });
   }
 
@@ -209,14 +209,16 @@ export class CatalogBrowserComponent implements OnInit, OnDestroy {
     layers.forEach((layer: CatalogItemLayer) => {
       this.store.state.update(layer, { added: false });
       if (layer.options.baseLayer === true) {
-        const currLayer = this.map.getLayerById(String(layer.options.id));
+        const currLayer = this.map.layerController.getById(
+          String(layer.options.id)
+        );
         if (currLayer !== undefined) {
-          this.map.removeLayer(currLayer);
+          this.map.layerController.remove(currLayer);
         }
       } else {
-        const currLayer = this.map.layerController.getBySourceId(layer.id);
+        const currLayer = this.map.layerController.getById(layer.id);
         if (currLayer !== undefined) {
-          this.map.removeLayer(currLayer);
+          this.map.layerController.remove(currLayer);
         }
       }
     });

packages/geo/src/lib/datasource/shared/capabilities.service.ts

@@ -16,6 +16,10 @@ import {
   TimeFilterStyle,
   TimeFilterType
 } from '../../filter/shared/time-filter.enum';
+import type {
+  ItemStyleOptions,
+  LegendOptions
+} from '../../layer/shared/layers/legend.interface';
 import { MapService } from '../../map/shared/map.service';
 import { getResolutionFromScale } from '../../map/shared/map.utils';
 import {
@@ -34,9 +38,6 @@ import { TileArcGISRestDataSourceOptions } from './datasources/tilearcgisrest-da
 import { WMSDataSourceOptions } from './datasources/wms-datasource.interface';
 import { WMTSDataSourceOptions } from './datasources/wmts-datasource.interface';
 
-type ItemStyleOptions = any;
-type LegendOptions = any;
-
 @Injectable({
   providedIn: 'root'
 })

packages/geo/src/lib/datasource/shared/datasources/wfs-datasource.interface.ts

@@ -1,5 +1,5 @@
-import { OgcFiltersOptions } from '../../../filter';
-import { FeatureDataSourceOptions } from './feature-datasource.interface';
+import type { OgcFiltersOptions } from '../../../filter';
+import type { FeatureDataSourceOptions } from './feature-datasource.interface';
 
 export interface WFSDataSourceOptions extends FeatureDataSourceOptions {
   // type?: 'wfs';

packages/geo/src/lib/datasource/shared/datasources/wms-datasource.interface.ts

@@ -1,9 +1,9 @@
 import type { ServerType } from 'ol/source/wms';
 
-import { OgcFiltersOptions } from '../../../filter';
-import { TimeFilterOptions } from '../../../filter/shared/time-filter.interface';
-import { DataSourceOptions } from './datasource.interface';
-import { WFSDataSourceOptionsParams } from './wfs-datasource.interface';
+import type { OgcFiltersOptions } from '../../../filter';
+import type { TimeFilterOptions } from '../../../filter/shared/time-filter.interface';
+import type { DataSourceOptions } from './datasource.interface';
+import type { WFSDataSourceOptionsParams } from './wfs-datasource.interface';
 
 export interface WMSDataSourceOptions extends DataSourceOptions {
   // type?: 'wms';

packages/geo/src/lib/datasource/shared/options/options-api.service.ts

@@ -5,7 +5,6 @@ import { Observable, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import {
-  AnyDataSourceOptions,
   ArcGISRestDataSourceOptions,
   ArcGISRestImageDataSourceOptions,
   TileArcGISRestDataSourceOptions,
@@ -125,21 +124,4 @@ export class OptionsApiService extends OptionsService {
       )
     );
   }
-
-  private handleSourceOptions<T extends AnyDataSourceOptions>(res: {
-    sourceOptions: T;
-    layerOptions: Record<string, string>;
-  }): T {
-    if (!res || !res.sourceOptions) {
-      return {} as T;
-    }
-    if (res.layerOptions) {
-      res.sourceOptions._layerOptionsFromSource = res.layerOptions;
-    } else {
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      const { sourceOptions, layerOptions, ...restOptions } = res;
-      res.sourceOptions._layerOptionsFromSource = restOptions;
-    }
-    return res.sourceOptions;
-  }
 }

packages/geo/src/lib/feature/shared/feature-store.utils.ts

@@ -15,7 +15,7 @@ export function tryBindStoreLayer(
 ): VectorLayer {
   if (store.layer !== undefined) {
     if (!store.map.layerController.getById(store.layer.id)) {
-      store.map.addLayer(store.layer);
+      store.map.layerController.add(store.layer);
     }
     return store.layer;
   }
@@ -27,7 +27,7 @@ export function tryBindStoreLayer(
       });
   store.bindLayer(layer);
   if (!store.map.layerController.getById(store.layer.id)) {
-    store.map.addLayer(store.layer);
+    store.map.layerController.add(store.layer);
   }
 
   return layer;

packages/geo/src/lib/feature/shared/strategies/selection.ts

@@ -471,6 +471,6 @@ export class FeatureStoreSelectionStrategy extends EntityStoreStrategy {
    */
   private removeOverlayLayer() {
     this.overlayStore.source.ol.clear();
-    this.map.removeLayer(this.overlayStore.layer);
+    this.map.layerController.remove(this.overlayStore.layer);
   }
 }

packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.ts

@@ -77,7 +77,7 @@ export class TimeFilterFormComponent implements OnInit {
   public startListYears: string[] = [];
   public endListYears: string[] = [];
 
-  public interval: any;
+  public interval: number;
   public playIcon = 'play-circle';
   public resetIcon = 'replay';
 
@@ -383,7 +383,7 @@ export class TimeFilterFormComponent implements OnInit {
       this.stopFilter();
     } else {
       this.playIcon = 'pause_circle';
-      this.interval = setInterval(
+      this.interval = window.setInterval(
         (that) => {
           let newMinDateNumber;
           const maxDateNumber = new Date(that.max);

packages/geo/src/lib/geometry/shared/controls/modify.ts

@@ -274,6 +274,7 @@ export class ModifyControl {
       return;
     }
 
+    this.deactivateModifyInteraction();
     this.deactivateModifyInteraction();
     this.olModifyInteraction = undefined;
   }