update cucumber to 1.2.1 and remove hack
This commit is contained in:
committed by
Patrick Niklaus
parent
e76e39a398
commit
2ddc00c21e
@@ -154,7 +154,7 @@ void ExtractorCallbacks::ProcessWay(const osmium::Way &input_way, const Extracti
|
||||
TurnLaneDescription lane_description;
|
||||
|
||||
typedef boost::tokenizer<boost::char_separator<char>> tokenizer;
|
||||
boost::char_separator<char> sep("|&", "", boost::keep_empty_tokens);
|
||||
boost::char_separator<char> sep("|", "", boost::keep_empty_tokens);
|
||||
boost::char_separator<char> inner_sep(";", "");
|
||||
tokenizer tokens(lane_string, sep);
|
||||
|
||||
|
||||
@@ -45,11 +45,6 @@ bool TurnLaneData::operator<(const TurnLaneData &other) const
|
||||
LaneDataVector laneDataFromDescription(const TurnLaneDescription &turn_lane_description)
|
||||
{
|
||||
typedef std::unordered_map<TurnLaneType::Mask, std::pair<LaneID, LaneID>> 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<LaneID>(turn_lane_description.size());
|
||||
const auto setLaneData = [&](
|
||||
LaneMap &map, TurnLaneType::Mask full_mask, const LaneID current_lane) {
|
||||
|
||||
Reference in New Issue
Block a user