From 2402d60429584aaa1ade632c796c3136667311ad Mon Sep 17 00:00:00 2001 From: Michael Krasnyk Date: Tue, 2 May 2017 13:32:04 +0200 Subject: [PATCH] Adjusted to PR comments --- src/extractor/guidance/roundabout_handler.cpp | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/extractor/guidance/roundabout_handler.cpp b/src/extractor/guidance/roundabout_handler.cpp index 167ced0e0..6095d405b 100644 --- a/src/extractor/guidance/roundabout_handler.cpp +++ b/src/extractor/guidance/roundabout_handler.cpp @@ -111,20 +111,26 @@ void RoundaboutHandler::invalidateExitAgainstDirection(const NodeID from_nid, if (in_edge_data.roundabout || in_edge_data.circular) return; - std::cout << "invalidateExitAgainstDirection\n"; - // Find range in which exits that must be invalidated (shaded areas): - // exit..end exit..end begin..exit for ↺ roundabouts - // ⭦ ⭦ ⭩ ⭦ - // ⭡⭧ ⭡⭩ ▒ ▒⭨⭡ - // ⭡⭦ ⭡⭨▒▒ ▒▒⭡⭨ - // ⭧▒▒⭦ ⭧▒▒▒▒ ▒▒⭧ + // exit..end exit..end begin..exit for ↺ roundabouts + // ************************************* + // * <--. ^ <--. / <--. * + // * | / | /░ | * + // * |/ |v░░ -->| * + // * |^ |\ ░ ░░░|\ * + // * |░\ |░\░ ░░░| \ * + // * --'░░░\ --'░░░v --' v * + // ************************************* // // begin..exit begin..exit exit..end for ↻ roundabouts - // ⭨▒▒▒ ⭨▒▒ ⭩ ▒▒⭨ - // ⭣⭧▒ ⭣⭩ ▒▒⭣⭧ - // ⭣⭦▒ ⭣⭨ ▒⭧⭣ - // ⭩ ⭦ ⭩ ⭩ + // ************************************* + // * --.░░░^ --.░░░/ --. ^ * + // * |░/░ |░/ ░░░| / * + // * |/░░ |v ░░░|/ * + // * |^░░ |\ -->| * + // * | \░ | \ | * + // * <--' \ <--' v <--' * + // ************************************* bool roundabout_entry_first = false; auto invalidate_from = intersection.end(), invalidate_to = intersection.end(); for (auto road = intersection.begin(); road != intersection.end(); ++road)