From 41064e2d7ba9066ee18b3c4b94d55dd0047c17af Mon Sep 17 00:00:00 2001 From: karenzshea Date: Tue, 31 Jan 2017 15:20:51 +0100 Subject: [PATCH] revert --- features/support/route.js | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/features/support/route.js b/features/support/route.js index 54513d690..34f0ff3de 100644 --- a/features/support/route.js +++ b/features/support/route.js @@ -167,19 +167,17 @@ module.exports = function () { if (!('annotation' in instructions.legs[0])) return ''; + function zip(list_1, list_2, list_3, list_4) + { + let tuples = []; + for (let i = 0; i < list_1.length; ++i) { + tuples.push([list_1[i], list_2[i], list_3[i], list_4[i]]); + } + return tuples; + } return instructions.legs.map(l => { - var fields = Object.keys(l.annotation); - var collected = l.annotation[fields[0]].map((f, i) => { - var zipped = []; - for (var j = 0; j < fields.length; j++) { - zipped.push(l.annotation[fields[j]][i]); - } - return zipped; - }); - - return collected.map((v) => { - return v.join(':'); - }).join(','); + const values = zip( l.annotation.weight, l.annotation.duration, l.annotation.distance, l.annotation.datasources); + return values.map(p => { return p.join(':'); }).join(','); }).join(','); };