using ChangeViewportTask for animating transition and rotation when pressing on direction arrow.

map/animator.cpp

@@ -1,5 +1,6 @@
 #include "animator.hpp"
 #include "rotate_screen_task.hpp"
+#include "change_viewport_task.hpp"
 #include "framework.hpp"
 
 #include "../anim/controller.hpp"
@@ -46,10 +47,58 @@ void Animator::RotateScreen(double startAngle, double endAngle, double duration)
 
 void Animator::StopRotation()
 {
+  if (m_rotateScreenTask)
+    m_rotateScreenTask->Lock();
+
   if (m_rotateScreenTask
-   && !m_rotateScreenTask->IsEnded()
-   && !m_rotateScreenTask->IsCancelled())
+  && !m_rotateScreenTask->IsEnded()
+  && !m_rotateScreenTask->IsCancelled())
+  {
+    m_rotateScreenTask->Unlock();
     m_rotateScreenTask->Cancel();
+    m_rotateScreenTask.reset();
+    return;
+  }
+
+  if (m_rotateScreenTask)
+    m_rotateScreenTask->Unlock();
 
   m_rotateScreenTask.reset();
 }
+
+shared_ptr<ChangeViewportTask> const & Animator::ChangeViewport(m2::AnyRectD const & start,
+                                                                m2::AnyRectD const & end,
+                                                                double rotationSpeed)
+{
+  StopChangeViewport();
+
+  m_changeViewportTask.reset(new ChangeViewportTask(start,
+                                                    end,
+                                                    rotationSpeed,
+                                                    m_framework));
+
+  m_framework->GetAnimController()->AddTask(m_changeViewportTask);
+
+  return m_changeViewportTask;
+}
+
+void Animator::StopChangeViewport()
+{
+  if (m_changeViewportTask)
+    m_changeViewportTask->Lock();
+
+  if (m_changeViewportTask
+  && !m_changeViewportTask->IsEnded()
+  && !m_changeViewportTask->IsCancelled())
+  {
+    m_changeViewportTask->Unlock();
+    m_changeViewportTask->Cancel();
+    m_changeViewportTask.reset();
+    return;
+  }
+
+  if (m_changeViewportTask)
+    m_changeViewportTask->Unlock();
+
+  m_changeViewportTask.reset();
+}

map/animator.hpp

@@ -2,9 +2,12 @@
 
 #include "../std/shared_ptr.hpp"
 
+#include "../geometry/point2d.hpp"
+#include "../geometry/any_rect2d.hpp"
+
 class Framework;
 class RotateScreenTask;
-
+class ChangeViewportTask;
 /// Class, which is responsible for
 /// tracking all map animations.
 class Animator
@@ -14,6 +17,7 @@ private:
   Framework * m_framework;
 
   shared_ptr<RotateScreenTask> m_rotateScreenTask;
+  shared_ptr<ChangeViewportTask> m_changeViewportTask;
 
 public:
 
@@ -25,5 +29,10 @@ public:
                     double duration);
   /// stopping screen rotation
   void StopRotation();
-
+  /// move screen from one point to another
+  shared_ptr<ChangeViewportTask> const & ChangeViewport(m2::AnyRectD const & start,
+                                         m2::AnyRectD const & endPt,
+                                         double rotationSpeed);
+  /// stop screen moving
+  void StopChangeViewport();
 };

map/location_state.cpp

@@ -3,6 +3,7 @@
 #include "framework.hpp"
 #include "compass_filter.hpp"
 #include "rotate_screen_task.hpp"
+#include "change_viewport_task.hpp"
 
 #include "../yg/display_list.hpp"
 #include "../yg/skin.hpp"
@@ -53,6 +54,11 @@ namespace location
     return m_hasPosition;
   }
 
+  m2::PointD const & State::Position() const
+  {
+    return m_position;
+  }
+
   bool State::HasCompass() const
   {
     return m_hasCompass;
@@ -476,13 +482,40 @@ namespace location
     controller->Unlock();
   }
 
+  void State::MarkCenteredAndFollowCompass()
+  {
+    m_isCentered = true;
+    SetCompassProcessMode(ECompassFollow);
+    FollowCompass();
+    (void)Settings::Set("SuggestAutoFollowMode", false);
+  }
+
+  void State::CenterScreenAndEnqueueFollowing()
+  {
+    anim::Controller * controller = m_framework->GetAnimController();
+
+    controller->Lock();
+
+    m2::AnyRectD startRect = m_framework->GetNavigator().Screen().GlobalRect();
+    m2::AnyRectD endRect = m2::AnyRectD(Position(),
+                                        -m_compassFilter.GetHeadingRad(),
+                                        m2::RectD(startRect.GetLocalRect()));
+
+    shared_ptr<ChangeViewportTask> const & t = m_framework->GetAnimator().ChangeViewport(startRect, endRect, 2);
+
+    t->Lock();
+    t->SetCallback(anim::Task::EEnded, bind(&State::MarkCenteredAndFollowCompass, this));
+    t->Unlock();
+
+    controller->Unlock();
+  }
+
   void State::StopCompassFollowing()
   {
     SetCompassProcessMode(ECompassDoNothing);
     m_framework->GetAnimator().StopRotation();
+    m_framework->GetAnimator().StopChangeViewport();
     setState(EActive);
-
-    invalidate();
   }
 
   bool State::IsCentered() const
@@ -497,6 +530,9 @@ namespace location
 
   bool State::onTapEnded(m2::PointD const & pt)
   {
+    if (!m_framework->GetNavigator().DoSupportRotation())
+      return false;
+
     anim::Controller * controller = m_framework->GetAnimController();
 
     controller->Lock();
@@ -504,12 +540,19 @@ namespace location
     switch (state())
     {
     case EActive:
-      if (m_hasCompass && IsCentered())
+      if (m_hasCompass)
       {
-        (void)Settings::Set("SuggestAutoFollowMode", false);
+        if (!IsCentered())
+          CenterScreenAndEnqueueFollowing();
+        else
+        {
+          SetCompassProcessMode(ECompassFollow);
+          FollowCompass();
+
+          (void)Settings::Set("SuggestAutoFollowMode", false);
+        }
+
         setState(EPressed);
-        SetCompassProcessMode(ECompassFollow);
-        CheckFollowCompass();
       }
       break;
     case EPressed:

map/location_state.hpp

@@ -68,6 +68,8 @@ namespace location
     ECompassProcessMode m_compassProcessMode;
 
     void FollowCompass();
+    void MarkCenteredAndFollowCompass();
+    void CenterScreenAndEnqueueFollowing();
 
     /// GUI element related fields.
 
@@ -126,7 +128,7 @@ namespace location
     State(Params const & p);
 
     /// @return GPS center point in mercator
-    m2::PointD const & Position() const { return m_position; }
+    m2::PointD const & Position() const;
 
     bool HasPosition() const;
     bool HasCompass() const;