From 31dee00cb1a66767e09262c2f5933c71d9982c41 Mon Sep 17 00:00:00 2001
From: Skylar Ittner <admin@netsyms.com>
Date: Sun, 22 Dec 2019 17:50:46 -0700
Subject: [PATCH] Group multiple addresses with identical coordinates

---
 www/assets/js/packages.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/www/assets/js/packages.js b/www/assets/js/packages.js
index 2c412dc..32a836a 100644
--- a/www/assets/js/packages.js
+++ b/www/assets/js/packages.js
@@ -11,14 +11,14 @@ if (localStorage.getItem("packages") != null) {
 }
 
 /**
- * Count how many items are still undelivered for an address.
- * @param {type} address An item in the packages array.
+ * Count how many items are still undelivered for a location.
+ * @param {type} location An item in the packages array.
  * @returns {Number}
  */
-function getUndeliveredCount(address) {
+function getUndeliveredCount(location) {
     var undelivered = 0;
-    for (var i = 0; i < address.items.length; i++) {
-        if (!address.items[i].delivered) {
+    for (var i = 0; i < location.items.length; i++) {
+        if (!location.items[i].delivered) {
             undelivered++;
         }
     }
@@ -95,7 +95,7 @@ function addPackage(address, latitude, longitude, type, callback, deadline) {
     var coordsID = "";
 
     for (var i = 0; i < packages.length; i++) {
-        if (packages[i].coords[0] == latitude && packages[i].coords[1] == longitude && packages[i].address == address) {
+        if (packages[i].coords[0] == latitude && packages[i].coords[1] == longitude) {
             coordsID = packages[i].id;
             packages[i].items.push({
                 address: address,
@@ -133,7 +133,7 @@ function addPackage(address, latitude, longitude, type, callback, deadline) {
     playSound("ok");
 
     app.toast.show({
-        text: 'Package Added!<br><span style="font-size: 80%;">' + address + "</span>",
+        text: SETTINGS.itemtypes[type].name + ' Added!<br><span style="font-size: 80%;">' + address + "</span>",
         position: "bottom",
         destroyOnClose: true,
         closeTimeout: 1000 * 3
@@ -163,12 +163,11 @@ function importPackageList(newlist) {
     for (latlng in newlist) {
         var latitude = newlist[latlng].coords[0];
         var longitude = newlist[latlng].coords[1];
-        var address = newlist[latlng].address;
 
         for (pkg in newlist[latlng].items) {
             var added = false;
             for (var i = 0; i < packages.length; i++) {
-                if (packages[i].coords[0] == latitude && packages[i].coords[1] == longitude && packages[i].address == address) {
+                if (packages[i].coords[0] == latitude && packages[i].coords[1] == longitude) {
                     var newpackage = newlist[latlng].items[pkg];
                     for (var j in packages[i].items) {
                         if (packages[i].items[j].id == newpackage.id) {
@@ -221,7 +220,7 @@ function markDelivered(id, delivered) {
 
 function confirmDeletePackage(package, callback) {
     app.dialog.confirm(
-            "Delete item at " + package.address + "?",
+            "Delete " + SETTINGS.itemtypes[package.type].name.toLowerCase() + " at " + package.address + "?",
             "Confirm",
             function () {
                 // delete