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

Adjusted to PR comments

Browse Source
This commit is contained in:
Michael Krasnyk 2017-05-02 13:32:04 +02:00 committed by Patrick Niklaus
parent 19494984eb
commit 2402d60429
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/extractor/guidance/roundabout_handler.cpp
View File

@ -111,20 +111,26 @@ void RoundaboutHandler::invalidateExitAgainstDirection(const NodeID from_nid,
if (in_edge_data.roundabout || in_edge_data.circular) if (in_edge_data.roundabout || in_edge_data.circular)
return; return;
std::cout << "invalidateExitAgainstDirection\n";
// Find range in which exits that must be invalidated (shaded areas): // 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 // begin..exit begin..exit exit..end for ↻ roundabouts
// ⭨▒▒▒ ⭨▒▒ ⭩ ▒▒⭨ // *************************************
// ⭣⭧▒ ⭣⭩ ▒▒⭣⭧ // * --.░░░^ --.░░░/ --. ^ *
// ⭣⭦▒ ⭣⭨ ▒⭧⭣ // * |░/░ |░/ ░░░| / *
// ⭩ ⭦ ⭩ ⭩ // * |/░░ |v ░░░|/ *
// * |^░░ |\ -->| *
// * | \░ | \ | *
// * <--' \ <--' v <--' *
// *************************************
bool roundabout_entry_first = false; bool roundabout_entry_first = false;
auto invalidate_from = intersection.end(), invalidate_to = intersection.end(); auto invalidate_from = intersection.end(), invalidate_to = intersection.end();
for (auto road = intersection.begin(); road != intersection.end(); ++road) for (auto road = intersection.begin(); road != intersection.end(); ++road)