pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixes after rabase.

Browse source
This commit is contained in:
Lev Dragunov 2015-10-07 15:27:26 +03:00
parent 2bc9bf1191
commit 86b1328a35
2 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
routing/route.cpp
View file

@ -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<uint32_t>(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();

2
routing/route.hpp
View file

@ -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::TurnItemDist> & turns) const;
/// Returns nearest speed camera and distance to it.
double GetCurrentCam(SpeedCameraRestriction & camera, Index const & index) const;
void GetCurrentDirectionPoint(m2::PointD & pt) const;