fixed sonar duplicated lines

Author: bonchan

js/main.js

@@ -903,47 +903,32 @@ function BlackboxLogViewer() {
         reader.readAsText(file);
     }
 
-    function exportCsv(file, options={}) {
-
-        function onSuccess(data) {
-            console.debug("CSV export finished in", (performance.now() - startTime) / 1000, "secs");
+    function createExportCallback(fileExtension, fileType, file, startTime) {
+        const callback = function(data) {
+            console.debug(`${fileExtension.toUpperCase()} export finished in ${(performance.now() - startTime) / 1000} secs`);
             if (!data) {
                 console.debug("Empty data, nothing to save");
                 return;
             }
-            let blob = new Blob([data], {type: 'text/csv'}),
+            let blob = new Blob([data], {type: fileType}),
                 e    = document.createEvent('MouseEvents'),
                 a    = document.createElement('a');
-            a.download = file || $(".log-filename").text() + ".csv";
+            a.download = file || $(".log-filename").text() + "." + fileExtension;
             a.href = window.URL.createObjectURL(blob);
-            a.dataset.downloadurl =  ['text/csv', a.download, a.href].join(':');
+            a.dataset.downloadurl =  [fileType, a.download, a.href].join(':');
             e.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
             a.dispatchEvent(e);
-        }
+          }
+          return callback;
+    }
 
-        let startTime = performance.now();
+    function exportCsv(file, options={}) {
+        const onSuccess = createExportCallback('csv', 'text/csv', file, performance.now());
         CsvExporter(flightLog, options).dump(onSuccess);
     }
 
     function exportGpx(file) {
-
-        function onSuccess(data) {
-            console.debug("Gpx export finished in", (performance.now() - startTime) / 1000, "secs");
-            if (!data) {
-                console.debug("Empty data, nothing to save");
-                return;
-            }
-            let blob = new Blob([data], {type: 'GPX File'}),
-                e    = document.createEvent('MouseEvents'),
-                a    = document.createElement('a');
-            a.download = file || $(".log-filename").text() + ".gpx";
-            a.href = window.URL.createObjectURL(blob);
-            a.dataset.downloadurl =  ['GPX File', a.download, a.href].join(':');
-            e.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
-            a.dispatchEvent(e);
-        }
-
-        let startTime = performance.now();
+        const onSuccess = createExportCallback('gpx', 'GPX File', file, performance.now());
         GpxExporter(flightLog).dump(onSuccess);
     }
 

js/webworkers/gpx-export-worker.js

@@ -1,8 +1,7 @@
 importScripts("/node_modules/lodash/lodash.min.js");
 
 onmessage = function (event) {
-  const header = `
-<?xml version="1.0" encoding="UTF-8"?>
+  const header = `<?xml version="1.0" encoding="UTF-8"?>
 <gpx xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.topografix.com/GPX/1/1" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd http://www.topografix.com/GPX/gpx_style/0/2 http://www.topografix.com/GPX/gpx_style/0/2/gpx_style.xsd" xmlns:gpx_style="http://www.topografix.com/GPX/gpx_style/0/2" 
   version="1.1" 
   creator="https://github.com/betaflight/blackbox-log-viewer">
@@ -41,20 +40,20 @@ onmessage = function (event) {
       let trkpt = `<trkpt lat="${lat}" lon="${lng}">`;
       trkpt += `<ele>${altitude}</ele>`;
       trkpt += `<time>${date.toISOString()}</time>`;
-      trkpt += `<speed>${speed}</speed>`;
-      trkpt += `<degreesType>${groundCourse}</degreesType>`;
-      trkpt += `<sat>${numSat}</sat>`;
+      // trkpt += `<speed>${speed}</speed>`;
+      // trkpt += `<degreesType>${groundCourse}</degreesType>`;
+      // trkpt += `<sat>${numSat}</sat>`;
       trkpt += `</trkpt>\n`;
 
       trkpts += trkpt;
     }
   }
 
-  let trk = `
-  <trk>
-    <trkseg>${trkpts}</trkseg>
-  </trk>
-`;
+  let trk = `  <trk>
+    <trkseg>
+      ${trkpts}
+    </trkseg>
+  </trk>`;
 
   postMessage(header + "\n" + trk + "\n" + footer);
 };