From 724b6c5247c97e661b104985fbb5956c88fae0dc Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Wed, 11 Nov 2020 18:03:33 +0200
Subject: [PATCH] Refactoring

---
 .../components/widget/lib/maps/leaflet-map.ts   |  6 +++---
 .../home/components/widget/lib/maps/markers.ts  |  2 +-
 .../widget/lib/maps/providers/image-map.ts      | 17 ++++++++---------
 3 files changed, 12 insertions(+), 13 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 f29ab38f03..0f1f08799c 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
@@ -413,11 +413,11 @@ export default abstract class LeafletMap {
     }
 
     convertToCustomFormat(position: L.LatLng): object {
-      if(position.lng > 180){
+      if (position.lng > 180) {
         position.lng = 180;
-      }else if(position.lng < -180){
+      } else if (position.lng < -180) {
         position.lng = -180;
-      };
+      }
       return {
         [this.options.latKeyName]: position.lat,
         [this.options.lngKeyName]: position.lng
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/markers.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/markers.ts
index 4796956fa6..5f9e5e8362 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/markers.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/markers.ts
@@ -94,7 +94,7 @@ export class Marker {
     }
 
     updateMarkerPosition(position: L.LatLng) {
-      if (!this.location.equals(position)) {
+      if (!this.leafletMarker.getLatLng().equals(position)) {
         this.location = position;
         this.leafletMarker.setLatLng(position);
       }
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 2c967660e0..825ace1227 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
@@ -258,29 +258,28 @@ export class ImageMap extends LeafletMap {
     }
 
     convertToCustomFormat(position: L.LatLng, width = this.width, height = this.height): object {
-      let point = this.latLngToPoint(position);
+      const point = this.latLngToPoint(position);
       const customX = calculateNewPointCoordinate(point.x, width);
       const customY = calculateNewPointCoordinate(point.y, height);
 
-      if(customX === 0){
+      if (customX === 0) {
         point.x = 0;
-      } else if(customX === 1){
+      } else if (customX === 1) {
         point.x = width;
       }
 
-      if(customY === 0){
+      if (customY === 0) {
         point.y = 0;
-      } else if(customY === 1){
+      } else if (customY === 1) {
         point.y = height;
       }
-
-      const customLatLng = this.pointToLatLng(point.x,point.y)
+      const customLatLng = this.pointToLatLng(point.x, point.y);
 
       return {
         [this.options.xPosKeyName]: customX,
         [this.options.yPosKeyName]: customY,
-        [this.options.latKeyName]:customLatLng.lat,
-        [this.options.lngKeyName]:customLatLng.lng
+        [this.options.latKeyName]: customLatLng.lat,
+        [this.options.lngKeyName]: customLatLng.lng
       };
     }