1 files changed, 6 insertions, 8 deletions

diff --git a/drape_frontend/my_position_controller.cpp b/drape_frontend/my_position_controller.cpp
index 8c179fab77..5d91c921d4 100644
--- a/drape_frontend/my_position_controller.cpp
+++ b/drape_frontend/my_position_controller.cpp
@@ -112,8 +112,6 @@ void MyPositionController::UpdatePixelPosition(ScreenBase const & screen)
 {
   m_pixelRect = screen.isPerspective() ? screen.PixelRectIn3d() : screen.PixelRect();
   m_positionYOffset = screen.isPerspective() ? kPositionOffsetYIn3D : kPositionOffsetY;
-  m_centerPixelPositionRouting = screen.P3dtoP(GetRoutingRotationPixelCenter());
-  m_centerPixelPosition = screen.P3dtoP(m_pixelRect.Center());
 }
 
 void MyPositionController::SetListener(ref_ptr<MyPositionController::Listener> listener)
@@ -266,7 +264,7 @@ void MyPositionController::NextMode(ScreenBase const & screen)
     if (!m_isInRouting)
     {
       ChangeMode(location::Follow);
-      ChangeModelView(m_position, 0.0, m_centerPixelPosition, preferredZoomLevel);
+      ChangeModelView(m_position, 0.0, m_pixelRect.Center(), preferredZoomLevel);
     }
   }
 }
@@ -317,7 +315,7 @@ void MyPositionController::OnLocationUpdate(location::GpsInfo const & info, bool
         ChangeModelView(m_position, kDoNotChangeZoom);
       else if (m_mode == location::FollowAndRotate)
         ChangeModelView(m_position, m_drawDirection,
-                        m_isInRouting ? m_centerPixelPositionRouting : m_centerPixelPosition, kDoNotChangeZoom);
+                        m_isInRouting ? GetRoutingRotationPixelCenter() : m_pixelRect.Center(), kDoNotChangeZoom);
     }
   }
   else if (m_mode == location::PendingPosition || m_mode == location::NotFollowNoPosition)
@@ -525,7 +523,7 @@ void MyPositionController::OnCompassTapped()
   if (m_mode == location::FollowAndRotate)
   {
     ChangeMode(location::Follow);
-    ChangeModelView(m_position, 0.0, m_centerPixelPosition, kDoNotChangeZoom);
+    ChangeModelView(m_position, 0.0, m_pixelRect.Center(), kDoNotChangeZoom);
   }
   else
   {
@@ -567,7 +565,7 @@ void MyPositionController::UpdateViewport(int zoomLevel)
     ChangeModelView(m_position, zoomLevel);
   else if (m_mode == location::FollowAndRotate)
     ChangeModelView(m_position, m_drawDirection,
-                    m_isInRouting ? m_centerPixelPositionRouting : m_centerPixelPosition, zoomLevel);
+                    m_isInRouting ? GetRoutingRotationPixelCenter() : m_pixelRect.Center(), zoomLevel);
 }
 
 m2::PointD MyPositionController::GetRotationPixelCenter() const
@@ -658,7 +656,7 @@ void MyPositionController::ActivateRouting(int zoomLevel)
     if (IsRotationAvailable())
     {
       ChangeMode(location::FollowAndRotate);
-      ChangeModelView(m_position, m_drawDirection, m_centerPixelPositionRouting, zoomLevel);
+      ChangeModelView(m_position, m_drawDirection, GetRoutingRotationPixelCenter(), zoomLevel);
     }
     else
     {
@@ -675,7 +673,7 @@ void MyPositionController::DeactivateRouting()
     m_isInRouting = false;
 
     ChangeMode(location::Follow);
-    ChangeModelView(m_position, 0.0, m_centerPixelPosition, kDoNotChangeZoom);
+    ChangeModelView(m_position, 0.0, m_pixelRect.Center(), kDoNotChangeZoom);
   }
 }