Route back to previous zoom level for bans, evacs, area restrictions …

…on desktop
bcgov · Dec 19, 2024 · 0bdccd9 · 0bdccd9
1 parent 123f36f
commit 0bdccd9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/.../components/preview-panels/area-restriction-preview/area-restriction-preview.component.ts b/.../components/preview-panels/area-restriction-preview/area-restriction-preview.component.ts
@@ -38,21 +38,22 @@ export class AreaRestrictionPreviewComponent {
 
 
   enterFullDetail() {
+    const currentZoomLevel = getActiveMap().$viewer?.map?._zoom;
     const url = this.router.serializeUrl(
       this.router.createUrlTree([ResourcesRoutes.PUBLIC_EVENT], {
         queryParams: {
           eventType: 'area-restriction',
           eventNumber: this.data.PROT_RA_SYSID,
           eventName: this.data.NAME,
-          source: [ResourcesRoutes.ACTIVEWILDFIREMAP]
+          source: [ResourcesRoutes.ACTIVEWILDFIREMAP],
+          zoom: currentZoomLevel
         },
       }),
     );
     this.capacitorService.redirect(url, true);
   }
 
   zoomIn(level?: number, polygon?: boolean) {
-    const viewer = getActiveMap().$viewer;
     this.agolService
       .getAreaRestrictions(
         `NAME='${this.data.NAME}'`,

diff --git a/...ar/src/app/components/preview-panels/evacuations-preview/evacuations-preview.component.ts b/...ar/src/app/components/preview-panels/evacuations-preview/evacuations-preview.component.ts
@@ -3,7 +3,7 @@ import { Router } from '@angular/router';
 import { AGOLService } from '@app/services/AGOL-service';
 import { CapacitorService } from '@app/services/capacitor-service';
 import { CommonUtilityService } from '@app/services/common-utility.service';
-import { ResourcesRoutes, convertToDateYear, hidePanel, showPanel } from '@app/utils';
+import { ResourcesRoutes, convertToDateYear, hidePanel, showPanel, getActiveMap } from '@app/utils';
 import { MapUtilityService } from '../map-share-service';
 
 @Component({
@@ -49,14 +49,16 @@ export class EvacuationsPreviewComponent {
   }
 
   enterFullDetail() {
+    const currentZoomLevel = getActiveMap().$viewer?.map?._zoom;
     if (this.data) {
       const url = this.router.serializeUrl(
         this.router.createUrlTree([ResourcesRoutes.PUBLIC_EVENT], {
           queryParams: {
             eventType: this.data.ORDER_ALERT_STATUS,
             id: this.data.EMRG_OAA_SYSID,
             eventNumber: this.data.EVENT_NUMBER,
-            source: [ResourcesRoutes.ACTIVEWILDFIREMAP]
+            source: [ResourcesRoutes.ACTIVEWILDFIREMAP],
+            zoom: currentZoomLevel
           },
         }),
       );

diff --git a/.../angular/src/app/components/preview-panels/fire-ban-preview/fire-ban-preview.component.ts b/.../angular/src/app/components/preview-panels/fire-ban-preview/fire-ban-preview.component.ts
@@ -38,21 +38,22 @@ export class FireBanPreviewComponent {
   }
 
   enterFullDetail() {
+    const currentZoomLevel = getActiveMap().$viewer?.map?._zoom;
     const url = this.router.serializeUrl(
       this.router.createUrlTree([ResourcesRoutes.PUBLIC_EVENT], {
         queryParams: {
           eventType: 'ban',
           eventNumber: this.data.PROT_BAP_SYSID,
           eventName: this.data.ACCESS_PROHIBITION_DESCRIPTION,
-          source: [ResourcesRoutes.ACTIVEWILDFIREMAP]
+          source: [ResourcesRoutes.ACTIVEWILDFIREMAP],
+          zoom: currentZoomLevel
         },
       }),
     );
     this.capacitorService.redirect(url, true);
   }
 
   zoomIn(level?: number, polygon?: boolean) {
-    const viewer = getActiveMap().$viewer;
     this.agolService
       .getBansAndProhibitionsById(
         this.data.PROT_BAP_SYSID,

diff --git a/...p/components/public-incident-page/incident-info-header/incident-header-panel.component.ts b/...p/components/public-incident-page/incident-info-header/incident-header-panel.component.ts
@@ -84,7 +84,7 @@ export class IncidentHeaderPanelComponent implements AfterViewInit, OnInit {
       weight: 2,
       fillOpacity: 0
     })
-  })
+  });
 
   private evacOrdersLayer = esri.featureLayer({
     url: this.appConfigService.getConfig()['externalAppConfig']['AGOLevacOrders'].toString(),
@@ -107,7 +107,7 @@ export class IncidentHeaderPanelComponent implements AfterViewInit, OnInit {
         };
       }
     }
-  })
+  });
 
 
   constructor(
@@ -418,7 +418,7 @@ export class IncidentHeaderPanelComponent implements AfterViewInit, OnInit {
               style: '7734'            
             })
             .addTo(this.map);
-        })
+        });
     }
     const icon = L.icon({
       iconUrl: '/assets/images/local_fire_department.png',
@@ -549,13 +549,16 @@ export class IncidentHeaderPanelComponent implements AfterViewInit, OnInit {
 
 
   backToMap() {
+    const zoom = this.params?.['zoom'];
+
     const navigateToMap = (longitude: number, latitude: number, queryParamKey: string) => {
       setTimeout(() => {
         this.router.navigate([ResourcesRoutes.ACTIVEWILDFIREMAP], {
           queryParams: {
             longitude,
             latitude,
-            [queryParamKey]: true
+            [queryParamKey]: true,
+            zoom
           },
         });
       }, 100);