diff options
author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2018-02-28 15:38:10 +0300 |
---|---|---|
committer | mpimenov <mpimenov@users.noreply.github.com> | 2018-03-01 14:40:31 +0300 |
commit | 0aa93d44ca852c3ac3e83c8a6748f7a9c0ff379c (patch) | |
tree | f8042b35c4a4ca540b6b3e51a59dfc0fb12c6c4c /routing | |
parent | ebf9e97dcc01887e1de8afadac2db2bcce45344e (diff) |
Removing an unused method and a warning.
Diffstat (limited to 'routing')
-rw-r--r-- | routing/turns_generator.cpp | 11 |
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; } |