From 7f8c3ad0b386650e0bd27ce1609e33d1384f18b9 Mon Sep 17 00:00:00 2001 From: Kalutka Zhenya Date: Thu, 14 Jan 2021 19:28:56 +0200 Subject: [PATCH] Refactoring --- .../components/widget/lib/maps/leaflet-map.ts | 18 +++++++++--------- .../widget/lib/maps/providers/image-map.ts | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts index 9f4ee64aef..f5c2a5dcc4 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts @@ -217,18 +217,18 @@ export default abstract class LeafletMap { }); const dragListener = (e: L.DragEndEvent) => { - const polygonOffset = this.options.provider === MapProviders.image ? 10 : 0.01; + if (e.type === 'dragend') { + const polygonOffset = this.options.provider === MapProviders.image ? 10 : 0.01; - let convert = this.convertToCustomFormat(mousePositionOnMap,polygonOffset); - mousePositionOnMap.lat = convert[this.options.latKeyName]; - mousePositionOnMap.lng = convert[this.options.lngKeyName]; + let convert = this.convertToCustomFormat(mousePositionOnMap,polygonOffset); + mousePositionOnMap.lat = convert[this.options.latKeyName]; + mousePositionOnMap.lng = convert[this.options.lngKeyName]; - const latlng1 = mousePositionOnMap; - const latlng2 = L.latLng(mousePositionOnMap.lat, mousePositionOnMap.lng + polygonOffset); - const latlng3 = L.latLng(mousePositionOnMap.lat - polygonOffset, mousePositionOnMap.lng); - polygonPoints = [latlng1, latlng2, latlng3]; + const latlng1 = mousePositionOnMap; + const latlng2 = L.latLng(mousePositionOnMap.lat, mousePositionOnMap.lng + polygonOffset); + const latlng3 = L.latLng(mousePositionOnMap.lat - polygonOffset, mousePositionOnMap.lng); + polygonPoints = [latlng1, latlng2, latlng3]; - if (e.type === 'dragend' && polygonPoints) { const newPolygon = L.polygon(polygonPoints).addTo(this.map); this.addPolygons.push(newPolygon); const datasourcesList = document.createElement('div'); diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts index 526bfa9f06..7492020a33 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts @@ -192,7 +192,7 @@ export class ImageMap extends LeafletMap { this.updateMarkers(this.markersData); if (this.options.draggableMarker && this.addMarkers.length) { this.addMarkers.forEach((marker) => { - const prevPoint = this.convertToCustomFormat(marker.getLatLng(),null, prevWidth, prevHeight); + const prevPoint = this.convertToCustomFormat(marker.getLatLng(), null, prevWidth, prevHeight); marker.setLatLng(this.convertPosition(prevPoint)); }); }