@provoly/dashboard 0.24.8 → 0.24.10

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

@@ -1,6 +1,6 @@
 import { AfterViewInit, ComponentRef, ElementRef, Injector, OnDestroy, TemplateRef, ViewContainerRef } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { BaseTooltipComponent, BaseWidgetMapLayerOptions, Class, DataWidgetComponent, Field, GetCapabilitiesResponse, MapAutoLayerOptions, MapFeatureLayerOptions, MapGeoServerLayerOptions, MapRasterTileLayerOptions, MapVectorTileLayerOptions, MapWidgetBubbleLayerOptions, MapWidgetHeatMapLayerOptions, MapWidgetLayerOptions, MapWidgetMarkerLayerOptions, MapWidgetOptions, MapWMSLayerLayerOptions, MapWMTSLayerLayerOptions, PryAggregationService, PryGeoAuthService, PryI18nService, SymbolService, TooltipFactoryService } from '@provoly/dashboard';
+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 { Coordinate } from 'ol/coordinate';
 import { Geometry } from 'ol/geom';
@@ -17,9 +17,11 @@ import { LayerSlider } from '../interaction/layer-slider.class';
 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 * as i0 from "@angular/core";
 export declare const TOOLTIP_PADDING = 15;
 export declare const NON_MANDATORY_FIT_LAYER_TYPES: string[];
+export declare const DEFAULT_LAYER_GROUP = "DEFAULT";
 export declare class WidgetMapComponent extends DataWidgetComponent implements AfterViewInit, OnDestroy {
     translateService: PryI18nService;
     private tooltipFactoryService;
@@ -124,6 +126,10 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     previousTooltip?: ComponentRef<BaseTooltipComponent>;
     previousTooltipSub?: Subscription;
     popupOverlay?: Overlay;
+    layerGroups$: Observable<LayerGroup[]>;
+    layerSettingsExpandedState: {
+        [key: string]: boolean;
+    };
     constructor(store: Store<any>, translateService: PryI18nService, tooltipFactoryService: TooltipFactoryService, symbolService: SymbolService, injector: Injector, widgetMapLayerService: WidgetMapLayerService, pryAggregationService: PryAggregationService, el: ElementRef, geoAuthService: PryGeoAuthService);
     initInteractionManager(): InteractionManager;
     ngAfterViewInit(): void;
@@ -135,7 +141,7 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
         coordinates: Pixel;
         values: any;
     }): Promise<ComponentRef<BaseTooltipComponent> | null>;
-    setDefaultLayerTitle(layer: MapWidgetLayerOptions, capabilities: {
+    setDefaultLayerTitle(layer: MapWidgetLayerOptions, index: number, capabilities: {
         [p: string]: GetCapabilitiesResponse | null;
     } | undefined): void;
     fitMapForObjects(selectedIds?: string[], extents?: {
@@ -150,16 +156,15 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     changeFit($event: boolean, layer: MapWidgetLayerOptions): void;
     changeSlide($event: undefined | 'left' | 'right', layer: MapWidgetLayerOptions): void;
     changeAttributions($event: boolean): void;
-    addLayer(): void;
+    addLayer(group: LayerGroup): void;
     changeLayerType($event: any, i: number): void;
-    changeTitle($event: any, layer: MapWidgetLayerOptions): void;
+    changeTitle($event: any, layer: MapWidgetLayerOptions, group: LayerGroup): void;
     emitManifest(): void;
     changeLocationAttributes($event: any, layer: MapWidgetLayerOptions): void;
     layerHasIntensity(layer: MapWidgetLayerOptions): MapWidgetHeatMapLayerOptions | MapWidgetBubbleLayerOptions;
     changeIntensityAttributes($event: any, layer: MapWidgetLayerOptions): void;
     changeClasses($event: string[], layer: MapWidgetLayerOptions): void;
     deleteLayer(i: number, layer: MapWidgetLayerOptions): void;
-    invertLayers(idx: number, idxWith: number): void;
     changeUrl($event: Event, layer: MapWMSLayerLayerOptions | MapFeatureLayerOptions | MapVectorTileLayerOptions | MapRasterTileLayerOptions | MapWMTSLayerLayerOptions | MapGeoServerLayerOptions): void;
     changeAttribution($event: Event, layer: BaseWidgetMapLayerOptions): void;
     changeParamLayer($event: Event, layer: MapWMSLayerLayerOptions | MapWMTSLayerLayerOptions): void;
@@ -173,7 +178,6 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     changeOpacity(layer: MapWidgetLayerOptions, $event: string): void;
     getWMSLayers(): Layer<any>[];
     isLayerRendered(layer: any): boolean;
-    isLayerVisible(layer: any): boolean;
     getFeatureFromServer(wmsLayers: Layer<any>[], pixel: Pixel): void;
     changeWmsClass($event: any, layer: MapWMSLayerLayerOptions): void;
     toggleLegend(index: number): void;
@@ -185,8 +189,8 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     get mapLayers(): BaseLayer[];
     get rightSlideLayers(): BaseLayer[];
     get leftSlideLayers(): BaseLayer[];
-    changeVisibility(layer: BaseLayer): void;
-    changeSingleLayer($event: any): void;
+    changeVisibility(group: LayerGroup, _layer?: MapWidgetLayerOptions): void;
+    isLayerVisible(layer: MapWidgetLayerOptions, group: LayerGroup): boolean;
     changeAutoLayer($event: any): void;
     get layerVisibleIdx(): number;
     ngOnDestroy(): void;
@@ -203,6 +207,16 @@ export declare class WidgetMapComponent extends DataWidgetComponent implements A
     private getOlZoomElement;
     changeSelection(action: 'click' | 'lasso' | 'rectangle' | 'zoom' | 'move' | 'export' | 'upload'): void;
     private clearLayers;
+    addLayerGroup(): void;
+    updateLayerGroup(name: string, newName?: string, singleLayer?: boolean, visibleLayers?: string[]): void;
+    updateLayerGroupTitle($event: Event, name: string): void;
+    deleteLayerGroup(name: string): void;
+    drop(event: CdkDragDrop<MapWidgetLayerOptions[]>, group: LayerGroup): void;
+    moveLayerInOptions(targetIdxInGroup: number, movedLayer: MapWidgetLayerOptions, group: LayerGroup, direction: 1 | -1): void;
+    toggleExpandAll(group: LayerGroup): void;
+    toggleLayerExpand(layer: MapWidgetLayerOptions, group: LayerGroup): void;
+    updateOrder($event: Event, layer: MapWidgetLayerOptions): void;
+    protected readonly DEFAULT_LAYER_GROUP = "DEFAULT";
     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

@@ -13,6 +13,7 @@ export declare const enTranslations: {
                 layer: string;
                 layerOptions: string;
                 layerTitle: string;
+                order: string;
                 layerType: {
                     title: string;
                     heatmap: string;
@@ -90,6 +91,25 @@ export declare const enTranslations: {
                 zoomOut: string;
                 slideTitle: string;
                 layerLoadError: string;
+                layerSettings: {
+                    title: string;
+                    addLayerGroup: string;
+                    layerGroupName: string;
+                    optionalColon: string;
+                    singleLayer: string;
+                    multipleLayer: string;
+                    unfoldAll: string;
+                    foldAll: string;
+                    noLayer: string;
+                    selectLayers: string;
+                    group: string;
+                    deleteGroup: string;
+                    deleteLayer: string;
+                    editLayerTitle: string;
+                    editGroupName: string;
+                };
+                missingTitle: string;
+                noGroup: string;
             };
         };
     };

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

@@ -13,6 +13,7 @@ export declare const frTranslations: {
                 layer: string;
                 layerOptions: string;
                 layerTitle: string;
+                order: string;
                 layerType: {
                     title: string;
                     heatmap: string;
@@ -90,6 +91,26 @@ export declare const frTranslations: {
                 zoomOut: string;
                 slideTitle: string;
                 layerLoadError: string;
+                layerSettings: {
+                    title: string;
+                    addLayerGroup: string;
+                    layerGroupName: string;
+                    optionalColon: string;
+                    singleLayer: string;
+                    multipleLayer: string;
+                    unfoldAll: string;
+                    foldAll: string;
+                    noLayer: string;
+                    selectLayers: string;
+                    group: string;
+                    deleteGroup: string;
+                    deleteLayer: string;
+                    confirmDelete: string;
+                    editLayerTitle: string;
+                    editGroupName: string;
+                };
+                missingTitle: string;
+                noGroup: string;
             };
         };
     };

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

@@ -29,7 +29,6 @@
     display: flex;
     flex-direction: row;
     align-items: center;
-    font-size: 12px;
 
     &:hover {
       cursor: pointer;
@@ -38,13 +37,20 @@
   }
 
   &__container {
-    color: #113b6e;
-    background-color: white;
     border-radius: toRem(8);
-    padding: toRem(5) toRem(8);
+    padding: toRem(8) toRem(10);
+
+    &--layers {
+      max-width: toRem(220);
+    }
 
     .a-h4 {
-      font-size: 12px;
+      font-size: 16px;
+    }
+
+    .a-h5 {
+      font-size: 14px;
+      margin: 0;
     }
 
     button.m-map-layer-action__toggle {
@@ -79,9 +85,28 @@
 }
 
 .m-layer-switcher {
+  &__group-title {
+    font-weight: 700;
+    margin-bottom: toRem(5);
+  }
+
   &__title {
     align-items: flex-start;
   }
+
+  &--radios {
+    display: flex;
+    flex-direction: column;
+    gap: toRem(5);
+
+    input {
+      margin-top: toRem(3);
+    }
+
+    .a-label {
+      margin-left: toRem(5)
+    }
+  }
 }
 
 .m-map-slide-legend {

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

@@ -8,6 +8,10 @@
   display: flex;
   flex-direction: column;
 
+  &__general-settings {
+    margin: 0 -10px;
+  }
+
   div.ol-scale-bar {
     position: absolute;
     left: initial;

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

@@ -10,11 +10,12 @@ import * as i6 from "@angular/forms";
 import * as i7 from "@angular/cdk/overlay";
 import * as i8 from "@provoly/dashboard";
 import * as i9 from "@provoly/dashboard/components/checkbox";
+import * as i10 from "@angular/cdk/drag-drop";
 export declare class WidgetMapModule extends BaseWidgetModule {
     private pryTranslateService;
     constructor(pryTranslateService: PryI18nService);
     getComponent(): Type<BaseWidgetComponent>;
     static ɵfac: i0.ɵɵFactoryDeclaration<WidgetMapModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<WidgetMapModule, [typeof i1.WidgetMapComponent, typeof i2.GeometryFieldsForPipe, typeof i3.PryWidgetMapCssComponent, typeof i4.WidgetMapLegendUrlPipe], [typeof i5.CommonModule, typeof i6.FormsModule, typeof i7.OverlayModule, typeof i8.PryCoreModule, typeof i8.PryDashboardModule, typeof i8.PrySelectModule, typeof i8.PryIconModule, typeof i9.PryCheckboxModule, typeof i8.PryToggleModule, typeof i8.PryOverlayModule, typeof i8.PryI18nModule, typeof i8.PryRangeModule], [typeof i1.WidgetMapComponent, typeof i2.GeometryFieldsForPipe, typeof i3.PryWidgetMapCssComponent, typeof i4.WidgetMapLegendUrlPipe]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<WidgetMapModule, [typeof i1.WidgetMapComponent, typeof i2.GeometryFieldsForPipe, typeof i3.PryWidgetMapCssComponent, typeof i4.WidgetMapLegendUrlPipe], [typeof i5.CommonModule, typeof i6.FormsModule, typeof i7.OverlayModule, typeof i8.PryCoreModule, typeof i8.PryDashboardModule, typeof i8.PrySelectModule, typeof i8.PryIconModule, typeof i9.PryCheckboxModule, typeof i8.PryToggleModule, typeof i8.PryOverlayModule, typeof i8.PryI18nModule, typeof i8.PryRangeModule, typeof i8.PryEditInputModule, typeof i10.DragDropModule], [typeof i1.WidgetMapComponent, typeof i2.GeometryFieldsForPipe, typeof i3.PryWidgetMapCssComponent, typeof i4.WidgetMapLegendUrlPipe]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<WidgetMapModule>;
 }