From 316e1c40d884b9badee5b0263be6e18537ac02fe Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Thu, 13 Jan 2022 16:05:38 +0200
Subject: [PATCH] UI: Improvement image map resize - correct calculate center
 position

---
 .../home/components/widget/lib/maps/map-widget2.ts     |  4 ++--
 .../components/widget/lib/maps/providers/image-map.ts  | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
index bc042e4fc0..469385f902 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
@@ -300,8 +300,8 @@ export class MapWidgetController implements MapWidgetInterface {
     }
 
     resize() {
-        this.map?.invalidateSize();
-        this.map.onResize();
+      this.map.onResize();
+      this.map?.invalidateSize();
     }
 
     destroy() {
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 be427f55cf..78d08295df 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
@@ -159,27 +159,25 @@ export class ImageMap extends LeafletMap {
             lastCenterPos.x *= w;
             lastCenterPos.y *= h;
             const center = this.pointToLatLng(lastCenterPos.x, lastCenterPos.y);
-            setTimeout(() => {
-                this.map.panTo(center, { animate: false });
-            }, 0);
+            this.map.panTo(center, { animate: false });
         }
     }
 
     onResize(updateImage?: boolean) {
       let width = this.$container.clientWidth;
       if (width > 0 && this.aspect) {
-        let height = width / this.aspect;
+        let height = Math.round(width / this.aspect);
         const imageMapHeight = this.$container.clientHeight;
         if (imageMapHeight > 0 && height > imageMapHeight) {
           height = imageMapHeight;
-          width = height * this.aspect;
+          width = Math.round(height * this.aspect);
         }
         width *= maxZoom;
         const prevWidth = this.width;
         const prevHeight = this.height;
         if (this.width !== width || updateImage) {
           this.width = width;
-          this.height = width / this.aspect;
+          this.height = Math.round(width / this.aspect);
           if (!this.map) {
             this.initMap(updateImage);
           } else {