From 5a6e6cc2419f31aa32db985685fdf02eb82a09a4 Mon Sep 17 00:00:00 2001
From: Olga Khlopkova <o.khlopkova@corp.mail.ru>
Date: Fri, 8 May 2020 17:11:52 +0300
Subject: [PATCH] renamed timer

---
 drape_frontend/my_position_controller.cpp | 9 +++++----
 drape_frontend/my_position_controller.hpp | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drape_frontend/my_position_controller.cpp b/drape_frontend/my_position_controller.cpp
index bcd8be157b..079001219b 100644
--- a/drape_frontend/my_position_controller.cpp
+++ b/drape_frontend/my_position_controller.cpp
@@ -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);
diff --git a/drape_frontend/my_position_controller.hpp b/drape_frontend/my_position_controller.hpp
index e437ebd7d2..9bfbb9e93b 100644
--- a/drape_frontend/my_position_controller.hpp
+++ b/drape_frontend/my_position_controller.hpp
@@ -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;