kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Fixed conditions of position recovering in routing

Browse source
This commit is contained in:
r.kuznetsov 2016-05-10 15:34:29 +03:00 • committed by Vladimir Byko-Ianko
parent b816be63bc
commit e6bbbf1880
7 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp
View file

@ -38,6 +38,7 @@ public:
void OnScaleEnded() override {}
void OnAnimationStarted(ref_ptr<df::Animation> /* anim */) override {}
void OnPerspectiveSwitchRejected() override {}
void OnTouchMapAction() override {}
void AddUserEvent(df::TouchEvent const & event)
{

7
drape_frontend/frontend_renderer.cpp
View file

@ -719,7 +719,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
case Message::Invalidate:
{
// Do nothing here, new frame will be rendered because of this message processing.
m_myPositionController->ResetRoutingNotFollowTimer();
break;
}
@ -1416,6 +1416,11 @@ void FrontendRenderer::OnPerspectiveSwitchRejected()
m_perspectiveDiscarded = false;
}
void FrontendRenderer::OnTouchMapAction()
{
m_myPositionController->ResetRoutingNotFollowTimer();
}
TTilesCollection FrontendRenderer::ResolveTileKeys(ScreenBase const & screen)
{
m2::RectD const & rect = screen.ClipRect();

1
drape_frontend/frontend_renderer.hpp
View file

@ -195,6 +195,7 @@ private:
void OnScaleEnded() override;
void OnAnimationStarted(ref_ptr<Animation> anim) override;
void OnPerspectiveSwitchRejected() override;
void OnTouchMapAction() override;
class Routine : public threads::IRoutine
{

7
drape_frontend/my_position_controller.cpp
View file

@ -219,6 +219,12 @@ void MyPositionController::Rotated()
m_wasRotationInScaling = true;
}
void MyPositionController::ResetRoutingNotFollowTimer()
{
if (m_isInRouting)
m_routingNotFollowTimer.Reset();
}
void MyPositionController::CorrectScalePoint(m2::PointD & pt) const
{
if (IsModeChangeViewport())
@ -680,6 +686,7 @@ void MyPositionController::ActivateRouting(int zoomLevel)
if (!m_isInRouting)
{
m_isInRouting = true;
m_routingNotFollowTimer.Reset();
if (IsRotationAvailable())
{

2
drape_frontend/my_position_controller.hpp
View file

@ -66,6 +66,8 @@ public:
void Rotated();
void ResetRoutingNotFollowTimer();
void CorrectScalePoint(m2::PointD & pt) const;
void CorrectScalePoint(m2::PointD & pt1, m2::PointD & pt2) const;
void CorrectGlobalScalePoint(m2::PointD & pt) const;

12
drape_frontend/user_event_stream.cpp
View file

@ -725,6 +725,9 @@ bool UserEventStream::ProcessTouch(TouchEvent const & touch)
bool UserEventStream::TouchDown(array<Touch, 2> const & touches)
{
if (m_listener)
m_listener->OnTouchMapAction();
size_t touchCount = GetValidTouchesCount(touches);
bool isMapTouch = true;
@ -788,6 +791,9 @@ bool UserEventStream::TouchDown(array<Touch, 2> const & touches)
bool UserEventStream::TouchMove(array<Touch, 2> const & touches, double timestamp)
{
if (m_listener)
m_listener->OnTouchMapAction();
double const kDragThreshold = my::sq(VisualParams::Instance().GetDragThreshold());
size_t touchCount = GetValidTouchesCount(touches);
bool isMapTouch = true;
@ -869,6 +875,9 @@ bool UserEventStream::TouchMove(array<Touch, 2> const & touches, double timestam
bool UserEventStream::TouchCancel(array<Touch, 2> const & touches)
{
if (m_listener)
m_listener->OnTouchMapAction();
size_t touchCount = GetValidTouchesCount(touches);
UNUSED_VALUE(touchCount);
bool isMapTouch = true;
@ -910,6 +919,9 @@ bool UserEventStream::TouchCancel(array<Touch, 2> const & touches)
bool UserEventStream::TouchUp(array<Touch, 2> const & touches)
{
if (m_listener)
m_listener->OnTouchMapAction();
size_t touchCount = GetValidTouchesCount(touches);
bool isMapTouch = true;
switch (m_state)

2
drape_frontend/user_event_stream.hpp
View file

@ -259,6 +259,8 @@ public:
virtual void OnAnimationStarted(ref_ptr<Animation> anim) = 0;
virtual void OnPerspectiveSwitchRejected() = 0;
virtual void OnTouchMapAction() = 0;
};
UserEventStream();