@igo2/geo 1.9.4 → 1.10.0

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

@@ -35,6 +35,7 @@ export interface Legend {
     };
     title?: string;
     currentStyle?: string;
+    imgGraphValue?: string;
 }
 export interface TileGridOptions {
     extent: [number, number, number, number];

package/lib/filter/filter.module.d.ts

@@ -48,6 +48,6 @@ import * as i45 from "@angular/material/badge";
 export declare class IgoFilterModule {
     static forRoot(): ModuleWithProviders<IgoFilterModule>;
     static ɵfac: i0.ɵɵFactoryDeclaration<IgoFilterModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<IgoFilterModule, [typeof i1.FilterableDataSourcePipe, typeof i2.TimeFilterButtonComponent, typeof i3.TimeFilterFormComponent, typeof i4.TimeFilterItemComponent, typeof i5.TimeFilterListComponent, typeof i6.TimeFilterListBindingDirective, typeof i7.OgcFilterFormComponent, typeof i8.OgcFilterButtonComponent, typeof i9.OgcFilterSelectionComponent, typeof i10.OgcFilterableFormComponent, typeof i11.OgcFilterableItemComponent, typeof i12.OgcFilterableListComponent, typeof i13.OgcFilterableListBindingDirective, typeof i14.SpatialFilterTypeComponent, typeof i15.SpatialFilterListComponent, typeof i16.SpatialFilterItemComponent, typeof i17.OgcFilterTimeComponent, typeof i18.OgcFilterTimeSliderComponent], [typeof i19.CommonModule, typeof i20.FormsModule, typeof i20.ReactiveFormsModule, typeof i21.MatAutocompleteModule, typeof i22.MatIconModule, typeof i23.MatButtonModule, typeof i24.MatTabsModule, typeof i25.MatRadioModule, typeof i26.MatMenuModule, typeof i27.MatTableModule, typeof i28.MatTreeModule, typeof i29.MatButtonToggleModule, typeof i30.MatCheckboxModule, typeof i31.MatSliderModule, typeof i32.MatSlideToggleModule, typeof i33.MatFormFieldModule, typeof i34.MatInputModule, typeof i35.MatOptionModule, typeof i36.MatSelectModule, typeof i37.MatListModule, typeof i38.MatTooltipModule, typeof i39.MatDatepickerModule, typeof i35.MatNativeDateModule, typeof i40.MatDatetimepickerModule, typeof i40.MatNativeDatetimeModule, typeof i41.IgoLanguageModule, typeof i42.IgoLayerModule, typeof i43.IgoCollapsibleModule, typeof i43.IgoListModule, typeof i43.IgoKeyValueModule, typeof i44.IgoGeometryModule, typeof i45.MatBadgeModule], [typeof i1.FilterableDataSourcePipe, typeof i2.TimeFilterButtonComponent, typeof i3.TimeFilterFormComponent, typeof i4.TimeFilterItemComponent, typeof i5.TimeFilterListComponent, typeof i6.TimeFilterListBindingDirective, typeof i7.OgcFilterFormComponent, typeof i8.OgcFilterButtonComponent, typeof i9.OgcFilterSelectionComponent, typeof i10.OgcFilterableFormComponent, typeof i11.OgcFilterableItemComponent, typeof i12.OgcFilterableListComponent, typeof i13.OgcFilterableListBindingDirective, typeof i14.SpatialFilterTypeComponent, typeof i15.SpatialFilterListComponent, typeof i16.SpatialFilterItemComponent, typeof i17.OgcFilterTimeComponent, typeof i18.OgcFilterTimeSliderComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<IgoFilterModule, [typeof i1.FilterableDataSourcePipe, typeof i2.TimeFilterButtonComponent, typeof i3.TimeFilterFormComponent, typeof i4.TimeFilterItemComponent, typeof i5.TimeFilterListComponent, typeof i6.TimeFilterListBindingDirective, typeof i7.OgcFilterFormComponent, typeof i8.OgcFilterButtonComponent, typeof i9.OgcFilterSelectionComponent, typeof i10.OgcFilterableFormComponent, typeof i11.OgcFilterableItemComponent, typeof i12.OgcFilterableListComponent, typeof i13.OgcFilterableListBindingDirective, typeof i14.SpatialFilterTypeComponent, typeof i15.SpatialFilterListComponent, typeof i16.SpatialFilterItemComponent, typeof i17.OgcFilterTimeComponent, typeof i18.OgcFilterTimeSliderComponent], [typeof i19.CommonModule, typeof i20.FormsModule, typeof i20.ReactiveFormsModule, typeof i21.MatAutocompleteModule, typeof i22.MatIconModule, typeof i23.MatButtonModule, typeof i24.MatTabsModule, typeof i25.MatRadioModule, typeof i26.MatMenuModule, typeof i27.MatTableModule, typeof i28.MatTreeModule, typeof i29.MatButtonToggleModule, typeof i30.MatCheckboxModule, typeof i31.MatSliderModule, typeof i32.MatSlideToggleModule, typeof i33.MatFormFieldModule, typeof i34.MatInputModule, typeof i35.MatOptionModule, typeof i36.MatSelectModule, typeof i37.MatListModule, typeof i38.MatTooltipModule, typeof i39.MatDatepickerModule, typeof i35.MatNativeDateModule, typeof i40.MatDatetimepickerModule, typeof i40.MatNativeDatetimeModule, typeof i41.IgoLanguageModule, typeof i42.IgoLayerModule, typeof i43.IgoCollapsibleModule, typeof i43.IgoListModule, typeof i43.IgoEntityModule, typeof i43.IgoKeyValueModule, typeof i44.IgoGeometryModule, typeof i45.MatBadgeModule], [typeof i1.FilterableDataSourcePipe, typeof i2.TimeFilterButtonComponent, typeof i3.TimeFilterFormComponent, typeof i4.TimeFilterItemComponent, typeof i5.TimeFilterListComponent, typeof i6.TimeFilterListBindingDirective, typeof i7.OgcFilterFormComponent, typeof i8.OgcFilterButtonComponent, typeof i9.OgcFilterSelectionComponent, typeof i10.OgcFilterableFormComponent, typeof i11.OgcFilterableItemComponent, typeof i12.OgcFilterableListComponent, typeof i13.OgcFilterableListBindingDirective, typeof i14.SpatialFilterTypeComponent, typeof i15.SpatialFilterListComponent, typeof i16.SpatialFilterItemComponent, typeof i17.OgcFilterTimeComponent, typeof i18.OgcFilterTimeSliderComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<IgoFilterModule>;
 }

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

@@ -12,7 +12,7 @@ import * as olStyle from 'ol/style';
 import { MatTreeNestedDataSource } from '@angular/material/tree';
 import { SpatialFilterService } from '../../shared/spatial-filter.service';
 import { MeasureLengthUnit } from '../../../measure';
-import { EntityStore } from '@igo2/common';
+import { EntityStore, EntityTableTemplate } from '@igo2/common';
 import { Layer } from '../../../layer/shared';
 import { NestedTreeControl } from '@angular/cdk/tree';
 import { SpatialFilterThematic } from './../../shared/spatial-filter.interface';
@@ -63,6 +63,7 @@ export declare class SpatialFilterItemComponent implements OnDestroy, OnInit {
     clearSearchEvent: EventEmitter<any>;
     export: EventEmitter<any>;
     openWorkspace: EventEmitter<any>;
+    entityChange: EventEmitter<any>;
     itemType: SpatialFilterItemType[];
     selectedItemType: SpatialFilterItemType;
     selectedSourceAddress: any;
@@ -101,6 +102,8 @@ export declare class SpatialFilterItemComponent implements OnDestroy, OnInit {
     bufferFormControl: FormControl;
     measureUnit: MeasureLengthUnit;
     zoneWithBuffer: any;
+    listIsVisible: boolean;
+    tableTemplate: EntityTableTemplate;
     constructor(cdRef: ChangeDetectorRef, spatialFilterService: SpatialFilterService, messageService: MessageService, languageService: LanguageService);
     ngOnInit(): void;
     /**
@@ -155,6 +158,8 @@ export declare class SpatialFilterItemComponent implements OnDestroy, OnInit {
      * Manage radius value at user change
      */
     getRadius(): void;
+    toggleVisibleList(): void;
+    private createTableTemplate;
     static ɵfac: i0.ɵɵFactoryDeclaration<SpatialFilterItemComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<SpatialFilterItemComponent, "igo-spatial-filter-item", never, { "map": "map"; "type": "type"; "queryType": "queryType"; "zone": "zone"; "loading": "loading"; "store": "store"; "layers": "layers"; "allLayers": "allLayers"; "thematicLength": "thematicLength"; }, { "toggleSearch": "toggleSearch"; "itemTypeChange": "itemTypeChange"; "thematicChange": "thematicChange"; "drawZoneEvent": "drawZoneEvent"; "bufferEvent": "bufferEvent"; "zoneWithBufferChange": "zoneWithBufferChange"; "measureUnitChange": "measureUnitChange"; "radiusEvent": "radiusEvent"; "freehandControl": "freehandControl"; "clearButtonEvent": "clearButtonEvent"; "clearSearchEvent": "clearSearchEvent"; "export": "export"; "openWorkspace": "openWorkspace"; }, never, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<SpatialFilterItemComponent, "igo-spatial-filter-item", never, { "map": "map"; "type": "type"; "queryType": "queryType"; "zone": "zone"; "loading": "loading"; "store": "store"; "layers": "layers"; "allLayers": "allLayers"; "thematicLength": "thematicLength"; }, { "toggleSearch": "toggleSearch"; "itemTypeChange": "itemTypeChange"; "thematicChange": "thematicChange"; "drawZoneEvent": "drawZoneEvent"; "bufferEvent": "bufferEvent"; "zoneWithBufferChange": "zoneWithBufferChange"; "measureUnitChange": "measureUnitChange"; "radiusEvent": "radiusEvent"; "freehandControl": "freehandControl"; "clearButtonEvent": "clearButtonEvent"; "clearSearchEvent": "clearSearchEvent"; "export": "export"; "openWorkspace": "openWorkspace"; "entityChange": "entityChange"; }, never, never>;
 }

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

@@ -82,6 +82,8 @@ export declare class ImportExportComponent implements OnDestroy, OnInit {
     importFiles(files: File[]): void;
     handlePopup(preCheck?: boolean): boolean;
     handleExportFormSubmit(data: ExportOptions): void;
+    private createTitleEmptyRows;
+    private circleToPoint;
     private buildForm;
     private onFileImportSuccess;
     private onFileImportError;

package/lib/import-export/shared/export.interface.d.ts

@@ -5,6 +5,7 @@ export interface ExportOptions {
     layers: string[];
     layersWithSelection?: string[];
     name?: string;
+    combineLayers?: boolean;
+    separator?: boolean;
     featureInMapExtent?: boolean;
-    circlesToPolygons?: boolean;
 }

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

@@ -58,10 +58,6 @@ export declare class LayerLegendComponent implements OnInit, OnDestroy {
     /**
      * activeLegend
      */
-    legendGraphic: {
-        [srcKey: string]: string;
-    };
-    currentItemTitle: string;
     constructor(capabilitiesService: CapabilitiesService, languageService: LanguageService, http: HttpClient, cdRef: ChangeDetectorRef);
     /**
      * On init, subscribe to the map's resolution and update the legend accordingly

package/lib/layer/layer.module.d.ts

@@ -29,6 +29,6 @@ import * as i26 from "@igo2/common";
 export declare class IgoLayerModule {
     static forRoot(): ModuleWithProviders<IgoLayerModule>;
     static ɵfac: i0.ɵɵFactoryDeclaration<IgoLayerModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<IgoLayerModule, [typeof i1.LayerItemComponent, typeof i2.LayerLegendItemComponent, typeof i3.LayerLegendComponent, typeof i4.LayerListComponent, typeof i5.LayerListToolComponent, typeof i6.LayerLegendListComponent, typeof i7.LayerListBindingDirective, typeof i8.LayerLegendListBindingDirective, typeof i9.TrackFeatureButtonComponent], [typeof i10.MatInputModule, typeof i11.MatFormFieldModule, typeof i12.CommonModule, typeof i13.FormsModule, typeof i14.MatDividerModule, typeof i15.MatMenuModule, typeof i16.MatIconModule, typeof i17.MatButtonModule, typeof i18.MatSlideToggleModule, typeof i19.MatSelectModule, typeof i20.MatTooltipModule, typeof i21.MatListModule, typeof i22.MatSliderModule, typeof i23.MatBadgeModule, typeof i24.MatCheckboxModule, typeof i25.IgoLanguageModule, typeof i26.IgoListModule, typeof i26.IgoCollapsibleModule, typeof i26.IgoImageModule, typeof i26.IgoPanelModule, typeof i26.IgoMatBadgeIconModule], [typeof i1.LayerItemComponent, typeof i2.LayerLegendItemComponent, typeof i3.LayerLegendComponent, typeof i4.LayerListComponent, typeof i5.LayerListToolComponent, typeof i6.LayerLegendListComponent, typeof i7.LayerListBindingDirective, typeof i8.LayerLegendListBindingDirective, typeof i9.TrackFeatureButtonComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<IgoLayerModule, [typeof i1.LayerItemComponent, typeof i2.LayerLegendItemComponent, typeof i3.LayerLegendComponent, typeof i4.LayerListComponent, typeof i5.LayerListToolComponent, typeof i6.LayerLegendListComponent, typeof i7.LayerListBindingDirective, typeof i8.LayerLegendListBindingDirective, typeof i9.TrackFeatureButtonComponent], [typeof i10.MatInputModule, typeof i11.MatFormFieldModule, typeof i12.CommonModule, typeof i13.FormsModule, typeof i14.MatDividerModule, typeof i15.MatMenuModule, typeof i16.MatIconModule, typeof i17.MatButtonModule, typeof i18.MatSlideToggleModule, typeof i19.MatSelectModule, typeof i20.MatTooltipModule, typeof i21.MatListModule, typeof i22.MatSliderModule, typeof i23.MatBadgeModule, typeof i24.MatCheckboxModule, typeof i25.IgoLanguageModule, typeof i26.IgoListModule, typeof i26.IgoCollapsibleModule, typeof i26.IgoImageModule, typeof i26.IgoPanelModule, typeof i26.IgoMatBadgeIconModule, typeof i26.IgoCustomHtmlModule], [typeof i1.LayerItemComponent, typeof i2.LayerLegendItemComponent, typeof i3.LayerLegendComponent, typeof i4.LayerListComponent, typeof i5.LayerListToolComponent, typeof i6.LayerLegendListComponent, typeof i7.LayerListBindingDirective, typeof i8.LayerLegendListBindingDirective, typeof i9.TrackFeatureButtonComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<IgoLayerModule>;
 }

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

@@ -15,7 +15,7 @@ export declare class LayerService {
     private authInterceptor;
     constructor(http: HttpClient, styleService: StyleService, dataSourceService: DataSourceService, messageService: MessageService, languageService: LanguageService, authInterceptor: AuthInterceptor);
     createLayer(layerOptions: AnyLayerOptions): Layer;
-    createAsyncLayer(layerOptions: AnyLayerOptions, detailedContextUri?: string): Observable<Layer>;
+    createAsyncLayer(_layerOptions: AnyLayerOptions, detailedContextUri?: string): Observable<Layer>;
     private createImageLayer;
     private createTileLayer;
     private createVectorLayer;

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

@@ -50,6 +50,7 @@ export declare abstract class Layer {
     constructor(options: LayerOptions, messageService?: MessageService, authInterceptor?: AuthInterceptor);
     protected abstract createOlLayer(): olLayer<olSource>;
     setMap(igoMap: IgoMap | undefined): void;
+    private showMessage;
     private observeResolution;
     private unobserveResolution;
     private updateInResolutionsRange;

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

@@ -27,6 +27,7 @@ export interface VectorLayerOptions extends LayerOptions {
     ol?: olLayerVector<olSourceVector<OlGeometry>>;
     animation?: VectorAnimation;
     styleByAttribute?: StyleByAttribute;
+    hoverStyle?: StyleByAttribute;
     clusterBaseStyle?: {
         [key: string]: any;
     } | olStyle | olStyle[];

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

@@ -13,5 +13,6 @@ export interface VectorTileLayerOptions extends LayerOptions {
     ol?: olLayerVectorTile;
     declutter?: boolean;
     styleByAttribute?: StyleByAttribute;
+    hoverStyle?: StyleByAttribute;
     mapboxStyle?: MapboxStyle;
 }

package/lib/layer/shared/style.service.d.ts

@@ -1,6 +1,9 @@
+import type { default as OlGeometry } from 'ol/geom/Geometry';
 import * as olstyle from 'ol/style';
+import OlFeature from 'ol/Feature';
 import { StyleByAttribute } from './vector-style.interface';
 import { ClusterParam } from './clusterParam';
+import RenderFeature from 'ol/render/Feature';
 import * as i0 from "@angular/core";
 export declare class StyleService {
     style: olstyle.Style;
@@ -10,7 +13,7 @@ export declare class StyleService {
     private parseStyle;
     private getOlKey;
     private getOlCls;
-    createStyleByAttribute(feature: any, styleByAttribute: StyleByAttribute): any;
+    createStyleByAttribute(feature: RenderFeature | OlFeature<OlGeometry>, styleByAttribute: StyleByAttribute): any;
     createClusterStyle(feature: any, clusterParam: ClusterParam, layerStyle: any): any;
     getLabel(feature: any, labelMatch: any): string;
     private guessTypeFeature;

package/lib/layer/shared/vector-style.interface.d.ts

@@ -1,5 +1,5 @@
-import olStyle from 'ol/style/Style';
 export interface StyleByAttribute {
+    anchor?: Array<[number, number]>;
     type?: string;
     attribute?: string;
     data?: Array<any>;
@@ -9,14 +9,18 @@ export interface StyleByAttribute {
     radius?: Array<number>;
     icon?: Array<string>;
     scale?: Array<number>;
-    label?: string | {
-        [key: string]: any;
-    } | olStyle | olStyle[];
+    label?: IgoLabel;
     baseStyle?: {
         [key: string]: any;
-    } | olStyle | olStyle[];
+    };
     hoverStyle?: StyleByAttribute;
 }
+export interface IgoLabel {
+    attribute: string;
+    style?: {
+        [key: string]: any;
+    };
+}
 export interface MapboxStyle {
     url: string;
     source: string;

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

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

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

@@ -0,0 +1,2 @@
+import { AnyLayerOptions } from "../shared/layers/any-layer.interface";
+export declare function computeMVTOptionsOnHover(layerOptions: AnyLayerOptions): AnyLayerOptions;

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/query/shared/query.interfaces.d.ts

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

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igo2/geo",
-  "version": "1.9.4",
+  "version": "1.10.0",
   "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.10.0",
+    "@igo2/core": "^1.10.0",
+    "@igo2/utils": "^1.10.0",
     "ol": "^6.8.1",
     "proj4": "^2.7.5",
     "rxjs": "^6.6.7",