Merge branch '2.3.0' into pointid-caching

bcgov · Jul 26, 2024 · 8412db3 · 8412db3
2 parents 97276fe + e24ef36
commit 8412db3
Showing 1 changed file with 41 additions and 36 deletions.
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
@@ -73,6 +73,41 @@ export class IncidentHeaderPanelComponent implements AfterViewInit, OnInit {
 
   private map: any;
 
+  private perimeterLayer = esri.featureLayer({
+    url: this.appConfigService.getConfig()['externalAppConfig']['AGOLperimetres'].toString(),
+    ignoreRenderer: true,
+    precision: 3,
+    style: (feature) => ({
+      fillColor: '#e60000',
+      color: '#e60000',
+      weight: 2,
+      fillOpacity: 0.5
+    })
+  })
+
+  private evacOrdersLayer = esri.featureLayer({
+    url: this.appConfigService.getConfig()['externalAppConfig']['AGOLevacOrders'].toString(),
+    ignoreRenderer: true,
+    precision: 10,
+    style: (feature) => {
+      if (feature.properties.ORDER_ALERT_STATUS === 'Order') {
+        return {
+          fillColor: '#ff3a35',
+          color: '#ff3a35',
+          weight: 2.25,
+          fillOpacity: 0.5
+        };
+      } else if (feature.properties.ORDER_ALERT_STATUS === 'Alert') {
+        return {
+          fillColor: '#fa9600',
+          color: '#fa9600',
+          weight: 2.25,
+          fillOpacity: 0.5
+        };
+      }
+    }
+  })
+
 
   constructor(
     private appConfigService: AppConfigService,
@@ -256,42 +291,8 @@ export class IncidentHeaderPanelComponent implements AfterViewInit, OnInit {
     ['mapServices']['openmapsBaseUrl'].toString();
 
     if (this.evac) {
-      esri.featureLayer({
-        url: this.appConfigService.getConfig()['externalAppConfig']['AGOLperimetres'].toString(),
-        ignoreRenderer: true,
-        precision: 3,
-        style: (feature) => ({
-          fillColor: '#e60000',
-          color: '#e60000',
-          weight: 2,
-          fillOpacity: 0.5
-        })
-      })
-        .addTo(this.map);
-
-      esri.featureLayer({
-        url: this.appConfigService.getConfig()['externalAppConfig']['AGOLevacOrders'].toString(),
-        ignoreRenderer: true,
-        precision: 10,
-        style: (feature) => {
-          if (feature.properties.ORDER_ALERT_STATUS === 'Order') {
-            return {
-              fillColor: '#ff3a35',
-              color: '#ff3a35',
-              weight: 2.25,
-              fillOpacity: 0.5
-            };
-          } else if (feature.properties.ORDER_ALERT_STATUS === 'Alert') {
-            return {
-              fillColor: '#fa9600',
-              color: '#fa9600',
-              weight: 2.25,
-              fillOpacity: 0.5
-            };
-          }
-        }
-      })
-        .addTo(this.map);
+      this.perimeterLayer.addTo(this.map);
+      this.evacOrdersLayer.addTo(this.map);
     }
 
     if (this.areaRestriction) {
@@ -451,6 +452,10 @@ export class IncidentHeaderPanelComponent implements AfterViewInit, OnInit {
           fillColor: colorToDisplay,
         }).addTo(this.map);
       }
+
+      this.perimeterLayer.addTo(this.map);
+      this.evacOrdersLayer.addTo(this.map);
+
       this.cdr.detectChanges();
     }