Group multiple addresses with identical coordinates

master
Skylar Ittner 4 years ago
parent 8514582bcb
commit 31dee00cb1

@ -11,14 +11,14 @@ if (localStorage.getItem("packages") != null) {
} }
/** /**
* Count how many items are still undelivered for an address. * Count how many items are still undelivered for a location.
* @param {type} address An item in the packages array. * @param {type} location An item in the packages array.
* @returns {Number} * @returns {Number}
*/ */
function getUndeliveredCount(address) { function getUndeliveredCount(location) {
var undelivered = 0; var undelivered = 0;
for (var i = 0; i < address.items.length; i++) { for (var i = 0; i < location.items.length; i++) {
if (!address.items[i].delivered) { if (!location.items[i].delivered) {
undelivered++; undelivered++;
} }
} }
@ -95,7 +95,7 @@ function addPackage(address, latitude, longitude, type, callback, deadline) {
var coordsID = ""; var coordsID = "";
for (var i = 0; i < packages.length; i++) { 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; coordsID = packages[i].id;
packages[i].items.push({ packages[i].items.push({
address: address, address: address,
@ -133,7 +133,7 @@ function addPackage(address, latitude, longitude, type, callback, deadline) {
playSound("ok"); playSound("ok");
app.toast.show({ 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", position: "bottom",
destroyOnClose: true, destroyOnClose: true,
closeTimeout: 1000 * 3 closeTimeout: 1000 * 3
@ -163,12 +163,11 @@ function importPackageList(newlist) {
for (latlng in newlist) { for (latlng in newlist) {
var latitude = newlist[latlng].coords[0]; var latitude = newlist[latlng].coords[0];
var longitude = newlist[latlng].coords[1]; var longitude = newlist[latlng].coords[1];
var address = newlist[latlng].address;
for (pkg in newlist[latlng].items) { for (pkg in newlist[latlng].items) {
var added = false; var added = false;
for (var i = 0; i < packages.length; i++) { 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]; var newpackage = newlist[latlng].items[pkg];
for (var j in packages[i].items) { for (var j in packages[i].items) {
if (packages[i].items[j].id == newpackage.id) { if (packages[i].items[j].id == newpackage.id) {
@ -221,7 +220,7 @@ function markDelivered(id, delivered) {
function confirmDeletePackage(package, callback) { function confirmDeletePackage(package, callback) {
app.dialog.confirm( app.dialog.confirm(
"Delete item at " + package.address + "?", "Delete " + SETTINGS.itemtypes[package.type].name.toLowerCase() + " at " + package.address + "?",
"Confirm", "Confirm",
function () { function () {
// delete // delete

Loading…
Cancel
Save