From 39b7569d8d5e9412589fd7660e351ebb3c8f64aa Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Wed, 6 May 2020 09:59:28 +0100
Subject: [PATCH] tidying custom apps

---
 apps.json                              |   6 +++---
 apps/openstmap/custom.html             |   1 -
 apps/route/app-icon.js                 |   1 +
 apps/route/{route.png => app.png}      | Bin
 apps/route/{route.html => custom.html} |   4 +---
 5 files changed, 5 insertions(+), 7 deletions(-)
 create mode 100644 apps/route/app-icon.js
 rename apps/route/{route.png => app.png} (100%)
 rename apps/route/{route.html => custom.html} (95%)

diff --git a/apps.json b/apps.json
index fd834bbf9..b2f850b98 100644
--- a/apps.json
+++ b/apps.json
@@ -558,14 +558,14 @@
   },
   { "id": "route",
     "name": "Route Viewer",
-    "icon": "route.png",
+    "icon": "app.png",
     "version":"0.01",
     "description": "Upload a KML file of a route, and have your watch display a map with how far around it you are",
     "tags": "",
-    "custom": "route.html",
+    "custom": "custom.html",
     "storage": [
       {"name":"route.app.js"},
-      {"name":"route.img"}
+      {"name":"route.img","url":"app-icon.js","evaluate":true}
     ]
   },
   {
diff --git a/apps/openstmap/custom.html b/apps/openstmap/custom.html
index 50d6149cb..531858bd9 100644
--- a/apps/openstmap/custom.html
+++ b/apps/openstmap/custom.html
@@ -147,7 +147,6 @@ TODO:
             lon : centerlatlon.lng
           })});
           mapFiles.unshift({"name":"openstmap.app.js","url":"app.js"});
-          mapFiles.unshift({"name":"openstmap.img","url":"app-icon.js","evaluate":true});
 
           console.log(mapFiles);
         });
diff --git a/apps/route/app-icon.js b/apps/route/app-icon.js
new file mode 100644
index 000000000..8410cad40
--- /dev/null
+++ b/apps/route/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwgIkhvgFE/wEDgOHAocDgYFEgOAAp4XEEYsB4w1E5hBKnByFKw8/AQNAAQP/4EAAIMB4HggBABHoNwCwUGE4kOgEYBAMAhk+hgIBAoM/hkEAoMIv8MC4QFChARCAoIMCDoQXChkcjA1EAoJBBg5dCJoJHDKYWAsCGD4AJBAAXBDYIlCsYFBGwUzPok+AokcsOOmIUCAogAWA=="))
diff --git a/apps/route/route.png b/apps/route/app.png
similarity index 100%
rename from apps/route/route.png
rename to apps/route/app.png
diff --git a/apps/route/route.html b/apps/route/custom.html
similarity index 95%
rename from apps/route/route.html
rename to apps/route/custom.html
index 2417aa232..52b6b635f 100644
--- a/apps/route/route.html
+++ b/apps/route/custom.html
@@ -240,12 +240,10 @@ Bangle.setGPSPower(1);
 Bangle.setCompassPower(1);
 g.clear();
 `;
-var icon = `require("heatshrink").decompress(atob("mEwgIkhvgFE/wEDgOHAocDgYFEgOAAp4XEEYsB4w1E5hBKnByFKw8/AQNAAQP/4EAAIMB4HggBABHoNwCwUGE4kOgEYBAMAhk+hgIBAoM/hkEAoMIv8MC4QFChARCAoIMCDoQXChkcjA1EAoJBBg5dCJoJHDKYWAsCGD4AJBAAXBDYIlCsYFBGwUzPok+AokcsOOmIUCAogAWA=="))`;
 
 sendCustomizedApp({
   storage:[
-    {name:"route.app.js", content:app},
-    {name:"route.img", content:icon, evaluate:true},
+    {name:"route.app.js", content:app}
   ]
 });
 });