nakarte

commit 0ec8770f2225754991bc0412342dfe75e2da35fa
parent eed66ef382dfeee91165a42a8fa589739f5be545
Author: Sergej Orlov <wladimirych@gmail.com>
Date:   Sun, 25 Nov 2018 23:51:10 +0100

[tracks] strava: fixed errors handling, cleanup

Diffstat:
M
src/lib/leaflet.control.track-list/lib/services/strava.js
 | 
14
++++++--------

1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/lib/leaflet.control.track-list/lib/services/strava.js b/src/lib/leaflet.control.track-list/lib/services/strava.js
@@ -25,23 +25,21 @@ class Strava extends BaseService {
 
     parseResponse(responses) {
         let data;
-        const pageResponse = responses[0];
-        const trackResponse = responses[1];
+        const [pageResponse, trackResponse] = responses;
+        let name = `Strava ${this.trackId}`;
         try {
             data = JSON.parse(trackResponse.responseBinaryText);
         } catch (e) {
-            return [{name: name, error: 'UNSUPPORTED'}];
+            return [{name, error: 'UNSUPPORTED'}];
         }
         if (!data.latlng) {
-            return [{name: name, error: 'UNSUPPORTED'}];
+            return [{name, error: 'UNSUPPORTED'}];
         }
-
         const tracks = [data.latlng.map((p) => ({lat: p[0],lng: p[1]}))];
 
-        let name = `Strava ${this.trackId}`;
         try {
             let name2;
-            const dom = (new DOMParser()).parseFromString(responses[0].responseBinaryText, "text/html");
+            const dom = (new DOMParser()).parseFromString(pageResponse.responseBinaryText, "text/html");
             let title = dom.querySelector('meta[property=og\\:title]').content;
             title = utf8_decode(title);
             // name and description
@@ -60,7 +58,7 @@ class Strava extends BaseService {
 
 
         return [{
-            name: name,
+            name,
             tracks
         }];
     }