map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Removing an unused method and a warning.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-02-28 15:38:10 +03:00 • committed by mpimenov
parent ebf9e97dcc
commit 0aa93d44ca
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
routing/turns_generator.cpp
View file

@ -34,13 +34,6 @@ bool IsHighway(ftypes::HighwayClass hwClass, bool isLink)
!isLink;
}
bool IsLinkOrSmallRoad(ftypes::HighwayClass hwClass, bool isLink)
{
return isLink || hwClass == ftypes::HighwayClass::LivingStreet ||
hwClass == ftypes::HighwayClass::Service ||
hwClass == ftypes::HighwayClass::Pedestrian;
}
bool IsSmallRoad(ftypes::HighwayClass hwClass)
{
return hwClass == ftypes::HighwayClass::LivingStreet ||
@ -58,8 +51,8 @@ bool IsExit(TurnCandidates const & possibleTurns, TurnInfo const & turnInfo,
return false;
if (!IsHighway(turnInfo.m_ingoing.m_highwayClass, turnInfo.m_ingoing.m_isLink) ||
!(turnInfo.m_outgoing.m_isLink || IsSmallRoad(turnInfo.m_outgoing.m_highwayClass) &&
IsGoStraightOrSlightTurn(intermediateDirection)))
!(turnInfo.m_outgoing.m_isLink || (IsSmallRoad(turnInfo.m_outgoing.m_highwayClass) &&
IsGoStraightOrSlightTurn(intermediateDirection))))
{
return false;
}