@provoly/dashboard 0.22.7 → 0.22.8

package/fesm2022/provoly-dashboard-widgets-widget-map.mjs

@@ -1796,14 +1796,19 @@ class WidgetMapComponent extends DataWidgetComponent {
                 this.map.setLayers([...mapStyleLayer]);
             }
         }));
-        this.subscriptions.add(combineLatest([this.wmsFeatures$, this.classicFeatures$, this.widgetSize$, this.displayHeader$]).subscribe(([wmsFeatures, classicFeatures, size, header]) => {
+        this.subscriptions.add(combineLatest([this.wmsFeatures$, this.classicFeatures$])
+            .pipe(withLatestFrom(this.widgetSize$, this.displayHeader$))
+            .subscribe(([[wmsFeatures, classicFeatures], size, header]) => {
             if (this.map) {
                 this.tooltipIndex = 0;
-                const popupOverlay = new Overlay({
+                if (this.popupOverlay !== null) {
+                    this.clearTooltip();
+                }
+                this.popupOverlay = new Overlay({
                     element: this.popup.nativeElement,
                     offset: [9, 9]
                 });
-                this.map.addOverlay(popupOverlay);
+                this.map.addOverlay(this.popupOverlay);
                 this.popupContent.clear();
                 const componentPromises = [];
                 wmsFeatures.forEach((value) => {
@@ -1817,7 +1822,7 @@ class WidgetMapComponent extends DataWidgetComponent {
                     this.tooltipNumber = realComponents.length;
                     if (realComponents.length <= 0) {
                         this.popup.nativeElement.hidden = true;
-                        popupOverlay.setPosition([-9999999999, -9999999999]);
+                        this.popupOverlay?.setPosition([-9999999999, -9999999999]);
                     }
                     else {
                         this.popup.nativeElement.hidden = false;
@@ -1836,11 +1841,21 @@ class WidgetMapComponent extends DataWidgetComponent {
                         setTimeout(() => {
                             this.tooltipMove(0);
                         }, 10);
-                        popupOverlay.setPosition(this.map.getCoordinateFromPixel(pixel ?? [0, 0]));
+                        this.popupOverlay?.setPosition(this.map.getCoordinateFromPixel(pixel ?? [0, 0]));
                     }
                 });
             }
         }));
+        window.addEventListener('forceCloseMapTooltip', () => {
+            this.clearTooltip();
+        });
+    }
+    clearTooltip() {
+        if (this.popupOverlay)
+            this.map.removeOverlay(this.popupOverlay);
+        this.popupContent.clear();
+        this.previousTooltip?.destroy();
+        this.previousTooltipSub?.unsubscribe();
     }
     addEmptyWebGlLayerBelowSlideHeatmaps(layers) {
         const _layers = [];
@@ -2152,7 +2167,7 @@ class WidgetMapComponent extends DataWidgetComponent {
                 FEATURE_COUNT: 10,
                 ...layer.getProperties()['getFeatureInfoAdditionalParameters']
             });
-            if (url) {
+            if (url && url.indexOf('I=-1') === -1 && url.indexOf('J=-1') === -1) {
                 this.store.dispatch(DashboardActions.getWmsFeatures({
                     url,
                     oClass: layer.getProperties()['oClass'] ?? '',