@igo2/geo 1.9.4 → 1.11.1

package/lib/map/shared/hover-feature.directive.d.ts

@@ -2,12 +2,16 @@ import { OnDestroy, OnInit } from '@angular/core';
 import { IgoMap } from '../../map/shared/map';
 import { MapBrowserComponent } from '../../map/map-browser/map-browser.component';
 import { Feature } from '../../feature/shared/feature.interfaces';
-import olFeature from 'ol/Feature';
-import * as olstyle from 'ol/style';
-import * as olgeom from 'ol/geom';
+import type { default as OlGeometry } from 'ol/geom/Geometry';
+import OlFeature from 'ol/Feature';
+import * as OlStyle from 'ol/style';
+import * as OlGeom from 'ol/geom';
+import { VectorLayer, VectorTileLayer } from '../../layer/shared/layers';
 import { FeatureStore } from '../../feature/shared/store';
 import { MediaService } from '@igo2/core';
 import { StyleService } from '../../layer/shared/style.service';
+import RenderFeature from 'ol/render/Feature';
+import { StyleByAttribute } from '../../layer/shared/vector-style.interface';
 import * as i0 from "@angular/core";
 /**
  * This directive makes the mouse coordinate trigger a reverse search on available search sources.
@@ -24,6 +28,9 @@ export declare class HoverFeatureDirective implements OnInit, OnDestroy {
     private lastTimeoutRequest;
     private store$$;
     private layers$$;
+    private selectionLayer;
+    private selectionMVT;
+    private mvtStyleOptions;
     /**
      * Listener to the pointer move event
      */
@@ -56,6 +63,7 @@ export declare class HoverFeatureDirective implements OnInit, OnDestroy {
      * @internal
      */
     private initStore;
+    createHoverStyle(feature: RenderFeature | OlFeature<OlGeometry>, hoverStyle: StyleByAttribute): any;
     /**
      * Stop listening to pointermove and reverse search results.
      * @internal
@@ -104,6 +112,8 @@ export declare class HoverFeatureDirective implements OnInit, OnDestroy {
      * @param event OL map browser pointer event
      */
     private onMapEvent;
+    canProcessHover(igoLayer: VectorLayer | VectorTileLayer): boolean;
+    handleRenderFeature(feature: RenderFeature | OlFeature<OlGeometry>): OlFeature<OlGeometry>;
     /**
      * Add a feature to the pointer store
      * @param text string
@@ -112,7 +122,6 @@ export declare class HoverFeatureDirective implements OnInit, OnDestroy {
     private setLayerStyleFromOptions;
     private getHoverSummary;
     private getGeometry;
-    private getSameFeatureNeighbour;
     /**
      * Clear the pointer store features
      */
@@ -125,4 +134,4 @@ export declare class HoverFeatureDirective implements OnInit, OnDestroy {
  * @param feature OlFeature
  * @returns OL style function
  */
-export declare function hoverFeatureMarker(feature: olFeature<olgeom.Geometry>, resolution: number): olstyle.Style[];
+export declare function hoverFeatureMarker(feature: OlFeature<OlGeom.Geometry>, resolution: number): OlStyle.Style[];

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

@@ -12,6 +12,7 @@ export declare class MapOfflineDirective implements AfterViewInit {
     private networkState;
     private offlineButtonState;
     get map(): IgoMap;
+    private previousMessageId;
     constructor(component: MapBrowserComponent, networkService: NetworkService, messageService: MessageService, languageService: LanguageService);
     ngAfterViewInit(): void;
     private changeLayer;

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

@@ -14,10 +14,11 @@ export interface QueryableDataSourceOptions extends DataSourceOptions {
     queryFormat?: QueryFormat;
     queryTitle?: string;
     queryUrl?: string;
-    queryFeature?: boolean;
+    queryLayerFeatures?: boolean;
     mapLabel?: string;
     queryHtmlTarget?: QueryHtmlTarget;
     ol?: olSourceVector<OlGeometry> | olSource;
+    queryFormatAsWms?: boolean;
 }
 export interface QueryableDataSource extends DataSource {
     queryTitle?: string;

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

@@ -105,6 +105,12 @@ export declare class SearchPointerSummaryDirective implements OnInit, OnDestroy,
      * @param event OL map browser pointer event
      */
     private onMapEvent;
+    /**
+   * Sort the results by display order.
+   * @param r1 First result
+   * @param r2 Second result
+   */
+    private sortByOrder;
     private onSearchCoordinate;
     private onSearch;
     /**

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

@@ -16,6 +16,7 @@ export interface SearchResult<T = {
         id: string;
         title: string;
         titleHtml?: string;
+        pointerSummaryTitle?: string;
         icon: string;
         score?: number;
         nextPage?: boolean;

package/lib/workspace/confirmation-popup/confirmation-popup.component.d.ts

@@ -0,0 +1,23 @@
+import { LanguageService } from '@igo2/core';
+import { MatDialogRef } from '@angular/material/dialog';
+import * as i0 from "@angular/core";
+export interface DialogData {
+    type: string;
+    cancel: boolean;
+}
+export declare class ConfirmationPopupComponent {
+    dialogRef: MatDialogRef<ConfirmationPopupComponent>;
+    languageService: LanguageService;
+    data: {
+        type: string;
+        cancel: boolean;
+    };
+    constructor(dialogRef: MatDialogRef<ConfirmationPopupComponent>, languageService: LanguageService, data: {
+        type: string;
+        cancel: boolean;
+    });
+    cancelAction(): void;
+    confirmedAction(): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<ConfirmationPopupComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<ConfirmationPopupComponent, "igo-confirmation-popup-component", never, {}, {}, never, never>;
+}

package/lib/workspace/confirmation-popup/confirmation-popup.module.d.ts

@@ -0,0 +1,14 @@
+import * as i0 from "@angular/core";
+import * as i1 from "./confirmation-popup.component";
+import * as i2 from "@angular/common";
+import * as i3 from "@angular/material/button";
+import * as i4 from "@angular/material/dialog";
+import * as i5 from "@angular/material/button-toggle";
+/**
+ * @ignore
+ */
+export declare class IgoConfirmationPopupModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<IgoConfirmationPopupModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<IgoConfirmationPopupModule, [typeof i1.ConfirmationPopupComponent], [typeof i2.CommonModule, typeof i3.MatButtonModule, typeof i4.MatDialogModule, typeof i5.MatButtonToggleModule], [typeof i1.ConfirmationPopupComponent]>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<IgoConfirmationPopupModule>;
+}

package/lib/workspace/confirmation-popup/index.d.ts

@@ -0,0 +1,2 @@
+export * from './confirmation-popup.component';
+export * from './confirmation-popup.module';

package/lib/workspace/index.d.ts

@@ -1,4 +1,5 @@
 export * from './shared';
+export * from './confirmation-popup/index';
 export * from './workspace-selector/workspace-selector.directive';
 export * from './workspace-selector/workspace-selector.module';
 export * from './workspace-updator/workspace-updator.directive';

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

@@ -0,0 +1,81 @@
+import { MatDialog } from '@angular/material/dialog';
+import { Workspace, WorkspaceOptions } from '@igo2/common';
+import { ConfigService } from '@igo2/core';
+import { BehaviorSubject } from 'rxjs';
+import { ImageLayer, VectorLayer } from '../../layer';
+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 { default as OlGeometry } from 'ol/geom/Geometry';
+import * as OlStyle from 'ol/style';
+import OlFeature from 'ol/Feature';
+export interface EditionWorkspaceOptions extends WorkspaceOptions {
+    layer: ImageLayer | VectorLayer;
+    map: IgoMap;
+}
+export declare class EditionWorkspace extends Workspace {
+    protected options: EditionWorkspaceOptions;
+    private editionWorkspaceService;
+    private dialog;
+    private configService;
+    readonly inResolutionRange$: BehaviorSubject<boolean>;
+    get layer(): ImageLayer | VectorLayer;
+    get map(): IgoMap;
+    private drawControl;
+    private drawEnd$$;
+    private olDrawingLayerSource;
+    private olDrawingLayer;
+    geometryType: typeof GeometryType;
+    modify: any;
+    modifyStyle: OlStyle.Style;
+    private filterClauseFunc;
+    fillColor: string;
+    strokeColor: string;
+    strokeWidth: number;
+    constructor(options: EditionWorkspaceOptions, editionWorkspaceService: EditionWorkspaceService, dialog: MatDialog, configService: ConfigService);
+    private getInResolutionRange;
+    deleteFeature(feature: any, workspace: any): void;
+    editFeature(feature: any, workspace: EditionWorkspace): void;
+    /**
+     * Create a Draw Control
+     * @param fillColor the fill color
+     * @param strokeColor the stroke color
+     * @param strokeWidth the stroke width
+     * @returns a Draw Control
+     */
+    createDrawControl(fillColor?: string, strokeColor?: string, strokeWidth?: number): DrawControl;
+    /**
+     * 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;
+    /**
+     * Activate the correct control
+     */
+    private toggleDrawControl;
+    /**
+     * Deactivate the active draw control
+     */
+    deactivateDrawControl(): void;
+    /**
+     * Activate a given control
+     */
+    private activateDrawControl;
+    /**
+     * Add a feature to layer. The loading strategy of the layer
+     * will trigger and add the feature to the workspace store.
+     * @internal
+     */
+    private addFeatureToStore;
+    /**
+     * Delete drawings layer and source from the map AND feature from the entity store.
+     * Layer refresh will automatically add the new feature into the store.
+     */
+    deleteDrawings(): void;
+    /**
+     * Create a modify interaction to allow a geometry change one feature at the time (drag and drop)
+     */
+    createModifyInteraction(olFeature: OlFeature<OlGeometry>, feature: any, workspace: EditionWorkspace): void;
+}

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

@@ -0,0 +1,45 @@
+import { HttpClient } from '@angular/common/http';
+import { MatDialog } from '@angular/material/dialog';
+import { ConfigService, LanguageService, MessageService, StorageService } from '@igo2/core';
+import { AuthInterceptor } from '@igo2/auth';
+import { ImageLayer, LayerService, VectorLayer } from '../../layer';
+import { IgoMap } from '../../map';
+import { EditionWorkspace } from './edition-workspace';
+import { BehaviorSubject, Observable } from 'rxjs';
+import * as i0 from "@angular/core";
+export declare class EditionWorkspaceService {
+    private layerService;
+    private storageService;
+    private configService;
+    private messageService;
+    private languageService;
+    private http;
+    private dialog;
+    authInterceptor?: AuthInterceptor;
+    ws$: BehaviorSubject<string>;
+    adding$: BehaviorSubject<boolean>;
+    relationLayers$: BehaviorSubject<ImageLayer[] | VectorLayer[]>;
+    rowsInMapExtentCheckCondition$: BehaviorSubject<boolean>;
+    loading: boolean;
+    get zoomAuto(): boolean;
+    constructor(layerService: LayerService, storageService: StorageService, configService: ConfigService, messageService: MessageService, languageService: LanguageService, http: HttpClient, dialog: MatDialog, authInterceptor?: AuthInterceptor);
+    createWorkspace(layer: ImageLayer, map: IgoMap): EditionWorkspace;
+    private createFeatureStore;
+    private createTableTemplate;
+    private createFilterInMapExtentOrResolutionStrategy;
+    saveFeature(feature: any, workspace: EditionWorkspace): boolean;
+    addFeature(feature: any, workspace: EditionWorkspace, url: string, headers: {
+        [key: string]: any;
+    }): void;
+    deleteFeature(workspace: EditionWorkspace, url: string): void;
+    modifyFeature(feature: any, workspace: EditionWorkspace, url: string, headers: {
+        [key: string]: any;
+    }, protocole?: string): void;
+    cancelEdit(workspace: EditionWorkspace, feature: any, fromSave?: boolean): void;
+    getDomainValues(table: string): Observable<any>;
+    refreshMap(layer: VectorLayer, map: IgoMap): void;
+    validateFeature(feature: any, workspace: EditionWorkspace): boolean;
+    sanitizeParameter(feature: any, workspace: EditionWorkspace): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<EditionWorkspaceService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<EditionWorkspaceService>;
+}

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

@@ -12,4 +12,7 @@ export declare class FeatureWorkspace extends Workspace {
     get layer(): VectorLayer;
     get map(): IgoMap;
     constructor(options: FeatureWorkspaceOptions);
+    getLayerWksOptionTabQuery(): boolean;
+    getLayerWksOptionMapQuery(): boolean;
+    private getInResolutionRange;
 }

package/lib/workspace/shared/feature-workspace.service.d.ts

@@ -1,3 +1,4 @@
+import { BehaviorSubject } from 'rxjs';
 import { VectorLayer } from '../../layer';
 import { IgoMap } from '../../map';
 import { FeatureWorkspace } from './feature-workspace';
@@ -6,6 +7,7 @@ import * as i0 from "@angular/core";
 export declare class FeatureWorkspaceService {
     private storageService;
     get zoomAuto(): boolean;
+    ws$: BehaviorSubject<string>;
     constructor(storageService: StorageService);
     createWorkspace(layer: VectorLayer, map: IgoMap): FeatureWorkspace;
     private createFeatureStore;

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

@@ -2,4 +2,6 @@ export * from './wfs-workspace';
 export * from './wfs-workspace.service';
 export * from './feature-workspace';
 export * from './feature-workspace.service';
+export * from './edition-workspace';
+export * from './edition-workspace.service';
 export * from './workspace.utils';

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

@@ -12,4 +12,7 @@ export declare class WfsWorkspace extends Workspace {
     get layer(): VectorLayer;
     get map(): IgoMap;
     constructor(options: WfsWorkspaceOptions);
+    getLayerWksOptionTabQuery(): boolean;
+    getLayerWksOptionMapQuery(): boolean;
+    private getInResolutionRange;
 }

package/lib/workspace/shared/wfs-workspace.service.d.ts

@@ -1,3 +1,4 @@
+import { BehaviorSubject } from 'rxjs';
 import { VectorLayer } from '../../layer';
 import { IgoMap } from '../../map';
 import { WfsWorkspace } from './wfs-workspace';
@@ -6,6 +7,7 @@ import * as i0 from "@angular/core";
 export declare class WfsWorkspaceService {
     private storageService;
     get zoomAuto(): boolean;
+    ws$: BehaviorSubject<string>;
     constructor(storageService: StorageService);
     createWorkspace(layer: VectorLayer, map: IgoMap): WfsWorkspace;
     private createFeatureStore;

package/lib/workspace/shared/wms-workspace.service.d.ts

@@ -1,3 +1,4 @@
+import { BehaviorSubject } from 'rxjs';
 import { StorageService } from '@igo2/core';
 import { ImageLayer, LayerService } from '../../layer';
 import { IgoMap } from '../../map';
@@ -7,6 +8,7 @@ export declare class WmsWorkspaceService {
     private layerService;
     private storageService;
     get zoomAuto(): boolean;
+    ws$: BehaviorSubject<string>;
     constructor(layerService: LayerService, storageService: StorageService);
     createWorkspace(layer: ImageLayer, map: IgoMap): WfsWorkspace;
     private createFeatureStore;

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

@@ -1,9 +1,10 @@
 import { WfsWorkspace } from './wfs-workspace';
 import { FeatureWorkspace } from './feature-workspace';
+import { EditionWorkspace } from './edition-workspace';
 import { Observable } from 'rxjs';
 export declare function getRowsInMapExtent(layerId: any, storageService: any): boolean;
 export declare function setRowsInMapExtent(value: any, layerId: any, storageService: any): void;
 export declare function getSelectedOnly(layerId: any, storageService: any): boolean;
 export declare function setSelectedOnly(value: any, layerId: any, storageService: any): void;
-export declare function mapExtentStrategyActiveToolTip(ws: WfsWorkspace | FeatureWorkspace): Observable<string>;
-export declare function noElementSelected(ws: WfsWorkspace | FeatureWorkspace): Observable<boolean>;
+export declare function mapExtentStrategyActiveToolTip(ws: WfsWorkspace | FeatureWorkspace | EditionWorkspace): Observable<string>;
+export declare function noElementSelected(ws: WfsWorkspace | FeatureWorkspace | EditionWorkspace): Observable<boolean>;

package/lib/workspace/workspace-selector/workspace-selector.directive.d.ts

@@ -1,25 +1,32 @@
-import { OnInit, OnDestroy } from '@angular/core';
+import { OnInit, OnDestroy, EventEmitter } from '@angular/core';
 import { WorkspaceStore, WorkspaceSelectorComponent } from '@igo2/common';
+import { ImageLayer, VectorLayer } from '../../layer';
 import { IgoMap } from '../../map';
 import { WfsWorkspaceService } from '../shared/wfs-workspace.service';
 import { WmsWorkspaceService } from '../shared/wms-workspace.service';
+import { EditionWorkspaceService } from '../shared/edition-workspace.service';
 import { FeatureWorkspaceService } from '../shared/feature-workspace.service';
 import * as i0 from "@angular/core";
 export declare class WorkspaceSelectorDirective implements OnInit, OnDestroy {
     private component;
     private wfsWorkspaceService;
     private wmsWorkspaceService;
+    private editionWorkspaceService;
     private featureWorkspaceService;
     private layers$$;
     private entities$$;
     map: IgoMap;
+    changeWorkspace: EventEmitter<string>;
+    disableSwitch: EventEmitter<boolean>;
+    relationLayers: EventEmitter<ImageLayer[] | VectorLayer[]>;
+    rowsInMapExtentCheckCondition: EventEmitter<boolean>;
     get workspaceStore(): WorkspaceStore;
-    constructor(component: WorkspaceSelectorComponent, wfsWorkspaceService: WfsWorkspaceService, wmsWorkspaceService: WmsWorkspaceService, featureWorkspaceService: FeatureWorkspaceService);
+    constructor(component: WorkspaceSelectorComponent, wfsWorkspaceService: WfsWorkspaceService, wmsWorkspaceService: WmsWorkspaceService, editionWorkspaceService: EditionWorkspaceService, featureWorkspaceService: FeatureWorkspaceService);
     ngOnInit(): void;
     ngOnDestroy(): void;
     private onLayersChange;
     private getOrCreateWorkspace;
     private layerIsEditable;
     static ɵfac: i0.ɵɵFactoryDeclaration<WorkspaceSelectorDirective, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<WorkspaceSelectorDirective, "[igoWorkspaceSelector]", never, { "map": "map"; }, {}, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<WorkspaceSelectorDirective, "[igoWorkspaceSelector]", never, { "map": "map"; }, { "changeWorkspace": "changeWorkspace"; "disableSwitch": "disableSwitch"; "relationLayers": "relationLayers"; "rowsInMapExtentCheckCondition": "rowsInMapExtentCheckCondition"; }, never>;
 }

package/lib/workspace/workspace-updator/workspace-updator.directive.d.ts

@@ -3,17 +3,19 @@ import type { WorkspaceStore } from '@igo2/common';
 import { IgoMap } from '../../map';
 import { WfsWorkspaceService } from '../shared/wfs-workspace.service';
 import { WmsWorkspaceService } from '../shared/wms-workspace.service';
+import { EditionWorkspaceService } from '../shared/edition-workspace.service';
 import { FeatureWorkspaceService } from '../shared/feature-workspace.service';
 import * as i0 from "@angular/core";
 export declare class WorkspaceUpdatorDirective implements OnInit, OnDestroy {
     private wfsWorkspaceService;
     private wmsWorkspaceService;
+    private editionWorkspaceService;
     private featureWorkspaceService;
     private layers$$;
     private entities$$;
     map: IgoMap;
     workspaceStore: WorkspaceStore;
-    constructor(wfsWorkspaceService: WfsWorkspaceService, wmsWorkspaceService: WmsWorkspaceService, featureWorkspaceService: FeatureWorkspaceService);
+    constructor(wfsWorkspaceService: WfsWorkspaceService, wmsWorkspaceService: WmsWorkspaceService, editionWorkspaceService: EditionWorkspaceService, featureWorkspaceService: FeatureWorkspaceService);
     ngOnInit(): void;
     ngOnDestroy(): void;
     private onLayersChange;

package/lib/workspace/workspace.module.d.ts

@@ -1,11 +1,14 @@
 import * as i0 from "@angular/core";
 import * as i1 from "@angular/common";
-import * as i2 from "@igo2/common";
-import * as i3 from "./workspace-selector/workspace-selector.module";
-import * as i4 from "./workspace-updator/workspace-updator.module";
-import * as i5 from "./widgets/ogc-filter/ogc-filter.module";
+import * as i2 from "@igo2/core";
+import * as i3 from "@igo2/common";
+import * as i4 from "./workspace-selector/workspace-selector.module";
+import * as i5 from "./workspace-updator/workspace-updator.module";
+import * as i6 from "./widgets/ogc-filter/ogc-filter.module";
+import * as i7 from "@angular/material/dialog";
+import * as i8 from "./confirmation-popup/confirmation-popup.module";
 export declare class IgoGeoWorkspaceModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<IgoGeoWorkspaceModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<IgoGeoWorkspaceModule, never, [typeof i1.CommonModule, typeof i2.IgoWidgetModule, typeof i3.IgoWorkspaceSelectorModule, typeof i4.IgoWorkspaceUpdatorModule, typeof i5.IgoOgcFilterModule], [typeof i3.IgoWorkspaceSelectorModule, typeof i4.IgoWorkspaceUpdatorModule, typeof i5.IgoOgcFilterModule]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<IgoGeoWorkspaceModule, never, [typeof i1.CommonModule, typeof i2.IgoLanguageModule, typeof i3.IgoWidgetModule, typeof i4.IgoWorkspaceSelectorModule, typeof i5.IgoWorkspaceUpdatorModule, typeof i6.IgoOgcFilterModule, typeof i7.MatDialogModule], [typeof i4.IgoWorkspaceSelectorModule, typeof i5.IgoWorkspaceUpdatorModule, typeof i6.IgoOgcFilterModule, typeof i8.IgoConfirmationPopupModule]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<IgoGeoWorkspaceModule>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igo2/geo",
-  "version": "1.9.4",
+  "version": "1.11.1",
   "description": "IGO Library",
   "author": "MSP",
   "keywords": [
@@ -29,9 +29,9 @@
     "@angular/core": "^12.2.9",
     "@angular/forms": "^12.2.9",
     "@angular/material": "^12.2.9",
-    "@igo2/common": "^1.9.4",
-    "@igo2/core": "^1.9.4",
-    "@igo2/utils": "^1.9.4",
+    "@igo2/common": "^1.11.1",
+    "@igo2/core": "^1.11.1",
+    "@igo2/utils": "^1.11.1",
     "ol": "^6.8.1",
     "proj4": "^2.7.5",
     "rxjs": "^6.6.7",

package/style/geo.theming.scss

@@ -8,4 +8,5 @@
   @include igo-map-theming($theme, $typography);
   @include igo-measure-theming($theme, $typography);
   @include igo-directions-theming($theme);
+  @include igo-workspace-theming($theme, $typography);
 }