From bb806bb0e055d8358717ae1af1268959a2ea715f Mon Sep 17 00:00:00 2001
From: Jeffrey Warren <jeff@unterbahn.com>
Date: Tue, 10 Aug 2021 14:54:50 -0400
Subject: [PATCH] fix generatePopup (#132)

Co-authored-by: daemon1024 <barun1024@gmail.com>
---
 dist/Leaflet.BlurredLocationDisplay.js | 12 ++++++------
 src/ui/gridCenterRectangle.js          |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dist/Leaflet.BlurredLocationDisplay.js b/dist/Leaflet.BlurredLocationDisplay.js
index ac0465d0..48f23579 100644
--- a/dist/Leaflet.BlurredLocationDisplay.js
+++ b/dist/Leaflet.BlurredLocationDisplay.js
@@ -455,15 +455,15 @@ module.exports = function changeRectangleColor(options){
   function generatePopupContentsFromMarkers(markers) {
     let popupContents = "<p><b>People within this region:</b></p>";
     popupContents += "<ul>";
-//    if (marker[0].hasOwnProperty('url') && marker[0].hasOwnProperty('url')) {
+    if (markers[0].hasOwnProperty('url') && markers[0].hasOwnProperty('url')) {
       markers.forEach(function(marker) {
         if (marker.hasOwnProperty('url') && marker.hasOwnProperty('url')) {
           popupContents += "<li><a href='" + marker.url + "'>@" + marker.title + "</a></li>";
         }
       });
-//    } else {
-//      popupContents += "<p>" + markers.length + " people</p>";
-//    }
+    } else {
+      popupContents += "<p>" + markers.length + " people</p>";
+    }
     popupContents += "</ul>";
     popupContents += "<p>These people have blurred their location. Learn about <a href='https://publiclab.org/location-privacy'>location privacy here</a>.</p>";
     return popupContents;
@@ -483,8 +483,8 @@ module.exports = function changeRectangleColor(options){
       let markers = calculateMarkersInsideRect(bounds) ; 
       let color = getColorCode(markers.length) ;
       let r = L.rectangle(bounds, {color: color , weight: 1})
-        .bindPopup(generatePopupContentsFromMarkers(markers))
         .addTo(map);
+      if (markers.length > 0) r.bindPopup(generatePopupContentsFromMarkers(markers))
       rectangles[rectangles.length] = r ; 
       
       current_lng = current_lng - diff ; 
@@ -506,8 +506,8 @@ module.exports = function changeRectangleColor(options){
       let color = getColorCode(markers.length) ;
 
       let r = L.rectangle(bounds, {color: color , weight: 1})
-        .bindPopup(generatePopupContentsFromMarkers(markers))
         .addTo(map);
+      if (markers.length > 0) r.bindPopup(generatePopupContentsFromMarkers(markers))
       rectangles[rectangles.length] = r ; 
       
       current_lng = current_lng + diff ; 
diff --git a/src/ui/gridCenterRectangle.js b/src/ui/gridCenterRectangle.js
index 57e6ac60..3d7cab2d 100644
--- a/src/ui/gridCenterRectangle.js
+++ b/src/ui/gridCenterRectangle.js
@@ -75,7 +75,7 @@ module.exports = function changeRectangleColor(options){
   function generatePopupContentsFromMarkers(markers) {
     let popupContents = "<p><b>People within this region:</b></p>";
     popupContents += "<ul>";
-    if (marker[0].hasOwnProperty('url') && marker[0].hasOwnProperty('url')) {
+    if (markers[0].hasOwnProperty('url') && markers[0].hasOwnProperty('url')) {
       markers.forEach(function(marker) {
         if (marker.hasOwnProperty('url') && marker.hasOwnProperty('url')) {
           popupContents += "<li><a href='" + marker.url + "'>@" + marker.title + "</a></li>";