From 0aa93d44ca852c3ac3e83c8a6748f7a9c0ff379c Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Wed, 28 Feb 2018 15:38:10 +0300 Subject: Removing an unused method and a warning. --- routing/turns_generator.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'routing') 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; } -- cgit v1.2.3