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

starting on conflict resolution

Browse Source
This commit is contained in:
Moritz Kobitzsch 2016-03-01 15:26:13 +01:00 committed by Patrick Niklaus
parent e0f009b3b9
commit adb8d0e845
3 changed files with 53 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/engine/guidance/turn_instruction.hpp
View File

@ -125,7 +125,7 @@ struct TurnInstruction
static TurnInstruction NO_TURN() static TurnInstruction NO_TURN()
{ {
return TurnInstruction(TurnType::NoTurn, DirectionModifier::Straight); return TurnInstruction(TurnType::NoTurn, DirectionModifier::UTurn);
} }
static TurnInstruction REMAIN_ROUNDABOUT(const DirectionModifier modifier) static TurnInstruction REMAIN_ROUNDABOUT(const DirectionModifier modifier)
@ -142,6 +142,11 @@ struct TurnInstruction
{ {
return TurnInstruction(TurnType::ExitRoundabout, modifier); return TurnInstruction(TurnType::ExitRoundabout, modifier);
} }
static TurnInstruction SUPPRESSED(const DirectionModifier modifier)
{
return TurnInstruction{TurnType::Suppressed,modifier};
}
}; };
inline bool operator!=(const TurnInstruction lhs, const TurnInstruction rhs) inline bool operator!=(const TurnInstruction lhs, const TurnInstruction rhs)

6
include/extractor/turn_analysis.hpp
View File

@ -188,6 +188,12 @@ AnalyzeTurn(const NodeID node_u,
const NodeID node_w, const NodeID node_w,
const double angle, const double angle,
const std::shared_ptr<const util::NodeBasedDynamicGraph> node_based_graph); const std::shared_ptr<const util::NodeBasedDynamicGraph> node_based_graph);
std::vector<TurnCandidate>
handleConflicts(const NodeID from,
const EdgeID via_edge,
std::vector<TurnCandidate> turn_candidates,
const std::shared_ptr<const util::NodeBasedDynamicGraph> node_based_graph);
} // namespace detail } // namespace detail
} // namespace turn_analysis } // namespace turn_analysis
} // namespace extractor } // namespace extractor

54
src/extractor/turn_analysis.cpp
View File

@ -116,17 +116,23 @@ getTurns(const NodeID from,
} }
if (turn_candidates.size() == 3) if (turn_candidates.size() == 3)
{ {
return detail::handleThreeWayTurn(from, via_edge, std::move(turn_candidates), return detail::handleConflicts(
node_based_graph); from, via_edge, detail::handleThreeWayTurn(
from, via_edge, std::move(turn_candidates), node_based_graph),
node_based_graph);
} }
if (turn_candidates.size() == 4) if (turn_candidates.size() == 4)
{ {
return detail::handleFourWayTurn(from, via_edge, std::move(turn_candidates), return detail::handleConflicts(
node_based_graph); from, via_edge, detail::handleFourWayTurn(
from, via_edge, std::move(turn_candidates), node_based_graph),
node_based_graph);
} }
// complex intersection, potentially requires conflict resolution // complex intersection, potentially requires conflict resolution
return detail::handleComplexTurn(from, via_edge, std::move(turn_candidates), return detail::handleConflicts(
node_based_graph); from, via_edge,
detail::handleComplexTurn(from, via_edge, std::move(turn_candidates), node_based_graph),
node_based_graph);
} }
#if PRINT_DEBUG_CANDIDATES #if PRINT_DEBUG_CANDIDATES
@ -413,7 +419,7 @@ handleFromMotorway(const NodeID from,
if (candidate.valid) if (candidate.valid)
{ {
BOOST_ASSERT(isRampClass(candidate.eid, node_based_graph)); BOOST_ASSERT(isRampClass(candidate.eid, node_based_graph));
candidate.instruction = TurnInstruction::NO_TURN(); candidate.instruction = TurnInstruction::SUPPRESSED(getTurnDirection(candidate.angle));
} }
} }
} }
@ -441,7 +447,7 @@ handleFromMotorway(const NodeID from,
if (candidate.angle == continue_angle) if (candidate.angle == continue_angle)
{ {
if (continues) if (continues)
candidate.instruction = TurnInstruction::NO_TURN(); candidate.instruction = TurnInstruction::SUPPRESSED(DirectionModifier::Straight);
else // TODO handle turn direction correctly else // TODO handle turn direction correctly
candidate.instruction = {TurnType::Merge, DirectionModifier::Straight}; candidate.instruction = {TurnType::Merge, DirectionModifier::Straight};
} }
@ -727,7 +733,7 @@ noTurnOrNewName(const NodeID from,
if (in_data.name_id == out_data.name_id) if (in_data.name_id == out_data.name_id)
{ {
if (angularDeviation(candidate.angle, 0) > 0.01) if (angularDeviation(candidate.angle, 0) > 0.01)
return TurnInstruction::NO_TURN(); return TurnInstruction::SUPPRESSED(getTurnDirection(candidate.angle));
return {TurnType::Turn, DirectionModifier::UTurn}; return {TurnType::Turn, DirectionModifier::UTurn};
} }
@ -965,7 +971,7 @@ handleThreeWayTurn(const NodeID from,
{ {
if (isObviousOfTwo(turn_candidates[1], turn_candidates[2])) if (isObviousOfTwo(turn_candidates[1], turn_candidates[2]))
{ {
turn_candidates[1].instruction = TurnInstruction::NO_TURN(); turn_candidates[1].instruction = TurnInstruction::SUPPRESSED(DirectionModifier::Straight);
} }
else else
{ {
@ -982,7 +988,7 @@ handleThreeWayTurn(const NodeID from,
{ {
if (isObviousOfTwo(turn_candidates[2], turn_candidates[1])) if (isObviousOfTwo(turn_candidates[2], turn_candidates[1]))
{ {
turn_candidates[2].instruction = TurnInstruction::NO_TURN(); turn_candidates[2].instruction = TurnInstruction::SUPPRESSED(DirectionModifier::Straight);
} }
else else
{ {
@ -1421,8 +1427,7 @@ suppressTurns(const EdgeID via_eid,
{ {
if (turn_candidates.size() == 3) if (turn_candidates.size() == 3)
{ {
BOOST_ASSERT(turn_candidates[0].instruction.direction_modifier == BOOST_ASSERT(turn_candidates[0].instruction.direction_modifier == DirectionModifier::UTurn);
DirectionModifier::UTurn);
if (isLowPriorityRoadClass(node_based_graph->GetEdgeData(turn_candidates[1].eid) if (isLowPriorityRoadClass(node_based_graph->GetEdgeData(turn_candidates[1].eid)
.road_classification.road_class) && .road_classification.road_class) &&
!isLowPriorityRoadClass(node_based_graph->GetEdgeData(turn_candidates[2].eid) !isLowPriorityRoadClass(node_based_graph->GetEdgeData(turn_candidates[2].eid)
@ -1827,6 +1832,29 @@ AnalyzeTurn(const NodeID node_u,
return {TurnType::Turn, getTurnDirection(angle)}; return {TurnType::Turn, getTurnDirection(angle)};
} }
std::vector<TurnCandidate>
handleConflicts(const NodeID from,
const EdgeID via_edge,
std::vector<TurnCandidate> turn_candidates,
const std::shared_ptr<const util::NodeBasedDynamicGraph> node_based_graph)
{
(void)from;
(void)via_edge;
(void)node_based_graph;
const auto isConflict = []( const TurnCandidate &left, const TurnCandidate &right )
{
// most obvious, same instructions conflict
if( left.instruction == right.instruction )
return true;
return left.instruction.direction_modifier != DirectionModifier::UTurn &&
left.instruction.direction_modifier == right.instruction.direction_modifier;
};
return turn_candidates;
}
} // anemspace detail } // anemspace detail
} // namespace turn_analysis } // namespace turn_analysis
} // namespace extractor } // namespace extractor