Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Skip handling none values for our edge cases for now..

Browse Source 
Conflicts:
	src/extractor/guidance/turn_lane_augmentation.cpp
This commit is contained in:
Daniel J. Hofmann 2016-08-02 19:12:25 +02:00
parent 4d84bc0f01
commit acc6da86de
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/extractor/guidance/turn_lane_augmentation.cpp
View File

@ -283,7 +283,14 @@ LaneDataVector handleNoneValueAtSimpleTurn(LaneDataVector lane_data,
// a pgerequisite is simple turns. Larger differences should not end up here // a pgerequisite is simple turns. Larger differences should not end up here
// an additional line at the side is only reasonable if it is targeting public // an additional line at the side is only reasonable if it is targeting public
// service vehicles. Otherwise, we should not have it // service vehicles. Otherwise, we should not have it
BOOST_ASSERT(connection_count + 1 == lane_data.size()); //
// TODO(mokob): #2730 have a look please
// BOOST_ASSERT(connection_count + 1 == lane_data.size());
//
if (connection_count + 1 != lane_data.size())
{
goto these_intersections_are_clearly_broken_at_the_moment;
}
lane_data = mergeNoneTag(none_index, std::move(lane_data)); lane_data = mergeNoneTag(none_index, std::move(lane_data));
} }
@ -293,6 +300,9 @@ LaneDataVector handleNoneValueAtSimpleTurn(LaneDataVector lane_data,
{ {
lane_data = handleRenamingSituations(none_index, std::move(lane_data), intersection); lane_data = handleRenamingSituations(none_index, std::move(lane_data), intersection);
} }
these_intersections_are_clearly_broken_at_the_moment:
// finally make sure we are still sorted // finally make sure we are still sorted
std::sort(lane_data.begin(), lane_data.end()); std::sort(lane_data.begin(), lane_data.end());
return lane_data; return lane_data;