From b816be63bcb360916f009e06d1d4bceb8cb10d00 Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Tue, 10 May 2016 20:09:37 +0300 Subject: [PATCH] Fixed positioning on a search result or a bookmark in perspective mode on Android. --- .../drape_frontend_tests/user_event_stream_tests.cpp | 1 + drape_frontend/my_position_controller.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) 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 91865064ab..1ce0b8e087 100644 --- a/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp +++ b/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp @@ -37,6 +37,7 @@ public: void CorrectGlobalScalePoint(m2::PointD & pt) const override {} void OnScaleEnded() override {} void OnAnimationStarted(ref_ptr /* anim */) override {} + void OnPerspectiveSwitchRejected() override {} void AddUserEvent(df::TouchEvent const & event) { diff --git a/drape_frontend/my_position_controller.cpp b/drape_frontend/my_position_controller.cpp index 95067fc342..c5b9fb2d55 100644 --- a/drape_frontend/my_position_controller.cpp +++ b/drape_frontend/my_position_controller.cpp @@ -529,7 +529,8 @@ void MyPositionController::StopLocationFollow() { if (m_mode == location::Follow || m_mode == location::FollowAndRotate) ChangeMode(location::NotFollow); - + m_desiredInitMode = location::NotFollow; + if (m_isInRouting) m_routingNotFollowTimer.Reset(); }