From 4dd4a17511e9a1d7fb9b3d0c36f831cd36e6ef80 Mon Sep 17 00:00:00 2001
From: Erik Andresen <erik@vontaene.de>
Date: Mon, 26 Jun 2023 21:26:42 +0200
Subject: [PATCH] waypoint_editor fixes:

-Display waypoint name instead of its index in remove menu
-fix icon
---
 apps/waypoint_editor/ChangeLog     |  1 +
 apps/waypoint_editor/app-icon.js   |  2 +-
 apps/waypoint_editor/app.js        | 42 ++++++++++++++++--------------
 apps/waypoint_editor/metadata.json |  2 +-
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/apps/waypoint_editor/ChangeLog b/apps/waypoint_editor/ChangeLog
index 5560f00bc..0ec5d2df8 100644
--- a/apps/waypoint_editor/ChangeLog
+++ b/apps/waypoint_editor/ChangeLog
@@ -1 +1,2 @@
 0.01: New App!
+0.02: Display waypoint name instead of its index in remove menu and fix icon
diff --git a/apps/waypoint_editor/app-icon.js b/apps/waypoint_editor/app-icon.js
index 49232b838..6ab351afa 100644
--- a/apps/waypoint_editor/app-icon.js
+++ b/apps/waypoint_editor/app-icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEwwJC/AH4A/AH4AgA=="))
+require("heatshrink").decompress(atob("mEwxH+AH4A/AA0QF1wABF94xrFwgvV63W5/PF1AsBAAQvBAAQviFggvHGRXWFwvWFigvKGQgPCFwwvMFxQvL54PDF9wuHF8wuIF7/OAYguFF7mBrtdFQWAvWA5+qvV6FxIvXrwfCGAQqBvXP0guLF6XV1awCmggCmgvB1Wk1QEBRpQvTJ4OAAgM6F4oAEFwulF66zBvXV62sMAM0M4IuKOYOlwGrF6nP0oXD54tGRpDLCO4TvXDwIAHXhB3BSQYvfdZPVSQIvsUILWBF8xeEX4OkF8wQFd7mlDgPP52q5wvDAYISF1elBAYvWwBNB54DBGYIAEO5YvSFAInB1asBQAQzBF5HQxGsF64rBvWlX4fO0nOSQgvD6E0TANeL65XCd4ySFCYWCe4ZhDF6GIxHQ6vVGgQAESQfOTwQvZnQWBmgXDF4qSC5+kGYOr62sR4U0R6WsI4eCF5AzETwYYBwWC6AvlX4gAIR553DR5Ivhd4OCFwYvpAAwv/F7wMBF6ouLF5APHF54sMF44SNF5IsPF4gUSGQQXVAH4A/AH4A/ADY"))
diff --git a/apps/waypoint_editor/app.js b/apps/waypoint_editor/app.js
index 34b3d8ef4..48a956d82 100644
--- a/apps/waypoint_editor/app.js
+++ b/apps/waypoint_editor/app.js
@@ -159,26 +159,28 @@ function removeCard() {
     "< Back" : mainMenu
   };
   if (Object.keys(wp).length==0) Object.assign(menu, {"NO CARDS":""});
-  else for (let c in wp) {
-    let card=c;
-    menu[c]=()=>{
-      E.showMenu();
-      var confirmRemove = new Layout (
-        {type:"v", c: [
-          {type:"txt", font:"15%", pad:1, fillx:1, filly:1, label:"Delete"},
-          {type:"txt", font:"15%", pad:1, fillx:1, filly:1, label:card+"?"},
-          {type:"h", c: [
-            {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: "YES", cb:l=>{
-              delete wp[card];
-              writeWP();
-              mainMenu();
-            }},
-            {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: " NO", cb:l=>{mainMenu();}}
-          ]}
-        ], lazy:true});
-      g.clear();
-      confirmRemove.render();
-    };
+  else {
+    wp.forEach((val, card) => {
+      const name = wp[card].name;
+      menu[name]=()=>{
+        E.showMenu();
+        var confirmRemove = new Layout (
+          {type:"v", c: [
+            {type:"txt", font:"15%", pad:1, fillx:1, filly:1, label:"Delete"},
+            {type:"txt", font:"15%", pad:1, fillx:1, filly:1, label:name},
+            {type:"h", c: [
+              {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: "YES", cb:l=>{
+                wp.splice(card, 1);
+                writeWP();
+                mainMenu();
+              }},
+              {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: " NO", cb:l=>{mainMenu();}}
+            ]}
+          ], lazy:true});
+        g.clear();
+        confirmRemove.render();
+      };
+    });
   }
   E.showMenu(menu);
 }
diff --git a/apps/waypoint_editor/metadata.json b/apps/waypoint_editor/metadata.json
index f48721732..12ff6e095 100644
--- a/apps/waypoint_editor/metadata.json
+++ b/apps/waypoint_editor/metadata.json
@@ -1,6 +1,6 @@
 { "id": "waypoint_editor",
   "name": "Waypoint editor",
-  "version":"0.01",
+  "version":"0.02",
   "description": "Allows editing waypoints on device",
   "icon": "app.png",
   "readme": "README.md",