pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

do not center map when receiving new gps position while dragging.

Browse source
This commit is contained in:
rachytski 2012-10-14 15:45:46 +03:00 • committed by Alex Zolotarev
parent 4a831e7a53
commit d14a2ffb3e
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
map/framework.cpp
View file

@ -925,6 +925,7 @@ void Framework::StartDrag(DragEvent const & e)
shared_ptr<location::State> locationState = m_informationDisplay.locationState();
m_dragCompassProcessMode = locationState->CompassProcessMode();
m_dragLocationProcessMode = locationState->LocationProcessMode();
}
void Framework::DoDrag(DragEvent const & e)
@ -937,8 +938,11 @@ void Framework::DoDrag(DragEvent const & e)
m_navigator.DoDrag(pt, ElapsedSeconds());
m_informationDisplay.locationState()->SetIsCentered(false);
m_informationDisplay.locationState()->StopCompassFollowing();
shared_ptr<location::State> locationState = m_informationDisplay.locationState();
locationState->SetIsCentered(false);
locationState->StopCompassFollowing();
locationState->SetLocationProcessMode(location::ELocationDoNothing);
if (m_renderPolicy)
m_renderPolicy->DoDrag();
@ -956,7 +960,7 @@ void Framework::StopDrag(DragEvent const & e)
shared_ptr<location::State> locationState = m_informationDisplay.locationState();
if (locationState->LocationProcessMode() != location::ELocationDoNothing)
if (m_dragLocationProcessMode != location::ELocationDoNothing)
{
// reset GPS centering mode if we have dragged far from current location
ScreenBase const & s = m_navigator.Screen();
@ -964,6 +968,7 @@ void Framework::StopDrag(DragEvent const & e)
locationState->SetLocationProcessMode(location::ELocationDoNothing);
else
{
locationState->SetLocationProcessMode(m_dragLocationProcessMode);
if (m_dragCompassProcessMode == location::ECompassFollow)
locationState->AnimateToPositionAndEnqueueFollowing();
else

1
map/framework.hpp
View file

@ -108,6 +108,7 @@ protected:
int m_height;
location::ECompassProcessMode m_dragCompassProcessMode;
location::ELocationProcessMode m_dragLocationProcessMode;
//mutable threads::Mutex m_modelSyn;