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

[core] bug fix

Browse source
This commit is contained in:
ExMix 2014-09-12 11:00:27 +03:00 • committed by Alex Zolotarev
parent f6e7d08bfd
commit c75136dba2
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
map/location_state.cpp
View file

@ -141,7 +141,7 @@ void State::OnLocationUpdate(location::GpsInfo const & info)
if (GetMode() == PendingPosition)
SetModeInfo(ChangeMode(m_modeInfo, Follow));
else
else if (GetMode() > NotFollow)
AnimateFollow();
CallPositionChangedListeners(m_position);
@ -453,11 +453,15 @@ bool ValidateTransition(State::Mode oldMode, State::Mode newMode)
}
if (oldMode == State::NotFollow)
return newMode == State::Follow;
{
return newMode == State::Follow ||
newMode == State::RotateAndFollow;
}
if (oldMode == State::RotateAndFollow)
{
return newMode == State::NotFollow ||
newMode == State::Follow ||
newMode == State::UnknownPosition;
}
@ -482,6 +486,8 @@ void State::AnimateStateTransition(Mode oldMode, Mode newMode)
}
else if (newMode == RotateAndFollow)
{
if (oldMode == NotFollow)
m_framework->SetViewportCenterAnimated(Position());
FollowCompass();
}
else if (oldMode == RotateAndFollow && newMode == UnknownPosition)