@igo2/geo 18.0.0-next.1 → 18.0.0-next.10

package/lib/catalog/shared/catalog.enum.d.ts

@@ -1,7 +1,5 @@
 import { QueryFormat } from '../../query/shared/query.enums';
-export type CatalogQueryFormatTypes = {
-    [key in QueryFormat]: string | string[];
-};
+export type CatalogQueryFormatTypes = Record<QueryFormat, string | string[]>;
 export declare enum CatalogItemType {
     Layer = "layer",
     Group = "group"

package/lib/datasource/shared/capabilities.service.d.ts

@@ -1,9 +1,14 @@
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { LegendOptions } from '../../layer/shared/layers/legend.interface';
+import type { LegendOptions } from '../../layer/shared/layers/legend.interface';
 import { MapService } from '../../map/shared/map.service';
 import { TypeCapabilitiesStrings } from './capabilities.interface';
-import { ArcGISRestDataSourceOptions, ArcGISRestImageDataSourceOptions, CartoDataSourceOptions, TileArcGISRestDataSourceOptions, WMSDataSourceOptions, WMTSDataSourceOptions } from './datasources';
+import { ArcGISRestDataSourceOptions } from './datasources/arcgisrest-datasource.interface';
+import { CartoDataSourceOptions } from './datasources/carto-datasource.interface';
+import { ArcGISRestImageDataSourceOptions } from './datasources/imagearcgisrest-datasource.interface';
+import { TileArcGISRestDataSourceOptions } from './datasources/tilearcgisrest-datasource.interface';
+import { WMSDataSourceOptions } from './datasources/wms-datasource.interface';
+import { WMTSDataSourceOptions } from './datasources/wmts-datasource.interface';
 import * as i0 from "@angular/core";
 export declare class CapabilitiesService {
     private http;

package/lib/datasource/shared/datasources/any-datasource.interface.d.ts

@@ -13,3 +13,4 @@ import { WMSDataSourceOptions } from './wms-datasource.interface';
 import { WMTSDataSourceOptions } from './wmts-datasource.interface';
 import { XYZDataSourceOptions } from './xyz-datasource.interface';
 export type AnyDataSourceOptions = DataSourceOptions | OSMDataSourceOptions | FeatureDataSourceOptions | WFSDataSourceOptions | XYZDataSourceOptions | TileDebugDataSourceOptions | WMTSDataSourceOptions | WMSDataSourceOptions | CartoDataSourceOptions | ArcGISRestDataSourceOptions | ArcGISRestImageDataSourceOptions | TileArcGISRestDataSourceOptions | MVTDataSourceOptions | ClusterDataSourceOptions;
+export type AnyDataSourceOptionsWithParams = FeatureDataSourceOptions | WFSDataSourceOptions | WMSDataSourceOptions | CartoDataSourceOptions | ArcGISRestDataSourceOptions | ArcGISRestImageDataSourceOptions | TileArcGISRestDataSourceOptions;

package/lib/datasource/shared/datasources/arcgisrest-datasource.d.ts

@@ -5,6 +5,7 @@ import { Legend } from './datasource.interface';
 export declare class ArcGISRestDataSource extends DataSource {
     ol: olSourceVector;
     options: ArcGISRestDataSourceOptions;
+    get saveableOptions(): Partial<ArcGISRestDataSourceOptions>;
     protected createOlSource(): olSourceVector;
     getLegend(): Legend[];
     htmlImgSrc(contentType: string, imageData: string): string;

package/lib/datasource/shared/datasources/carto-datasource.d.ts

@@ -9,6 +9,7 @@ export declare class CartoDataSource extends DataSource {
     get queryTitle(): string;
     get mapLabel(): string;
     get queryHtmlTarget(): string;
+    get saveableOptions(): Partial<CartoDataSourceOptions>;
     protected createOlSource(): olSourceCarto;
     getLegend(): Legend[];
     onUnwatch(): void;

package/lib/datasource/shared/datasources/carto-datasource.interface.d.ts

@@ -1,4 +1,3 @@
-import olSourceCarto from 'ol/source/CartoDB';
 import { DataSourceOptions } from './datasource.interface';
 export interface CartoDataSourceOptions extends DataSourceOptions {
     account: string;
@@ -9,5 +8,4 @@ export interface CartoDataSourceOptions extends DataSourceOptions {
     projection?: string;
     config?: any;
     map?: string;
-    ol?: olSourceCarto;
 }

package/lib/datasource/shared/datasources/cluster-datasource.d.ts

@@ -4,6 +4,7 @@ import { FeatureDataSource } from './feature-datasource';
 export declare class ClusterDataSource extends FeatureDataSource {
     options: ClusterDataSourceOptions;
     ol: olSourceCluster;
+    get saveableOptions(): Partial<ClusterDataSourceOptions>;
     protected createOlSource(): olSourceCluster;
     protected generateId(): string;
     onUnwatch(): void;

package/lib/datasource/shared/datasources/cluster-datasource.interface.d.ts

@@ -3,7 +3,6 @@ import { FeatureDataSourceOptions } from './feature-datasource.interface';
 export interface ClusterDataSourceOptions extends FeatureDataSourceOptions {
     distance?: number;
     source?: olSourceVector;
-    ol?: olSourceVector;
     pathOffline?: string;
     excludeAttribute?: string[];
     excludeAttributeOffline?: string[];

package/lib/datasource/shared/datasources/datasource.d.ts

@@ -10,6 +10,7 @@ export declare abstract class DataSource {
     id: string;
     ol: olSource | olVectorSource | olClusterSource;
     private legend;
+    get saveableOptions(): Partial<DataSourceOptions>;
     constructor(options?: DataSourceOptions, dataService?: DataService);
     protected abstract createOlSource(): olSource;
     protected generateId(): string;

package/lib/datasource/shared/datasources/datasource.interface.d.ts

@@ -1,5 +1,4 @@
 import type { Type } from 'ol/geom/Geometry';
-import olSource from 'ol/source/Source';
 import { Encoders, Preset, Tokenizer } from 'flexsearch';
 import { DownloadOptions } from '../../../download/shared/download.interface';
 import { OgcFilterOperatorType } from '../../../filter/shared/ogc-filter.enum';
@@ -8,8 +7,8 @@ export interface DataSourceOptions {
     optionsFromCapabilities?: boolean;
     optionsFromApi?: boolean;
     _layerOptionsFromSource?: Record<string, string>;
+    url?: string;
     id?: string;
-    ol?: olSource;
     minZoom?: number;
     maxZoom?: number;
     minDate?: string;

package/lib/datasource/shared/datasources/feature-datasource.d.ts

@@ -4,6 +4,7 @@ import { FeatureDataSourceOptions } from './feature-datasource.interface';
 export declare class FeatureDataSource extends DataSource {
     options: FeatureDataSourceOptions;
     ol: olSourceVector;
+    get saveableOptions(): Partial<FeatureDataSourceOptions>;
     protected createOlSource(): olSourceVector;
     protected getSourceFormatFromOptions(options: FeatureDataSourceOptions): any;
     onUnwatch(): void;

package/lib/datasource/shared/datasources/feature-datasource.interface.d.ts

@@ -1,7 +1,5 @@
 import olFeature from 'ol/Feature';
 import olFormatFeature from 'ol/format/Feature';
-import olSource from 'ol/source/Source';
-import olSourceVector from 'ol/source/Vector';
 import { DataSourceOptions } from './datasource.interface';
 export interface FeatureDataSourceOptions extends DataSourceOptions {
     formatType?: string;
@@ -14,7 +12,6 @@ export interface FeatureDataSourceOptions extends DataSourceOptions {
     preload?: PreloadOptions;
     excludeAttribute?: string[];
     excludeAttributeOffline?: string[];
-    ol?: olSourceVector | olSource;
 }
 export interface PreloadOptions {
     bypassVisible?: boolean;

package/lib/datasource/shared/datasources/imagearcgisrest-datasource.d.ts

@@ -9,6 +9,7 @@ export declare class ImageArcGISRestDataSource extends DataSource {
     get queryTitle(): string;
     get mapLabel(): string;
     get queryHtmlTarget(): string;
+    get saveableOptions(): Partial<ArcGISRestImageDataSourceOptions>;
     protected createOlSource(): ImageArcGISRest;
     getLegend(): Legend[];
     onUnwatch(): void;

package/lib/datasource/shared/datasources/imagearcgisrest-datasource.interface.d.ts

@@ -1,5 +1,4 @@
 import olAttribution from 'ol/control/Attribution';
-import ImageArcGISRest from 'ol/source/ImageArcGISRest';
 import { DataSourceOptions } from './datasource.interface';
 export interface ArcGISRestImageDataSourceOptions extends DataSourceOptions {
     queryPrecision?: number;
@@ -9,7 +8,6 @@ export interface ArcGISRestImageDataSourceOptions extends DataSourceOptions {
     attributions?: olAttribution;
     projection?: string;
     url?: string;
-    ol?: ImageArcGISRest;
     idColumn?: string;
     options?: any;
 }

package/lib/datasource/shared/datasources/mvt-datasource.d.ts

@@ -4,6 +4,7 @@ import { MVTDataSourceOptions } from './mvt-datasource.interface';
 export declare class MVTDataSource extends DataSource {
     options: MVTDataSourceOptions;
     ol: olSourceVectorTile;
+    get saveableOptions(): Partial<MVTDataSourceOptions>;
     protected createOlSource(): olSourceVectorTile;
     protected generateId(): string;
     onUnwatch(): void;

package/lib/datasource/shared/datasources/mvt-datasource.interface.d.ts

@@ -1,10 +1,8 @@
-import olSourceVectorTile from 'ol/source/VectorTile';
 import { DataSourceOptions } from './datasource.interface';
 export interface MVTDataSourceOptions extends DataSourceOptions {
     projection?: string;
     attributions?: string | string[];
     format?: any;
-    ol?: olSourceVectorTile;
     url?: string;
     pathOffline?: string;
     excludeAttribute?: string[];

package/lib/datasource/shared/datasources/osm-datasource.interface.d.ts

@@ -1,7 +1,5 @@
-import olSourceOSM from 'ol/source/OSM';
 import { DataSourceOptions } from './datasource.interface';
 export interface OSMDataSourceOptions extends DataSourceOptions {
     maxZoom?: number;
     url?: string;
-    ol?: olSourceOSM;
 }

package/lib/datasource/shared/datasources/tilearcgisrest-datasource.d.ts

@@ -9,6 +9,7 @@ export declare class TileArcGISRestDataSource extends DataSource {
     get queryTitle(): string;
     get mapLabel(): string;
     get queryHtmlTarget(): string;
+    get saveableOptions(): Partial<TileArcGISRestDataSourceOptions>;
     protected createOlSource(): olSourceTileArcGISRest;
     getLegend(): Legend[];
     onUnwatch(): void;

package/lib/datasource/shared/datasources/tilearcgisrest-datasource.interface.d.ts

@@ -1,4 +1,3 @@
-import olSourceTileArcGISRest from 'ol/source/TileArcGISRest';
 import { DataSourceOptions } from './datasource.interface';
 export interface TileArcGISRestDataSourceOptions extends DataSourceOptions {
     queryPrecision?: number;
@@ -9,6 +8,5 @@ export interface TileArcGISRestDataSourceOptions extends DataSourceOptions {
     projection?: string;
     url?: string;
     urls?: string[];
-    ol?: olSourceTileArcGISRest;
     idColumn?: string;
 }

package/lib/datasource/shared/datasources/tiledebug-datasource.interface.d.ts

@@ -1,9 +1,7 @@
-import TileDebug from 'ol/source/TileDebug';
 import { DataSourceOptions, TileGridOptions } from './datasource.interface';
 export interface TileDebugDataSourceOptions extends DataSourceOptions {
     projection?: string;
     wrapX?: boolean;
-    ol?: TileDebug;
     zDirection?: number;
     tileGrid?: TileGridOptions;
 }

package/lib/datasource/shared/datasources/wfs-datasource.d.ts

@@ -1,9 +1,20 @@
+import type { HttpClient } from '@angular/common/http';
 import { AuthInterceptor } from '@igo2/auth';
+import OlFeature from 'ol/Feature';
+import { Extent } from 'ol/extent';
+import type { default as OlGeometry } from 'ol/geom/Geometry';
+import olProjection from 'ol/proj/Projection';
 import olSourceVector from 'ol/source/Vector';
+import { Observable } from 'rxjs';
 import { OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface';
 import { DataSource } from './datasource';
 import { WFSDataSourceOptions } from './wfs-datasource.interface';
 import { WFSService } from './wfs.service';
+interface FetchFeatureOptions {
+    extent: Extent;
+    projection: olProjection;
+    httpClient: HttpClient;
+}
 export declare class WFSDataSource extends DataSource {
     options: WFSDataSourceOptions;
     protected wfsService: WFSService;
@@ -11,8 +22,13 @@ export declare class WFSDataSource extends DataSource {
     ol: olSourceVector;
     set ogcFilters(value: OgcFiltersOptions);
     get ogcFilters(): OgcFiltersOptions;
+    get saveableOptions(): Partial<WFSDataSourceOptions>;
     constructor(options: WFSDataSourceOptions, wfsService: WFSService, authInterceptor?: AuthInterceptor);
     protected createOlSource(): olSourceVector;
     setOgcFilters(ogcFilters: OgcFiltersOptions, triggerEvent?: boolean): void;
     onUnwatch(): void;
+    fetchFeatures({ extent, projection, httpClient }: FetchFeatureOptions): Observable<OlFeature<OlGeometry>[]>;
+    private _fetchFeatures;
+    private _parseXmlFeatures;
 }
+export {};

package/lib/datasource/shared/datasources/wfs-datasource.interface.d.ts

@@ -1,11 +1,10 @@
-import olSource from 'ol/source/Source';
-import olSourceVector from 'ol/source/Vector';
-import { FeatureDataSourceOptions } from './feature-datasource.interface';
+import type { OgcFiltersOptions } from '../../../filter';
+import type { FeatureDataSourceOptions } from './feature-datasource.interface';
 export interface WFSDataSourceOptions extends FeatureDataSourceOptions {
     params: WFSDataSourceOptionsParams;
     paramsWFS?: WFSDataSourceOptionsParams;
     urlWfs?: string;
-    ol?: olSourceVector | olSource;
+    ogcFilters?: OgcFiltersOptions;
 }
 export interface WFSDataSourceOptionsParams {
     version?: string;

package/lib/datasource/shared/datasources/wms-datasource.d.ts

@@ -27,6 +27,7 @@ export declare class WMSDataSource extends DataSource {
     set timeFilter(value: TimeFilterOptions);
     get timeFilter(): TimeFilterOptions;
     readonly timeFilter$: BehaviorSubject<TimeFilterOptions>;
+    get saveableOptions(): Partial<WMSDataSourceOptions>;
     constructor(options: WMSDataSourceOptions, wfsService: WFSService);
     refresh(): void;
     private buildDynamicDownloadUrlFromParamsWFS;

package/lib/datasource/shared/datasources/wms-datasource.interface.d.ts

@@ -1,9 +1,8 @@
-import olSource from 'ol/source/Source';
-import olSourceVector from 'ol/source/Vector';
 import type { ServerType } from 'ol/source/wms';
-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 {
     paramsWFS?: WFSDataSourceOptionsParams;
     urlWfs?: string;
@@ -14,10 +13,11 @@ export interface WMSDataSourceOptions extends DataSourceOptions {
     resolutions?: number[];
     serverType?: ServerType;
     ratio?: number;
-    ol?: olSourceVector | olSource;
     refreshIntervalSec?: number;
     contentDependentLegend?: boolean;
-    excludeAttribute?: string[];
+    excludeAttribute?: Array<string>;
+    ogcFilters?: OgcFiltersOptions;
+    timeFilter?: TimeFilterOptions;
 }
 export interface WMSDataSourceOptionsParams {
     LAYERS: string;

package/lib/datasource/shared/datasources/wmts-datasource.interface.d.ts

@@ -1,4 +1,3 @@
-import olSourceWMTS from 'ol/source/WMTS';
 import { DataSourceOptions } from './datasource.interface';
 export interface WMTSDataSourceOptions extends DataSourceOptions {
     projection?: string;
@@ -9,5 +8,4 @@ export interface WMTSDataSourceOptions extends DataSourceOptions {
     matrixSet?: string;
     url?: string;
     urls?: string[];
-    ol?: olSourceWMTS;
 }

package/lib/datasource/shared/datasources/xyz-datasource.interface.d.ts

@@ -1,8 +1,6 @@
-import olSourceXYZ from 'ol/source/XYZ';
 import { DataSourceOptions } from './datasource.interface';
 export interface XYZDataSourceOptions extends DataSourceOptions {
     projection?: string;
-    ol?: olSourceXYZ;
     url?: string;
     urls?: string[];
     pathOffline?: string;

package/lib/download/download-button/download-button.component.d.ts

@@ -1,17 +1,13 @@
-import { Layer } from '../../layer/shared/layers/layer';
+import { Layer } from '../../layer';
 import { DownloadDataSourceOptions } from '../shared/download.interface';
 import { DownloadService } from '../shared/download.service';
 import * as i0 from "@angular/core";
 export declare class DownloadButtonComponent {
     private downloadService;
-    get layer(): Layer;
-    set layer(value: Layer);
-    private _layer;
-    get color(): string;
-    set color(value: string);
-    private _color;
+    layer: Layer;
+    color: string;
     constructor(downloadService: DownloadService);
-    openDownload(layer: Layer): void;
+    openDownload(): void;
     get options(): DownloadDataSourceOptions;
     static ɵfac: i0.ɵɵFactoryDeclaration<DownloadButtonComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<DownloadButtonComponent, "igo-download-button", never, { "layer": { "alias": "layer"; "required": false; }; "color": { "alias": "color"; "required": false; }; }, {}, never, never, true, never>;

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

@@ -1,5 +1,5 @@
 import { MessageService } from '@igo2/core/message';
-import { Layer } from '../../layer/shared/layers/layer';
+import { Layer } from '../../layer';
 import * as i0 from "@angular/core";
 export declare class DownloadService {
     private messageService;

package/lib/draw/draw/draw.component.d.ts

@@ -190,9 +190,9 @@ export declare class DrawComponent implements OnInit, OnDestroy {
     getFeatureOffsetX(): number;
     getFeatureOffsetY(): number | "0";
     get allFontStyles(): string[];
-    get allLayers(): import("@igo2/geo").Layer[];
+    get allLayers(): import("@igo2/geo").AnyLayer[];
     updateHeightTable(): void;
-    updateActiveLayer(): import("@igo2/geo").Layer;
+    updateActiveLayer(): import("@igo2/geo").AnyLayer;
     /**
      * Activate the correct control
      */

package/lib/environment/environment.interface.d.ts

@@ -6,6 +6,7 @@ import { DirectionsSourceOptions } from '../directions/directions-sources/direct
 import { DrawOptions } from '../draw/shared/draw.interface';
 import { SpatialFilterOptions } from '../filter/shared/spatial-filter.interface';
 import { ImportExportServiceOptions } from '../import-export/shared/import.interface';
+import { LayerConfig } from '../layer';
 import { HomeExtentButtonOptions } from '../map/home-extent-button/home-extent-button.interface';
 import { GeolocationOptions } from '../map/shared/controllers/geolocation.interface';
 import { Projection } from '../map/shared/projection.interfaces';
@@ -19,6 +20,7 @@ export interface EnvironmentOptions {
         contextListFile?: string;
         defaultContextUri?: string;
     };
+    layer?: LayerConfig;
     depot?: DepotOptions;
     directionsSources?: DirectionsSourceOptions;
     dom?: DOMOptions[];

package/lib/feature/shared/feature-store.utils.d.ts

@@ -1,5 +1,5 @@
 import { VectorLayer } from '../../layer/shared/layers/vector-layer';
-import { FeatureStore } from './store';
+import type { FeatureStore } from './store';
 /**
  * Try to bind a layer to a store if none is bound already.
  * The layer will also be added to the store's map.
@@ -7,4 +7,4 @@ import { FeatureStore } from './store';
  * @param store The store to bind the layer
  * @param layer An optional VectorLayer
  */
-export declare function tryBindStoreLayer(store: FeatureStore, layer?: VectorLayer): void;
+export declare function tryBindStoreLayer(store: FeatureStore, layer?: VectorLayer): VectorLayer;

package/lib/feature/shared/feature.interfaces.d.ts

@@ -5,7 +5,7 @@ import type { default as OlGeometry } from 'ol/geom/Geometry';
 import OlRenderFeature from 'ol/render/Feature';
 import { GeoJsonGeometryTypes } from 'geojson';
 import { SourceFieldsOptionsParams } from '../../datasource/shared/datasources';
-import { VectorLayer } from '../../layer/shared/layers/vector-layer';
+import type { VectorLayer } from '../../layer/shared/layers/vector-layer';
 import type { IgoMap } from '../../map/shared/map';
 import { FeatureMotion } from './feature.enums';
 export interface Feature<P = Record<string, any>> {

package/lib/feature/shared/store.d.ts

@@ -3,8 +3,8 @@ import OlFeature from 'ol/Feature';
 import type { default as OlGeometry } from 'ol/geom/Geometry';
 import { Document } from 'flexsearch';
 import { FeatureDataSource } from '../../datasource/shared/datasources';
-import { VectorLayer } from '../../layer/shared';
-import { IgoMap } from '../../map/shared';
+import { VectorLayer } from '../../layer/shared/layers/vector-layer';
+import type { IgoMap } from '../../map/shared';
 import { FeatureMotion } from './feature.enums';
 import { Feature, FeatureStoreOptions } from './feature.interfaces';
 /**

package/lib/filter/ogc-filter-button/ogc-filter-button.component.d.ts

@@ -1,5 +1,5 @@
 import { OnInit } from '@angular/core';
-import { Layer } from '../../layer/shared/layers/layer';
+import { Layer } from '../../layer';
 import { MapBase } from '../../map';
 import { OgcFilterableDataSourceOptions } from '../shared/ogc-filter.interface';
 import * as i0 from "@angular/core";

package/lib/filter/ogc-filterable-item/ogc-filterable-item.component.d.ts

@@ -1,6 +1,6 @@
 import { OnDestroy, OnInit } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
-import { Layer } from '../../layer/shared/layers/layer';
+import { Layer } from '../../layer';
 import { MapBase } from '../../map';
 import { OgcFilterableDataSource } from '../shared/ogc-filter.interface';
 import { OGCFilterService } from '../shared/ogc-filter.service';

package/lib/filter/ogc-filterable-list/ogc-filterable-list.component.d.ts

@@ -1,8 +1,8 @@
-import { Layer } from '../../layer/shared/layers/layer';
+import { AnyLayer } from '../../layer';
 import { MapBase } from '../../map/shared/map.abstract';
 import * as i0 from "@angular/core";
 export declare class OgcFilterableListComponent {
-    layers: Layer[];
+    layers: AnyLayer[];
     map: MapBase;
     static ɵfac: i0.ɵɵFactoryDeclaration<OgcFilterableListComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<OgcFilterableListComponent, "igo-ogc-filterable-list", never, { "layers": { "alias": "layers"; "required": false; }; "map": { "alias": "map"; "required": false; }; }, {}, never, never, true, never>;

package/lib/filter/shared/filterable-datasource.pipe.d.ts

@@ -1,8 +1,8 @@
 import { PipeTransform } from '@angular/core';
-import { Layer } from '../../layer/shared/layers/layer';
+import { AnyLayer, Layer } from '../../layer';
 import * as i0 from "@angular/core";
 export declare class FilterableDataSourcePipe implements PipeTransform {
-    transform(value: Layer[], arg: string): Layer[];
+    transform(value: AnyLayer[], arg: string): Layer[];
     private isTimeFilterable;
     private isOgcFilterable;
     static ɵfac: i0.ɵɵFactoryDeclaration<FilterableDataSourcePipe, never>;

package/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.d.ts

@@ -10,7 +10,7 @@ import * as olStyle from 'ol/style';
 import { BehaviorSubject } from 'rxjs';
 import { GeometryType } from '../../../draw';
 import { GeoJSONGeometry } from '../../../geometry/shared/geometry.interfaces';
-import { Layer } from '../../../layer/shared';
+import { AnyLayer } from '../../../layer/shared';
 import { IgoMap } from '../../../map/shared/map';
 import { MeasureLengthUnit } from '../../../measure';
 import { SpatialFilterQueryType, SpatialFilterType } from '../../shared/spatial-filter.enum';
@@ -42,8 +42,8 @@ export declare class SpatialFilterItemComponent implements OnDestroy, OnInit {
      * @internal
      */
     get measureUnits(): string[];
-    layers: Layer[];
-    allLayers: Layer[];
+    layers: AnyLayer[];
+    allLayers: AnyLayer[];
     get thematicLength(): number;
     set thematicLength(value: number);
     private _thematicLength;

package/lib/filter/spatial-filter/spatial-filter-list/spatial-filter-list.component.d.ts

@@ -4,7 +4,7 @@ import { EntityStore } from '@igo2/common/entity';
 import { MessageService } from '@igo2/core/message';
 import { Subscription } from 'rxjs';
 import { Feature } from '../../../feature';
-import { Layer } from '../../../layer';
+import { AnyLayer } from '../../../layer';
 import { MeasureLengthUnit } from '../../../measure/shared';
 import { SpatialFilterQueryType } from './../../shared/spatial-filter.enum';
 import { SpatialFilterService } from './../../shared/spatial-filter.service';
@@ -12,16 +12,14 @@ import * as i0 from "@angular/core";
 export declare class SpatialFilterListComponent implements OnInit, OnDestroy {
     private spatialFilterService;
     private messageService;
-    get store(): EntityStore<Feature>;
-    set store(store: EntityStore<Feature>);
-    private _store;
+    store: EntityStore<Feature>;
     get queryType(): SpatialFilterQueryType;
     set queryType(queryType: SpatialFilterQueryType);
     private _queryType;
     get zone(): any;
     set zone(value: any);
     private _zone;
-    layers: Layer[];
+    layers: AnyLayer[];
     zoneWithBuffer: any;
     selectedZone: any;
     measureUnit: MeasureLengthUnit;

package/lib/filter/spatial-filter/spatial-filter-type/spatial-filter-type.component.d.ts

@@ -2,7 +2,7 @@ import { EventEmitter, OnInit } from '@angular/core';
 import { UntypedFormControl } from '@angular/forms';
 import { EntityStore } from '@igo2/common/entity';
 import { Feature } from '../../../feature';
-import { Layer } from '../../../layer';
+import { AnyLayer } from '../../../layer';
 import { MeasureLengthUnit } from '../../../measure';
 import { SpatialFilterQueryType, SpatialFilterType } from '../../shared/spatial-filter.enum';
 import * as i0 from "@angular/core";
@@ -10,9 +10,7 @@ import * as i0 from "@angular/core";
  * Spatial Filter Type
  */
 export declare class SpatialFilterTypeComponent implements OnInit {
-    get store(): EntityStore<Feature>;
-    set store(store: EntityStore<Feature>);
-    private _store;
+    store: EntityStore<Feature>;
     queryType: string[];
     selectedTypeIndex: UntypedFormControl;
     /**
@@ -23,7 +21,7 @@ export declare class SpatialFilterTypeComponent implements OnInit {
     activeDrawType: SpatialFilterType;
     selectedQueryType: SpatialFilterQueryType;
     zone: Feature;
-    layers: Layer[];
+    layers: AnyLayer[];
     type: SpatialFilterType;
     eventType: EventEmitter<SpatialFilterType>;
     eventQueryType: EventEmitter<SpatialFilterQueryType>;

package/lib/filter/time-filter-button/time-filter-button.component.d.ts

@@ -1,6 +1,6 @@
 import { OnInit } from '@angular/core';
 import { TimeFilterableDataSourceOptions } from '../../datasource/shared/datasources/wms-datasource.interface';
-import { Layer } from '../../layer/shared/layers/layer';
+import { Layer } from '../../layer';
 import { IgoMap } from '../../map/shared/map';
 import * as i0 from "@angular/core";
 export declare class TimeFilterButtonComponent implements OnInit {

package/lib/filter/time-filter-form/time-filter-form.component.d.ts

@@ -1,13 +1,11 @@
 import { EventEmitter, OnInit } from '@angular/core';
 import { DateAdapter, ThemePalette } from '@angular/material/core';
-import { Layer } from '../../layer/shared/layers/layer';
+import { Layer } from '../../layer';
 import { TimeFilterStyle, TimeFilterType } from '../shared/time-filter.enum';
 import { TimeFilterOptions } from '../shared/time-filter.interface';
 import * as i0 from "@angular/core";
 export declare class TimeFilterFormComponent implements OnInit {
     private dateAdapter;
-    layer: Layer;
-    options: TimeFilterOptions;
     color: ThemePalette;
     date: Date;
     startDate: Date;
@@ -20,10 +18,12 @@ export declare class TimeFilterFormComponent implements OnInit {
     listYears: string[];
     startListYears: string[];
     endListYears: string[];
-    set currentValue(value: string);
-    interval: any;
+    interval: number;
     playIcon: string;
     resetIcon: string;
+    layer: Layer;
+    options: TimeFilterOptions;
+    set currentValue(value: string);
     change: EventEmitter<Date | [Date, Date]>;
     yearChange: EventEmitter<string | [string, string]>;
     mySlider: any;

package/lib/filter/time-filter-item/time-filter-item.component.d.ts

@@ -1,7 +1,7 @@
 import { OnDestroy, OnInit } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { TimeFilterableDataSource } from '../../datasource/shared/datasources/wms-datasource';
-import { Layer } from '../../layer/shared/layers/layer';
+import { Layer } from '../../layer';
 import { TimeFilterService } from '../shared/time-filter.service';
 import * as i0 from "@angular/core";
 export declare class TimeFilterItemComponent implements OnInit, OnDestroy {

package/lib/filter/time-filter-list/time-filter-list.component.d.ts

@@ -1,12 +1,7 @@
-import { ChangeDetectorRef } from '@angular/core';
-import { Layer } from '../../layer/shared/layers/layer';
+import { AnyLayer } from '../../layer';
 import * as i0 from "@angular/core";
 export declare class TimeFilterListComponent {
-    private cdRef;
-    get layers(): Layer[];
-    set layers(value: Layer[]);
-    private _layers;
-    constructor(cdRef: ChangeDetectorRef);
+    layers: AnyLayer[];
     static ɵfac: i0.ɵɵFactoryDeclaration<TimeFilterListComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<TimeFilterListComponent, "igo-time-filter-list", never, { "layers": { "alias": "layers"; "required": false; }; }, {}, never, never, true, never>;
 }