@provoly/dashboard 1.0.0 → 1.1.1

package/widgets/widget-map/component/widget-map.component.d.ts

@@ -1,16 +1,15 @@
-import { AfterViewInit, ComponentRef, ElementRef, Injector, OnDestroy, TemplateRef, ViewContainerRef } from '@angular/core';
+import { AfterViewInit, ElementRef, Injector, OnDestroy, TemplateRef, ViewContainerRef } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { BaseTooltipComponent, BaseWidgetMapLayerOptions, Class, DataWidgetComponent, Field, GetCapabilitiesResponse, LayerGroup, MapAutoLayerOptions, MapFeatureLayerOptions, MapGeoServerLayerOptions, MapRasterTileLayerOptions, MapVectorTileLayerOptions, MapWidgetBubbleLayerOptions, MapWidgetHeatMapLayerOptions, MapWidgetLayerOptions, MapWidgetMarkerLayerOptions, MapWidgetOptions, MapWMSLayerLayerOptions, MapWMTSLayerLayerOptions, PryAggregationService, PryGeoAuthService, PryI18nService, SymbolService, TooltipFactoryService } from '@provoly/dashboard';
-import { Map, Overlay } from 'ol';
+import { BaseWidgetMapLayerOptions, Class, DataWidgetComponent, Field, GetCapabilitiesResponse, LayerGroup, MapAutoLayerOptions, MapFeatureLayerOptions, MapGeoServerLayerOptions, MapRasterTileLayerOptions, MapVectorTileLayerOptions, MapWidgetBubbleLayerOptions, MapWidgetHeatMapLayerOptions, MapWidgetLayerOptions, MapWidgetMarkerLayerOptions, MapWidgetOptions, MapWMSLayerLayerOptions, MapWMTSLayerLayerOptions, PryAggregationService, PryGeoAuthService, PryI18nService, SymbolService, TooltipFactoryService } from '@provoly/dashboard';
+import { Map } from 'ol';
 import { Coordinate } from 'ol/coordinate';
 import { Geometry } from 'ol/geom';
 import { Layer } from 'ol/layer';
 import BaseLayer from 'ol/layer/Base';
 import VectorLayer from 'ol/layer/Vector';
-import { Pixel } from 'ol/pixel';
 import VectorSource from 'ol/source/Vector';
 import { Style } from 'ol/style';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
 import { InteractionManager } from '../interaction/interaction-manager.class';
 import { WidgetMapLayerService } from './widget-map-layer.service';
 import { LayerSlider } from '../interaction/layer-slider.class';
@@ -18,6 +17,7 @@ import TileLayer from 'ol/layer/Tile';
 import { Attribution } from 'ol/control';
 import VectorTileLayer from 'ol/layer/VectorTile';
 import { CdkDragDrop } from '@angular/cdk/drag-drop';
+import { TooltipManager } from '../interaction/tooltip-manager.class';
 import * as i0 from "@angular/core";
 export declare const TOOLTIP_PADDING = 15;
 export declare const NON_MANDATORY_FIT_LAYER_TYPES: string[];
@@ -30,6 +30,8 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     private widgetMapLayerService;
     private pryAggregationService;
     private geoAuthService;
+    static idCounter: number;
+    id: string;
     mapUrl$: Observable<string>;
     mapRef: ElementRef;
     popup: ElementRef;
@@ -60,8 +62,6 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     }>;
     height$: Observable<number>;
     actions$: BehaviorSubject<("click" | "lasso" | "rectangle" | "zoom" | "move" | "export" | "upload")[]>;
-    private wmsFeatures$;
-    classicFeatures$: BehaviorSubject<any>;
     geoServerLayerDescriptions$: Observable<MapGeoServerLayerOptions[]>;
     legendTabOpen: boolean;
     layersTabOpen: boolean;
@@ -82,9 +82,8 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     }>;
     mapStyleUrl$: Observable<string | null>;
     interactionManager: InteractionManager;
+    tooltipManager: TooltipManager;
     mapStyleLayer$: Observable<(VectorTileLayer | TileLayer<any>)[]>;
-    tooltipIndex: number;
-    tooltipNumber: number;
     STYLE_FROM_URL: string;
     NO_STYLE: string;
     wmsCapabilities$: Observable<{
@@ -123,9 +122,6 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     attributions$: Observable<boolean>;
     olZoomElement$: BehaviorSubject<HTMLDivElement | null>;
     previousLayers: BaseLayer[];
-    previousTooltip?: ComponentRef<BaseTooltipComponent>;
-    previousTooltipSub?: Subscription;
-    popupOverlay?: Overlay;
     layerGroups$: Observable<LayerGroup[]>;
     layerGroups: LayerGroup[];
     layerSettingsExpandedState: {
@@ -133,15 +129,10 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     };
     constructor(store: Store<any>, translateService: PryI18nService, tooltipFactoryService: TooltipFactoryService, symbolService: SymbolService, injector: Injector, widgetMapLayerService: WidgetMapLayerService, pryAggregationService: PryAggregationService, el: ElementRef, geoAuthService: PryGeoAuthService);
     initInteractionManager(): InteractionManager;
+    initTooltipManager(): TooltipManager;
     ngAfterViewInit(): void;
-    clearTooltip(): void;
     private addEmptyWebGlLayerBelowSlideHeatmaps;
     initResultSet$(): Observable<import("@provoly/dashboard").ResultSet>;
-    generateTooltip(value: {
-        oClass: string;
-        coordinates: Pixel;
-        values: any;
-    }): Promise<ComponentRef<BaseTooltipComponent> | null>;
     setDefaultLayerTitle(layer: MapWidgetLayerOptions, index: number, capabilities: {
         [p: string]: GetCapabilitiesResponse | null;
     } | undefined): void;
@@ -179,14 +170,10 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     changeOpacity(layer: MapWidgetLayerOptions, $event: string): void;
     getWMSLayers(): Layer<any>[];
     isLayerRendered(layer: any): boolean;
-    getFeatureFromServer(wmsLayers: Layer<any>[], pixel: Pixel): void;
     changeWmsClass($event: any, layer: MapWMSLayerLayerOptions): void;
     toggleLegend(index: number): void;
     toggleLegendWindow(): void;
     toggleLayersWindow(): void;
-    tooltipMove(number: number): void;
-    tooltipCanMove(number: number): boolean;
-    private setStyleAsync;
     get mapLayers(): BaseLayer[];
     get rightSlideLayers(): BaseLayer[];
     get leftSlideLayers(): BaseLayer[];

package/widgets/widget-map/interaction/interaction-manager.class.d.ts

@@ -1,20 +1,15 @@
-import { MapBrowserEvent, Overlay } from 'ol';
 import { ScaleLine } from 'ol/control';
 import type { WidgetMapComponent } from '../component/widget-map.component';
 import { SelectionInteraction } from './selection-interaction.class';
 export declare class InteractionManager {
-    interactionPopupOverlay?: Overlay;
     scaleControl?: ScaleLine;
     selectionInteraction: SelectionInteraction;
-    tooltipEvent?: MapBrowserEvent<MouseEvent>;
     private component;
     init(component: WidgetMapComponent): this;
     listeners: {
         contextMenu: (e: MouseEvent) => void;
-        popup: (event: MapBrowserEvent<MouseEvent>) => void;
     };
     private addContextMenuInteraction;
-    private addOverlayOnInteraction;
     private addScaleControl;
     private addUpdateZoomAndCenter;
 }

package/widgets/widget-map/interaction/tooltip-manager.class.d.ts

@@ -0,0 +1,43 @@
+import { Pixel } from 'ol/pixel';
+import { ComponentRef, ElementRef, Injector, ViewContainerRef } from '@angular/core';
+import { BaseTooltipComponent, Size, TooltipFactoryService } from '@provoly/dashboard';
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import { Map, MapBrowserEvent, Overlay } from 'ol';
+import { Store } from '@ngrx/store';
+import { WidgetMapComponent } from '../component/widget-map.component';
+import { InteractionManager } from './interaction-manager.class';
+import { Layer } from 'ol/layer';
+export declare class TooltipManager {
+    private tooltipFactoryService;
+    private injector;
+    private store;
+    wmsFeatures$: Observable<any[]>;
+    classicFeatures$: BehaviorSubject<any>;
+    tooltipIndex: number;
+    popupOverlay?: Overlay;
+    map: Map;
+    popup: ElementRef;
+    popupContent: ViewContainerRef;
+    tooltipNumber: number;
+    interactionManager: InteractionManager;
+    previousTooltip?: ComponentRef<BaseTooltipComponent>;
+    previousTooltipSub?: Subscription;
+    tooltipEvent?: MapBrowserEvent<MouseEvent>;
+    parent: WidgetMapComponent;
+    interactionPopupOverlay: Overlay;
+    init(tooltipFactoryService: TooltipFactoryService, injector: Injector, store: Store, subscriptions: Subscription, widgetSize$: Observable<Size>, displayHeader$: Observable<boolean | {
+        [p: string]: boolean;
+    }>, map: Map, popup: ElementRef, popupContent: ViewContainerRef, interactionManager: InteractionManager, parent: WidgetMapComponent): this;
+    private addOverlayOnInteraction;
+    generateTooltip(value: {
+        oClass: string;
+        coordinates: Pixel;
+        values: any;
+    }): Promise<ComponentRef<BaseTooltipComponent> | null>;
+    clearTooltip(empty?: boolean): void;
+    tooltipMove(number: number): void;
+    private setStyleAsync;
+    tooltipCanMove(number: number): boolean;
+    getFeatureFromServer(wmsLayers: Layer<any>[], pixel: Pixel): void;
+    destroy(): void;
+}

package/widgets/widget-map/public-api.d.ts

@@ -6,6 +6,7 @@ export * from './pipe/widget-map-legend-url.pipe';
 export * from './interaction/interaction-manager.class';
 export * from './interaction/selection-interaction.class';
 export * from './interaction/layer-slider.class';
+export * from './interaction/tooltip-manager.class';
 export * from './utils/widget-map.utils';
 export * from './utils/xml-utils.class';
 export * from './utils/cql-utils.class';

package/widgets/widget-tile/component/widget-tile.component.d.ts

@@ -28,7 +28,10 @@ export declare class WidgetTileComponent extends DataWidgetComponent {
     optionsCopy: TileWidgetOptions;
     WIDGET_HEADER_HEIGHT: number;
     propertiesToDisplay$: Observable<{
-        [p: string]: string[];
+        [p: string]: {
+            label: string;
+            prop: string;
+        }[];
     } | undefined>;
     fields: Field[];
     classes: Class[];