@igo2/geo 18.0.0-next.9 → 18.0.1-next.1

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

@@ -1,4 +1,6 @@
 import MapBrowserPointerEvent from 'ol/MapBrowserEvent';
+import { Coordinate } from 'ol/coordinate';
+import { Position } from 'geojson';
 import { MapViewState } from './map.interface';
 import { Projection } from './projection.interfaces';
 /**
@@ -26,7 +28,7 @@ export declare function stringToLonLat(str: string, mapProjection: string, opts?
  * @param decimal number of decimals for seconds
  * @returns longitude and latitude in dms
  */
-export declare function convertDDToDMS(lonLatDD: [number, number], decimal?: number): string[];
+export declare function convertDDToDMS(lonLatDD: Coordinate, decimal?: number): string[];
 /**
  * Return true of two view states are equal.
  * @param state1 View state
@@ -59,8 +61,8 @@ export declare function getScaleFromResolution(resolution: number, unit?: string
  * @returns Whether the CTRL key is pushed
  */
 export declare function ctrlKeyDown(event: MapBrowserPointerEvent<any>): boolean;
-export declare function roundCoordTo(coord: [number, number], decimal?: number): [number, number];
-export declare function roundCoordToString(coord: [number, number], decimal?: number): [string, string];
+export declare function roundCoordTo(coord: [number, number] | Position | Coordinate, decimal?: number): Coordinate;
+export declare function roundCoordToString(coord: [number, number] | Position | Coordinate, decimal?: number): [string, string];
 /**
  * Returns an array of converted coordinates.
  * Conversion is done for every configured projections

package/lib/map/utils/index.d.ts

@@ -0,0 +1 @@
+export * from './layer-watcher';

package/lib/map/utils/layer-watcher.d.ts

@@ -1,20 +1,30 @@
 import { Watcher } from '@igo2/utils';
 import { ObjectEvent } from 'ol/Object';
 import { BehaviorSubject } from 'rxjs';
-import { Layer } from '../../layer/shared/layers';
+import type { AnyLayer } from '../../layer/shared/layers/any-layer';
+import type { Layer } from '../../layer/shared/layers/layer';
+export interface LayerWatcherChange {
+    event: LayerWatcherEvent;
+    layer: Layer;
+}
+type LayerWatcherEvent = Pick<ObjectEvent, 'key' | 'oldValue'> & {
+    value: unknown;
+};
 export declare class LayerWatcher extends Watcher {
-    propertyChange$: BehaviorSubject<{
-        event: ObjectEvent;
-        layer: Layer;
-    }>;
+    propertyChange$: BehaviorSubject<LayerWatcherChange>;
     private loaded;
     private loading;
     private layers;
+    private subscriptionsByLayerId;
     private subscriptions;
     constructor();
     watch(): void;
     unwatch(): void;
-    setPropertyChange(change: ObjectEvent, layer: Layer): void;
-    watchLayer(layer: Layer): void;
-    unwatchLayer(layer: Layer): void;
+    setPropertyChange(change: LayerWatcherChange): void;
+    watchLayer(layer: AnyLayer): void;
+    private _watchLayer;
+    private createOlEventObservable;
+    unwatchLayer(layer: AnyLayer): void;
+    private _unwatchLayer;
 }
+export {};

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

@@ -360,10 +360,6 @@ export declare class MeasurerComponent implements OnInit, OnDestroy {
      * @param measureUnit Display tooltip measure in those units
      */
     private updateTooltipsOfOlGeometry;
-    /**
-     * Show the map tooltips of a geoemtry
-     */
-    private showTooltipsOfOlGeometry;
     /**
      * Clear the tooltips of an OL geometrys
      * @param olGeometry OL geometry with tooltips
@@ -373,10 +369,6 @@ export declare class MeasurerComponent implements OnInit, OnDestroy {
      * Show the map tooltips of all the geometries of a source
      */
     private updateTooltipsOfOlSource;
-    /**
-     * Show the map tooltips of all the geometries of a source
-     */
-    private showTooltipsOfOlSource;
     /**
      * Clear the map tooltips
      * @param olDrawSource OL vector source

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

@@ -1,17 +1,13 @@
 import { MatDialog } from '@angular/material/dialog';
-import { Layer } from '../../layer/shared/layers/layer';
+import { Layer } from '../../layer';
 import { MetadataLayerOptions, MetadataOptions } from '../shared/metadata.interface';
 import { MetadataService } from '../shared/metadata.service';
 import * as i0 from "@angular/core";
 export declare class MetadataButtonComponent {
     private metadataService;
     private dialog;
-    get layer(): Layer;
-    set layer(value: Layer);
-    private _layer;
-    get color(): string;
-    set color(value: string);
-    private _color;
+    layer: Layer;
+    color: string;
     constructor(metadataService: MetadataService, dialog: MatDialog);
     openMetadata(metadata: MetadataOptions): void;
     get options(): MetadataLayerOptions;

package/lib/offline/geoDB/geoDB.service.d.ts

@@ -26,7 +26,7 @@ export declare class GeoDBService {
     getRegionCountByID(id: number): Observable<number>;
     getRegionByID(id: number): Observable<any[]>;
     deleteByRegionID(id: number): Observable<any>;
-    openCursor(keyRange?: IDBKeyRange, mode?: DBMode): Observable<Event>;
+    openCursor(keyRange?: IDBKeyRange, mode?: DBMode): Observable<import("ngx-indexed-db").NgxIDBCursorWithValue<unknown, IDBValidKey, IDBValidKey>>;
     resetCounters(): void;
     resetCollisionsMap(): void;
     revertCollisions(): void;

package/lib/offline/layerDB/layerDB.service.d.ts

@@ -24,7 +24,7 @@ export declare class LayerDBService {
      * @param layerId
      * @returns
      */
-    deleteByKey(layerId: string): Observable<boolean>;
+    deleteByKey(layerId: string): Observable<void>;
     /**
      * This method retrive all idb layer definition
      * @param layerId

package/lib/offline/offline.provider.d.ts

@@ -1,3 +1,3 @@
 import { EnvironmentProviders } from '@angular/core';
 import { IOfflineOptions } from './offline.interface';
-export declare function provideOffline(options: IOfflineOptions | undefined): EnvironmentProviders;
+export declare function provideOffline(options: IOfflineOptions): EnvironmentProviders;

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

@@ -4,7 +4,7 @@ import olFeature from 'ol/Feature';
 import * as olgeom from 'ol/geom';
 import { Observable } from 'rxjs';
 import { Feature } from '../../feature/shared/feature.interfaces';
-import { Layer } from '../../layer/shared/layers/layer';
+import { Layer } from '../../layer';
 import { MapExtent } from '../../map/shared/map.interface';
 import { QueryOptions, QueryUrlData, QueryableDataSource } from './query.interfaces';
 import * as i0 from "@angular/core";

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

@@ -1,6 +1,7 @@
 import OlLayer from 'ol/layer/Layer';
 import OlSource from 'ol/source/Source';
 import { AnyLayer } from '../../layer/shared/layers/any-layer';
+import { Layer } from '../../layer/shared/layers/layer';
 /**
  * Whether a layer is queryable
  * @param layer Layer
@@ -18,7 +19,7 @@ export declare function olLayerIsQueryable(olLayer: OlLayer<OlSource>): boolean;
  * @param layer Layer
  * @returns True if the layer's feature is queryable
  */
-export declare function layerFeatureIsQueryable(layer: AnyLayer): boolean;
+export declare function layerFeatureIsQueryable(layer: Layer): boolean;
 /**
  * Whether an OL Vector layer is queryable
  * @param layer Layer

package/lib/search/search-results/search-results-add-button.component.d.ts

@@ -42,7 +42,7 @@ export declare class SearchResultAddButtonComponent implements OnInit, OnDestroy
     set color(value: string);
     private _color;
     stores: FeatureStore<Feature>[];
-    get allLayers(): import("@igo2/geo").Layer[];
+    get allLayers(): import("@igo2/geo").AnyLayer[];
     private mediaService$$;
     isMobile: boolean;
     constructor(layerService: LayerService, dialog: MatDialog, dataSourceService: DataSourceService, mediaService: MediaService);

package/lib/search/shared/search-pointer-summary.directive.d.ts

@@ -23,7 +23,6 @@ export declare class SearchPointerSummaryDirective implements OnInit, OnDestroy,
     private pointerSearchStore;
     private lastTimeoutRequest;
     private store$$;
-    private layers$$;
     private reverseSearch$$;
     private hasPointerReverseSearchSource;
     /**

package/lib/search/shared/sources/workspace.interfaces.d.ts

@@ -1,5 +1,5 @@
 import { Feature } from '../../../feature/shared/feature.interfaces';
-import { Layer } from '../../../layer/shared/layers/layer';
+import { Layer } from '../../../layer';
 export interface WorkspaceData {
     index: any;
     feature: Feature;

package/lib/style/style-list/style-list.provider.d.ts

@@ -1,15 +1,8 @@
 import { InjectionToken } from '@angular/core';
 import { StyleListOptions } from './style-list.interface';
-import { StyleListService } from './style-list.service';
 export declare const STYLELIST_OPTIONS: InjectionToken<StyleListOptions>;
 export declare function provideStyleListOptions(options: StyleListOptions): {
     provide: InjectionToken<StyleListOptions>;
     useValue: StyleListOptions;
 };
-export declare function styleListFactory(styleListService: StyleListService, options: StyleListOptions): () => true | Promise<unknown>;
-export declare function provideStyleListLoader(): {
-    provide: InjectionToken<readonly (() => import("rxjs").Observable<unknown> | Promise<unknown> | void)[]>;
-    useFactory: typeof styleListFactory;
-    multi: boolean;
-    deps: (typeof StyleListService | InjectionToken<StyleListOptions>)[];
-};
+export declare function provideStyleListLoader(): import("@angular/core").EnvironmentProviders;

package/lib/style/style-list/style-list.service.d.ts

@@ -12,7 +12,7 @@ export declare class StyleListService {
     /**
      * This method loads "[path]" to get all styleList's variables
      */
-    load(options: StyleListOptions): true | Promise<unknown>;
+    load(options: StyleListOptions): void | Promise<unknown>;
     static ɵfac: i0.ɵɵFactoryDeclaration<StyleListService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<StyleListService>;
 }

package/lib/workspace/widgets/ogc-filter/ogc-filter.component.d.ts

@@ -1,7 +1,7 @@
 import { ChangeDetectorRef, EventEmitter } from '@angular/core';
 import { OnUpdateInputs } from '@igo2/common/dynamic-component';
 import { WidgetComponent } from '@igo2/common/widget';
-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 OgcFilterComponent implements OnUpdateInputs, WidgetComponent {

package/locale/en.geo.json

@@ -224,6 +224,23 @@
         "drawFeature": ""
       },
       "layer": {
+        "layer": "Layer",
+        "name": "Layer name",
+        "group": {
+          "name": "Group name",
+          "create": "Create group",
+          "rename": "Rename group",
+          "hide": "Hide group",
+          "hideChildren": "Hided by a group",
+          "show": "Show group"
+        },
+        "type": {
+          "raster": "Raster",
+          "vector": "Vector",
+          "measure": "Measure",
+          "draw": "Drawing"
+        },
+        "rename": "Rename layer",
         "hideLayer": "Hide Layer",
         "lowerLayer": "Bring layer backward",
         "hideSelectedLayers": "Hide selected layers",
@@ -356,102 +373,100 @@
         },
         "showNorthArrow": "Show north arrow"
       },
-      "directionsForm": {
-        "stopLayer": "Directions - stops",
-        "routeLayer": "Directions - route",
-        "start": "Start",
-        "intermediate": "Intermediate",
-        "end": "End",
-        "directionsBtn": "Get route",
-        "resetDirectionsBtn": "Reset",
-        "zoomRoute": "Zoom on route",
-        "null": "",
+      "directions": {
+        "buttons": {
+          "copyDirections": "Copy directions to clipboard",
+          "copyLink": "Copy link to clipboard",
+          "downloadDirections": "Download directions",
+          "message": {
+            "copyDirections": "Directions copied to clipboard",
+            "copyLink": "Link copied to clipboard"
+          },
+          "resetStops": "Reset stops",
+          "zoomOnRoute": "Zoom on route"
+        },
         "directions": "Directions",
-        "raiseStop": "Raise stop's priority",
-        "lowerStop": "Lower stop's priority",
-        "addStop": "Add a stop",
-        "clearStop": "Clear this stop",
-        "moveStop": "Move this stop",
-        "removeStop": "Remove this stop",
-        "drivingOptions": "Options",
-        "summary": "Direction's summary",
-        "stopsList": "Stops's list",
-        "instructions": "Instructions",
-        "copy": "Copy directions",
-        "geolocate": "Use current localisation as stop",
-        "link": "Link",
-        "print": "Print",
-        "dialog": {
-          "copyMsg": "Directions copied to clipboard",
-          "copyMsgLink": "Link for directions copied to clipboard",
-          "copyTitle": "Directions"
+        "directionsText": {
+          "link": "Link",
+          "stopList": "Stops",
+          "summary": "Summary"
         },
-        "toggleActive": "Activate direction control",
-        "toggleType": "Include forest roads",
         "forestRoadsWarning": {
           "title": "Warning",
           "text": "Some forest roads may be impassable or not suitable for vehicles."
+        },
+        "input": {
+          "addStop": "Add a destination",
+          "clearStop": "Clear stop",
+          "currentPosition": "Use current position",
+          "end": "Destination",
+          "intermediate": "Intermediate stop",
+          "moveStop": "Move stop",
+          "placeholder": "Click on the map or type to search",
+          "removeStop": "Remove stop",
+          "start": "Starting point"
+        },
+        "layer": {
+          "stops": "Directions - Stops",
+          "route": "Directions - Route"
+        },
+        "results": {
+          "direction": {
+            "n": "north",
+            "ne": "northeast",
+            "e": "east",
+            "se": "southeast",
+            "s": "south",
+            "sw": "southwest",
+            "w": "west",
+            "nw": "northwest"
+          },
+          "maneuverModifier": {
+            "uturn": "u-turn",
+            "sharp right": "sharp right",
+            "right": "right",
+            "slight right": "slight right",
+            "sharp left": "sharp left",
+            "left": "left",
+            "slight left": "slight left",
+            "straight": "straight"
+          },
+          "maneuverType": {
+            "arrive": {
+              "lastStep": "You have reached your destination, {{name}}",
+              "intermediate": "You have reached an intermediate stop, {{name}}"
+            },
+            "continue": "Continue on {{name}}",
+            "depart": "Head {{maneuverBearing}} on {{name}}",
+            "end of road": "At the end of the road, turn {{maneuverModifier}} onto {{name}}",
+            "exit roundabout": "Continue to {{name}}",
+            "fork": {
+              "left": "Keep left onto {{name}}",
+              "right": "Keep right onto {{name}}",
+              "else": "Continue on {{name}}"
+            },
+            "merge": "Continue on {{name}}",
+            "new name": "Head {{maneuverBearing}} on {{name}}",
+            "notification": "",
+            "off ramp": "Take the exit on the {{maneuverModifier}}",
+            "on ramp": "Take the ramp on the {{maneuverModifier}}",
+            "rotary": "",
+            "roundabout": "At the roundabout, take the exit towards {{name}}",
+            "roundabout turn": "",
+            "turn": {
+              "straight": "Continue {{maneuverModifier}} on {{name}}",
+              "uturn": "Make a {{maneuverModifier}}}} onto {{name}}",
+              "else": "Make a {{maneuverModifier}} turn onto {{name}}"
+            }
+          },
+          "routeOptions": "Route options",
+          "stepTitleTooltip": "Zoom on location"
+        },
+        "toggle": {
+          "activateControl": "Activate controls",
+          "type": "Include forest roads"
         }
       },
-      "directions": {
-        "uturn": "u-turn",
-        "sharp right": "sharp right",
-        "right": "right",
-        "slight right": "slightly on right",
-        "sharp left": "sharp left",
-        "left": "left",
-        "slight left": "slightly on left",
-        "straight": "forward",
-        "turn": {
-          "straight": "Continue on {{route}}",
-          "uturn": "Make u-turn on {{route}}",
-          "else": "Turn {{translatedModifier}} onto {{route}}"
-        },
-        "new name": "Head {{translatedDirection}} on {{route}}",
-        "depart": "Head {{translatedDirection}} on {{route}}",
-        "arrive": {
-          "lastStep": "You have reached your destination {{coma}} {{aggregatedDirection}}",
-          "intermediate": "You have reached the intermediate stop onto {{route}}"
-        },
-        "merge": "Continue on {{route}}",
-        "on ramp": "Take the ramp {{aggregatedDirection}}",
-        "off ramp": "Take exit {{aggregatedDirection}}",
-        "fork": {
-          "left": "Merge left onto {{route}}",
-          "right": "Merge right onto {{route}}",
-          "else": "Continue on {{route}}"
-        },
-        "end of road": "At the end of the road, turn {{translatedModifier}} onto {{route}}",
-        "use lane": "Take the lane ...",
-        "continue": {
-          "notUturn": "Continue on {{route}}"
-        },
-        "roundabout": "At the roundabout, take the {{exit}}{{cntSuffix}} exit towards {{route}}",
-        "rotary": "Roundabout rotary ...",
-        "roundabout turn": "Roundabout, take the ...",
-        "exit roundabout": "Continue to {{route}}",
-        "notification": "notification ...",
-        "uturnText": "Make u-turn and head {{translatedDirection}} on {{route}}",
-        "unknown": "???",
-
-        "cntSuffix": {
-          "first": "st",
-          "secondAndMore": "rd"
-        },
-        "modifier": {
-          "prefix": "on the "
-        }
-      },
-      "cardinalPoints": {
-        "n": "north",
-        "ne": "northeast",
-        "e": "east",
-        "se": "southeast",
-        "s": "south",
-        "sw": "southwest",
-        "w": "west",
-        "nw": "northwest"
-      },
       "search": {
         "placeholder": "Search for a localisation or a layer",
         "emptyType.placeholder": "Please choose a search type",