Merge branch '2.3.0' into fix-publishedPublicIncident-undefined-call

client/wfnews-war/src/main/angular/src/app/components/full-details/evac-alert-full-details/evac-alert-full-details.component.ts

@@ -1,18 +1,18 @@
 import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { LocationData } from '@app/components/wildfires-list-header/filter-by-location/filter-by-location-dialog.component';
 import { AGOLService, AgolOptions } from '@app/services/AGOL-service';
+import { CommonUtilityService } from '@app/services/common-utility.service';
 import {
   PublishedIncidentService,
   SimpleIncident,
 } from '@app/services/published-incident-service';
-import { ResourcesRoutes, convertToDateYear, convertToDateTime, openLink, getStageOfControlIcon, getStageOfControlLabel } from '@app/utils';
-import L from 'leaflet';
-import { setDisplayColor } from '../../../utils';
-import { LocationData } from '@app/components/wildfires-list-header/filter-by-location/filter-by-location-dialog.component';
-import { AppConfigService } from '@wf1/core-ui';
-import { Router } from '@angular/router';
 import { WatchlistService } from '@app/services/watchlist-service';
-import { CommonUtilityService } from '@app/services/common-utility.service';
+import { ResourcesRoutes, convertToDateTime, convertToDateYear, getStageOfControlIcon, getStageOfControlLabel, openLink } from '@app/utils';
+import { AppConfigService } from '@wf1/core-ui';
 import * as esri from 'esri-leaflet';
+import L from 'leaflet';
+import { setDisplayColor } from '../../../utils';
 
 export class EvacData {
   public name: string;
@@ -126,7 +126,7 @@ export class EvacAlertFullDetailsComponent implements OnInit {
     esri.featureLayer({
         url: this.appConfigService.getConfig()['externalAppConfig']['AGOLevacOrders'].toString(),
         ignoreRenderer: true,
-        precision: 3,
+        precision: 10,
         style: (feature) => {
           if (feature.properties.ORDER_ALERT_STATUS === 'Order') {
             return {

client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/incident-header-panel.component.ts

@@ -20,6 +20,7 @@ import { AGOLService } from '@app/services/AGOL-service';
 import { CommonUtilityService } from '@app/services/common-utility.service';
 import { PublishedIncidentService } from '@app/services/published-incident-service';
 import { AppConfigService } from '@wf1/core-ui';
+import * as esri from 'esri-leaflet';
 import * as L from 'leaflet';
 import * as moment from 'moment';
 import { toCanvas } from 'qrcode';
@@ -35,7 +36,6 @@ import {
   setDisplayColor
 } from '../../../utils';
 import { ContactUsDialogComponent } from '../../admin-incident-form/contact-us-dialog/contact-us-dialog.component';
-import * as esri from 'esri-leaflet';
 
 @Component({
   selector: 'incident-header-panel',
@@ -274,7 +274,7 @@ export class IncidentHeaderPanelComponent implements AfterViewInit, OnInit {
       esri.featureLayer({
         url: this.appConfigService.getConfig()['externalAppConfig']['AGOLevacOrders'].toString(),
         ignoreRenderer: true,
-        precision: 3,
+        precision: 10,
         style: (feature) => {
           if (feature.properties.ORDER_ALERT_STATUS === 'Order') {
             return {

client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-overview-panel/incident-overview-panel.component.ts

@@ -42,7 +42,7 @@ export class IncidentOverviewPanel {
     if (code === 'MONITOR') {
       return 'When a fire is being monitored, this means BC Wildfire Service is observing and analyzing the fire but it\'s not immediately suppressed. It may be allowed to burn to achieve ecological or resource management objectives and is used on remote fires that do not threaten values.';
     } else if (code === 'MODIFIED') {
-      return 'During a modified response, a wildfire is managed using a combination of techniques with the goal to minimize costs and damage while maximizing ecological benefits from the fire. This response method is used when there is no immediate threat to values.';
+      return 'During a modified response, a wildfire is managed using a combination of techniques with the goal to minimize damage while maximizing ecological benefits from the fire. This response method is used when there is no immediate threat to values.';
     } else if (code === 'FULL') {
       return 'The suppression of an unwanted wildfire to limit spread.';
     }

client/wfnews-war/src/main/angular/src/app/utils/index.ts

@@ -648,7 +648,7 @@ export function getResponseTypeDescription(code: string) {
   if (code === 'MONITOR') {
     return 'When a fire is being monitored, this means BC Wildfire Service is observing and analyzing the fire but it\'s not immediately suppressed. It may be allowed to burn to achieve ecological or resource management objectives and is used on remote fires that do not threaten values.';
   } else if (code === 'MODIFIED') {
-    return 'During a modified response, a wildfire is managed using a combination of techniques with the goal to minimize costs and damage while maximizing ecological benefits from the fire. This response method is used when there is no immediate threat to values.';
+    return 'During a modified response, a wildfire is managed using a combination of techniques with the goal to minimize damage while maximizing ecological benefits from the fire. This response method is used when there is no immediate threat to values.';
   } else if (code === 'FULL') {
     return 'The suppression of an unwanted wildfire to limit spread.';
   }