@provoly/dashboard 0.19.0 → 0.19.2

package/widgets/widget-aggregated-chart/i18n/en.translations.d.ts

@@ -98,6 +98,8 @@ export declare const enTranslations: {
                 color: string;
                 sort: {
                     title: string;
+                    attribute: string;
+                    direction: string;
                     asc: {
                         quantitative: string;
                         nominal: string;
@@ -110,6 +112,13 @@ export declare const enTranslations: {
                         ordinal: string;
                         temporal: string;
                     };
+                    by: {
+                        operation: {
+                            none: string;
+                            count: string;
+                            cardinality: string;
+                        };
+                    };
                 };
             };
         };

package/widgets/widget-aggregated-chart/i18n/fr.translations.d.ts

@@ -97,6 +97,8 @@ export declare const frTranslations: {
                 color: string;
                 sort: {
                     title: string;
+                    attribute: string;
+                    direction: string;
                     asc: {
                         quantitative: string;
                         ordinal: string;
@@ -109,6 +111,13 @@ export declare const frTranslations: {
                         nominal: string;
                         temporal: string;
                     };
+                    by: {
+                        operation: {
+                            none: string;
+                            count: string;
+                            cardinality: string;
+                        };
+                    };
                 };
             };
         };

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

@@ -14,8 +14,11 @@ import { Style } from 'ol/style';
 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';
+import { Attribution } from 'ol/control';
 import * as i0 from "@angular/core";
 export declare const TOOLTIP_PADDING = 15;
+export declare const NON_MANDATORY_FIT_LAYER_TYPES: string[];
 export declare class WidgetMapComponent extends DataWidgetComponent implements AfterViewInit, OnDestroy {
     translateService: PryI18nService;
     private tooltipFactoryService;
@@ -29,7 +32,7 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     popup: ElementRef;
     popupContent: ViewContainerRef;
     exportTypeTemplate: TemplateRef<any>;
-    address: ElementRef;
+    sliderElement: ElementRef<HTMLInputElement>;
     options$: Observable<MapWidgetOptions>;
     layerTypes: string[];
     optionsCopy: MapWidgetOptions;
@@ -74,8 +77,6 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
         } | undefined;
         center?: number[] | undefined;
     }>;
-    fitOption$: Observable<boolean>;
-    ignoreGetCapabilitiesExtent$: Observable<boolean>;
     mapStyleUrl$: Observable<string | null>;
     interactionManager: InteractionManager;
     mapStyleLayer$: Observable<VectorTileLayer[]>;
@@ -87,15 +88,40 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
         [p: string]: GetCapabilitiesResponse | null;
     } | undefined>;
     autoDatasetLayers$: Observable<MapAutoLayerOptions[]>;
-    aggregatedExtents$: Observable<{
+    fitExtents$: Observable<{
         datasource: string;
         extent: Coordinate[];
     }[]>;
     datasourceFilters$: Observable<any>;
     usedClasses$: Observable<any>;
+    layerSlider: LayerSlider;
+    hasSlideLayer$: Observable<boolean>;
+    slides: {
+        id: undefined | string;
+        label: string;
+    }[];
+    possibleStyles: {
+        [p: string]: {
+            layers: {
+                [p: string]: {
+                    param: string;
+                    styles: {
+                        id: string;
+                        label: string;
+                    }[];
+                };
+            } | null;
+            url: string;
+        };
+    };
+    attributions: Attribution;
+    actionMenuOpen$: BehaviorSubject<boolean>;
+    attributions$: Observable<boolean>;
+    olZoomElement$: BehaviorSubject<HTMLDivElement | null>;
     constructor(store: Store<any>, translateService: PryI18nService, tooltipFactoryService: TooltipFactoryService, symbolService: SymbolService, injector: Injector, widgetMapLayerService: WidgetMapLayerService, pryAggregationService: PryAggregationService, el: ElementRef, geoAuthService: PryGeoAuthService);
     initInteractionManager(): InteractionManager;
     ngAfterViewInit(): void;
+    private addEmptyWebGlLayerBelowSlideHeatmaps;
     initResultSet$(): Observable<import("@provoly/dashboard").ResultSet>;
     generateTooltip(value: {
         oClass: string;
@@ -105,9 +131,7 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     setDefaultLayerTitle(layer: MapWidgetLayerOptions, capabilities: {
         [p: string]: GetCapabilitiesResponse | null;
     } | undefined): void;
-    fitMapForObjects(fit: boolean, ignoreGetCapabilitiesExtent?: boolean, wmsCapabilities?: {
-        [p: string]: GetCapabilitiesResponse | null;
-    }, selectedIds?: string[], extents?: {
+    fitMapForObjects(selectedIds?: string[], extents?: {
         datasource: string;
         extent: Coordinate[];
     }[], filters?: {
@@ -118,7 +142,8 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     private getLocationAttribute;
     changeStyle($event: any): void;
     changeStyleURL($event: Event): void;
-    changeFit($event: boolean): void;
+    changeFit($event: boolean, layer: MapWidgetLayerOptions): void;
+    changeSlide($event: undefined | 'left' | 'right', layer: MapWidgetLayerOptions): void;
     changeAttributions($event: boolean): void;
     addLayer(): void;
     changeLayerType($event: any, i: number): void;
@@ -140,7 +165,6 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     toImage(): Promise<string>;
     changeClustered(layer: MapWidgetMarkerLayerOptions, $event: boolean): void;
     changeClusterDistance(layer: MapWidgetMarkerLayerOptions, $event: Event): void;
-    hideAddress(): void;
     changeOpacity(layer: MapWidgetLayerOptions, $event: string): void;
     getWMSLayers(): Layer<any>[];
     isLayerRendered(layer: any): boolean;
@@ -159,6 +183,18 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     changeAutoLayer($event: any): void;
     get layerVisibleIdx(): number;
     ngOnDestroy(): void;
+    getStyle(_layer: MapWidgetLayerOptions): any;
+    changeLayerStyle($event: any, _layer: MapWidgetLayerOptions): void;
+    getAsWmsType(_layer: MapWidgetLayerOptions): MapWMSLayerLayerOptions | MapGeoServerLayerOptions;
+    layerStyleOptions(_layer: MapWidgetLayerOptions): {
+        id: string;
+        label: string;
+    }[];
+    triggerLayerRender(): void;
+    changeSlideOption($event: any): void;
+    toggleMenu(): void;
+    private getOlZoomElement;
+    changeSelection(action: 'click' | 'lasso' | 'rectangle' | 'zoom' | 'move' | 'export' | 'upload'): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<WidgetMapComponent, [null, null, null, null, null, null, null, null, { optional: true; }]>;
     static ɵcmp: i0.ɵɵComponentDeclaration<WidgetMapComponent, "pry-widget-map", never, {}, {}, never, never, false, never>;
 }

package/widgets/widget-map/i18n/en.translations.d.ts

@@ -53,6 +53,7 @@ export declare const enTranslations: {
                     lat: string;
                     lng: string;
                 };
+                layerStyle: string;
                 intensityAttribute: string;
                 classes: string;
                 relations: string;
@@ -75,6 +76,13 @@ export declare const enTranslations: {
                 legends: string;
                 singleLayer: string;
                 autoLayer: string;
+                slide: {
+                    global: string;
+                    title: string;
+                    all: string;
+                    left: string;
+                    right: string;
+                };
             };
         };
     };

package/widgets/widget-map/i18n/fr.translations.d.ts

@@ -53,6 +53,7 @@ export declare const frTranslations: {
                     lat: string;
                     lng: string;
                 };
+                layerStyle: string;
                 intensityAttribute: string;
                 classes: string;
                 relations: string;
@@ -75,6 +76,13 @@ export declare const frTranslations: {
                 legends: string;
                 singleLayer: string;
                 autoLayer: string;
+                slide: {
+                    global: string;
+                    title: string;
+                    all: string;
+                    left: string;
+                    right: string;
+                };
             };
         };
     };

package/widgets/widget-map/interaction/layer-slider.class.d.ts

@@ -0,0 +1,10 @@
+import { Map } from 'ol';
+import TileLayer from 'ol/layer/Tile';
+import VectorLayer from 'ol/layer/Vector';
+import { Heatmap } from 'ol/layer';
+export declare class LayerSlider {
+    map: Map;
+    slider: HTMLInputElement;
+    init(map: Map, slider: HTMLInputElement): this;
+    applySlide(type: 'left' | 'right' | 'all', layer: TileLayer<any> | VectorLayer<any> | Heatmap): void;
+}

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

@@ -2,12 +2,11 @@ import { Store } from '@ngrx/store';
 import { MapBrowserEvent } from 'ol';
 import PointerInteraction from 'ol/interaction/Pointer';
 import { Style } from 'ol/style';
+import { BehaviorSubject } from 'rxjs';
 export declare class SelectionInteraction extends PointerInteraction {
     private coordinates;
-    private cursor;
     private features;
-    private previousCursor;
-    selectionType: 'click' | 'lasso' | 'rectangle' | 'zoom' | 'move';
+    selectionType$: BehaviorSubject<"click" | "lasso" | "rectangle" | "zoom" | "move">;
     private store?;
     private currentRectangle;
     private overlayForLasso;

package/widgets/widget-map/pipe/widget-map-legend-url.pipe.d.ts

@@ -9,6 +9,7 @@ export declare class WidgetMapLegendUrlPipe implements PipeTransform {
             [p: string]: GetCapabilitiesResponse | null;
         } | undefined | null;
     }]): string;
+    returnStyleForLayer(style: ChildNode): any;
     static ɵfac: i0.ɵɵFactoryDeclaration<WidgetMapLegendUrlPipe, never>;
     static ɵpipe: i0.ɵɵPipeDeclaration<WidgetMapLegendUrlPipe, "legendUrl", false>;
 }

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

@@ -5,6 +5,7 @@ export * from './pipe/widget-map-geometry-fields-for.pipe';
 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 './utils/widget-map.utils';
 export * from './utils/xml-utils.class';
 export * from './utils/cql-utils.class';

package/widgets/widget-map/style/_o-layer-legend.scss

@@ -2,11 +2,16 @@
 
 .m-layer-legend {
   z-index: 2;
-  left: toRem(8);
+  right: toRem(8);
   overflow: hidden;
 
   &.ol-control {
-    border: 1px solid #bccad8;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+
+    border: none;
+    background: white;
   }
 
   button {
@@ -19,6 +24,7 @@
   }
 
   &__toggle {
+    align-self: flex-end;
     width: toRem(30);
     height: toRem(30);
   }
@@ -44,11 +50,16 @@
 
 .m-layer-switcher {
   z-index: 2;
-  left: toRem(8);
+  right: toRem(8);
   overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  align-items: normal;
 
   &.ol-control {
-    border: 1px solid #bccad8;
+    border: none;
+    background: white;
+    align-self: flex-end;
   }
 
   button {
@@ -63,6 +74,7 @@
   &__toggle {
     width: toRem(30);
     height: toRem(30);
+    align-self: flex-end;
   }
 
   &__title {
@@ -71,7 +83,6 @@
     background-color: white;
     justify-content: space-between;
     gap: toRem(10);
-    margin-left: toRem(35);
     padding: 5px;
   }
 

package/widgets/widget-map/style/_o-widget-map.scss

@@ -54,9 +54,36 @@
   }
 }
 
-.ol-attribution {
+.ol-attribution, .ol-zoom {
   top: toRem(5);
   bottom: unset;
+  border-radius: toRem(6);
+  padding: 0;
+  border: none;
+  background: white;
+
+  > button {
+    padding: 0;
+    border: none;
+    background: white;
+  }
+}
+
+.ol-zoom {
+  top: toRem(5);
+  right: toRem(8);
+  left: unset;
+  bottom: unset;
+  border-radius: toRem(6);
+  padding: 0;
+  border: none;
+  background: white;
+
+  > button {
+    padding: 0;
+    border: none;
+    background: white;
+  }
 }
 
 .a-form-field {
@@ -80,3 +107,50 @@
     }
   }
 }
+
+.o-map-slider {
+  position: absolute;
+  width: 100%;
+  margin-top: toRem(-10);
+  z-index: 1;
+
+  &.-hidden {
+    visibility: hidden;
+    pointer-events: none;
+  }
+
+  -webkit-appearance: none;
+  appearance: none;
+  background: transparent;
+  cursor: grab;
+
+  &::-webkit-slider-runnable-track {
+    background: none;
+  }
+
+  &::-moz-range-track {
+    background: none;
+  }
+
+  &::-webkit-slider-thumb {
+    -webkit-appearance: none; /* Override default look */
+    appearance: none;
+
+    /*custom styles*/
+    background-color: #113B6E;
+    height: toRem(2000);
+    margin-top: toRem(-1950);
+    width: toRem(4);
+  }
+
+  &::-moz-range-thumb {
+    border: none; /*Removes extra border that FF applies*/
+    border-radius: 0; /*Removes default border-radius that FF applies*/
+
+    /*custom styles*/
+    background-color: #113B6E;
+    height: toRem(2000);
+    margin-top: toRem(-1950);
+    width: toRem(4);
+  }
+}

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

@@ -1,4 +1,4 @@
-import { Attribute, AttributeSimpleValue, Class, Field, Item, MapWidgetLayerOptions, Relation, ResultSet } from '@provoly/dashboard';
+import { AggregationResult, Attribute, AttributeSimpleValue, Class, Field, GetCapabilitiesResponse, Item, MapGeoServerLayerOptions, MapWidgetLayerOptions, Relation, ResultSet } from '@provoly/dashboard';
 import { Feature, Map } from 'ol';
 import { Circle, LineString, Point } from 'ol/geom';
 import { Style } from 'ol/style';
@@ -16,6 +16,12 @@ export declare class WidgetMapUtils {
     static assignLayersOrder(_layers: MapWidgetLayerOptions[]): MapWidgetLayerOptions[];
     static readGeometry<T extends 'point' | 'line' | 'multi-line' | 'polygon' | 'multi-polygon'>(projection: ProjectionLike, item: Item, type: T, attribute: Attribute | undefined): Geometry | null | undefined;
     static extractGeometries(value: AttributeSimpleValue, points: any[], type: 'point' | 'line' | 'polygon'): void;
+    static projectExtentAggregationResponse(field: Field, extentResponse: AggregationResult, layer: MapGeoServerLayerOptions, wmsCapabilities: {
+        [p: string]: GetCapabilitiesResponse | null;
+    } | undefined, map: Map): {
+        datasource: string;
+        extent: import("ol/coordinate").Coordinate[];
+    };
     static DEFAULT_HEATMAP_RADIUS: number;
     static DEFAULT_RADIUS_INTENSITY_FACTOR: number;
     static DEFAULT_ZOOM_MIN: number;

package/widgets/widget-map/utils/xml-utils.class.d.ts

@@ -3,6 +3,16 @@ export declare class XMLUtils {
     static find(childs: NodeListOf<ChildNode>, name: string): ChildNode | null;
     static findAll(childs: NodeListOf<ChildNode>, name: string): ChildNode[];
     static findWith(childs: NodeListOf<ChildNode>, attribute: string, value: string): ChildNode | null;
-    static getMatchingLayer(paramLayer: string, doc: Document): ChildNode | null;
+    static getMatchingLayer(paramLayer: string, doc?: Document): ChildNode | null;
+    static allLayers(doc?: Document): ChildNode[];
     static getLayerExtent(paramLayer: string, map: Map, doc?: Document): import("ol/coordinate").Coordinate[] | null;
+    static getPossibleLayerStyles(doc?: Document): {
+        [param: string]: {
+            param: string;
+            styles: {
+                id: string;
+                label: string;
+            }[];
+        };
+    } | null;
 }