hiding both info windows when one is closed

OpenUpSA · Jan 26, 2021 · 6cc8c20 · 6cc8c20
1 parent 6b19f20
commit 6cc8c20
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/js/map/point_data.js b/src/js/map/point_data.js
@@ -23,7 +23,7 @@ let facilityRowItem = null;
 let activeMarkers = [];
 let activePoints = [];  //the visible points on the map
 
-const POPUP_OFFSET= [20, 0];
+const POPUP_OFFSET = [20, 0];
 
 /**
  * this class creates the point data dialog
@@ -47,7 +47,7 @@ export class PointData extends Observable {
         tooltipRowItem = $('.' + tooltipRowClsName)[0].cloneNode(true);
         facilityRowItem = $('.' + facilityRowClsName)[0].cloneNode(true);
         facilityItem = $('.' + facilityClsName);
-        $('.facility-info__close').on('click', () => this.hideFacilityModal());
+        $('.facility-info__close').on('click', () => this.hideInfoWindows());
     }
 
     genLayer() {
@@ -191,7 +191,10 @@ export class PointData extends Observable {
             popup
                 .setLatLng({lat: point.y, lng: point.x})
                 .setContent(popupContent)
-                .addTo(this.map);
+                .addTo(this.map)
+                .on('remove', () => {
+                    this.hideInfoWindows();
+                });
             this.triggerEvent('point_data.load_popup.clicked', eventLabel);
         } else {
             popup
@@ -204,6 +207,11 @@ export class PointData extends Observable {
         setPopupStyle('facility-tooltip');
     }
 
+    hideInfoWindows = () => {
+        this.hideFacilityModal();
+        $('a.leaflet-popup-close-button')[0].click()
+    }
+
     hideMarkerPopup = () => {
         this.map.closePopup();
         this.map.map_variables.popup = null;

diff --git a/yarn.lock b/yarn.lock
@@ -1517,8 +1517,9 @@ adler-32@~1.2.0:
     printj "~1.1.0"
 
 ajv-keywords@^3.5.2:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.1.tgz#b83ca89c5d42d69031f424cad49aada0236c6957"
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
 ajv@^6.12.3, ajv@^6.12.4:
   version "6.12.6"