nakarte

commit ad4a00ede4d403c5f002518fa8baca2c8adac6d9
parent 40e9553d03a8ce395d8d65acf52933c24c5b7d86
Author: Sergej Orlov <wladimirych@gmail.com>
Date:   Tue, 13 Feb 2018 23:18:09 +0300

[tracks/geo_file_formats] small refactoring

Diffstat:
M
src/lib/leaflet.control.track-list/lib/geo_file_formats.js
 | 
64
++++++++++++++++++++++++++++++++--------------------------------

1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/lib/leaflet.control.track-list/lib/geo_file_formats.js b/src/lib/leaflet.control.track-list/lib/geo_file_formats.js
@@ -783,43 +783,43 @@ function simpleTrackParser(name, responses) {
 
 
 function loadFromUrl(url) {
-    try {
-        url = decodeURIComponent(url);
-    } catch (e) {
-    }
     let geodata;
     geodata = parseGeoFile('', url);
     if (geodata.length === 0 || geodata.length > 1 || geodata[0].error !== 'UNSUPPORTED') {
         return Promise.resolve(geodata);
-    } else {
-        var name = url
-            .split('#')[0]
-            .split('?')[0]
-            .replace(/\/*$/, '')
-            .split('/')
-            .pop();
-
-        let urlToRequest = simpleTrackFetchOptions;
-        let parser = simpleTrackParser;
-
-
-        if (isGpsiesUrl(url)) {
-            urlToRequest = gpsiesXhrOptions;
-            parser = gpsiesParser;
-        } else if (isEndomondoUrl(url)) {
-            urlToRequest = endomonXhrOptions;
-            parser = endomondoParser;
-        } else if (isStravaUrl(url)) {
-            urlToRequest = stravaXhrOptions;
-            parser = stravaParser;
-        }
-        const requests = urlToRequest(url);
-        return Promise.all(requests.map((request) => fetch(request.url, request.options)))
-            .then(
-                (responses) => parser(name, responses),
-                () => [{name: url, error: 'NETWORK'}]
-            );
     }
+    // FIXME: check logs for loaded track urls, maybe we should use it only for names
+    try {
+        url = decodeURIComponent(url);
+    } catch (e) {
+    }
+    var name = url
+        .split('#')[0]
+        .split('?')[0]
+        .replace(/\/*$/, '')
+        .split('/')
+        .pop();
+
+    let urlToRequest = simpleTrackFetchOptions;
+    let parser = simpleTrackParser;
+
+
+    if (isGpsiesUrl(url)) {
+        urlToRequest = gpsiesXhrOptions;
+        parser = gpsiesParser;
+    } else if (isEndomondoUrl(url)) {
+        urlToRequest = endomonXhrOptions;
+        parser = endomondoParser;
+    } else if (isStravaUrl(url)) {
+        urlToRequest = stravaXhrOptions;
+        parser = stravaParser;
+    }
+    const requests = urlToRequest(url);
+    return Promise.all(requests.map((request) => fetch(request.url, request.options)))
+        .then(
+            (responses) => parser(name, responses),
+            () => [{name: url, error: 'NETWORK'}]
+        );
 }