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

Fixed scaling on location update in routing

Browse source
This commit is contained in:
r.kuznetsov 2016-05-31 17:18:39 +03:00
parent e073854e95
commit a8fd30d0e0
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drape_frontend/user_event_stream.cpp
View file

@ -323,15 +323,14 @@ bool UserEventStream::SetScale(m2::PointD const & pxScaleCenter, double factor,
if (isAnim)
{
auto const & followAnim = m_animationSystem.FindAnimation<MapFollowAnimation>(Animation::MapFollow);
if (followAnim != nullptr)
if (followAnim != nullptr && followAnim->HasScale())
{
// Scaling is not possible if current follow animation does pixel offset.
if (followAnim->HasPixelOffset())
return false;
// Reset follow animation with scaling if we apply scale explicitly.
if (followAnim->HasScale())
ResetAnimations(Animation::MapFollow);
ResetAnimations(Animation::MapFollow);
}
m2::PointD glbScaleCenter = m_navigator.PtoG(m_navigator.P3dtoP(scaleCenter));