From b9cd6859ccb18e6319fc0f2443e17be2466d7d94 Mon Sep 17 00:00:00 2001
From: "MAXIME LAMER (LAMM26)" <maxime.lamer@msp.gouv.qc.ca>
Date: Wed, 19 May 2021 13:41:11 -0400
Subject: [PATCH 1/3] ajout bouton zoom on Layer

---
 demo/src/app/geo/layer/layer.component.ts     |  1 +
 .../datasource/shared/capabilities.service.ts |  3 +
 .../layer-list/layer-list.component.html      | 24 ++++++++
 .../layer/layer-list/layer-list.component.ts  | 56 +++++++++++++++++++
 .../layer/shared/layers/layer.interface.ts    |  4 +-
 .../src/lib/map/shared/controllers/view.ts    | 17 +++++-
 .../geo/src/lib/map/shared/map.interface.ts   |  2 +-
 packages/geo/src/lib/map/shared/map.ts        |  4 ++
 packages/geo/src/locale/en.geo.json           |  2 +
 packages/geo/src/locale/fr.geo.json           |  2 +
 10 files changed, 111 insertions(+), 4 deletions(-)

diff --git a/demo/src/app/geo/layer/layer.component.ts b/demo/src/app/geo/layer/layer.component.ts
index 8d0228cbac..50b8917266 100644
--- a/demo/src/app/geo/layer/layer.component.ts
+++ b/demo/src/app/geo/layer/layer.component.ts
@@ -28,6 +28,7 @@ export class AppLayerComponent {
 
   public view = {
     center: [-73, 47.2],
+    maxLayerZoomExtent: [-11000000, 4500000, -4500000, 10000000],
     zoom: 7
   };
 
diff --git a/packages/geo/src/lib/datasource/shared/capabilities.service.ts b/packages/geo/src/lib/datasource/shared/capabilities.service.ts
index 1e9d1b6c1b..ecfb47bc4a 100644
--- a/packages/geo/src/lib/datasource/shared/capabilities.service.ts
+++ b/packages/geo/src/lib/datasource/shared/capabilities.service.ts
@@ -36,6 +36,7 @@ import {
   TimeFilterType,
   TimeFilterStyle
 } from '../../filter/shared/time-filter.enum';
+import * as olproj from 'ol/proj';
 
 export enum TypeCapabilities {
   wms = 'wms',
@@ -251,6 +252,7 @@ export class CapabilitiesService {
     const timeFilter = this.getTimeFilter(layer);
     const timeFilterable = timeFilter && Object.keys(timeFilter).length > 0;
     const legendOptions = layer.Style ? this.getStyle(layer.Style) : undefined;
+    const extent = olproj.transformExtent(layer.EX_GeographicBoundingBox, 'EPSG:4326', 'EPSG:3857');
 
     let queryFormat: QueryFormat;
     const queryFormatMimeTypePriority = [
@@ -284,6 +286,7 @@ export class CapabilitiesService {
         title: layer.Title,
         maxResolution: getResolutionFromScale(layer.MaxScaleDenominator),
         minResolution: getResolutionFromScale(layer.MinScaleDenominator),
+        extent,
         metadata: {
           url: metadata ? metadata.OnlineResource : undefined,
           extern: metadata ? true : undefined,
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
index 1f666029e4..e7517224ed 100644
--- a/packages/geo/src/lib/layer/layer-list/layer-list.component.html
+++ b/packages/geo/src/lib/layer/layer-list/layer-list.component.html
@@ -40,6 +40,18 @@
   </ng-container>
 
   <ng-content select="[igoLayerItemToolbar]"></ng-content>
+    <button
+      *ngIf="activeLayerIsValid(activeLayer)"
+      class="zoomLayer-button"
+      color="primary"
+      mat-icon-button
+      tooltip-position="below"
+      matTooltipShowDelay="500"
+      [matTooltip]="'igo.geo.layer.zoomLayer' | translate"
+      (click)="zoomLayerExtents(activeLayer)">
+      <mat-icon matBadgeColor="primary" matBadgeSize="medium" svgIcon="magnify-scan"></mat-icon>
+    </button>
+
     <!-- <label>{{ 'igo.geo.layer.opacity' | translate }} </label> -->
     <button
       class="opacity-button"
@@ -128,6 +140,18 @@
                     ('igo.geo.layer.selectAll' | translate)}}
     </button>
 
+    <button
+      *ngIf="layersChecked.length !== 0 && activeLayersAreValid(layersChecked)"
+      class="zoomLayer-button"
+      color="primary"
+      mat-icon-button
+      tooltip-position="below"
+      matTooltipShowDelay="500"
+      [matTooltip]="'igo.geo.layer.zoomLayers' | translate"
+      (click)="zoomLayersExtents(layersChecked)">
+      <mat-icon matBadgeColor="primary" matBadgeSize="medium" svgIcon="magnify-scan"></mat-icon>
+    </button>
+
     <button
       class="opacity-button"
       color="primary"
diff --git a/packages/geo/src/lib/layer/layer-list/layer-list.component.ts b/packages/geo/src/lib/layer/layer-list/layer-list.component.ts
index 472650bc2a..c0d3eeae76 100644
--- a/packages/geo/src/lib/layer/layer-list/layer-list.component.ts
+++ b/packages/geo/src/lib/layer/layer-list/layer-list.component.ts
@@ -31,6 +31,7 @@ import { IgoMap } from '../../map/shared/map';
 import { Layer } from '../shared/layers/layer';
 import { LinkedProperties, LayersLink } from '../shared/layers/layer.interface';
 import { MatSliderChange } from '@angular/material/slider';
+import * as olextent from 'ol/extent';
 
 // TODO: This class could use a clean up. Also, some methods could be moved ealsewhere
 @Component({
@@ -285,6 +286,61 @@ export class LayerListComponent implements OnInit, OnDestroy {
     this.layers$$.unsubscribe();
   }
 
+  activeLayerIsValid(layer: Layer): boolean {
+    let valid = false;
+    const layerExtent = layer.options.extent;
+    const maxLayerZoomExtent = this.map.viewController.maxLayerZoomExtent;
+
+    if (layerExtent) {
+      if (maxLayerZoomExtent) {
+        valid = olextent.containsExtent(maxLayerZoomExtent, layerExtent);
+      } else {
+        valid = true;
+      }
+    }
+    return valid;
+  }
+
+  activeLayersAreValid(layers: Layer[]): boolean {
+    let valid = false;
+    const layersExtent = olextent.createEmpty();
+    const maxLayerZoomExtent = this.map.viewController.maxLayerZoomExtent;
+
+    for (const layer of layers) {
+      const layerExtent = layer.options.extent;
+
+      if (layerExtent && !layerExtent.includes(Infinity)) {
+        olextent.extend(layersExtent, layerExtent);
+      }
+    }
+
+    if (!layersExtent.isEmpty) {
+      if (maxLayerZoomExtent) {
+        valid = (olextent.containsExtent(maxLayerZoomExtent, layersExtent));
+      } else {
+        valid = true;
+      }
+    }
+    return valid;
+  }
+
+  zoomLayerExtents(layer: Layer) {
+    this.map.viewController.zoomToExtent(layer.options.extent);
+  }
+
+  zoomLayersExtents(layers: Layer[]) {
+    const layersExtent = olextent.createEmpty();
+
+    for (const layer of layers) {
+      const layerExtent = layer.options.extent;
+
+      if (layerExtent) {
+        olextent.extend(layersExtent, layerExtent);
+      }
+    }
+    this.map.viewController.zoomToExtent(layersExtent);
+  }
+
   changeOpacity(event: MatSliderChange ){
     this.opacity = event.value;
   }
diff --git a/packages/geo/src/lib/layer/shared/layers/layer.interface.ts b/packages/geo/src/lib/layer/shared/layers/layer.interface.ts
index 1bb2e8459a..668475d2f8 100644
--- a/packages/geo/src/lib/layer/shared/layers/layer.interface.ts
+++ b/packages/geo/src/lib/layer/shared/layers/layer.interface.ts
@@ -2,7 +2,7 @@ import olLayer from 'ol/layer/Layer';
 
 import { DataSource } from '../../../datasource/shared/datasources/datasource';
 import { AnyDataSourceOptions } from '../../../datasource/shared/datasources/any-datasource.interface';
-import { MapViewOptions } from '../../../map/shared/map.interface';
+import { MapExtent, MapViewOptions } from '../../../map/shared/map.interface';
 
 export interface LayerOptions {
   source?: DataSource;
@@ -13,7 +13,7 @@ export interface LayerOptions {
   baseLayer?: boolean;
   opacity?: number;
   visible?: boolean;
-  extent?: [number, number, number, number];
+  extent?: MapExtent;
   zIndex?: number;
   minResolution?: number;
   maxResolution?: number;
diff --git a/packages/geo/src/lib/map/shared/controllers/view.ts b/packages/geo/src/lib/map/shared/controllers/view.ts
index 758bcd5b02..f51a32a1ba 100644
--- a/packages/geo/src/lib/map/shared/controllers/view.ts
+++ b/packages/geo/src/lib/map/shared/controllers/view.ts
@@ -42,6 +42,11 @@ export class MapViewController extends MapController {
    */
   maxZoomOnExtent = 19;
 
+  /**
+   * Max extent possible when zooming
+   */
+  maxLayerZoomExtent: MapExtent;
+
   /**
    * Extent stream
    */
@@ -340,7 +345,17 @@ export class MapViewController extends MapController {
       size: this.olMap.getSize(),
       maxZoom,
       padding: this.padding,
-      duration: xSize > 4 ? 0 : duration
+      duration: xSize > 4 ? 0 : duration,
+      callback: (isFinished: boolean) => {
+        if (!isFinished) {
+          olView.fit(extent, {
+            size: this.olMap.getSize(),
+            maxZoom,
+            padding: this.padding,
+            duration: xSize > 4 ? 0 : duration
+          });
+        }
+      }
     });
   }
 
diff --git a/packages/geo/src/lib/map/shared/map.interface.ts b/packages/geo/src/lib/map/shared/map.interface.ts
index f211744667..8b81428262 100644
--- a/packages/geo/src/lib/map/shared/map.interface.ts
+++ b/packages/geo/src/lib/map/shared/map.interface.ts
@@ -7,10 +7,10 @@ export interface MapViewOptions {
   geolocate?: boolean;
   buffer?: Buffer;
   alwaysTracking?: boolean;
-
   constrainRotation?: boolean | number;
   enableRotation?: boolean;
   extent?: MapExtent;
+  maxLayerZoomExtent?: MapExtent;
   maxResolution?: number;
   minResolution?: number;
   maxZoom?: number;
diff --git a/packages/geo/src/lib/map/shared/map.ts b/packages/geo/src/lib/map/shared/map.ts
index 828777ebd9..4a353a8826 100644
--- a/packages/geo/src/lib/map/shared/map.ts
+++ b/packages/geo/src/lib/map/shared/map.ts
@@ -161,6 +161,10 @@ export class IgoMap {
 
     this.unsubscribeGeolocate();
     if (options) {
+      if (options.maxLayerZoomExtent) {
+        this.viewController.maxLayerZoomExtent = options.maxLayerZoomExtent;
+      }
+
       if (options.center) {
         const projection = view.getProjection().getCode();
         const center = olproj.fromLonLat(options.center, projection);
diff --git a/packages/geo/src/locale/en.geo.json b/packages/geo/src/locale/en.geo.json
index 4d9340ca31..4310992256 100644
--- a/packages/geo/src/locale/en.geo.json
+++ b/packages/geo/src/locale/en.geo.json
@@ -213,6 +213,8 @@
         "tools": "Tools",
         "selectAll": "Select all",
         "deselectAll": "Deselect all",
+        "zoomLayer": "Zoom To Layer Extents",
+        "zoomLayers": "Zoom To Selected Layers Extents",
         "opacity": "Opacity",
         "raiseLayer": "Bring layer forward",
         "filterRaiseLayer": "The forward movement is always done according to the order of the map!",
diff --git a/packages/geo/src/locale/fr.geo.json b/packages/geo/src/locale/fr.geo.json
index b448d3dfe0..ad587b5060 100644
--- a/packages/geo/src/locale/fr.geo.json
+++ b/packages/geo/src/locale/fr.geo.json
@@ -212,6 +212,8 @@
         "tools": "Outils",
         "selectAll": "Tout sélectionner",
         "deselectAll": "Tout désélectionner",
+        "zoomLayer": "Cadrer sur l'étendue de la couche",
+        "zoomLayers": "Cadrer sur l'étendue des couches sélectionnées",
         "opacity": "Opacité",
         "raiseLayer": "Mettre en avant",
         "filterRaiseLayer": "Le déplacement avant se fait toujours selon l'ordre de la carte!",

From 926f1a58acfe11f7f83b2f870f6122ad4b4ba9db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Barbeau?=
 <marc-andre.barbeau@msp.gouv.qc.ca>
Date: Wed, 26 May 2021 09:53:47 -0400
Subject: [PATCH 2/3] Update capabilities.service.ts

---
 .../geo/src/lib/datasource/shared/capabilities.service.ts     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/geo/src/lib/datasource/shared/capabilities.service.ts b/packages/geo/src/lib/datasource/shared/capabilities.service.ts
index ecfb47bc4a..02c74a0061 100644
--- a/packages/geo/src/lib/datasource/shared/capabilities.service.ts
+++ b/packages/geo/src/lib/datasource/shared/capabilities.service.ts
@@ -252,7 +252,9 @@ export class CapabilitiesService {
     const timeFilter = this.getTimeFilter(layer);
     const timeFilterable = timeFilter && Object.keys(timeFilter).length > 0;
     const legendOptions = layer.Style ? this.getStyle(layer.Style) : undefined;
-    const extent = olproj.transformExtent(layer.EX_GeographicBoundingBox, 'EPSG:4326', 'EPSG:3857');
+    const extent = layer.EX_GeographicBoundingBox ?
+        olproj.transformExtent(layer.EX_GeographicBoundingBox, 'EPSG:4326', 'EPSG:3857') :
+        undefined;
 
     let queryFormat: QueryFormat;
     const queryFormatMimeTypePriority = [

From fcd5062befafef454c7be59ec90727273624ed61 Mon Sep 17 00:00:00 2001
From: "MAXIME LAMER (LAMM26)" <maxime.lamer@msp.gouv.qc.ca>
Date: Wed, 26 May 2021 16:12:50 -0400
Subject: [PATCH 3/3] modification isEmpty()

---
 packages/geo/src/lib/layer/layer-list/layer-list.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/geo/src/lib/layer/layer-list/layer-list.component.ts b/packages/geo/src/lib/layer/layer-list/layer-list.component.ts
index c0d3eeae76..2c6d746bdd 100644
--- a/packages/geo/src/lib/layer/layer-list/layer-list.component.ts
+++ b/packages/geo/src/lib/layer/layer-list/layer-list.component.ts
@@ -21,7 +21,7 @@ import {
   EMPTY,
   timer
 } from 'rxjs';
-import { debounce } from 'rxjs/operators';
+import { debounce, isEmpty } from 'rxjs/operators';
 import {
   MetadataOptions,
   MetadataLayerOptions
@@ -314,7 +314,7 @@ export class LayerListComponent implements OnInit, OnDestroy {
       }
     }
 
-    if (!layersExtent.isEmpty) {
+    if (!olextent.isEmpty(layersExtent)) {
       if (maxLayerZoomExtent) {
         valid = (olextent.containsExtent(maxLayerZoomExtent, layersExtent));
       } else {