Fix map icons staying "alerted" after marking delivered

4 years ago · b21140de11
parent 3962a56db8
commit b21140de11
3 changed files with 8 additions and 6 deletions
--- a/www/assets/js/map_leaflet.js
+++ b/www/assets/js/map_leaflet.js
@ -85,8 +85,9 @@ function leafletMap() {
                if (map.openedPanelIconID != null && map.openedPanelIconID == datai.id) {
                    classes += " selected";
                }
-                // Show different color highlight when nearby
-                if (packages[i].distance * 1 < getStorage("alertradius") * 1) {
+                // Show different color highlight when nearby and undelivered
+                if (packages[i].distance * 1 < getStorage("alertradius") * 1
+                        && getUndeliveredCount(packages[i]) > 0) {
                    classes += " alerted";
                }
                var icon = L.icon({
--- a/www/assets/js/map_mapbox.js
+++ b/www/assets/js/map_mapbox.js
@ -110,8 +110,9 @@ function mapboxMap() {
                if (map.openedPanelIconID != null && map.openedPanelIconID == datai.id) {
                    el.className += " selected";
                }
-                // Show different color highlight when nearby
-                if (packages[i].distance * 1 < getStorage("alertradius") * 1) {
+                // Show different color highlight when nearby and undelivered
+                if (packages[i].distance * 1 < getStorage("alertradius") * 1
+                        && getUndeliveredCount(packages[i]) > 0) {
                    el.className += " alerted";
                }