nakarte

commit 4ebbf2d1bfcb2390777dfab50fc6d43a9bc17e97
parent 2f55e7c91e1d27dfa3a26a7eb7e6629cadd0f799
Author: Sergej Orlov <wladimirych@gmail.com>
Date:   Sat,  8 Dec 2018 23:32:47 +0100

[tracks] load tracks from all values in nktj param #131

Diffstat:
M
src/lib/leaflet.control.track-list/lib/services/nakarte/index.js
 | 
2
+-
M
src/lib/leaflet.control.track-list/lib/services/nakarte/loadTracksFromJson.js
 | 
10
++++------

2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/lib/leaflet.control.track-list/lib/services/nakarte/index.js b/src/lib/leaflet.control.track-list/lib/services/nakarte/index.js
@@ -70,7 +70,7 @@ class NakarteUrlLoader {
     }
 
     async loadFromJSON(values) {
-        return loadTracksFromJson(values);
+        return flattenArray(await Promise.all(values.map(loadTracksFromJson)));
     }
 
     async loadFromUrlencodedUrls(values) {
diff --git a/src/lib/leaflet.control.track-list/lib/services/nakarte/loadTracksFromJson.js b/src/lib/leaflet.control.track-list/lib/services/nakarte/loadTracksFromJson.js
@@ -42,12 +42,10 @@ function parseTrack(rawTrack) {
 
 }
 
-async function loadTracksFromJson(values) {
+async function loadTracksFromJson(value) {
     const errCorrupt = [{name: 'Track in url', error: 'CORRUPT'}];
-    if (values.length < 1) {
-        return errCorrupt;
-    }
-    const jsonString = urlSafeBase64.decode(values[0]);
+
+    const jsonString = urlSafeBase64.decode(value);
     let data;
     try {
         data = JSON.parse(jsonString)
@@ -60,7 +58,7 @@ async function loadTracksFromJson(values) {
     const geoDataArray = [];
 
     for (let el of data) {
-        // Each track should contain either url or at least ono of tracks and points
+        // Each track should contain either url or at least one of tracks and points
         if (!el.u && !(el.p || el.t)) {
             return errCorrupt;
         }