AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Stop discarding junctions if all turn candidates go straight or make only slight turns.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-02-14 19:00:41 +03:00 • committed by mpimenov
parent 2147d48dea
commit 04fbed9f22
1 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
routing/turns_generator.cpp
View file

@ -111,13 +111,43 @@ bool KeepRoundaboutTurnByHighwayClass(CarDirection turn, TurnCandidates const &
return false;
}
/// \brief Analyzes its args and makes a decision if it's possible to have a turn at this junction
/// or not.
/// \returns true if based on this analysis there's no turn at this junction and
/// false if the junction should be considered as possible turn.
bool DiscardTurnByIngoingAndOutgoingEdges(CarDirection intermediateDirection, bool hasMultiTurns,
TurnInfo const & turnInfo, TurnItem const & turn)
TurnInfo const & turnInfo, TurnItem const & turn,
TurnCandidates const & turnCandidates)
{
return !turn.m_keepAnyway && !turnInfo.m_ingoing.m_onRoundabout &&
!turnInfo.m_outgoing.m_onRoundabout &&
turnInfo.m_ingoing.m_highwayClass == turnInfo.m_outgoing.m_highwayClass &&
((!hasMultiTurns && IsGoStraightOrSlightTurn(intermediateDirection)) ||
if (turn.m_keepAnyway || turnInfo.m_ingoing.m_onRoundabout ||
turnInfo.m_outgoing.m_onRoundabout ||
turnInfo.m_ingoing.m_highwayClass != turnInfo.m_outgoing.m_highwayClass)
{
return false;
}
// Checks if all turn candidates go straight or make a slight turn to left or to right.
bool otherTurnCandidatesGoAlmostStraight = true;
if (turnCandidates.isCandidatesAngleValid)
{
for (auto const & c : turnCandidates.candidates)
{
if (!IsGoStraightOrSlightTurn(IntermediateDirection(c.angle)))
{
otherTurnCandidatesGoAlmostStraight = false;
break;
}
}
}
else
{
otherTurnCandidatesGoAlmostStraight = false;
}
if (otherTurnCandidatesGoAlmostStraight)
return !hasMultiTurns;
return ((!hasMultiTurns && IsGoStraightOrSlightTurn(intermediateDirection)) ||
(hasMultiTurns && intermediateDirection == CarDirection::GoStraight));
}
@ -635,7 +665,7 @@ void GetTurnDirection(IRoutingResult const & result, NumMwmIds const & numMwmIds
bool const hasMultiTurns = HasMultiTurns(numMwmIds, nodes, turnInfo);
if (DiscardTurnByIngoingAndOutgoingEdges(intermediateDirection, hasMultiTurns, turnInfo, turn))
if (DiscardTurnByIngoingAndOutgoingEdges(intermediateDirection, hasMultiTurns, turnInfo, turn, nodes))
return;
if (!hasMultiTurns || !nodes.isCandidatesAngleValid)