From 81252d1dc6bf056b52d92d07f19a3088b29f2a46 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Wed, 10 Nov 2021 14:55:08 +0000
Subject: [PATCH] recorder 0.03: Fix theme and maps/graphing if no GPS

---
 apps.json                    |  2 +-
 apps/recorder/ChangeLog      |  1 +
 apps/recorder/app.js         | 64 ++++++++++++++++++++----------------
 apps/recorder/interface.html |  8 ++---
 4 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/apps.json b/apps.json
index a09997f7d..89d06093a 100644
--- a/apps.json
+++ b/apps.json
@@ -657,7 +657,7 @@
     "id": "recorder",
     "name": "Recorder (BETA)",
     "shortName": "Recorder",
-    "version": "0.02",
+    "version": "0.03",
     "description": "Record GPS position, heart rate and more in the background, then download to your PC.",
     "icon": "app.png",
     "tags": "tool,outdoors,gps,widget",
diff --git a/apps/recorder/ChangeLog b/apps/recorder/ChangeLog
index bf90d0384..2ea6e9fa8 100644
--- a/apps/recorder/ChangeLog
+++ b/apps/recorder/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: Use 'recorder.log..' rather than 'record.log..'
       Fix interface.html
+0.03: Fix theme and maps/graphing if no GPS
diff --git a/apps/recorder/app.js b/apps/recorder/app.js
index ac3e391fc..d29959e25 100644
--- a/apps/recorder/app.js
+++ b/apps/recorder/app.js
@@ -140,10 +140,10 @@ function getTrackInfo(filename) {
   }
   // pushed this loop together to try and bump loading speed a little
   while(l!==undefined) {
-    ++nl;c=l.split(",");
+    ++nl;c=l.split(",");l = f.readLine(f);
+    if (c[latIdx]=="")continue;
     n = +c[latIdx];if(n>maxLat)maxLat=n;if(n<minLat)minLat=n;
     n = +c[lonIdx];if(n>maxLong)maxLong=n;if(n<minLong)minLong=n;
-    l = f.readLine(f);
   }
   if (c) duration = parseInt(c[timeIdx]) - starttime;
   var lfactor = Math.cos(minLat*Math.PI/180);
@@ -177,7 +177,7 @@ function viewTrack(filename, info) {
     E.showMessage("Loading...","Track "+getTrackNumber(filename));
     info = getTrackInfo(filename);
   }
-  console.log(info);
+  //console.log(info);
   const menu = {
     '': { 'title': 'Track '+info.fn }
   };
@@ -244,25 +244,18 @@ function plotTrack(info) {
   g.flip(); // on buffered screens, draw a not saying we're busy
   g.clear(1);
   var s = require("Storage");
-  var cx = g.getWidth()/2;
-  var cy = 24 + (g.getHeight()-24)/2;
-  g.setColor(1,0.5,0.5);
-  g.setFont("Vector",16);
-  g.drawString("Track"+info.fn.toString()+" - Loading",10,220);
-  g.setColor(0,0,0);
-  g.fillRect(0,220,239,239);
+  var W = g.getWidth();
+  var H = g.getHeight();
+  var cx = W/2;
+  var cy = 24 + (H-24)/2;
   if (!info.qOSTM) {
-    g.setColor(1, 0, 0);
-    g.fillRect(9,80,11,120);
-    g.fillPoly([9,60,19,80,0,80]);
-    g.setColor(1,1,1);
-    g.drawString("N",2,40);
-    g.setColor(1,1,1);
+    g.setColor("#f00").fillRect(9,80,11,120).fillPoly([9,60,19,80,0,80]);
+    g.setColor(g.theme.fg).setFont("6x8").setFontAlign(0,0).drawString("N",10,50);
   } else {
     osm.lat = info.lat;
     osm.lon = info.lon;
     osm.draw();
-    g.setColor(0, 0, 0);
+    g.setColor("#000");
   }
   var latIdx = info.fields.indexOf("Latitude");
   var lonIdx = info.fields.indexOf("Longitude");
@@ -274,19 +267,26 @@ function plotTrack(info) {
   var ox=0;
   var oy=0;
   var olat,olong,dist=0;
-  var i=0;
-  var c = l.split(",");
+  var i=0, c = l.split(",");
+  // skip until we find our first data
+  while(l!==undefined && c[latIdx]=="") {
+    c = l.split(",");
+    l = f.readLine(f);
+  }
+  // now start plotting
   var lat = +c[latIdx];
   var long = +c[lonIdx];
   var mp = getMapXY(lat, long);
   g.moveTo(mp.x,mp.y);
-  g.setColor(0,1,0);
+  g.setColor("#0f0");
   g.fillCircle(mp.x,mp.y,5);
-  if (info.qOSTM) g.setColor(1,0,0.55);
-  else g.setColor(1,1,1);
+  if (info.qOSTM) g.setColor("#f09");
+  else g.setColor(g.theme.fg);
   l = f.readLine(f);
+  g.flip(); // force update
   while(l!==undefined) {
-    c = l.split(",");
+    c = l.split(",");l = f.readLine(f);
+    if (c[latIdx]=="")continue;
     lat = +c[latIdx];
     long = +c[lonIdx];
     mp = getMapXY(lat, long);
@@ -298,12 +298,12 @@ function plotTrack(info) {
     olong = long;
     ox = mp.x;
     oy = mp.y;
-    l = f.readLine(f);
+    if (++i > 100) { g.flip();i=0; }
   }
-  g.setColor(1,0,0);
+  g.setColor("#f00");
   g.fillCircle(ox,oy,5);
-  if (info.qOSTM) g.setColor(0, 0, 0);
-  else g.setColor(1,1,1);
+  if (info.qOSTM) g.setColor("#000");
+  else g.setColor(g.theme.fg);
   g.drawString(require("locale").distance(dist),120,220);
   g.setFont("6x8",2);
   g.setFontAlign(0,0,3);
@@ -340,16 +340,22 @@ function plotGraph(info, style) {
     title = "Altitude (m)";
     var altIdx = info.fields.indexOf("Altitude");
     while(l!==undefined) {
-      ++nl;c=l.split(",");
+      ++nl;c=l.split(",");l = f.readLine(f);
+      if (c[altIdx]=="") continue;
       i = Math.round(80*(c[timeIdx] - strt)/dur);
       infn[i]+=+c[altIdx];
       infc[i]++;
-      l = f.readLine(f);
     }
   } else if (style=="Speed") {
     title = "Speed (m/s)";
     var latIdx = info.fields.indexOf("Latitude");
     var lonIdx = info.fields.indexOf("Longitude");
+    // skip until we find our first data
+    while(l!==undefined && c[latIdx]=="") {
+      c = l.split(",");
+      l = f.readLine(f);
+    }
+    // now iterate
     var p,lp = Bangle.project({lat:c[1],lon:c[2]});
     var t,dx,dy,d,lt = c[timeIdx];
     while(l!==undefined) {
diff --git a/apps/recorder/interface.html b/apps/recorder/interface.html
index eca13d263..ad0de4887 100644
--- a/apps/recorder/interface.html
+++ b/apps/recorder/interface.html
@@ -62,7 +62,7 @@ function saveGPX(track, title) {
 <gpx creator="Bangle.js" version="1.1" xmlns="http://www.topografix.com/GPX/1/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd http://www.garmin.com/xmlschemas/GpxExtensions/v3 http://www.garmin.com/xmlschemas/GpxExtensionsv3.xsd http://www.garmin.com/xmlschemas/TrackPointExtension/v1 http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd http://www.garmin.com/xmlschemas/GpxExtensions/v3 http://www.garmin.com/xmlschemas/GpxExtensionsv3.xsd http://www.garmin.com/xmlschemas/TrackPointExtension/v1 http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd http://www.garmin.com/xmlschemas/GpxExtensions/v3 http://www.garmin.com/xmlschemas/GpxExtensionsv3.xsd http://www.garmin.com/xmlschemas/TrackPointExtension/v1 http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd http://www.garmin.com/xmlschemas/GpxExtensions/v3 http://www.garmin.com/xmlschemas/GpxExtensionsv3.xsd http://www.garmin.com/xmlschemas/TrackPointExtension/v1 http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd http://www.garmin.com/xmlschemas/GpxExtensions/v3 http://www.garmin.com/xmlschemas/GpxExtensionsv3.xsd http://www.garmin.com/xmlschemas/TrackPointExtension/v1 http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd" xmlns:gpxtpx="http://www.garmin.com/xmlschemas/TrackPointExtension/v1" xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
 <gpx creator="Bangle.js" version="1.1">
   <metadata>
-    <time>${track[0].date.toISOString()}</time>
+    <time>${track[0].Time.toISOString()}</time>
   </metadata>
   <trk>
     <name>${title}</name>
@@ -74,9 +74,7 @@ function saveGPX(track, title) {
         <time>${pt.Time.toISOString()}</time>
         <extensions>
             <gpxtpx:TrackPointExtension>
-                ${pt.Heartrate ? `<gpxtpx:hr>${pt.Heartrate}</gpxtpx:hr>`:``}
-                ${""/*<gpxtpx:distance>...</gpxtpx:distance>*/}
-                ${""/* <gpxtpx:cad>65</gpxtpx:cad> */}
+                ${pt.Heartrate ? `<gpxtpx:hr>${pt.Heartrate}</gpxtpx:hr>`:``}${""/*<gpxtpx:distance>...</gpxtpx:distance><gpxtpx:cad>65</gpxtpx:cad>*/}
             </gpxtpx:TrackPointExtension>
         </extensions>
       </trkpt>`;
@@ -189,7 +187,7 @@ ${trackData.Latitude ? `
                width="100%"
                height="250"
                frameborder="0" style="border:0"
-               src="https://www.google.com/maps/embed/v1/place?key=AIzaSyBxTcwrrVOh2piz7EmIs1Xn4FsRxJWeVH4&q=${track.lat},${track.lon}&zoom=10" allowfullscreen>
+               src="https://www.google.com/maps/embed/v1/place?key=AIzaSyBxTcwrrVOh2piz7EmIs1Xn4FsRxJWeVH4&q=${trackData.Latitude},${trackData.Longitude}&zoom=10" allowfullscreen>
              </iframe>
            </div><div class="card-body"></div>` : `<div class="card-body">No GPS info</div>`}
            <div class="card-footer">