From 00d1371bbdc88df207ccfb669d244ec1406405b1 Mon Sep 17 00:00:00 2001 From: Sean Sylver Date: Wed, 24 Apr 2024 15:53:49 -0700 Subject: [PATCH] WFNEWS-2144 remove area restrction centroid & increase radii for static maps --- .../area-restrictions-full-details.component.ts | 17 +---------------- .../bans-full-details.component.ts | 2 +- .../danger-rating-full-details.component.ts | 2 +- .../evac-alert-full-details.component.ts | 2 +- .../incident-header-panel.component.ts | 2 +- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/client/wfnews-war/src/main/angular/src/app/components/full-details/area-restrictions-full-details/area-restrictions-full-details.component.ts b/client/wfnews-war/src/main/angular/src/app/components/full-details/area-restrictions-full-details/area-restrictions-full-details.component.ts index abdb929516..09b971c2f4 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/full-details/area-restrictions-full-details/area-restrictions-full-details.component.ts +++ b/client/wfnews-war/src/main/angular/src/app/components/full-details/area-restrictions-full-details/area-restrictions-full-details.component.ts @@ -136,28 +136,13 @@ export class AreaRestrictionsFullDetailsComponent implements OnInit { popupAnchor: [1, -34], shadowSize: [41, 41], }); - if (this.incident) { - if (this.incident.fireOfNoteInd) { - L.marker(location, { icon: fireOfNoteIcon }).addTo(this.map); - } else { - const colorToDisplay = setDisplayColor( - this.incident.stageOfControlCode, - ); - L.circleMarker(location, { - radius: 15, - fillOpacity: 1, - color: 'black', - fillColor: colorToDisplay, - }).addTo(this.map); - } - } // now fetch the rest of the incidents in the area and display on map try { const locationData = new LocationData(); locationData.latitude = Number(this.restrictionData.centroidLatitude); locationData.longitude = Number(this.restrictionData.centroidLongitude); - locationData.radius = 10; + locationData.radius = 100; const stageOfControlCodes = ['OUT_CNTRL', 'HOLDING', 'UNDR_CNTRL']; const incidents = await this.publishedIncidentService .fetchPublishedIncidentsList( diff --git a/client/wfnews-war/src/main/angular/src/app/components/full-details/bans-full-details/bans-full-details.component.ts b/client/wfnews-war/src/main/angular/src/app/components/full-details/bans-full-details/bans-full-details.component.ts index 0fb4a2ff5a..fa7c0332ab 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/full-details/bans-full-details/bans-full-details.component.ts +++ b/client/wfnews-war/src/main/angular/src/app/components/full-details/bans-full-details/bans-full-details.component.ts @@ -159,7 +159,7 @@ export class BansFullDetailsComponent implements OnInit { const locationData = new LocationData(); locationData.latitude = Number(this.banData.centroidLatitude); locationData.longitude = Number(this.banData.centroidLongitude); - locationData.radius = 10; + locationData.radius = 100; const stageOfControlCodes = ['OUT_CNTRL', 'HOLDING', 'UNDR_CNTRL']; const incidents = await this.publishedIncidentService .fetchPublishedIncidentsList( diff --git a/client/wfnews-war/src/main/angular/src/app/components/full-details/danger-rating-full-details/danger-rating-full-details.component.ts b/client/wfnews-war/src/main/angular/src/app/components/full-details/danger-rating-full-details/danger-rating-full-details.component.ts index 78d1257fe3..943ca737e9 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/full-details/danger-rating-full-details/danger-rating-full-details.component.ts +++ b/client/wfnews-war/src/main/angular/src/app/components/full-details/danger-rating-full-details/danger-rating-full-details.component.ts @@ -114,7 +114,7 @@ export class DangerRatingFullDetailsComponent implements OnInit { // now fetch the rest of the incidents in the area and display on map try { - locationData.radius = 10; + locationData.radius = 100; const stageOfControlCodes = ['OUT_CNTRL', 'HOLDING', 'UNDR_CNTRL']; const incidents = await this.publishedIncidentService .fetchPublishedIncidentsList( diff --git a/client/wfnews-war/src/main/angular/src/app/components/full-details/evac-alert-full-details/evac-alert-full-details.component.ts b/client/wfnews-war/src/main/angular/src/app/components/full-details/evac-alert-full-details/evac-alert-full-details.component.ts index c3ad7f36c3..4610c40950 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/full-details/evac-alert-full-details/evac-alert-full-details.component.ts +++ b/client/wfnews-war/src/main/angular/src/app/components/full-details/evac-alert-full-details/evac-alert-full-details.component.ts @@ -142,7 +142,7 @@ export class EvacAlertFullDetailsComponent implements OnInit { const locationData = new LocationData(); locationData.latitude = Number(this.evacData.centroidLatitude); locationData.longitude = Number(this.evacData.centroidLongitude); - locationData.radius = 10; + locationData.radius = 100; const stageOfControlCodes = ['OUT_CNTRL', 'HOLDING', 'UNDR_CNTRL']; const incidents = await this.publishedIncidentService .fetchPublishedIncidentsList( diff --git a/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/incident-header-panel.component.ts b/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/incident-header-panel.component.ts index 1524a3248e..ed2f5eee66 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/incident-header-panel.component.ts +++ b/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/incident-header-panel.component.ts @@ -297,7 +297,7 @@ this.router.navigate([ResourcesRoutes.DASHBOARD]); const locationData = new LocationData(); locationData.latitude = Number(this.incident.latitude); locationData.longitude = Number(this.incident.longitude); - locationData.radius = 10; + locationData.radius = 100; const stageOfControlCodes = ['OUT_CNTRL', 'HOLDING', 'UNDR_CNTRL']; const incidents = await this.publishedIncidentService .fetchPublishedIncidentsList(