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

Merge pull request #409 from gardster/routing_rebuild_fix

Browse source 
Fix bug with endless route rebuilding.
This commit is contained in:
Vladimir Byko-Ianko 2015-10-29 14:08:48 +03:00
commit 586ebdf5b6
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
routing/routing_session.cpp
View file

@ -25,6 +25,8 @@ double constexpr kShowLanesDistInMeters = 500.;
// @todo(kshalnev) The distance may depend on the current speed.
double constexpr kShowPedestrianTurnInMeters = 5.;
double constexpr kRunawayDistanceSensitivityMeters = 0.01;
// Minimal distance to speed camera to make sound bell on overspeed.
double constexpr kSpeedCameraMinimalWarningMeters = 200.;
// Seconds to warning user before speed camera for driving with current speed.
@ -194,7 +196,9 @@ RoutingSession::State RoutingSession::OnLocationPositionChanged(m2::PointD const
// Distance from the last known projection on route
// (check if we are moving far from the last known projection).
double const dist = m_route.GetCurrentSqDistance(position);
if (dist > m_lastDistance || my::AlmostEqualULPs(dist, m_lastDistance, 1 << 16))
if (my::AlmostEqualAbs(dist, m_lastDistance, kRunawayDistanceSensitivityMeters))
return m_state;
if (dist > m_lastDistance)
{
++m_moveAwayCounter;
m_lastDistance = dist;