Perspective switching removed.

5 files changed, 2 insertions, 62 deletions

diff --git a/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp b/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp
index 8ce2d76bab..4858841d20 100644
--- a/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp
+++ b/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp
@@ -37,7 +37,6 @@ public:
   void CorrectGlobalScalePoint(m2::PointD & pt) const override {}
   void OnScaleEnded() override {}
   void OnAnimationStarted(ref_ptr<df::Animation> /* anim */) override {}
-  void OnPerspectiveSwitchRejected() override {}
   void OnTouchMapAction() override {}
   void OnAnimatedScaleEnded() override {}
 
diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp
index a74d31f9c3..bac2bb33a8 100755
--- a/drape_frontend/frontend_renderer.cpp
+++ b/drape_frontend/frontend_renderer.cpp
@@ -1279,20 +1279,6 @@ void FrontendRenderer::CheckIsometryMinScale(ScreenBase const & screen)
   }
 }
 
-void FrontendRenderer::CheckPerspectiveMinScale()
-{
-  if (!m_enablePerspectiveInNavigation || m_userEventStream.IsInPerspectiveAnimation())
-    return;
-
-  bool const switchTo2d = !IsScaleAllowableIn3d(m_currentZoomLevel);
-  if ((!switchTo2d && !m_perspectiveDiscarded) ||
-      (switchTo2d && !m_userEventStream.GetCurrentScreen().isPerspective()))
-    return;
-
-  m_perspectiveDiscarded = switchTo2d;
-  AddUserEvent(SwitchViewModeEvent(switchTo2d));
-}
-
 void FrontendRenderer::ResolveZoomLevel(ScreenBase const & screen)
 {
   int const prevZoomLevel = m_currentZoomLevel;
@@ -1302,7 +1288,6 @@ void FrontendRenderer::ResolveZoomLevel(ScreenBase const & screen)
     UpdateCanBeDeletedStatus();
 
   CheckIsometryMinScale(screen);
-  CheckPerspectiveMinScale();
   UpdateDisplacementEnabled();
 }
 
@@ -1430,12 +1415,6 @@ void FrontendRenderer::OnAnimationStarted(ref_ptr<Animation> anim)
   m_myPositionController->AnimationStarted(anim);
 }
 
-void FrontendRenderer::OnPerspectiveSwitchRejected()
-{
-   if (m_perspectiveDiscarded)
-     m_perspectiveDiscarded = false;
-}
-
 void FrontendRenderer::OnTouchMapAction()
 {
   m_myPositionController->ResetRoutingNotFollowTimer();
diff --git a/drape_frontend/frontend_renderer.hpp b/drape_frontend/frontend_renderer.hpp
index d4adc101f2..873a774b87 100755
--- a/drape_frontend/frontend_renderer.hpp
+++ b/drape_frontend/frontend_renderer.hpp
@@ -174,7 +174,6 @@ private:
   TTilesCollection ResolveTileKeys(ScreenBase const & screen);
   void ResolveZoomLevel(ScreenBase const & screen);
   void UpdateDisplacementEnabled();
-  void CheckPerspectiveMinScale();
   void CheckIsometryMinScale(ScreenBase const & screen);
 
   void DisablePerspective();
@@ -195,7 +194,6 @@ private:
   void OnScaleEnded() override;
   void OnAnimatedScaleEnded() override;
   void OnAnimationStarted(ref_ptr<Animation> anim) override;
-  void OnPerspectiveSwitchRejected() override;
   void OnTouchMapAction() override;
 
   class Routine : public threads::IRoutine
diff --git a/drape_frontend/user_event_stream.cpp b/drape_frontend/user_event_stream.cpp
index 2e983e78f4..21b431f215 100644
--- a/drape_frontend/user_event_stream.cpp
+++ b/drape_frontend/user_event_stream.cpp
@@ -216,24 +216,9 @@ ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChanged, bool
     case UserEvent::EVENT_ENABLE_PERSPECTIVE:
       SetEnable3dMode(e.m_enable3dMode.m_rotationAngle, e.m_enable3dMode.m_angleFOV,
                       e.m_enable3dMode.m_isAnim, e.m_enable3dMode.m_immediatelyStart);
-      m_discardedFOV = m_discardedAngle = 0.0;
       break;
     case UserEvent::EVENT_DISABLE_PERSPECTIVE:
       SetDisable3dModeAnimation();
-      m_discardedFOV = m_discardedAngle = 0.0;
-      break;
-    case UserEvent::EVENT_SWITCH_VIEW_MODE:
-      if (e.m_switchViewMode.m_to2d)
-      {
-        m_discardedFOV = m_navigator.Screen().GetAngleFOV();
-        m_discardedAngle = m_navigator.Screen().GetRotationAngle();
-        SetDisable3dModeAnimation();
-      }
-      else if (m_discardedFOV > 0.0)
-      {
-        SetEnable3dMode(m_discardedAngle, m_discardedFOV, true /* isAnim */, true /* immediatelyStart */);
-        m_discardedFOV = m_discardedAngle = 0.0;
-      }
       break;
     default:
       ASSERT(false, ());
@@ -529,8 +514,7 @@ bool UserEventStream::FilterEventWhile3dAnimation(UserEvent::EEventType type) co
 {
   return type != UserEvent::EVENT_RESIZE && type != UserEvent::EVENT_SET_RECT &&
          type != UserEvent::EVENT_ENABLE_PERSPECTIVE &&
-         type != UserEvent::EVENT_DISABLE_PERSPECTIVE &&
-         type != UserEvent::EVENT_SWITCH_VIEW_MODE;
+         type != UserEvent::EVENT_DISABLE_PERSPECTIVE;
 }
 
 void UserEventStream::SetEnable3dMode(double maxRotationAngle, double angleFOV,
@@ -568,13 +552,6 @@ void UserEventStream::SetDisable3dModeAnimation()
   ResetAnimationsBeforeSwitch3D();
   InterruptFollowAnimations(true /* force */);
 
-  if (m_discardedFOV > 0.0 && IsScaleAllowableIn3d(GetDrawTileScale(GetCurrentScreen())))
-  {
-    m_discardedFOV = m_discardedAngle = 0.0;
-    m_listener->OnPerspectiveSwitchRejected();
-    return;
-  }
-
   double const startAngle = m_navigator.Screen().GetRotationAngle();
   double const endAngle = 0.0;
 
diff --git a/drape_frontend/user_event_stream.hpp b/drape_frontend/user_event_stream.hpp
index b8d8133536..aa02aca90d 100644
--- a/drape_frontend/user_event_stream.hpp
+++ b/drape_frontend/user_event_stream.hpp
@@ -166,13 +166,6 @@ struct DisablePerspectiveEvent
   DisablePerspectiveEvent() {}
 };
 
-struct SwitchViewModeEvent
-{
-  SwitchViewModeEvent(bool to2d): m_to2d(to2d) {}
-
-  bool m_to2d;
-};
-
 struct RotateEvent
 {
   RotateEvent(double targetAzimut) : m_targetAzimut(targetAzimut) {}
@@ -201,8 +194,7 @@ struct UserEvent
     EVENT_ROTATE,
     EVENT_FOLLOW_AND_ROTATE,
     EVENT_ENABLE_PERSPECTIVE,
-    EVENT_DISABLE_PERSPECTIVE,
-    EVENT_SWITCH_VIEW_MODE
+    EVENT_DISABLE_PERSPECTIVE
   };
 
   UserEvent(TouchEvent const & e) : m_type(EVENT_TOUCH) { m_touchEvent = e; }
@@ -215,7 +207,6 @@ struct UserEvent
   UserEvent(FollowAndRotateEvent const & e) : m_type(EVENT_FOLLOW_AND_ROTATE) { m_followAndRotate = e; }
   UserEvent(EnablePerspectiveEvent const & e) : m_type(EVENT_ENABLE_PERSPECTIVE) { m_enable3dMode = e; }
   UserEvent(DisablePerspectiveEvent const & e) : m_type(EVENT_DISABLE_PERSPECTIVE) { m_disable3dMode = e; }
-  UserEvent(SwitchViewModeEvent const & e) : m_type(EVENT_SWITCH_VIEW_MODE) { m_switchViewMode = e; }
 
   EEventType m_type;
   union
@@ -230,7 +221,6 @@ struct UserEvent
     FollowAndRotateEvent m_followAndRotate;
     EnablePerspectiveEvent m_enable3dMode;
     DisablePerspectiveEvent m_disable3dMode;
-    SwitchViewModeEvent m_switchViewMode;
   };
 };
 
@@ -259,7 +249,6 @@ public:
     virtual void OnAnimatedScaleEnded() = 0;
 
     virtual void OnAnimationStarted(ref_ptr<Animation> anim) = 0;
-    virtual void OnPerspectiveSwitchRejected() = 0;
 
     virtual void OnTouchMapAction() = 0;
   };
@@ -388,8 +377,6 @@ private:
 
   bool m_perspectiveAnimation = false;
   unique_ptr<UserEvent> m_pendingEvent;
-  double m_discardedFOV = 0.0;
-  double m_discardedAngle = 0.0;
 
   ref_ptr<Listener> m_listener;