infra-geo-ouverte · mbarbeau · Nov 3, 2020 · Feb 13, 2020 · Feb 13, 2020 · Feb 13, 2020
diff --git a/packages/common/src/lib/action/actionbar/actionbar.component.html b/packages/common/src/lib/action/actionbar/actionbar.component.html
@@ -53,6 +53,9 @@
 <div *ngIf="mode === actionbarMode.Overlay">
   <button class="buttonOverlay"
     mat-icon-button
+    tooltip-position="below"
+    matTooltipShowDelay="500"
+    [matTooltip]="'igo.common.actionbar.icon' | translate"
     [matMenuTriggerFor]="actionbarMenu"
     [disabled]="store.view.empty"
     [color]="iconColor">

diff --git a/packages/common/src/locale/en.common.json b/packages/common/src/locale/en.common.json
@@ -19,7 +19,8 @@
       },
       "actionbar": {
         "scrollUp": "Scroll up",
-        "scrollDown": "Scroll down"
+        "scrollDown": "Scroll down",
+        "icon": "Action list"
       },
       "interactiveTour": {
         "tooltipTourToolButton": "Interactive tour of the application",

diff --git a/packages/common/src/locale/fr.common.json b/packages/common/src/locale/fr.common.json
@@ -19,7 +19,8 @@
       },
       "actionbar": {
         "scrollUp": "Défiler vers le haut",
-        "scrollDown": "Défiler vers le bas"
+        "scrollDown": "Défiler vers le bas",
+        "icon": "Actions supplémentaires"
       },
       "interactiveTour": {
         "tooltipTourToolButton": "Aide interactive sur l'outil",

diff --git a/packages/geo/src/lib/datasource/shared/datasources/wfs-datasource.ts b/packages/geo/src/lib/datasource/shared/datasources/wfs-datasource.ts
@@ -16,11 +16,21 @@ import {
   getFormatFromOptions,
   defaultMaxFeatures
 } from './wms-wfs.utils';
+import { BehaviorSubject } from 'rxjs';
 import { AuthInterceptor } from '@igo2/auth';
 
 export class WFSDataSource extends DataSource {
   public ol: olSourceVector;
 
+  set ogcFilters(value: OgcFiltersOptions) {
+    (this.options as OgcFilterableDataSourceOptions).ogcFilters = value;
+  }
+  get ogcFilters(): OgcFiltersOptions {
+    return (this.options as OgcFilterableDataSourceOptions).ogcFilters;
+  }
+
+  readonly ogcFilters$: BehaviorSubject<OgcFiltersOptions> = new BehaviorSubject(undefined);
+
   constructor(
     public options: WFSDataSourceOptions,
     protected wfsService: WFSService,
@@ -39,6 +49,8 @@ export class WFSDataSource extends DataSource {
     ) {
       this.wfsService.getSourceFieldsFromWFS(this.options);
     }
+
+    this.setOgcFilters((this.options as OgcFilterableDataSourceOptions).ogcFilters, true);
   }
 
   protected createOlSource(): olSourceVector {
@@ -112,6 +124,13 @@ export class WFSDataSource extends DataSource {
     xhr.send();
   }
 
+  setOgcFilters(ogcFilters: OgcFiltersOptions, triggerEvent: boolean = false) {
+    this.ogcFilters = ogcFilters;
+    if (triggerEvent) {
+      this.ogcFilters$.next(this.ogcFilters);
+    }
+  }
+
   private buildUrl(extent, proj: olProjection, ogcFilters: OgcFiltersOptions): string {
     const paramsWFS = this.options.paramsWFS;
     const queryStringValues = formatWFSQueryString(this.options, undefined, this.options.paramsWFS.srsName);

diff --git a/packages/geo/src/lib/datasource/shared/datasources/wms-datasource.ts b/packages/geo/src/lib/datasource/shared/datasources/wms-datasource.ts
@@ -6,7 +6,7 @@ import { WMSDataSourceOptions } from './wms-datasource.interface';
 import { WFSService } from './wfs.service';
 
 import { OgcFilterWriter } from '../../../filter/shared/ogc-filter';
-import { OgcFilterableDataSourceOptions } from '../../../filter/shared/ogc-filter.interface';
+import { OgcFilterableDataSourceOptions, OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface';
 import { QueryHtmlTarget } from '../../../query/shared/query.enums';
 import {
   formatWFSQueryString,
@@ -15,6 +15,8 @@ import {
 } from './wms-wfs.utils';
 
 import { ObjectUtils } from '@igo2/utils';
+import { BehaviorSubject } from 'rxjs';
+import { TimeFilterableDataSourceOptions, TimeFilterOptions } from '../../../filter/shared/time-filter.interface';
 
 export class WMSDataSource extends DataSource {
   public ol: olSourceImageWMS;
@@ -39,6 +41,23 @@ export class WMSDataSource extends DataSource {
       : QueryHtmlTarget.BLANK;
   }
 
+  set ogcFilters(value: OgcFiltersOptions) {
+    (this.options as OgcFilterableDataSourceOptions).ogcFilters = value;
+  }
+  get ogcFilters(): OgcFiltersOptions {
+    return (this.options as OgcFilterableDataSourceOptions).ogcFilters;
+  }
+
+  readonly ogcFilters$: BehaviorSubject<OgcFiltersOptions> = new BehaviorSubject(undefined);
+
+  set timeFilter(value: TimeFilterOptions ) {
+    (this.options as TimeFilterableDataSourceOptions).timeFilter = value;
+  }
+  get timeFilter(): TimeFilterOptions {
+    return (this.options as TimeFilterableDataSourceOptions).timeFilter;
+  }
+  readonly timeFilter$: BehaviorSubject<TimeFilterOptions> = new BehaviorSubject(undefined);
+
   constructor(
     public options: WMSDataSourceOptions,
     protected wfsService: WFSService
@@ -121,6 +140,14 @@ export class WMSDataSource extends DataSource {
       fieldNameGeometry
     );
     sourceParams.FILTER = filterQueryString;
+    this.setOgcFilters(initOgcFilters, true);
+
+    const timeFilterableDataSourceOptions = (options as TimeFilterableDataSourceOptions);
+    if (
+      timeFilterableDataSourceOptions?.timeFilterable &&
+      timeFilterableDataSourceOptions?.timeFilter) {
+      this.setTimeFilter(timeFilterableDataSourceOptions.timeFilter, true);
+    }
   }
 
   refresh() {
@@ -138,6 +165,20 @@ export class WMSDataSource extends DataSource {
     return new olSourceImageWMS(this.options);
   }
 
+  setOgcFilters(ogcFilters: OgcFiltersOptions, triggerEvent: boolean = false) {
+    this.ogcFilters = ogcFilters;
+    if (triggerEvent) {
+      this.ogcFilters$.next(this.ogcFilters);
+    }
+  }
+
+  setTimeFilter(timeFilter: TimeFilterOptions, triggerEvent: boolean = false) {
+    this.timeFilter = timeFilter;
+    if (triggerEvent) {
+      this.timeFilter$.next(this.timeFilter);
+    }
+  }
+
   getLegend(style?: string, scale?: number): Legend[] {
     let legend = super.getLegend();
     if (legend.length > 0 && (style === undefined && !scale)) {

diff --git a/packages/geo/src/lib/filter/ogc-filter-toggle-button/ogc-filter-toggle-button.component.ts b/packages/geo/src/lib/filter/ogc-filter-toggle-button/ogc-filter-toggle-button.component.ts
@@ -156,5 +156,6 @@ export class OgcFilterToggleButtonComponent implements OnInit {
       // TODO: Check how to prevent wfs to refresh when filter icon is pushed...
       this.datasource.ol.refresh();
     }
+    this.refreshFilters();
   }
 }
diff --git a/packages/geo/src/lib/filter/ogc-filterable-item/ogc-filterable-item.component.ts b/packages/geo/src/lib/filter/ogc-filterable-item/ogc-filterable-item.component.ts
@@ -140,9 +140,8 @@ export class OgcFilterableItemComponent implements OnInit {
       this.lastRunOgcFilter = undefined;
     }
     const ogcFilters: OgcFiltersOptions = this.datasource.options.ogcFilters;
-    const activeFilters = ogcFilters.interfaceOgcFilters.filter(
-      f => f.active === true
-    );
+    const activeFilters = ogcFilters.interfaceOgcFilters ?
+      ogcFilters.interfaceOgcFilters.filter(f => f.active === true) : [];
     if (activeFilters.length === 0) {
       ogcFilters.filters = undefined;
       ogcFilters.filtered = false;
@@ -201,6 +200,7 @@ export class OgcFilterableItemComponent implements OnInit {
     } else {
       // identical filter. Nothing triggered
     }
+    (this.layer.dataSource as OgcFilterableDataSource).setOgcFilters(ogcFilters, true);
   }
 
   public setVisible() {

diff --git a/packages/geo/src/lib/filter/ogc-filterable-list/ogc-filterable-list-binding.directive.ts b/packages/geo/src/lib/filter/ogc-filterable-list/ogc-filterable-list-binding.directive.ts
@@ -23,7 +23,7 @@ export class OgcFilterableListBindingDirective implements OnInit, OnDestroy {
     this.component.layers = [];
 
     this.layers$$ = this.mapService.getMap().layers$.subscribe(layers => {
-      this.component.layers = layers;
+      this.component.layers = layers.filter(layer => layer.showInLayerList);
     });
   }
 

diff --git a/packages/geo/src/lib/filter/shared/ogc-filter.interface.ts b/packages/geo/src/lib/filter/shared/ogc-filter.interface.ts
@@ -4,6 +4,7 @@ import olFormatFilter from 'ol/format/filter/Filter';
 import { DataSource } from '../../datasource/shared/datasources/datasource';
 import { DataSourceOptions } from '../../datasource/shared/datasources/datasource.interface';
 import { OgcFilterOperatorType } from './ogc-filter.enum';
+import { BehaviorSubject } from 'rxjs';
 
 export interface OgcFilter extends olFormatFilter {}
 
@@ -83,6 +84,8 @@ export interface OgcFilterableDataSourceOptions extends DataSourceOptions {
 }
 export interface OgcFilterableDataSource extends DataSource {
   options: OgcFilterableDataSourceOptions;
+  ogcFilters$?: BehaviorSubject<OgcFiltersOptions>;
+  setOgcFilters(ogcFilters: OgcFiltersOptions, triggerEvent?: boolean );
 }
 
 export interface IgoLogicalArrayOptions {

diff --git a/packages/geo/src/lib/filter/shared/time-filter.interface.ts b/packages/geo/src/lib/filter/shared/time-filter.interface.ts
@@ -1,6 +1,7 @@
 import { WMSDataSource } from '../../datasource/shared/datasources/wms-datasource';
 import { WMSDataSourceOptions } from '../../datasource/shared/datasources/wms-datasource.interface';
 import { TimeFilterType, TimeFilterStyle } from './time-filter.enum';
+import { BehaviorSubject } from 'rxjs';
 
 export interface TimeFilterOptions {
   min?: string;
@@ -24,6 +25,8 @@ export interface TimeFilterableDataSourceOptions extends WMSDataSourceOptions {
 
 export interface TimeFilterableDataSource extends WMSDataSource {
   options: TimeFilterableDataSourceOptions;
+  timeFilter$: BehaviorSubject<TimeFilterOptions>;
+  setTimeFilter(ogcFilters: TimeFilterOptions, triggerEvent?: boolean );
   filterByDate(date: Date | [Date, Date]);
   filterByYear(year: string | [string, string]);
 }
diff --git a/packages/geo/src/lib/filter/shared/time-filter.service.ts b/packages/geo/src/lib/filter/shared/time-filter.service.ts
@@ -44,6 +44,10 @@ export class TimeFilterService {
 
     const params = { TIME: time };
     datasource.ol.updateParams(params);
+    if (datasource instanceof WMSDataSource) {
+      const wmsDataSource  = datasource as WMSDataSource;
+      wmsDataSource.setTimeFilter(wmsDataSource.timeFilter, true);
+    }
   }
 
   filterByYear(
@@ -80,6 +84,10 @@ export class TimeFilterService {
 
     const params = { TIME: time };
     datasource.ol.updateParams(params);
+    if (datasource instanceof WMSDataSource) {
+      const wmsDataSource  = datasource as WMSDataSource;
+      wmsDataSource.setTimeFilter(wmsDataSource.timeFilter, true);
+    }
   }
 
   private reformatDateTime(value) {

diff --git a/packages/geo/src/lib/import-export/export-button/export-button.component.ts b/packages/geo/src/lib/import-export/export-button/export-button.component.ts
@@ -39,8 +39,12 @@ export class ExportButtonComponent {
   }
 
   layerIsExportable(): boolean {
-    if ((this.layer instanceof VectorLayer && this.layer.exportable === true) ||
-      (this.layer.dataSource.options.download && this.layer.dataSource.options.download.url)) {
+    if (
+      (this.layer instanceof VectorLayer && this.layer.exportable === true) ||
+      (this.layer.dataSource.options.download && this.layer.dataSource.options.download.url) ||
+      (this.layer.options.workspace?.workspaceId !== this.layer.id)
+
+    ) {
       return true;
     }
     return false;

diff --git a/packages/geo/src/lib/layer/layer-item/layer-item.component.html b/packages/geo/src/lib/layer/layer-item/layer-item.component.html
@@ -24,7 +24,7 @@ <h4 (click)="toggleLegendOnClick()" matLine class="igo-layer-title" [matTooltip]
       matBadgePosition="after"
       [matBadgeHidden]="queryBadgeHidden$ | async"
       [ngClass]="{disabled: !(inResolutionRange$ | async)}"
-      [svgIcon]="layer.visible ? 'eye' : 'eye-off'">
+      [svgIcon]="(layer.visible$ | async) ? 'eye' : 'eye-off'">
     </mat-icon>
   </button>
 

diff --git a/packages/geo/src/lib/layer/layer-list/layer-list.component.html b/packages/geo/src/lib/layer/layer-list/layer-list.component.html
@@ -77,7 +77,7 @@
       matTooltipShowDelay="500"
       [matTooltip]="(sortAlpha || onlyVisible || keyword) ? ('igo.geo.layer.filterRaiseLayer' | translate) : ('igo.geo.layer.raiseLayer' | translate)"
       [disabled]="raiseDisabled"
-      (click)="activeLayer.map.raiseLayer(activeLayer)">
+      (click)="moveActiveLayer(activeLayer,layerListDisplacement.Raise)">
       <mat-icon [matBadge]="(sortAlpha || onlyVisible || keyword) ? '!' : ''" matBadgeColor="warn" matBadgeSize="medium" [matBadgeHidden]="raiseDisabled"
                 svgIcon="arrow-up"></mat-icon>
     </button>
@@ -89,7 +89,7 @@
       matTooltipShowDelay="500"
       [matTooltip]="(sortAlpha || onlyVisible || keyword) ? ('igo.geo.layer.filterLowerLayer' | translate) : ('igo.geo.layer.lowerLayer' | translate)"
       [disabled]="lowerDisabled"
-      (click)="activeLayer.map.lowerLayer(activeLayer)">
+      (click)="moveActiveLayer(activeLayer,layerListDisplacement.Lower)">
       <mat-icon [matBadge]="(sortAlpha || onlyVisible || keyword) ? '!' : ''" matBadgeColor="warn" matBadgeSize="medium" [matBadgeHidden]="lowerDisabled"
                 svgIcon="arrow-down"></mat-icon>
     </button>