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

make collapse work by better detecting continue/non-continue situations

Browse Source
This commit is contained in:
Moritz Kobitzsch 2016-08-23 12:58:28 +02:00
parent d06eec5e42
commit 7e0d14b113
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/extractor/guidance/intersection_handler.cpp
View File

@ -449,15 +449,30 @@ std::size_t IntersectionHandler::findObviousTurn(const EdgeID via_edge,
} }
} }
// We don't consider empty names a valid continue feature. This distinguishes between missing
// names and actual continuing roads.
if (in_data.name_id == EMPTY_NAMEID)
best_continue = 0;
if (best == 0) if (best == 0)
return 0; return 0;
const std::size_t num_continue_names = [&]() { const std::pair<std::size_t, std::size_t> num_continue_names = [&]() {
std::size_t count = 0; std::size_t count = 0, count_valid = 0;
for (const auto &road : intersection) if (in_data.name_id != EMPTY_NAMEID)
if (in_data.name_id == node_based_graph.GetEdgeData(road.turn.eid).name_id) {
for (std::size_t i = 1; i < intersection.size(); ++i)
{
const auto &road = intersection[i];
if ((in_data.name_id == node_based_graph.GetEdgeData(road.turn.eid).name_id))
{
++count; ++count;
return count; if (road.entry_allowed)
++count_valid;
}
}
}
return std::make_pair(count, count_valid);
}(); }();
if (0 != best_continue && best != best_continue && if (0 != best_continue && best != best_continue &&
@ -473,8 +488,8 @@ std::size_t IntersectionHandler::findObviousTurn(const EdgeID via_edge,
// has no obvious continued road // has no obvious continued road
const auto &best_data = node_based_graph.GetEdgeData(intersection[best].turn.eid); const auto &best_data = node_based_graph.GetEdgeData(intersection[best].turn.eid);
if (best_continue == 0 || num_continue_names > 2 || if (best_continue == 0 || (num_continue_names.first >= 2 && intersection.size() >= 4) ||
(num_continue_names > 2 && best_continue_deviation >= 2 * NARROW_TURN_ANGLE) || (num_continue_names.second >= 2 && best_continue_deviation >= 2 * NARROW_TURN_ANGLE) ||
(best_deviation < FUZZY_ANGLE_DIFFERENCE && !best_data.road_classification.IsRampClass())) (best_deviation < FUZZY_ANGLE_DIFFERENCE && !best_data.road_classification.IsRampClass()))
{ {
// Find left/right deviation // Find left/right deviation