From acc6da86de6dbf9b12dc0a3d9f6d502ed0dbd31b Mon Sep 17 00:00:00 2001 From: "Daniel J. Hofmann" Date: Tue, 2 Aug 2016 19:12:25 +0200 Subject: [PATCH] Skip handling none values for our edge cases for now.. Conflicts: src/extractor/guidance/turn_lane_augmentation.cpp --- src/extractor/guidance/turn_lane_augmentation.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/extractor/guidance/turn_lane_augmentation.cpp b/src/extractor/guidance/turn_lane_augmentation.cpp index e7fb7561a..9962f7083 100644 --- a/src/extractor/guidance/turn_lane_augmentation.cpp +++ b/src/extractor/guidance/turn_lane_augmentation.cpp @@ -283,7 +283,14 @@ LaneDataVector handleNoneValueAtSimpleTurn(LaneDataVector lane_data, // 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 // 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)); } @@ -293,6 +300,9 @@ LaneDataVector handleNoneValueAtSimpleTurn(LaneDataVector lane_data, { 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 std::sort(lane_data.begin(), lane_data.end()); return lane_data;