deprecate use-lane -- the information can be found in the intersections array

2017-07-10 12:46:18 +02:00
parent 210fa9d545
commit 361e6b998f
12 changed files with 165 additions and 215 deletions
@@ -171,6 +171,22 @@ module.exports = function () {
                                                              ('out' in s.intersections[0] ? s.intersections[0].bearings[s.intersections[0].out] : 0));
    };

+    this.lanesList = (instructions) => {
+        return this.extractInstructionList(instructions, s => {
+            return s.intersections.map( i => {
+                if(i.lanes == undefined )
+                    return '';
+                else
+                {
+                    return i.lanes.map( l => {
+                        let indications = l.indications.join(';');
+                        return indications + ':' + (l.valid ? 'true' : 'false');
+                    }).join(' ');
+                }
+            }).join(';');
+        });
+    };
+
    this.approachList = (instructions) => {
        return this.extractInstructionList(instructions, s => s.approaches || '');
    };
@@ -197,17 +213,6 @@ module.exports = function () {
        return instructions.tracepoints.map(t => t.alternatives_count.toString()).join(',');
    };

-    this.lanesList = (instructions) => {
-        return this.extractInstructionList(instructions, instruction => {
-            if( 'lanes' in instruction.intersections[0] )
-            {
-                return instruction.intersections[0].lanes.map( p => { return (p.indications).join(';') + ':' + p.valid; } ).join(' ');
-            } else
-            {
-                return '';
-            }});
-    };
-
    this.turnList = (instructions) => {
        return instructions.legs.reduce((m, v) => m.concat(v.steps), [])
            .map(v => {