@igo2/geo 1.13.0-alpha.0 → 1.13.0

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

@@ -1,7 +1,7 @@
 import olSource from 'ol/source/Source';
 import { DownloadOptions } from '../../../download/shared/download.interface';
 import { OgcFilterOperatorType } from '../../../filter/shared/ogc-filter.enum';
-import type { default as OlGeometryType } from 'ol/geom/GeometryType';
+import type { Type } from 'ol/geom/Geometry';
 export interface DataSourceOptions {
     type?: 'wms' | 'wfs' | 'vector' | 'wmts' | 'xyz' | 'osm' | 'tiledebug' | 'carto' | 'arcgisrest' | 'imagearcgisrest' | 'tilearcgisrest' | 'websocket' | 'mvt' | 'cluster';
     optionsFromCapabilities?: boolean;
@@ -43,7 +43,7 @@ export interface EditionOptions {
     addUrl: string;
     deleteUrl: string;
     modifyUrl: string;
-    geomType: typeof OlGeometryType;
+    geomType: Type;
     hasGeometry: boolean;
     addWithDraw?: boolean;
     messages?: any[];

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

@@ -4,7 +4,6 @@ import { DataSource } from './datasource';
 import { WFSDataSourceOptions } from './wfs-datasource.interface';
 import { WFSService } from './wfs.service';
 import { OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface';
-import { BehaviorSubject } from 'rxjs';
 import { AuthInterceptor } from '@igo2/auth';
 export declare class WFSDataSource extends DataSource {
     options: WFSDataSourceOptions;
@@ -14,7 +13,6 @@ export declare class WFSDataSource extends DataSource {
     mostRecentIdCallOGCFilter: number;
     set ogcFilters(value: OgcFiltersOptions);
     get ogcFilters(): OgcFiltersOptions;
-    readonly ogcFilters$: BehaviorSubject<OgcFiltersOptions>;
     constructor(options: WFSDataSourceOptions, wfsService: WFSService, authInterceptor?: AuthInterceptor);
     protected createOlSource(): olSourceVector<OlGeometry>;
     setOgcFilters(ogcFilters: OgcFiltersOptions, triggerEvent?: boolean): void;

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

@@ -17,7 +17,6 @@ export declare class WMSDataSource extends DataSource {
     get queryHtmlTarget(): string;
     set ogcFilters(value: OgcFiltersOptions);
     get ogcFilters(): OgcFiltersOptions;
-    readonly ogcFilters$: BehaviorSubject<OgcFiltersOptions>;
     set timeFilter(value: TimeFilterOptions);
     get timeFilter(): TimeFilterOptions;
     readonly timeFilter$: BehaviorSubject<TimeFilterOptions>;

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

@@ -1,6 +1,7 @@
 import olSource from 'ol/source/Source';
 import olSourceVector from 'ol/source/Vector';
 import type { default as OlGeometry } from 'ol/geom/Geometry';
+import type { ServerType } from 'ol/source/wms';
 import { DataSourceOptions } from './datasource.interface';
 import { WFSDataSourceOptionsParams } from './wfs-datasource.interface';
 export interface WMSDataSourceOptions extends DataSourceOptions {
@@ -11,7 +12,7 @@ export interface WMSDataSourceOptions extends DataSourceOptions {
     crossOrigin?: string;
     projection?: string;
     resolutions?: number[];
-    serverType?: string;
+    serverType?: ServerType;
     ratio?: number;
     ol?: olSourceVector<OlGeometry> | olSource;
     refreshIntervalSec?: number;

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

@@ -9,7 +9,7 @@ import { Draw, FeatureWithDraw } from '../shared/draw.interface';
 import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms';
 import { DrawControl } from '../../geometry/shared/controls/draw';
 import { EntityTableTemplate } from '@igo2/common';
-import type { default as OlGeometryType } from 'ol/geom/GeometryType';
+import type { Type } from 'ol/geom/Geometry';
 import { DrawStyleService } from '../shared/draw-style.service';
 import { DrawIconService } from '../shared/draw-icon.service';
 import * as i0 from "@angular/core";
@@ -71,7 +71,7 @@ export declare class DrawComponent implements OnInit, OnDestroy {
      * Called when the user selects a new geometry type
      * @param geometryType the geometry type selected by the user
      */
-    onGeometryTypeChange(geometryType: typeof OlGeometryType): void;
+    onGeometryTypeChange(geometryType: Type): void;
     /**
      * Store initialization, including drawing layer creation
      */

package/lib/feature/feature-details/feature-details.component.d.ts

@@ -50,7 +50,7 @@ export declare class FeatureDetailsComponent implements OnInit, OnDestroy {
     isDoc(value: any): boolean;
     isImg(value: any): boolean;
     isEmbeddedLink(value: any): boolean;
-    getEmbeddedLinkText(value: any): any;
+    getEmbeddedLinkText(value: any): string;
     filterFeatureProperties(feature: any): any;
     static ɵfac: i0.ɵɵFactoryDeclaration<FeatureDetailsComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<FeatureDetailsComponent, "igo-feature-details", never, { "source": "source"; "map": "map"; "toolbox": "toolbox"; "feature": "feature"; }, { "routeEvent": "routeEvent"; "selectFeature": "selectFeature"; "htmlDisplayEvent": "htmlDisplayEvent"; }, never, never, false>;

package/lib/filter/shared/ogc-filter.interface.d.ts

@@ -7,7 +7,6 @@ import { DOMValue } from '@igo2/common';
 import { DataSource } from '../../datasource/shared/datasources/datasource';
 import { DataSourceOptions } from '../../datasource/shared/datasources/datasource.interface';
 import { OgcFilterOperatorType } from './ogc-filter.enum';
-import { BehaviorSubject } from 'rxjs';
 export interface OgcFilter extends olFormatFilter {
 }
 export interface WFSWriteGetFeatureOptions {
@@ -104,7 +103,6 @@ export interface OgcFilterableDataSourceOptions extends DataSourceOptions {
 }
 export interface OgcFilterableDataSource extends DataSource {
     options: OgcFilterableDataSourceOptions;
-    ogcFilters$?: BehaviorSubject<OgcFiltersOptions>;
     setOgcFilters(ogcFilters: OgcFiltersOptions, triggerEvent?: boolean): any;
 }
 export interface IgoLogicalArrayOptions {

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

@@ -6,7 +6,7 @@ import { SpatialFilterItemType } from './../../shared/spatial-filter.enum';
 import { Feature } from './../../../feature/shared/feature.interfaces';
 import { UntypedFormControl } from '@angular/forms';
 import { BehaviorSubject } from 'rxjs';
-import type { default as OlGeometryType } from 'ol/geom/GeometryType';
+import type { Type } from 'ol/geom/Geometry';
 import { GeoJSONGeometry } from '../../../geometry/shared/geometry.interfaces';
 import * as olStyle from 'ol/style';
 import { MatTreeNestedDataSource } from '@angular/material/tree';
@@ -82,7 +82,7 @@ export declare class SpatialFilterItemComponent implements OnDestroy, OnInit {
     private radiusChanges$$;
     private bufferChanges$$;
     formControl: UntypedFormControl;
-    geometryType: typeof OlGeometryType | string;
+    geometryType: Type | string;
     geometryTypeField: boolean;
     geometryTypes: string[];
     drawGuideField: boolean;

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

@@ -2,7 +2,7 @@ import { OnInit, OnDestroy, ChangeDetectorRef } from '@angular/core';
 import { NgControl, ControlValueAccessor } from '@angular/forms';
 import * as OlStyle from 'ol/style';
 import OlGeometry from 'ol/geom/Geometry';
-import type { default as OlGeometryType } from 'ol/geom/GeometryType';
+import type { Type } from 'ol/geom/Geometry';
 import OlVectorSource from 'ol/source/Vector';
 import { IgoMap } from '../../map';
 import { DrawControl, ModifyControl } from '../shared/controls';
@@ -38,8 +38,8 @@ export declare class GeometryFormFieldInputComponent implements OnInit, OnDestro
     /**
      * The geometry type
      */
-    set geometryType(value: typeof OlGeometryType);
-    get geometryType(): typeof OlGeometryType;
+    set geometryType(value: Type);
+    get geometryType(): Type;
     private _geometryType;
     /**
      * The drawGuide around the mouse pointer to help drawing

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

@@ -1,6 +1,6 @@
 import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
 import { UntypedFormControl } from '@angular/forms';
-import type { default as OlGeometryType } from 'ol/geom/GeometryType';
+import type { Type } from 'ol/geom/Geometry';
 import * as OlStyle from 'ol/style';
 import { BehaviorSubject } from 'rxjs';
 import { IgoMap } from '../../map';
@@ -28,9 +28,9 @@ export declare class GeometryFormFieldComponent implements OnInit, OnDestroy {
      * The map to draw the geometry on
      */
     map: IgoMap;
-    set geometryType(value: typeof OlGeometryType);
-    get geometryType(): typeof OlGeometryType;
-    readonly geometryType$: BehaviorSubject<typeof OlGeometryType>;
+    set geometryType(value: Type);
+    get geometryType(): Type;
+    readonly geometryType$: BehaviorSubject<Type>;
     /**
      * Whether a geometry type toggle should be displayed
      */

package/lib/geometry/shared/controls/draw.d.ts

@@ -1,12 +1,12 @@
 import OlMap from 'ol/Map';
 import { StyleLike as OlStyleLike } from 'ol/style/Style';
-import type { default as OlGeometryType } from 'ol/geom/GeometryType';
+import type { Type } from 'ol/geom/Geometry';
 import OlVectorSource from 'ol/source/Vector';
 import OlVectorLayer from 'ol/layer/Vector';
 import type { default as OlGeometry } from 'ol/geom/Geometry';
 import { Subject, BehaviorSubject } from 'rxjs';
 export interface DrawControlOptions {
-    geometryType: typeof OlGeometryType | string;
+    geometryType: Type | string;
     drawingLayerSource?: OlVectorSource<OlGeometry>;
     drawingLayer?: OlVectorLayer<OlVectorSource<OlGeometry>>;
     drawingLayerStyle?: OlStyleLike;
@@ -81,7 +81,7 @@ export declare class DrawControl {
      * Set the current geometry type
      * @param geometryType the geometry type
      */
-    setGeometryType(geometryType: typeof OlGeometryType): void;
+    setGeometryType(geometryType: Type): void;
     /**
      * Create a drawing source if none is defined in the options
      */

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

@@ -1,10 +1,10 @@
-import type { default as OlGeometryType } from 'ol/geom/GeometryType';
+import type { Type } from 'ol/geom/Geometry';
 import { GeoJsonGeometryTypes } from 'geojson';
 import { FormFieldInputs } from '@igo2/common';
 import { IgoMap } from '../../map';
 export interface GeometryFormFieldInputs extends FormFieldInputs {
     map: IgoMap;
-    geometryType: typeof OlGeometryType;
+    geometryType: Type;
     tooltip?: string;
 }
 export interface GeoJSONGeometry {

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

@@ -92,7 +92,6 @@ export declare class LayerListComponent implements OnInit, OnDestroy {
     };
     isUpperBaselayer(layer: any): boolean;
     moveActiveLayer(activeLayer: Layer, actiontype: LayerListDisplacement): void;
-    private getLinkedLayers;
     raisableLayers(layers: Layer[]): boolean;
     raisableLayer(index: number): any;
     raiseLayers(layers: Layer[], fromUi?: boolean): void;

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

@@ -52,7 +52,6 @@ export declare abstract class Layer {
     get displayed(): boolean;
     readonly displayed$: Observable<boolean>;
     get showInLayerList(): boolean;
-    private layerSyncWatcher;
     constructor(options: LayerOptions, messageService?: MessageService, authInterceptor?: AuthInterceptor);
     protected abstract createOlLayer(): olLayer<olSource>;
     setMap(igoMap: IgoMap | undefined): void;

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

@@ -53,7 +53,6 @@ export interface LayersLink {
     links?: LayersLinkProperties[];
 }
 export interface LayersLinkProperties {
-    bidirectionnal?: boolean;
     linkedIds: string[];
     syncedDelete: boolean;
     properties: LinkedProperties[];

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

@@ -1,6 +1,5 @@
 export * from './image-watcher';
 export * from './layer.utils';
-export * from './layerSync-watcher';
 export * from './tile-watcher';
 export * from './outputLegend';
 export * from './vector-watcher';

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

@@ -10,3 +10,4 @@ export * from './projection.interfaces';
 export * from './projection.service';
 export * from './controllers';
 export * from './projection.utils';
+export * from './linkedLayers.utils';

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

@@ -0,0 +1,17 @@
+import { ObjectEvent } from "ol/Object";
+import { Layer, LinkedProperties } from "../../layer/shared/layers";
+import { IgoMap } from "./map";
+export declare function getLinkedLayersOptions(layer: Layer): import("../../layer/shared/layers").LayersLink;
+export declare function getIgoLayerByLinkId(map: IgoMap, id: string): Layer;
+export declare function layerHasLinkWithProperty(layer: Layer, property: LinkedProperties): boolean;
+export declare function layerHasLinkDeletion(layer: Layer): boolean;
+export declare function getRootParentByProperty(map: IgoMap, layer: Layer, property: LinkedProperties): Layer;
+export declare function getDirectParentLayerByProperty(map: IgoMap, layer: Layer, property: LinkedProperties): Layer;
+export declare function getDirectChildLayersByProperty(map: IgoMap, layer: Layer, property: LinkedProperties): Layer[];
+export declare function getAllChildLayersByProperty(map: IgoMap, layer: Layer, knownChildLayers: Layer[], property: LinkedProperties): Layer[];
+export declare function getRootParentByDeletion(map: IgoMap, layer: Layer): Layer;
+export declare function getDirectParentLayerByDeletion(map: IgoMap, layer: Layer): Layer;
+export declare function getDirectChildLayersByDeletion(map: IgoMap, layer: Layer): Layer[];
+export declare function getAllChildLayersByDeletion(map: IgoMap, layer: Layer, knownChildLayers: Layer[]): Layer[];
+export declare function initLayerSyncFromRootParentLayers(map: IgoMap, layers: Layer[]): void;
+export declare function handleLayerPropertyChange(map: IgoMap, propertyChange: ObjectEvent, initiatorIgoLayer: Layer): void;

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

@@ -1,5 +1,7 @@
 import olMap from 'ol/Map';
 import OlProjection from 'ol/proj/Projection';
+import olLayer from 'ol/layer/Layer';
+import olSource from 'ol/source/Source';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { SubjectStatus } from '@igo2/utils';
 import { Layer } from '../../layer/shared/layers';
@@ -9,6 +11,7 @@ import { MapViewController } from './controllers/view';
 import { FeatureDataSource } from '../../datasource/shared/datasources/feature-datasource';
 import { MapGeolocationController } from './controllers/geolocation';
 import { StorageService, ConfigService } from '@igo2/core';
+import { ObjectEvent } from 'ol/Object';
 export declare class IgoMap {
     private storageService?;
     private configService?;
@@ -16,6 +19,10 @@ export declare class IgoMap {
     offlineButtonToggle$: BehaviorSubject<boolean>;
     layers$: BehaviorSubject<Layer[]>;
     status$: Subject<SubjectStatus>;
+    propertyChange$: Subject<{
+        event: ObjectEvent;
+        layer: Layer;
+    }>;
     overlay: Overlay;
     queryResultsOverlay: Overlay;
     searchResultsOverlay: Overlay;
@@ -57,6 +64,7 @@ export declare class IgoMap {
     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

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

@@ -1,6 +1,12 @@
+import { BehaviorSubject } from 'rxjs';
 import { Watcher } from '@igo2/utils';
 import { Layer } from '../../layer/shared/layers';
+import { ObjectEvent } from 'ol/Object';
 export declare class LayerWatcher extends Watcher {
+    propertyChange$: BehaviorSubject<{
+        event: ObjectEvent;
+        layer: Layer;
+    }>;
     private loaded;
     private loading;
     private layers;
@@ -8,6 +14,7 @@ export declare class LayerWatcher extends Watcher {
     constructor();
     watch(): void;
     unwatch(): void;
+    setPropertyChange(change: ObjectEvent, layer: Layer): void;
     watchLayer(layer: Layer): void;
     unwatchLayer(layer: Layer): void;
 }

package/lib/workspace/shared/edition-workspace.d.ts

@@ -7,7 +7,7 @@ import { IgoMap } from '../../map';
 import { EditionWorkspaceService } from './edition-workspace.service';
 import { DrawControl } from '../../geometry';
 import { GeometryType } from '../../draw';
-import type { default as OlGeometryType } from 'ol/geom/GeometryType';
+import type { Type } from 'ol/geom/Geometry';
 import type { default as OlGeometry } from 'ol/geom/Geometry';
 import * as OlStyle from 'ol/style';
 import OlFeature from 'ol/Feature';
@@ -51,7 +51,7 @@ export declare class EditionWorkspace extends Workspace {
      * Called when the user selects a new geometry type
      * @param geometryType the geometry type selected by the user
      */
-    onGeometryTypeChange(geometryType: typeof OlGeometryType, feature: any, workspace: EditionWorkspace): void;
+    onGeometryTypeChange(geometryType: Type, feature: any, workspace: EditionWorkspace): void;
     /**
      * Activate the correct control
      */

package/ngcc.config.js

@@ -1,3 +1,3 @@
-module.exports = {
-  ignorableDeepImportMatchers: [/ol\//, /ol-mapbox-style\//]
-};
+module.exports = {
+  ignorableDeepImportMatchers: [/ol\//, /ol-mapbox-style\//]
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igo2/geo",
-  "version": "1.13.0-alpha.0",
+  "version": "1.13.0",
   "description": "IGO Library",
   "author": "MSP",
   "keywords": [
@@ -21,31 +21,31 @@
     "@turf/helpers": "^6.5.0",
     "@turf/line-intersect": "^6.5.0",
     "@turf/point-on-feature": "^6.5.0",
-    "tslib": "^2.0.0",
+    "tslib": "^2.4.0",
     "nosleep.js": "^0.12.0",
     "windows-1252": "^3.0.4"
   },
   "peerDependencies": {
-    "@angular/animations": "^14.0.6",
-    "@angular/common": "^14.0.6",
-    "@angular/core": "^14.0.6",
-    "@angular/forms": "^14.0.6",
-    "@angular/material": "^14.0.5",
-    "@igo2/common": "^1.13.0-alpha.0",
-    "@igo2/core": "^1.13.0-alpha.0",
-    "@igo2/utils": "^1.13.0-alpha.0",
-    "ol": "~6.14.1",
+    "@angular/animations": "^14.1.2",
+    "@angular/common": "^14.1.2",
+    "@angular/core": "^14.1.2",
+    "@angular/forms": "^14.1.2",
+    "@angular/material": "^14.1.2",
+    "@igo2/common": "^1.13.0",
+    "@igo2/core": "^1.13.0",
+    "@igo2/utils": "^1.13.0",
+    "ol": "^6.15.1",
     "proj4": "^2.8.0",
-    "rxjs": "^6.6.7",
-    "ol-mapbox-style": "^8.2.0",
+    "rxjs": "^7.5.6",
+    "ol-mapbox-style": "^8.2.1",
     "striptags": "^3.2.0"
   },
   "optionalDependencies": {
     "file-saver": "^2.0.2",
-    "html2canvas": "^1.0.0-rc.5",
+    "html2canvas": "^1.4.1",
     "jspdf": "^2.5.1",
-    "jszip": "^3.1.5",
-    "moment": "^2.24.0",
+    "jszip": "^3.10.1",
+    "moment": "^2.29.4",
     "stream": "^0.0.2"
   },
   "module": "fesm2015/igo2-geo.mjs",

package/style/geo.theming.scss

@@ -1,12 +1,12 @@
-@import '~ol/ol.css';
-
-@mixin igo-geo-theming($theme, $typography) {
-  @include igo-drawingTool-theming($theme, $typography);
-  @include igo-feature-theming($theme);
-  @include igo-filter-theming($theme, $typography);
-  @include igo-layer-theming($theme);
-  @include igo-map-theming($theme, $typography);
-  @include igo-measure-theming($theme, $typography);
-  @include igo-directions-theming($theme);
-  @include igo-workspace-theming($theme, $typography);
-}
+@import '~ol/ol.css';
+
+@mixin igo-geo-theming($theme, $typography) {
+  @include igo-drawingTool-theming($theme, $typography);
+  @include igo-feature-theming($theme);
+  @include igo-filter-theming($theme, $typography);
+  @include igo-layer-theming($theme);
+  @include igo-map-theming($theme, $typography);
+  @include igo-measure-theming($theme, $typography);
+  @include igo-directions-theming($theme);
+  @include igo-workspace-theming($theme, $typography);
+}