Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'routing/turns_generator.cpp')
-rw-r--r--routing/turns_generator.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/routing/turns_generator.cpp b/routing/turns_generator.cpp
index 9aaebc0ac9..799f28f2b0 100644
--- a/routing/turns_generator.cpp
+++ b/routing/turns_generator.cpp
@@ -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;
}