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

Moving functionality for checking if oneway outgoing turn shell be kept to a private method.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2015-01-12 16:32:06 +03:00 • committed by Alex Zolotarev
parent d9a17de4d8
commit 112bc15a72
2 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
routing/osrm_router.cpp
View file

@ -973,6 +973,22 @@ turns::TurnDirection OsrmRouter::IntermediateDirection(const double angle) const
return turns::NoTurn;
}
bool OsrmRouter::KeepOnewayOutgoingTurn(TurnCandidatesT const & nodes, Route::TurnItem const & turn,
m2::PointD const & p, m2::PointD const & p1OneSeg, string const & fName) const
{
size_t const outgoingNotesCount = 1;
if (turns::IsGoStraightOrSlightTurn(turn.m_turn))
return false;
else
{
GeomTurnCandidateT geoNodes;
GetTurnGeometry(p, p1OneSeg, geoNodes, fName);
if (geoNodes.size() <= outgoingNotesCount)
return false;
return true;
}
}
void OsrmRouter::GetTurnDirection(PathData const & node1,
PathData const & node2,
uint32_t mwmId, Route::TurnItem & turn, string const & fName)
@ -1044,24 +1060,10 @@ void OsrmRouter::GetTurnDirection(PathData const & node1,
turn.m_turn = MostLeftDirection(a);
else turn.m_turn = IntermediateDirection(a);
size_t const outgoingNotesCount = 1;
if (nodesSz == outgoingNotesCount)
if (nodesSz == 1 && !KeepOnewayOutgoingTurn(nodes, turn, p, p1OneSeg, fName))
{
if (turns::IsGoStraightOrSlightTurn(turn.m_turn))
{
turn.m_turn = turns::NoTurn;
return;
}
else
{
GeomTurnCandidateT geoNodes;
GetTurnGeometry(p, p1OneSeg, geoNodes, fName);
if (geoNodes.size() <= outgoingNotesCount)
{
turn.m_turn = turns::NoTurn;
return;
}
}
turn.m_turn = turns::NoTurn;
return;
}
turn.m_keepAnyway = (!ftypes::IsLinkChecker::Instance()(ft1)

2
routing/osrm_router.hpp
View file

@ -87,6 +87,8 @@ private:
turns::TurnDirection IntermediateDirection(double angle) const;
void GetTurnGeometry(m2::PointD const & p, m2::PointD const & p1,
OsrmRouter::GeomTurnCandidateT & candidates, string const & fName) const;
bool KeepOnewayOutgoingTurn(TurnCandidatesT const & nodes, Route::TurnItem const & turn,
m2::PointD const & p, m2::PointD const & p1, string const & fName) const;
Index const * m_pIndex;