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

renamed timer

Browse source
This commit is contained in:
Olga Khlopkova 2020-05-08 17:11:52 +03:00 • committed by Vladimir Byko-Ianko
parent 6ff1389127
commit 5a6e6cc241
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drape_frontend/my_position_controller.cpp
View file

@ -148,7 +148,7 @@ MyPositionController::MyPositionController(Params && params, ref_ptr<DrapeNotifi
, m_enableAutoZoomInRouting(params.m_isAutozoomEnabled)
, m_autoScale2d(GetScreenScale(kDefaultAutoZoom))
, m_autoScale3d(m_autoScale2d)
, m_lastGPSBearing(false)
, m_lastGPSBearingTimer(false)
, m_lastLocationTimestamp(0.0)
, m_positionRoutingOffsetY(kPositionRoutingOffsetY)
, m_isDirtyViewport(false)
@ -434,7 +434,7 @@ void MyPositionController::OnLocationUpdate(location::GpsInfo const & info, bool
if ((!m_isCompassAvailable || glueArrowInRouting || isMovingFast) && info.HasBearing())
{
SetDirection(base::DegToRad(info.m_bearing));
m_lastGPSBearing.Reset();
m_lastGPSBearingTimer.Reset();
}
if (m_isPositionAssigned && (!AlmostCurrentPosition(oldPos) || !AlmostCurrentAzimut(oldAzimut)))
@ -578,8 +578,9 @@ void MyPositionController::OnCompassUpdate(location::CompassInfo const & info, S
double const oldAzimut = GetDrawableAzimut();
m_isCompassAvailable = true;
if ((IsInRouting() && m_isArrowGluedInRouting) ||
m_lastGPSBearing.ElapsedSeconds() < kGpsBearingLifetimeSec)
bool const existsFreshGpsBearing =
m_lastGPSBearingTimer.ElapsedSeconds() < kGpsBearingLifetimeSec;
if ((IsInRouting() && m_isArrowGluedInRouting) || existsFreshGpsBearing)
return;
SetDirection(info.m_bearing);

2
drape_frontend/my_position_controller.hpp
View file

@ -188,7 +188,7 @@ private:
double m_autoScale2d;
double m_autoScale3d;
base::Timer m_lastGPSBearing;
base::Timer m_lastGPSBearingTimer;
base::Timer m_pendingTimer;
bool m_pendingStarted = true;
base::Timer m_routingNotFollowTimer;