@igo2/geo 16.0.2 → 16.1.0

package/lib/catalog/catalog-browser/catalog-browser-group.component.d.ts

@@ -2,7 +2,7 @@ import { EventEmitter, OnDestroy, OnInit } from '@angular/core';
 import { EntityStore } from '@igo2/common';
 import type { EntityStateManager } from '@igo2/common';
 import { BehaviorSubject } from 'rxjs';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import { AddedChangeEmitter, AddedChangeGroupEmitter, Catalog, CatalogItem, CatalogItemGroup, CatalogItemState } from '../shared';
 import * as i0 from "@angular/core";
 /**

package/lib/catalog/catalog-browser/catalog-browser-layer.component.d.ts

@@ -2,7 +2,7 @@ import { EventEmitter, OnDestroy, OnInit } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { LayerService } from '../../layer/shared/layer.service';
 import { Layer } from '../../layer/shared/layers';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import { AddedChangeEmitter, CatalogItemLayer } from '../shared';
 import * as i0 from "@angular/core";
 /**

package/lib/catalog/catalog-browser/catalog-browser.component.d.ts

@@ -2,7 +2,7 @@ import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
 import { EntityStore } from '@igo2/common';
 import { BehaviorSubject } from 'rxjs';
 import { LayerService } from '../../layer/shared/layer.service';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import { AddedChangeEmitter, AddedChangeGroupEmitter, Catalog, CatalogItem, CatalogItemState } from '../shared';
 import * as i0 from "@angular/core";
 /**

package/lib/catalog/catalog-library/catalog-library-item.component.d.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from '@angular/core';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import { Catalog } from '../shared/catalog.abstract';
 import * as i0 from "@angular/core";
 /**

package/lib/catalog/catalog-library/catalog-library.component.d.ts

@@ -3,8 +3,8 @@ import { MatDialog } from '@angular/material/dialog';
 import { EntityStore } from '@igo2/common';
 import { MessageService, StorageService } from '@igo2/core';
 import { Observable } from 'rxjs';
-import { CapabilitiesService } from '../../datasource';
-import { IgoMap } from '../../map/shared';
+import { CapabilitiesService } from '../../datasource/shared/capabilities.service';
+import { IgoMap } from '../../map/shared/map';
 import { Catalog } from '../shared/catalog.abstract';
 import * as i0 from "@angular/core";
 /**

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

@@ -1,7 +1,7 @@
 import { Observable } from 'rxjs';
-import { TimeFilterOptions } from '../../filter/shared';
-import { TooltipType } from '../../layer/shared';
-import { QueryFormat, QueryHtmlTarget } from '../../query/shared';
+import { TimeFilterOptions } from '../../filter/shared/time-filter.interface';
+import { TooltipType } from '../../layer/shared/layers/layer.interface';
+import { QueryFormat, QueryHtmlTarget } from '../../query/shared/query.enums';
 import { TypeCatalogStrings } from './catalog.enum';
 import { CatalogItem, CatalogItemGroup, ICatalog } from './catalog.interface';
 export declare abstract class Catalog implements ICatalog {

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

@@ -1,6 +1,6 @@
 import { EntityState } from '@igo2/common';
-import { TooltipType } from '../../layer';
-import { QueryFormat } from '../../query';
+import { TooltipType } from '../../layer/shared/layers/layer.interface';
+import { QueryFormat } from '../../query/shared/query.enums';
 import { MetadataLayerOptions } from './../../metadata/shared/metadata.interface';
 import { CatalogItemType, CatalogQueryFormatTypes, TypeCatalogStrings } from './catalog.enum';
 export interface AddedChangeEmitter {

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

@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { ConfigService, LanguageService, MessageService } from '@igo2/core';
 import { Observable } from 'rxjs';
-import { CapabilitiesService } from '../../datasource';
+import { CapabilitiesService } from '../../datasource/shared/capabilities.service';
 import { Catalog } from './catalog.abstract';
 import { CatalogItem, CatalogItemGroup } from './catalog.interface';
 import * as i0 from "@angular/core";

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

@@ -0,0 +1,8 @@
+export declare enum TypeCapabilities {
+    wms = "wms",
+    wmts = "wmts",
+    arcgisrest = "esriJSON",
+    imagearcgisrest = "esriJSON",
+    tilearcgisrest = "esriJSON"
+}
+export type TypeCapabilitiesStrings = keyof typeof TypeCapabilities;

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

@@ -2,16 +2,9 @@ import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { 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 * as i0 from "@angular/core";
-export declare enum TypeCapabilities {
-    wms = "wms",
-    wmts = "wmts",
-    arcgisrest = "esriJSON",
-    imagearcgisrest = "esriJSON",
-    tilearcgisrest = "esriJSON"
-}
-export type TypeCapabilitiesStrings = keyof typeof TypeCapabilities;
 export declare class CapabilitiesService {
     private http;
     private mapService;

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

@@ -1,7 +1,7 @@
 import olSourceImageWMS from 'ol/source/ImageWMS';
 import { BehaviorSubject } from 'rxjs';
-import { TimeFilterOptions } from '../../../filter';
 import { OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface';
+import { TimeFilterOptions } from '../../../filter/shared/time-filter.interface';
 import { LegendMapViewOptions } from '../../../layer/shared/layers/legend.interface';
 import { DataSource } from './datasource';
 import { Legend } from './datasource.interface';

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

@@ -2,7 +2,7 @@ import type { default as OlGeometry } from 'ol/geom/Geometry';
 import olSource from 'ol/source/Source';
 import olSourceVector from 'ol/source/Vector';
 import type { ServerType } from 'ol/source/wms';
-import { TimeFilterOptions } from '../../../filter';
+import { TimeFilterOptions } from '../../../filter/shared/time-filter.interface';
 import { DataSourceOptions } from './datasource.interface';
 import { WFSDataSourceOptionsParams } from './wfs-datasource.interface';
 export interface WMSDataSourceOptions extends DataSourceOptions {

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

@@ -1,4 +1,5 @@
 export * from './datasources';
 export * from './datasource.service';
+export * from './capabilities.interface';
 export * from './capabilities.service';
 export * from './options';

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

@@ -2,8 +2,8 @@ import { ActivityService, ConfigService, LanguageService } from '@igo2/core';
 import { SubjectStatus } from '@igo2/utils';
 import 'jspdf-autotable';
 import { Observable } from 'rxjs';
-import { IgoMap } from '../../map';
-import { PrintService } from '../../print';
+import { IgoMap } from '../../map/shared/map';
+import { PrintService } from '../../print/shared/print.service';
 import { DirectionsSource } from '../directions-sources/directions-source';
 import { Direction, DirectionOptions } from '../shared/directions.interface';
 import { DirectionsSourceService } from './directions-source.service';

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

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

package/lib/draw/shared/draw.interface.d.ts

@@ -1,5 +1,5 @@
-import { FeatureStore } from '../../feature';
 import { Feature } from '../../feature/shared/feature.interfaces';
+import { FeatureStore } from '../../feature/shared/store';
 import { DrawControl } from '../../geometry/shared/controls/draw';
 import { IgoMap } from '../../map/shared/map';
 import { MeasureAreaUnit, MeasureLengthUnit } from '../../measure/shared/measure.enum';

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

@@ -1,11 +1,13 @@
 import { DOMOptions, DepotOptions } from '@igo2/common';
-import { CatalogServiceOptions } from '../catalog';
-import { OptionsApiOptions } from '../datasource';
-import { DirectionsSourceOptions } from '../directions';
+import { CatalogServiceOptions } from '../catalog/shared/catalog.interface';
+import { OptionsApiOptions } from '../datasource/shared/options/options-api.interface';
+import { DirectionsSourceOptions } from '../directions/directions-sources/directions-source.interface';
 import { DrawOptions } from '../draw/shared/draw.interface';
-import { SpatialFilterOptions } from '../filter';
-import { ImportExportServiceOptions } from '../import-export';
-import { GeolocationOptions, HomeExtentButtonOptions, Projection } from '../map';
+import { SpatialFilterOptions } from '../filter/shared/spatial-filter.interface';
+import { ImportExportServiceOptions } from '../import-export/shared/import.interface';
+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';
 import { SearchSourceOptions, StoredQueriesReverseSearchSourceOptions, StoredQueriesSearchSourceOptions } from '../search';
 import { OverlayStyleOptions } from '../style';
 export interface EnvironmentOptions {

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

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

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

@@ -5,7 +5,8 @@ import OlLayer from 'ol/layer/Layer';
 import * as olproj from 'ol/proj';
 import OlRenderFeature from 'ol/render/Feature';
 import OlSource from 'ol/source/Source';
-import { MapExtent, MapViewController } from '../../map/shared';
+import { MapViewController } from '../../map/shared/controllers/view';
+import { MapExtent } from '../../map/shared/map.interface';
 import { FeatureMotion } from './feature.enums';
 import { Feature } from './feature.interfaces';
 /**

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

@@ -2,7 +2,7 @@ import { EntityKey, EntityStoreWithStrategy } from '@igo2/common';
 import OlFeature from 'ol/Feature';
 import type { default as OlGeometry } from 'ol/geom/Geometry';
 import { Document } from 'flexsearch';
-import { FeatureDataSource } from '../../datasource';
+import { FeatureDataSource } from '../../datasource/shared/datasources';
 import { VectorLayer } from '../../layer/shared';
 import { IgoMap } from '../../map/shared';
 import { FeatureMotion } from './feature.enums';

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

@@ -1,6 +1,6 @@
 import { OnInit } from '@angular/core';
 import { Layer } from '../../layer/shared/layers/layer';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import { OgcFilterableDataSourceOptions } from '../shared/ogc-filter.interface';
 import * as i0 from "@angular/core";
 export declare class OgcFilterButtonComponent implements OnInit {

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

@@ -4,7 +4,7 @@ import { BehaviorSubject, Observable } from 'rxjs';
 import { SourceFieldsOptionsParams } from '../../datasource/shared/datasources/datasource.interface';
 import { OgcFilterOperator } from '../../filter/shared/ogc-filter.enum';
 import { OgcFilterableDataSource } from '../../filter/shared/ogc-filter.interface';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import { WktService } from '../../wkt/shared/wkt.service';
 import * as i0 from "@angular/core";
 export declare class OgcFilterFormComponent implements OnInit {

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

@@ -5,7 +5,7 @@ import { DOMService } from '@igo2/common';
 import { ConfigService } from '@igo2/core';
 import { BehaviorSubject } from 'rxjs';
 import { OgcFilterableDataSource, OgcPushButton, OgcSelectorBundle, SelectorGroup } from '../../filter/shared/ogc-filter.interface';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import { OgcFilterOperator } from '../shared/ogc-filter.enum';
 import { OGCFilterService } from '../shared/ogc-filter.service';
 import * as i0 from "@angular/core";

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

@@ -81,6 +81,7 @@ export declare class OgcFilterTimeComponent implements OnInit {
     getDateFromStringWithoutTime(stringDate: string): Date;
     resetFilter(): void;
     toggleFilterState(): void;
+    private isValidDate;
     static ɵfac: i0.ɵɵFactoryDeclaration<OgcFilterTimeComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<OgcFilterTimeComponent, "igo-ogc-filter-time", never, { "datasource": { "alias": "datasource"; "required": false; }; "currentFilter": { "alias": "currentFilter"; "required": false; }; }, { "changeProperty": "changeProperty"; }, never, never, false, never>;
 }

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

@@ -1,4 +1,4 @@
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import { OgcFilterableDataSource } from '../shared/ogc-filter.interface';
 import * as i0 from "@angular/core";
 export declare class OgcFilterableFormComponent {

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

@@ -1,7 +1,7 @@
 import { OnDestroy, OnInit } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { Layer } from '../../layer/shared/layers/layer';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import { OgcFilterableDataSource } from '../shared/ogc-filter.interface';
 import { OGCFilterService } from '../shared/ogc-filter.service';
 import * as i0 from "@angular/core";

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

@@ -1,5 +1,5 @@
 import { Layer } from '../../layer/shared/layers/layer';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import * as i0 from "@angular/core";
 export declare class OgcFilterableListComponent {
     layers: Layer[];

package/lib/filter/shared/spatial-filter.service.d.ts

@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { ConfigService, LanguageService } from '@igo2/core';
 import { Observable } from 'rxjs';
-import { Feature } from '../../feature/shared';
+import { Feature } from '../../feature/shared/feature.interfaces';
 import { SpatialFilterItemType, SpatialFilterQueryType, SpatialFilterType } from './spatial-filter.enum';
 import { SpatialFilterThematic } from './spatial-filter.interface';
 import * as i0 from "@angular/core";

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 { GeoJSONGeometry } from '../../../geometry/shared/geometry.interfaces';
 import { Layer } from '../../../layer/shared';
-import { IgoMap } from '../../../map/shared';
+import { IgoMap } from '../../../map/shared/map';
 import { MeasureLengthUnit } from '../../../measure';
 import { SpatialFilterQueryType, SpatialFilterType } from '../../shared/spatial-filter.enum';
 import { SpatialFilterService } from '../../shared/spatial-filter.service';

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

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

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

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

package/lib/geometry/geometry-form-field/geometry-form-field-input.component.d.ts

@@ -5,7 +5,7 @@ import type { Type } from 'ol/geom/Geometry';
 import OlVectorSource from 'ol/source/Vector';
 import * as OlStyle from 'ol/style';
 import { StyleLike as OlStyleLike } from 'ol/style/Style';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import { DrawControl, ModifyControl } from '../shared/controls';
 import { GeoJSONGeometry } from '../shared/geometry.interfaces';
 import * as i0 from "@angular/core";

package/lib/geometry/geometry-form-field/geometry-form-field.component.d.ts

@@ -3,7 +3,7 @@ import { UntypedFormControl } from '@angular/forms';
 import type { Type } from 'ol/geom/Geometry';
 import { StyleLike as OlStyleLike } from 'ol/style/Style';
 import { BehaviorSubject } from 'rxjs';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import { GeoJSONGeometry } from '../shared/geometry.interfaces';
 import * as i0 from "@angular/core";
 /**

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

@@ -1,7 +1,7 @@
 import { FormFieldInputs } from '@igo2/common';
 import type { Type } from 'ol/geom/Geometry';
 import { GeoJsonGeometryTypes } from 'geojson';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 export interface GeometryFormFieldInputs extends FormFieldInputs {
     map: IgoMap;
     geometryType: Type;

package/lib/import-export/export-button/export-button.component.d.ts

@@ -1,4 +1,4 @@
-import { DataSourceOptions } from '../../datasource';
+import { DataSourceOptions } from '../../datasource/shared/datasources';
 import { Layer } from '../../layer/shared/layers/layer';
 import * as i0 from "@angular/core";
 export declare class ExportButtonComponent {

package/lib/layer/layer-item/layer-item.component.d.ts

@@ -1,7 +1,7 @@
 import { ChangeDetectorRef, ElementRef, EventEmitter, OnDestroy, OnInit, Renderer2 } from '@angular/core';
 import { ConnectionState, NetworkService } from '@igo2/core';
 import { BehaviorSubject } from 'rxjs';
-import { Layer } from '../shared/layers';
+import { Layer } from '../shared/layers/layer';
 import * as i0 from "@angular/core";
 export declare class LayerItemComponent implements OnInit, OnDestroy {
     private networkService;

package/lib/layer/layer-legend/layer-legend.component.d.ts

@@ -5,7 +5,7 @@ import { ConfigService, LanguageService } from '@igo2/core';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { CapabilitiesService } from '../../datasource/shared/capabilities.service';
 import { Legend } from '../../datasource/shared/datasources/datasource.interface';
-import { Layer } from '../shared/layers';
+import { Layer } from '../shared/layers/layer';
 import * as i0 from "@angular/core";
 export declare class LayerLegendComponent implements OnInit, OnDestroy {
     private capabilitiesService;

package/lib/layer/layer-legend-item/layer-legend-item.component.d.ts

@@ -1,7 +1,7 @@
 import { OnDestroy, OnInit } from '@angular/core';
 import { ConnectionState, NetworkService } from '@igo2/core';
 import { BehaviorSubject } from 'rxjs';
-import { Layer } from '../shared/layers';
+import { Layer } from '../shared/layers/layer';
 import * as i0 from "@angular/core";
 export declare class LayerLegendItemComponent implements OnInit, OnDestroy {
     private networkService;

package/lib/layer/layer-legend-list/layer-legend-list.component.d.ts

@@ -1,6 +1,6 @@
 import { EventEmitter, OnDestroy, OnInit } from '@angular/core';
 import { BehaviorSubject, ReplaySubject } from 'rxjs';
-import { Layer } from '../shared';
+import { Layer } from '../shared/layers/layer';
 import * as i0 from "@angular/core";
 export declare class LayerLegendListComponent implements OnInit, OnDestroy {
     orderable: boolean;

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

@@ -4,7 +4,7 @@ import olLayerImage from 'ol/layer/Image';
 import olSourceImage from 'ol/source/Image';
 import { ImageArcGISRestDataSource } from '../../../datasource/shared/datasources/imagearcgisrest-datasource';
 import { WMSDataSource } from '../../../datasource/shared/datasources/wms-datasource';
-import { IgoMap } from '../../../map/shared';
+import { IgoMap } from '../../../map/shared/map';
 import { ImageLayerOptions } from './image-layer.interface';
 import { Layer } from './layer';
 export declare class ImageLayer extends Layer {

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

@@ -4,7 +4,8 @@ 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, Legend } from '../../../datasource';
+import { DataSource } from '../../../datasource/shared/datasources/datasource';
+import { Legend } from '../../../datasource/shared/datasources/datasource.interface';
 import { MapBase } from '../../../map/shared/map.abstract';
 import { GeoDBService } from '../../../offline/geoDB/geoDB.service';
 import { LayerDBService } from '../../../offline/layerDB/layerDB.service';

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

@@ -8,7 +8,7 @@ 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 { IgoMap } from '../../../map/shared';
+import { IgoMap } from '../../../map/shared/map';
 import { Layer } from './layer';
 import { TileLayerOptions } from './tile-layer.interface';
 export declare class TileLayer extends Layer {

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

@@ -2,7 +2,7 @@ import { AuthInterceptor } from '@igo2/auth';
 import { MessageService } from '@igo2/core';
 import olLayerVectorTile from 'ol/layer/VectorTile';
 import { MVTDataSource } from '../../../datasource/shared/datasources/mvt-datasource';
-import { IgoMap } from '../../../map/shared';
+import { IgoMap } from '../../../map/shared/map';
 import { Layer } from './layer';
 import { VectorTileLayerOptions } from './vectortile-layer.interface';
 export declare class VectorTileLayer extends Layer {

package/lib/layer/track-feature-button/track-feature-button.component.d.ts

@@ -1,5 +1,5 @@
 import { OnInit } from '@angular/core';
-import { VectorLayer } from '../shared/layers';
+import { VectorLayer } from '../shared/layers/vector-layer';
 import { VectorLayerOptions } from '../shared/layers/vector-layer.interface';
 import * as i0 from "@angular/core";
 export declare class TrackFeatureButtonComponent implements OnInit {

package/lib/map/baselayers-switcher/baselayers-switcher.component.d.ts

@@ -1,7 +1,7 @@
 import { AfterViewInit, OnDestroy } from '@angular/core';
 import { MediaService } from '@igo2/core';
 import { Layer } from '../../layer/shared';
-import { IgoMap } from '../shared';
+import { IgoMap } from '../shared/map';
 import * as i0 from "@angular/core";
 export declare class BaseLayersSwitcherComponent implements AfterViewInit, OnDestroy {
     private mediaService;

package/lib/map/baselayers-switcher/mini-basemap.component.d.ts

@@ -1,7 +1,7 @@
 import { AfterViewInit, ApplicationRef, OnDestroy } from '@angular/core';
 import { Layer } from '../../layer/shared';
 import { LayerService } from '../../layer/shared/layer.service';
-import { IgoMap } from '../shared';
+import { IgoMap } from '../shared/map';
 import * as i0 from "@angular/core";
 export declare class MiniBaseMapComponent implements AfterViewInit, OnDestroy {
     private layerService;

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

@@ -5,10 +5,11 @@ import { Projection } from 'ol/proj';
 import { Source } from 'ol/source';
 import { Map } from 'ol';
 import { BehaviorSubject, Subject } from 'rxjs';
-import { FeatureDataSource } from '../../datasource';
-import { Layer } from '../../layer';
-import { Overlay } from '../../overlay';
-import { MapControlsOptions, MapExtent, MapGeolocationController, MapViewController, MapViewOptions } from '../shared';
+import { FeatureDataSource } from '../../datasource/shared/datasources';
+import { 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';
 export declare abstract class MapBase {
     ol: Map;
     forcedOffline$: BehaviorSubject<boolean>;

package/lib/measure/measurer/measurer.component.d.ts

@@ -5,7 +5,7 @@ import type { EntityTableComponent } from '@igo2/common';
 import { LanguageService, StorageService } from '@igo2/core';
 import { BehaviorSubject } from 'rxjs';
 import { FeatureStore } from '../../feature';
-import { IgoMap } from '../../map/shared';
+import { IgoMap } from '../../map/shared/map';
 import { MeasureAreaUnit, MeasureLengthUnit, MeasureType } from '../shared/measure.enum';
 import { FeatureWithMeasure, Measure } from '../shared/measure.interfaces';
 import * as i0 from "@angular/core";
@@ -16,6 +16,7 @@ export declare class MeasurerComponent implements OnInit, OnDestroy {
     private languageService;
     private dialog;
     private storageService;
+    private document;
     /**
      * Table template
      * @internal
@@ -106,11 +107,11 @@ export declare class MeasurerComponent implements OnInit, OnDestroy {
     /**
      * Active mlength unit
      */
-    private activeLengthUnit;
+    activeLengthUnit: MeasureLengthUnit;
     /**
      * Active area unit
      */
-    private activeAreaUnit;
+    activeAreaUnit: MeasureAreaUnit;
     /**
      * Feature added listener key
      */
@@ -183,7 +184,7 @@ export declare class MeasurerComponent implements OnInit, OnDestroy {
      */
     get drawControlIsActive(): boolean;
     get projection(): string;
-    constructor(languageService: LanguageService, dialog: MatDialog, storageService: StorageService);
+    constructor(languageService: LanguageService, dialog: MatDialog, storageService: StorageService, document: Document);
     /**
      * Add draw controls and activate one
      * @internal
@@ -254,6 +255,7 @@ export declare class MeasurerComponent implements OnInit, OnDestroy {
      * @internal
      */
     onAreaUnitChange(unit: MeasureAreaUnit): void;
+    private refreshTableAndTooltip;
     onCalculateClick(): void;
     onDeleteClick(): void;
     onModifyClick(): void;
@@ -400,6 +402,8 @@ export declare class MeasurerComponent implements OnInit, OnDestroy {
      * @returns True if the tooltip should be shown
      */
     private shouldShowTooltip;
+    private saveCurrentUnits;
+    private getSavedUnits;
     static ɵfac: i0.ɵɵFactoryDeclaration<MeasurerComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<MeasurerComponent, "igo-measurer", never, { "map": { "alias": "map"; "required": false; }; "store": { "alias": "store"; "required": false; }; "activeMeasureType": { "alias": "activeMeasureType"; "required": false; }; "minSegmentLength": { "alias": "minSegmentLength"; "required": false; }; }, {}, never, never, false, never>;
 }

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

@@ -1,5 +1,5 @@
-import { Feature } from '../../feature';
-import { IgoMap } from '../../map/shared';
+import { Feature } from '../../feature/shared/feature.interfaces';
+import { IgoMap } from '../../map/shared/map';
 export interface Measure {
     area?: number;
     length?: number;

package/lib/metadata/shared/metadata.interface.d.ts

@@ -1,4 +1,4 @@
-import { TypeCatalogStrings } from '../../catalog';
+import { TypeCatalogStrings } from '../../catalog/shared/catalog.enum';
 import { LayerOptions } from '../../layer/shared/layers/layer.interface';
 export interface MetadataOptions {
     url: string;

package/lib/overlay/shared/overlay.d.ts

@@ -1,6 +1,6 @@
 import OlFeature from 'ol/Feature';
 import type { default as OlGeometry } from 'ol/geom/Geometry';
-import { FeatureDataSource } from '../../datasource';
+import { FeatureDataSource } from '../../datasource/shared/datasources';
 import { Feature, FeatureMotion } from '../../feature/shared';
 import { MapBase } from '../../map/shared/map.abstract';
 /**