From 86b1328a3500f2d8a65da1f753923a71892ae07a Mon Sep 17 00:00:00 2001 From: Lev Dragunov Date: Wed, 7 Oct 2015 15:27:26 +0300 Subject: [PATCH] Fixes after rabase. --- routing/route.cpp | 17 ----------------- routing/route.hpp | 2 -- 2 files changed, 19 deletions(-) diff --git a/routing/route.cpp b/routing/route.cpp index cdd8e3c471..602ff31dac 100644 --- a/routing/route.cpp +++ b/routing/route.cpp @@ -148,23 +148,6 @@ Route::TTurns::const_iterator Route::GetCurrentTurn() const }); } -double Route::GetCurrentCam(SpeedCameraRestriction & camera, Index const & index) const -{ - size_t const currentIndex = max(m_poly.GetCurrentIter().m_ind, m_lastCheckedCamera); - for (size_t i = currentIndex; i < m_poly.GetPolyline().GetSize(); ++i) - { - uint8_t speed = CheckCameraInPoint(m_poly.GetPolyline().GetPoint(i), index); - if (speed != kNoSpeedCamera) - { - camera = SpeedCameraRestriction(static_cast(i), speed); - m_lastCheckedCamera = i; - return m_poly.GetDistanceM(m_poly.GetCurrentIter(), m_poly.GetIterToIndex(i)); - } - } - m_lastCheckedCamera = m_poly.GetPolyline().GetSize(); - return kInvalidSpeedCameraDistance; -} - bool Route::GetCurrentTurn(double & distanceToTurnMeters, turns::TurnItem & turn) const { auto it = GetCurrentTurn(); diff --git a/routing/route.hpp b/routing/route.hpp index fe3f56f14c..86f199aedd 100644 --- a/routing/route.hpp +++ b/routing/route.hpp @@ -88,8 +88,6 @@ public: /// \brief Extract information about zero, one or two nearest turns depending on current position. /// @return true if its parameter is filled with correct result. (At least with one element.) bool GetNextTurns(vector & turns) const; - /// Returns nearest speed camera and distance to it. - double GetCurrentCam(SpeedCameraRestriction & camera, Index const & index) const; void GetCurrentDirectionPoint(m2::PointD & pt) const;