diff --git a/client/wfnews-war/src/main/angular/src/app/components/preview-panels/closed-rec-sites/closed-rec-sites.component.html b/client/wfnews-war/src/main/angular/src/app/components/preview-panels/closed-rec-sites/closed-rec-sites.component.html index 635c37a46d..c9fd8b0d4f 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/preview-panels/closed-rec-sites/closed-rec-sites.component.html +++ b/client/wfnews-war/src/main/angular/src/app/components/preview-panels/closed-rec-sites/closed-rec-sites.component.html @@ -26,7 +26,7 @@
- diff --git a/client/wfnews-war/src/main/angular/src/app/components/preview-panels/closed-rec-sites/closed-rec-sites.component.ts b/client/wfnews-war/src/main/angular/src/app/components/preview-panels/closed-rec-sites/closed-rec-sites.component.ts index 984edae822..3b1862ffcf 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/preview-panels/closed-rec-sites/closed-rec-sites.component.ts +++ b/client/wfnews-war/src/main/angular/src/app/components/preview-panels/closed-rec-sites/closed-rec-sites.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { MapConfigService } from '@app/services/map-config.service'; -import { convertToDateYear, hidePanel, showPanel, getActiveMap } from '@app/utils'; +import { convertToDateYear, hidePanel, showPanel, zoomInWithLocationPin } from '@app/utils'; @Component({ selector: 'wfnews-closed-rec-sites', @@ -11,8 +11,10 @@ export class ClosedRecSitesComponent { constructor(private mapConfigService: MapConfigService) {} convertToDateYear = convertToDateYear; + zoomInWithLocationPin = zoomInWithLocationPin; public data; - defaultZoomLevel = 13; + defaultZoomLevel = 11; + pinDrop; setContent(data) { this.data = data; @@ -27,19 +29,4 @@ export class ClosedRecSitesComponent { hidePanel('desktop-preview'); } - zoomIn(){ - const long = Number(this.data?._identifyPoint?.longitude); - const lat = Number(this.data?._identifyPoint?.latitude); - - if(long && lat) { - this.mapConfigService.getMapConfig().then(() => { - getActiveMap().$viewer.panToFeature( - window['turf'].point([long, lat]), - this.defaultZoomLevel - ); - }); - } - } - -} - +} \ No newline at end of file diff --git a/client/wfnews-war/src/main/angular/src/app/components/preview-panels/road-events-preview/road-events-preview.component.html b/client/wfnews-war/src/main/angular/src/app/components/preview-panels/road-events-preview/road-events-preview.component.html index fe26a2ba4a..0c511b488b 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/preview-panels/road-events-preview/road-events-preview.component.html +++ b/client/wfnews-war/src/main/angular/src/app/components/preview-panels/road-events-preview/road-events-preview.component.html @@ -29,7 +29,7 @@
- diff --git a/client/wfnews-war/src/main/angular/src/app/components/preview-panels/road-events-preview/road-events-preview.component.ts b/client/wfnews-war/src/main/angular/src/app/components/preview-panels/road-events-preview/road-events-preview.component.ts index e7d195810b..25ef2ed6ce 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/preview-panels/road-events-preview/road-events-preview.component.ts +++ b/client/wfnews-war/src/main/angular/src/app/components/preview-panels/road-events-preview/road-events-preview.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { MapConfigService } from '@app/services/map-config.service'; -import { convertToDateYear, hidePanel, showPanel, openLink, getActiveMap } from '@app/utils'; +import { convertToDateYear, hidePanel, showPanel, openLink, zoomInWithLocationPin } from '@app/utils'; import { AppConfigService } from '@wf1/core-ui'; @Component({ @@ -14,8 +14,10 @@ export class RoadEventsPreviewComponent { convertToDateYear = convertToDateYear; openLink = openLink + zoomInWithLocationPin = zoomInWithLocationPin; public data; - defaultZoomLevel = 13; + defaultZoomLevel = 11; + pinDrop; setContent(data) { this.data = data; @@ -29,19 +31,5 @@ export class RoadEventsPreviewComponent { showPanel('identify-panel-wrapper') hidePanel('desktop-preview'); } - - zoomIn(){ - const long = Number(this.data?._identifyPoint?.longitude); - const lat = Number(this.data?._identifyPoint?.latitude); - - if(long && lat) { - this.mapConfigService.getMapConfig().then(() => { - getActiveMap().$viewer.panToFeature( - window['turf'].point([long, lat]), - this.defaultZoomLevel - ); - }); - } - } } diff --git a/client/wfnews-war/src/main/angular/src/app/utils/index.ts b/client/wfnews-war/src/main/angular/src/app/utils/index.ts index afeae33b91..0005760edf 100644 --- a/client/wfnews-war/src/main/angular/src/app/utils/index.ts +++ b/client/wfnews-war/src/main/angular/src/app/utils/index.ts @@ -879,3 +879,38 @@ export function addMarker(incident: any) { const viewer = getActiveMap().$viewer; this.marker.addTo(viewer.map); } + +export function zoomInWithLocationPin(){ + const viewer = getActiveMap().$viewer; + const long = Number(this.data?._identifyPoint?.longitude); + const lat = Number(this.data?._identifyPoint?.latitude); + + if(long && lat) { + this.mapConfigService.getMapConfig().then(() => { + getActiveMap().$viewer.panToFeature( + window['turf'].point([long, lat]), + this.defaultZoomLevel + ); + }); + const markerOptions = { + icon: L.divIcon({ + className: 'custom-icon-class', + html: `
+ icon +
`, + iconSize: [32, 32], + }), + draggable: false, + }; + if (this.pinDrop) { + viewer.map.removeLayer(this.pinDrop); + } + + this.pinDrop = L.marker( + [lat, long], + markerOptions, + ).addTo(viewer.map); + } + } + +