From 06a5b811bbd8dc8e6ebf945e2fc3eb31ad49eab8 Mon Sep 17 00:00:00 2001
From: Philippe Lafreniere <philippe.lafreniere@msp.gouv.qc.ca>
Date: Fri, 4 Feb 2022 15:57:08 -0500
Subject: [PATCH 1/3] feat(ogc-time): allow alias to ogc-filter-time section

---
 .../ogc-filter-selection/ogc-filter-selection.component.html   | 3 ++-
 packages/geo/src/lib/filter/shared/ogc-filter.interface.ts     | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.html b/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.html
index 6c4ca23c47..2c42bac1f7 100644
--- a/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.html
+++ b/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.html
@@ -166,7 +166,8 @@ <h4>{{bundle.title}}</h4>
 
 <div *ngIf="isTemporalOperator()">
   <mat-divider></mat-divider>
-  <h4>{{ 'igo.geo.filter.reportingDate' | translate }}</h4>
+  <h4 *ngIf="!currentFilter.alias">{{ 'igo.geo.filter.reportingDate' | translate }}</h4>
+  <h4 *ngIf="currentFilter.alias">{{ currentFilter.alias }}</h4>
   <igo-ogc-filter-time
     [(datasource)]="datasource"
     [(currentFilter)]="currentFilter"
diff --git a/packages/geo/src/lib/filter/shared/ogc-filter.interface.ts b/packages/geo/src/lib/filter/shared/ogc-filter.interface.ts
index bb7aaeab2d..5a25c56454 100644
--- a/packages/geo/src/lib/filter/shared/ogc-filter.interface.ts
+++ b/packages/geo/src/lib/filter/shared/ogc-filter.interface.ts
@@ -154,6 +154,7 @@ export interface OgcFilterDuringOptions extends OgcFilterAttributeOptions {
   sliderOptions?: SliderOptionsInterface;
   displayFormat?: string;
   calendarModeYear?: boolean;
+  alias?: string;
 }
 export interface OgcFilterIsBetweenOptions extends OgcFilterAttributeOptions {
   lowerBoundary: number;

From 6a5cb01a4bce85b9ed0ecd7c5caf6be7fedcc9f5 Mon Sep 17 00:00:00 2001
From: Philippe Lafreniere <philippe.lafreniere@msp.gouv.qc.ca>
Date: Thu, 17 Feb 2022 17:00:23 -0500
Subject: [PATCH 2/3] refactor(ogc-filter-time): use sourceField alias

---
 .../ogc-filter-selection.component.html            |  4 ++--
 .../ogc-filter-selection.component.ts              | 14 ++++++++++++++
 .../src/lib/filter/shared/ogc-filter.interface.ts  |  1 -
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.html b/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.html
index 2c42bac1f7..e5728c38e5 100644
--- a/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.html
+++ b/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.html
@@ -166,8 +166,8 @@ <h4>{{bundle.title}}</h4>
 
 <div *ngIf="isTemporalOperator()">
   <mat-divider></mat-divider>
-  <h4 *ngIf="!currentFilter.alias">{{ 'igo.geo.filter.reportingDate' | translate }}</h4>
-  <h4 *ngIf="currentFilter.alias">{{ currentFilter.alias }}</h4>
+  <h4 *ngIf="!timeSourceField">{{ 'igo.geo.filter.reportingDate' | translate }}</h4>
+  <h4 *ngIf="timeSourceField && timeSourceField.name === currentFilter.propertyName">{{ timeSourceField.alias }}</h4>
   <igo-ogc-filter-time
     [(datasource)]="datasource"
     [(currentFilter)]="currentFilter"
diff --git a/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.ts b/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.ts
index 0894516117..19f8cff712 100644
--- a/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.ts
+++ b/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.ts
@@ -14,6 +14,7 @@ import {
 
 } from '../../filter/shared/ogc-filter.interface';
 import { OgcFilterWriter } from '../../filter/shared/ogc-filter';
+import { OgcFilterOperatorType } from './../shared/ogc-filter.enum';
 import { IgoMap } from '../../map';
 import { OGCFilterService } from '../shared/ogc-filter.service';
 import { WMSDataSource } from '../../datasource/shared/datasources/wms-datasource';
@@ -65,6 +66,8 @@ export class OgcFilterSelectionComponent implements OnInit {
   public enabled$ = new BehaviorSubject(undefined);
   public enableds$ = new BehaviorSubject([]);
 
+  public timeSourceField;
+
   public applyFiltersTimeout;
 
   get ogcFiltersSelectors() {
@@ -224,6 +227,7 @@ export class OgcFilterSelectionComponent implements OnInit {
         this.getSelectEnabled();
       }
       this.applyFilters();
+      this.setTimeSourceField();
     }
 
     this.form
@@ -334,6 +338,16 @@ export class OgcFilterSelectionComponent implements OnInit {
     return styles;
   }
 
+  setTimeSourceField() {
+    if (this.datasource?.options?.sourceFields) {
+      this.datasource?.options?.sourceFields.forEach(sf => {
+        if (sf.allowedOperatorsType.toLowerCase() === OgcFilterOperatorType.Time && sf.alias) {
+          this.timeSourceField = sf;
+        }
+      });
+    }
+  }
+
   bundleIsVertical(bundle: OgcSelectorBundle): boolean {
     return bundle.vertical ? bundle.vertical : false;
   }
diff --git a/packages/geo/src/lib/filter/shared/ogc-filter.interface.ts b/packages/geo/src/lib/filter/shared/ogc-filter.interface.ts
index 5a25c56454..bb7aaeab2d 100644
--- a/packages/geo/src/lib/filter/shared/ogc-filter.interface.ts
+++ b/packages/geo/src/lib/filter/shared/ogc-filter.interface.ts
@@ -154,7 +154,6 @@ export interface OgcFilterDuringOptions extends OgcFilterAttributeOptions {
   sliderOptions?: SliderOptionsInterface;
   displayFormat?: string;
   calendarModeYear?: boolean;
-  alias?: string;
 }
 export interface OgcFilterIsBetweenOptions extends OgcFilterAttributeOptions {
   lowerBoundary: number;

From 94c5db5d184de01e2d6ba95bf98f5b5a29d4f8ab Mon Sep 17 00:00:00 2001
From: Philippe Lafreniere <philippe.lafreniere@msp.gouv.qc.ca>
Date: Tue, 22 Feb 2022 09:00:08 -0500
Subject: [PATCH 3/3] refactor(ogc-filter-time): use title instead of alias

---
 .../ogc-filter-selection.component.html            |  4 ++--
 .../ogc-filter-selection.component.ts              | 14 --------------
 .../src/lib/filter/shared/ogc-filter.interface.ts  |  1 +
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.html b/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.html
index e5728c38e5..c6e9d978e3 100644
--- a/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.html
+++ b/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.html
@@ -166,8 +166,8 @@ <h4>{{bundle.title}}</h4>
 
 <div *ngIf="isTemporalOperator()">
   <mat-divider></mat-divider>
-  <h4 *ngIf="!timeSourceField">{{ 'igo.geo.filter.reportingDate' | translate }}</h4>
-  <h4 *ngIf="timeSourceField && timeSourceField.name === currentFilter.propertyName">{{ timeSourceField.alias }}</h4>
+  <h4 *ngIf="!currentFilter.title">{{ 'igo.geo.filter.reportingDate' | translate }}</h4>
+  <h4 *ngIf="currentFilter.title">{{ currentFilter.title }}</h4>
   <igo-ogc-filter-time
     [(datasource)]="datasource"
     [(currentFilter)]="currentFilter"
diff --git a/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.ts b/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.ts
index 19f8cff712..0894516117 100644
--- a/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.ts
+++ b/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.ts
@@ -14,7 +14,6 @@ import {
 
 } from '../../filter/shared/ogc-filter.interface';
 import { OgcFilterWriter } from '../../filter/shared/ogc-filter';
-import { OgcFilterOperatorType } from './../shared/ogc-filter.enum';
 import { IgoMap } from '../../map';
 import { OGCFilterService } from '../shared/ogc-filter.service';
 import { WMSDataSource } from '../../datasource/shared/datasources/wms-datasource';
@@ -66,8 +65,6 @@ export class OgcFilterSelectionComponent implements OnInit {
   public enabled$ = new BehaviorSubject(undefined);
   public enableds$ = new BehaviorSubject([]);
 
-  public timeSourceField;
-
   public applyFiltersTimeout;
 
   get ogcFiltersSelectors() {
@@ -227,7 +224,6 @@ export class OgcFilterSelectionComponent implements OnInit {
         this.getSelectEnabled();
       }
       this.applyFilters();
-      this.setTimeSourceField();
     }
 
     this.form
@@ -338,16 +334,6 @@ export class OgcFilterSelectionComponent implements OnInit {
     return styles;
   }
 
-  setTimeSourceField() {
-    if (this.datasource?.options?.sourceFields) {
-      this.datasource?.options?.sourceFields.forEach(sf => {
-        if (sf.allowedOperatorsType.toLowerCase() === OgcFilterOperatorType.Time && sf.alias) {
-          this.timeSourceField = sf;
-        }
-      });
-    }
-  }
-
   bundleIsVertical(bundle: OgcSelectorBundle): boolean {
     return bundle.vertical ? bundle.vertical : false;
   }
diff --git a/packages/geo/src/lib/filter/shared/ogc-filter.interface.ts b/packages/geo/src/lib/filter/shared/ogc-filter.interface.ts
index bb7aaeab2d..78ea7f4c62 100644
--- a/packages/geo/src/lib/filter/shared/ogc-filter.interface.ts
+++ b/packages/geo/src/lib/filter/shared/ogc-filter.interface.ts
@@ -154,6 +154,7 @@ export interface OgcFilterDuringOptions extends OgcFilterAttributeOptions {
   sliderOptions?: SliderOptionsInterface;
   displayFormat?: string;
   calendarModeYear?: boolean;
+  title?: string;
 }
 export interface OgcFilterIsBetweenOptions extends OgcFilterAttributeOptions {
   lowerBoundary: number;