From 2ddc00c21e0d541e0fc35b4901e26250cd1fb0c7 Mon Sep 17 00:00:00 2001 From: Moritz Kobitzsch Date: Thu, 7 Jul 2016 15:31:20 +0200 Subject: [PATCH] update cucumber to 1.2.1 and remove hack --- features/guidance/anticipate-lanes.feature | 158 +++++++-------- features/guidance/turn-lanes.feature | 216 ++++++++++----------- features/step_definitions/hooks.js | 12 -- features/support/hooks.js | 5 - features/testbot/summary.feature | 2 +- package.json | 8 +- src/extractor/extractor_callbacks.cpp | 2 +- src/extractor/guidance/turn_lane_data.cpp | 5 - 8 files changed, 192 insertions(+), 216 deletions(-) diff --git a/features/guidance/anticipate-lanes.feature b/features/guidance/anticipate-lanes.feature index 23908538c..2c27d147f 100644 --- a/features/guidance/anticipate-lanes.feature +++ b/features/guidance/anticipate-lanes.feature @@ -15,14 +15,14 @@ Feature: Turn Lane Guidance | | | y | | e | | | And the ways - | nodes | turn:lanes:forward | - | ab | through\|right&right&right | - | bx | | - | bc | left\|left&through | - | cd | through\|right | - | cy | | - | dz | | - | de | | + | nodes | turn:lanes:forward | + | ab | through\|right\|right\|right | + | bx | | + | bc | left\|left\|through | + | cd | through\|right | + | cy | | + | dz | | + | de | | When I route I should get | waypoints | route | turns | lanes | # | @@ -39,13 +39,13 @@ Feature: Turn Lane Guidance | e | | d | y | And the ways - | nodes | turn:lanes:forward | turn:lanes:backward | name | - | ab | through\|right&right | | MySt | - | bx | | | XSt | - | bc | | left\|right | MySt | - | cd | left\|right | through\|through | MySt | - | de | | left\|left&through | MySt | - | dy | | | YSt | + | nodes | turn:lanes:forward | turn:lanes:backward | name | + | ab | through\|right\|right | | MySt | + | bx | | | XSt | + | bc | | left\|right | MySt | + | cd | left\|right | through\|through | MySt | + | de | | left\|left\|through | MySt | + | dy | | | YSt | When I route I should get | waypoints | route | turns | lanes | @@ -62,13 +62,13 @@ Feature: Turn Lane Guidance | e | | d | y | And the ways - | nodes | turn:lanes:forward | turn:lanes:backward | name | - | ab | through\|right&right | | AXSt | - | bx | | | AXSt | - | bc | | left\|right | BDSt | - | cd | left\|right | through\|through | BDSt | - | de | | left\|left&through | EYSt | - | dy | | | EYSt | + | nodes | turn:lanes:forward | turn:lanes:backward | name | + | ab | through\|right\|right | | AXSt | + | bx | | | AXSt | + | bc | | left\|right | BDSt | + | cd | left\|right | through\|through | BDSt | + | de | | left\|left\|through | EYSt | + | dy | | | EYSt | When I route I should get | waypoints | route | turns | lanes | @@ -105,13 +105,13 @@ Feature: Turn Lane Guidance | | | | | | j | And the ways - | nodes | turn:lanes:forward | lanes | highway | oneway | name | - | ab | none\|none&none&slight_right&slight_right | 5 | motorway | | abx | - | bx | | 3 | motorway | | abx | - | bc | | 2 | motorway_link | yes | bcd | - | cd | slight_left\|slight_left;slight_right&slight_right | 3 | motorway_link | yes | bcd | - | di | slight_left\|slight_right | 2 | motorway_link | yes | di | - | dj | | 2 | motorway_link | yes | dj | + | nodes | turn:lanes:forward | lanes | highway | oneway | name | + | ab | none\|none\|none\|slight_right\|slight_right | 5 | motorway | | abx | + | bx | | 3 | motorway | | abx | + | bc | | 2 | motorway_link | yes | bcd | + | cd | slight_left\|slight_left;slight_right\|slight_right | 3 | motorway_link | yes | bcd | + | di | slight_left\|slight_right | 2 | motorway_link | yes | di | + | dj | | 2 | motorway_link | yes | dj | When I route I should get | waypoints | route | turns | lanes | @@ -150,14 +150,14 @@ Feature: Turn Lane Guidance | | | y | | e | | | And the ways - | nodes | turn:lanes:forward | name | - | ab | through\|right&right&right | abx | - | bx | | abx | - | bc | left\|left&through | bcy | - | cy | | bcy | - | cd | through\|right | cdz | - | dz | | cdz | - | de | | de | + | nodes | turn:lanes:forward | name | + | ab | through\|right\|right\|right | abx | + | bx | | abx | + | bc | left\|left\|through | bcy | + | cy | | bcy | + | cd | through\|right | cdz | + | dz | | cdz | + | de | | de | When I route I should get | waypoints | route | turns | lanes | @@ -173,14 +173,14 @@ Feature: Turn Lane Guidance | | | y | | e | | | And the ways - | nodes | turn:lanes:forward | name | - | ab | through\|right | abx | - | bx | | abx | - | bc | left\|left&through | bcy | - | cy | | bcy | - | cd | through\|right&right&right | cdz | - | dz | | cdz | - | de | | de | + | nodes | turn:lanes:forward | name | + | ab | through\|right | abx | + | bx | | abx | + | bc | left\|left\|through | bcy | + | cy | | bcy | + | cd | through\|right\|right\|right | cdz | + | dz | | cdz | + | de | | de | When I route I should get | waypoints | route | turns | lanes | @@ -196,14 +196,14 @@ Feature: Turn Lane Guidance | | | y | | e | | | And the ways - | nodes | turn:lanes:forward | name | - | ab | through\|right&right&right | abx | - | bx | | abx | - | bc | left\|left&through | bcy | - | cy | | bcy | - | cd | through\|right&right&right | cdz | - | dz | | cdz | - | de | | de | + | nodes | turn:lanes:forward | name | + | ab | through\|right\|right\|right | abx | + | bx | | abx | + | bc | left\|left\|through | bcy | + | cy | | bcy | + | cd | through\|right\|right\|right | cdz | + | dz | | cdz | + | de | | de | When I route I should get | waypoints | route | turns | lanes | @@ -219,14 +219,14 @@ Feature: Turn Lane Guidance | | | y | | e | | | And the ways - | nodes | turn:lanes:forward | name | - | ab | through\|right | abx | - | bx | | abx | - | bc | left\|left&through | bcy | - | cy | | bcy | - | cd | through\|right | cdz | - | dz | | cdz | - | de | | de | + | nodes | turn:lanes:forward | name | + | ab | through\|right | abx | + | bx | | abx | + | bc | left\|left\|through | bcy | + | cy | | bcy | + | cd | through\|right | cdz | + | dz | | cdz | + | de | | de | When I route I should get | waypoints | route | turns | lanes | @@ -244,16 +244,16 @@ Feature: Turn Lane Guidance | | | | | w | | | And the ways - | nodes | turn:lanes:forward | name | - | ab | through\|right&right&right | abx | - | bx | | abx | - | bc | left\|left&through | bcy | - | cy | | bcy | - | cd | through\|right&right | cdz | - | dz | | cdz | - | de | left\|through | dew | - | ew | | dew | - | ef | | ef | + | nodes | turn:lanes:forward | name | + | ab | through\|right\|right\|right | abx | + | bx | | abx | + | bc | left\|left\|through | bcy | + | cy | | bcy | + | cd | through\|right\|right | cdz | + | dz | | cdz | + | de | left\|through | dew | + | ew | | dew | + | ef | | ef | When I route I should get | waypoints | route | turns | lanes | @@ -407,10 +407,10 @@ Feature: Turn Lane Guidance And the ways | nodes | turn:lanes:forward | highway | name | - | abi | \|&right&right | primary | start | - | bch | \|&right&right | primary | first | - | cdj | \|&right&right | primary | second | - | de | left\|right&right | secondary | third | + | abi | \|\|right\|right | primary | start | + | bch | \|\|right\|right | primary | first | + | cdj | \|\|right\|right | primary | second | + | de | left\|right\|right | secondary | third | | feg | | tertiary | fourth | When I route I should get @@ -432,10 +432,10 @@ Feature: Turn Lane Guidance And the ways | nodes | turn:lanes:forward | highway | name | - | abi | left\|left&& | primary | start | - | bch | left\|left&& | primary | first | - | cdj | left\|left&& | primary | second | - | de | left\|left&right | secondary | third | + | abi | left\|left\|\| | primary | start | + | bch | left\|left\|\| | primary | first | + | cdj | left\|left\|\| | primary | second | + | de | left\|left\|right | secondary | third | | feg | | tertiary | fourth | When I route I should get diff --git a/features/guidance/turn-lanes.feature b/features/guidance/turn-lanes.feature index 89b1b5603..994a9a56e 100644 --- a/features/guidance/turn-lanes.feature +++ b/features/guidance/turn-lanes.feature @@ -5,9 +5,7 @@ Feature: Turn Lane Guidance Given the profile "car" Given a grid size of 20 meters - #requires https://github.com/cucumber/cucumber-js/issues/417 - #Due to this, we use & as a pipe character. Switch them out for \| when 417 is fixed - @bug @WORKAROUND-FIXME + @bug Scenario: Basic Turn Lane 3-way Turn with empty lanes Given the node map | a | | b | | c | @@ -16,7 +14,7 @@ Feature: Turn Lane Guidance And the ways | nodes | turn:lanes | turn:lanes:forward | turn:lanes:backward | name | | ab | | through\|right | | in | - | bc | | | left\|through&& | straight | + | bc | | | left\|through\|\| | straight | | bd | | | left\|right | right | When I route I should get @@ -89,7 +87,7 @@ Feature: Turn Lane Guidance #this next test requires decision on how to announce lanes for going straight if there is no turn - @TODO @WORKAROUND-FIXME + @TODO Scenario: Turn with Bus-Lane Given the node map | a | | b | | c | @@ -98,7 +96,7 @@ Feature: Turn Lane Guidance And the ways | nodes | name | turn:lanes:forward | lanes:psv:forward | - | ab | road | through\|right& | 1 | + | ab | road | through\|right\| | 1 | | bc | road | | | | bd | turn | | | @@ -126,7 +124,7 @@ Feature: Turn Lane Guidance | a,c | road,road | depart,arrive | #turn lanes are often drawn at the incoming road, even though the actual turn requires crossing the intersection first - @todo @WORKAROUND-FIXME @bug + @todo @bug Scenario: Turn Lanes at Segregated Road Given the node map | | | i | l | | | @@ -137,19 +135,19 @@ Feature: Turn Lane Guidance | | | j | k | | | And the ways - | nodes | name | turn:lanes:forward | oneway | - | ab | road | left\|through&right | yes | - | bc | road | left\|through | yes | - | cd | road | | yes | - | ef | road | \|through&through;right | yes | - | fg | road | left;through\|through& | yes | - | gh | road | | yes | - | ig | cross | | yes | - | gb | cross | left\|through | yes | - | bj | cross | | yes | - | kc | cross | left\|through;right | yes | - | cf | cross | left\|through | yes | - | fl | cross | | yes | + | nodes | name | turn:lanes:forward | oneway | + | ab | road | left\|through\|right | yes | + | bc | road | left\|through | yes | + | cd | road | | yes | + | ef | road | \|through\|through;right | yes | + | fg | road | left;through\|through\| | yes | + | gh | road | | yes | + | ig | cross | | yes | + | gb | cross | left\|through | yes | + | bj | cross | | yes | + | kc | cross | left\|through;right | yes | + | cf | cross | left\|through | yes | + | fl | cross | | yes | When I route I should get | waypoints | route | turns | lanes | @@ -181,19 +179,19 @@ Feature: Turn Lane Guidance | | | j | k | | | And the ways - | nodes | name | turn:lanes:forward | oneway | - | ab | road | left\|through&right | yes | - | bc | road | left\|through | yes | - | cd | road | | yes | - | ef | road | \|through&through;right | yes | - | fg | road | left;through\|through& | yes | - | gh | road | | yes | - | ig | cross | | yes | - | gb | cross | left\|through | yes | - | bj | cross | | yes | - | kc | cross | left\|through;right | yes | - | cf | cross | left\|through | yes | - | fl | cross | | yes | + | nodes | name | turn:lanes:forward | oneway | + | ab | road | left\|through\|right | yes | + | bc | road | left\|through | yes | + | cd | road | | yes | + | ef | road | \|through\|through;right | yes | + | fg | road | left;through\|through\| | yes | + | gh | road | | yes | + | ig | cross | | yes | + | gb | cross | left\|through | yes | + | bj | cross | | yes | + | kc | cross | left\|through;right | yes | + | cf | cross | left\|through | yes | + | fl | cross | | yes | When I route I should get | waypoints | route | turns | lanes | @@ -212,14 +210,14 @@ Feature: Turn Lane Guidance | | | j | k | | | And the ways - | nodes | name | turn:lanes:forward | oneway | - | ab | road | left\|through&right | yes | - | bc | road | | yes | - | cd | road | | yes | - | gb | cross | | yes | - | bj | cross | | yes | - | kc | cross | | yes | - | cf | cross | | yes | + | nodes | name | turn:lanes:forward | oneway | + | ab | road | left\|through\|right | yes | + | bc | road | | yes | + | cd | road | | yes | + | gb | cross | | yes | + | bj | cross | | yes | + | kc | cross | | yes | + | cf | cross | | yes | When I route I should get | waypoints | route | turns | lanes | @@ -329,13 +327,13 @@ Feature: Turn Lane Guidance | | | | f | | | And the ways - | nodes | name | turn:lanes:forward | - | ab | road | left\|through&right | - | bc | road | | - | cd | road | left\|through | - | de | through | | - | dg | left | | - | cf | right | | + | nodes | name | turn:lanes:forward | + | ab | road | left\|through\|right | + | bc | road | | + | cd | road | left\|through | + | de | through | | + | dg | left | | + | cf | right | | When I route I should get | waypoints | route | turns | lanes | @@ -384,16 +382,16 @@ Feature: Turn Lane Guidance | g | traffic_signals | And the ways - | nodes | name | turn:lanes:forward | junction | oneway | highway | - | abcdef | roundabout | | roundabout | yes | primary | - | gha | roundabout | | roundabout | yes | primary | - | fg | roundabout | slight_left\|slight_left;slight_right&slight_right&slight_right | roundabout | yes | primary | - | aoib | top | | | yes | primary | - | cjd | left | | | yes | primary | - | ekf | bottom | | | yes | primary | - | fng | bottom-right | | | yes | primary | - | hma | top-right | | | yes | primary | - | hl | top-right-out | | | yes | secondary | + | nodes | name | turn:lanes:forward | junction | oneway | highway | + | abcdef | roundabout | | roundabout | yes | primary | + | gha | roundabout | | roundabout | yes | primary | + | fg | roundabout | slight_left\|slight_left;slight_right\|slight_right\|slight_right | roundabout | yes | primary | + | aoib | top | | | yes | primary | + | cjd | left | | | yes | primary | + | ekf | bottom | | | yes | primary | + | fng | bottom-right | | | yes | primary | + | hma | top-right | | | yes | primary | + | hl | top-right-out | | | yes | secondary | When I route I should get | waypoints | route | turns | lanes | @@ -411,12 +409,12 @@ Feature: Turn Lane Guidance | | | | f | | And the ways - | nodes | name | turn:lanes:forward | oneway | highway | - | ab | road | left\|left&through&through | yes | primary | - | bd | road | through\|through | yes | primary | - | bc | road | left\|left | yes | primary | - | de | road | | yes | primary | - | fdcg | cross | | | secondary | + | nodes | name | turn:lanes:forward | oneway | highway | + | ab | road | left\|left\|through\|through | yes | primary | + | bd | road | through\|through | yes | primary | + | bc | road | left\|left | yes | primary | + | de | road | | yes | primary | + | fdcg | cross | | | secondary | And the relations | type | way:from | way:to | node:via | restriction | @@ -440,8 +438,8 @@ Feature: Turn Lane Guidance | nodes | name | turn:lanes:forward | oneway | highway | | ab | road | | no | primary | | di | road | | yes | primary | - | bc | road | \|through&right | yes | primary | - | cd | road | \|through&right | yes | primary | + | bc | road | \|through\|right | yes | primary | + | cd | road | \|through\|right | yes | primary | | fc | road | | no | tertiary | | jefb | road | | yes | primary | | gdeh | cross | | no | primary | @@ -464,12 +462,12 @@ Feature: Turn Lane Guidance | | | | | | h | | And the ways - | nodes | name | turn:lanes:forward | oneway | highway | - | abc | road | left\|left&left&through&through | yes | primary | - | cde | road | | yes | primary | - | hc | cross | | yes | secondary | - | cg | straight | | no | tertiary | - | cf | left | | yes | primary | + | nodes | name | turn:lanes:forward | oneway | highway | + | abc | road | left\|left\|left\|through\|through | yes | primary | + | cde | road | | yes | primary | + | hc | cross | | yes | secondary | + | cg | straight | | no | tertiary | + | cf | left | | yes | primary | When I route I should get | waypoints | route | turns | lanes | @@ -489,15 +487,15 @@ Feature: Turn Lane Guidance | | | | | j | | | And the ways - | nodes | name | turn:lanes:forward | oneway | highway | junction | - | efgha | round | | yes | primary | roundabout | - | ab | round | | yes | primary | roundabout | - | bc | round | slight_left\|slight_left&slight_right | yes | primary | roundabout | - | cd | round | | yes | primary | roundabout | - | de | round | slight_left\|slight_right | yes | primary | roundabout | - | ib | left | slight_left\|slight_left&slight_right | yes | primary | | - | cj | bottom | | yes | primary | | - | ek | right | | yes | primary | | + | nodes | name | turn:lanes:forward | oneway | highway | junction | + | efgha | round | | yes | primary | roundabout | + | ab | round | | yes | primary | roundabout | + | bc | round | slight_left\|slight_left\|slight_right | yes | primary | roundabout | + | cd | round | | yes | primary | roundabout | + | de | round | slight_left\|slight_right | yes | primary | roundabout | + | ib | left | slight_left\|slight_left\|slight_right | yes | primary | | + | cj | bottom | | yes | primary | | + | ek | right | | yes | primary | | When I route I should get | waypoints | route | turns | lanes | @@ -514,10 +512,10 @@ Feature: Turn Lane Guidance | b | traffic_signals | And the ways - | nodes | name | turn:lanes:forward | highway | - | abc | road | through\|through&through;slight_right&slight_right | primary | - | cd | road | | primary | - | ce | cross | | primary | + | nodes | name | turn:lanes:forward | highway | + | abc | road | through\|through\|through;slight_right\|slight_right | primary | + | cd | road | | primary | + | ce | cross | | primary | When I route I should get | waypoints | route | turns | lanes | @@ -530,10 +528,10 @@ Feature: Turn Lane Guidance | | | | | | | e | And the ways - | nodes | name | turn:lanes:forward | highway | - | abc | hwy | through\|through&through;slight_right&slight_right | motorway | - | cd | hwy | | motorway | - | ce | ramp | | motorway_link | + | nodes | name | turn:lanes:forward | highway | + | abc | hwy | through\|through\|through;slight_right\|slight_right | motorway | + | cd | hwy | | motorway | + | ce | ramp | | motorway_link | When I route I should get | waypoints | route | turns | lanes | @@ -570,10 +568,10 @@ Feature: Turn Lane Guidance | | | | | | | | | | | d | | And the ways - | nodes | name | turn:lanes:forward | highway | oneway | - | ab | hwy | through\|through&slight_right | motorway | yes | - | bc | hwy | | motorway | yes | - | bd | ramp | | motorway_link | yes | + | nodes | name | turn:lanes:forward | highway | oneway | + | ab | hwy | through\|through\|slight_right | motorway | yes | + | bc | hwy | | motorway | yes | + | bd | ramp | | motorway_link | yes | When I route I should get | waypoints | route | turns | lanes | @@ -588,11 +586,11 @@ Feature: Turn Lane Guidance | a | | | | | b | | | | | | c | And the ways - | nodes | name | turn:lanes:forward | highway | oneway | - | ab | road | reverse\|through&through | primary | yes | - | bc | road | | primary | yes | - | bdeg | road | | primary_link | yes | - | fgh | road | | primary | yes | + | nodes | name | turn:lanes:forward | highway | oneway | + | ab | road | reverse\|through\|through | primary | yes | + | bc | road | | primary | yes | + | bdeg | road | | primary_link | yes | + | fgh | road | | primary | yes | When I route I should get | waypoints | route | turns | lanes | @@ -606,11 +604,11 @@ Feature: Turn Lane Guidance | a | | | | | b | | | | | | c | And the ways - | nodes | name | turn:lanes:forward | highway | oneway | - | ab | road | reverse\|through&none | primary | yes | - | bc | road | | primary | yes | - | bdeg | road | | primary_link | yes | - | fgh | road | | primary | yes | + | nodes | name | turn:lanes:forward | highway | oneway | + | ab | road | reverse\|through\|none | primary | yes | + | bc | road | | primary | yes | + | bdeg | road | | primary_link | yes | + | fgh | road | | primary | yes | When I route I should get | waypoints | route | turns | lanes | @@ -625,12 +623,12 @@ Feature: Turn Lane Guidance | | | i | | | | | | | | | | And the ways - | nodes | name | turn:lanes:forward | highway | oneway | - | ajb | road | reverse\|through&none | primary | yes | - | bc | road | | primary | yes | - | bdeg | road | | primary_link | yes | - | fgh | road | | primary | yes | - | ji | park | | service | no | + | nodes | name | turn:lanes:forward | highway | oneway | + | ajb | road | reverse\|through\|none | primary | yes | + | bc | road | | primary | yes | + | bdeg | road | | primary_link | yes | + | fgh | road | | primary | yes | + | ji | park | | service | no | When I route I should get | waypoints | route | turns | lanes | diff --git a/features/step_definitions/hooks.js b/features/step_definitions/hooks.js index 07b47195a..d6ed251b4 100644 --- a/features/step_definitions/hooks.js +++ b/features/step_definitions/hooks.js @@ -15,16 +15,4 @@ module.exports = function () { this.setOrigin(this.DEFAULT_ORIGIN); callback(); }); - - this.Before('@ignore-platform-windows', () => { - this.skipThisScenario(); - }); - - this.Before('@ignore-platform-unix', () => { - this.skipThisScenario(); - }); - - this.Before('@ignore-platform-mac', () => { - this.skipThisScenario(); - }); }; diff --git a/features/support/hooks.js b/features/support/hooks.js index 753bdf760..1e265ea14 100644 --- a/features/support/hooks.js +++ b/features/support/hooks.js @@ -33,9 +33,4 @@ module.exports = function () { }); }); }); - - this.Around('@stress', (scenario, callback) => { - // TODO implement stress timeout? Around support is being dropped in cucumber-js anyway - callback(); - }); }; diff --git a/features/testbot/summary.feature b/features/testbot/summary.feature index 028c863f7..563230a03 100644 --- a/features/testbot/summary.feature +++ b/features/testbot/summary.feature @@ -29,7 +29,7 @@ Feature: Basic Routing Scenario: Check handling empty values Given the node map | a | b | | c | | d | f | - | | | | | | e | + | | | | | | e | | And the ways | nodes | name | diff --git a/package.json b/package.json index f03a47b05..87d21ce87 100644 --- a/package.json +++ b/package.json @@ -4,13 +4,13 @@ "private": true, "description": "The Open Source Routing Machine is a high performance routing engine written in C++11 designed to run on OpenStreetMap data.", "dependencies": { - "cucumber": "^0.9.4", + "chalk": "^1.1.3", + "cucumber": "^1.2.1", "d3-queue": "^2.0.3", "node-timeout": "0.0.4", + "polyline": "^0.2.0", "request": "^2.69.0", - "xmlbuilder": "^4.2.1", - "chalk": "^1.1.3", - "polyline": "^0.2.0" + "xmlbuilder": "^4.2.1" }, "bin": { "cucumber": "./node_modules/cucumber/bin/cucumber.js" diff --git a/src/extractor/extractor_callbacks.cpp b/src/extractor/extractor_callbacks.cpp index a12ad29c7..fd03ca7e2 100644 --- a/src/extractor/extractor_callbacks.cpp +++ b/src/extractor/extractor_callbacks.cpp @@ -154,7 +154,7 @@ void ExtractorCallbacks::ProcessWay(const osmium::Way &input_way, const Extracti TurnLaneDescription lane_description; typedef boost::tokenizer> tokenizer; - boost::char_separator sep("|&", "", boost::keep_empty_tokens); + boost::char_separator sep("|", "", boost::keep_empty_tokens); boost::char_separator inner_sep(";", ""); tokenizer tokens(lane_string, sep); diff --git a/src/extractor/guidance/turn_lane_data.cpp b/src/extractor/guidance/turn_lane_data.cpp index b78722b22..f79f06510 100644 --- a/src/extractor/guidance/turn_lane_data.cpp +++ b/src/extractor/guidance/turn_lane_data.cpp @@ -45,11 +45,6 @@ bool TurnLaneData::operator<(const TurnLaneData &other) const LaneDataVector laneDataFromDescription(const TurnLaneDescription &turn_lane_description) { typedef std::unordered_map> LaneMap; - - // FIXME this is a workaround due to https://github.com/cucumber/cucumber-js/issues/417, - // need to switch statements when fixed - // const auto num_lanes = std::count(turn_lane_string.begin(), turn_lane_string.end(), '|') + 1; - // count the number of lanes const auto num_lanes = boost::numeric_cast(turn_lane_description.size()); const auto setLaneData = [&]( LaneMap &map, TurnLaneType::Mask full_mask, const LaneID current_lane) {