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

Merge pull request #1247 from rokuz/changed-nav-zoom

Browse source 
Changed default navigation zoom
This commit is contained in:
Alexander Matveenko 2016-01-06 14:44:42 +03:00
commit dfafd71142
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
indexer/scales.hpp
View file

@ -17,11 +17,11 @@ namespace scales
/// Upper scale for user comfort view (e.g. location zoom).
inline int GetUpperComfortScale() { return UPPER_STYLE_SCALE - 2; }
/// Default navigation mode scale
inline int GetNavigationScale() { return UPPER_STYLE_SCALE - 4; }
inline int GetNavigationScale() { return UPPER_STYLE_SCALE - 3; }
/// Default pedestrian navigation mode scale
inline int GetPedestrianNavigationScale() { return UPPER_STYLE_SCALE - 1; }
inline int GetPedestrianNavigationScale() { return UPPER_STYLE_SCALE - 2; }
/// Default navigation 3d mode scale
inline int GetNavigation3dScale() { return UPPER_STYLE_SCALE - 3; }
inline int GetNavigation3dScale() { return UPPER_STYLE_SCALE - 2; }
/// Default pedestrian navigation 3d mode scale
inline int GetPedestrianNavigation3dScale() { return UPPER_STYLE_SCALE - 2; }

2
map/framework.cpp
View file

@ -1864,7 +1864,7 @@ void Framework::FollowRoute()
{
ASSERT(m_drapeEngine != nullptr, ());
int const scale = (m_currentRouterType == RouterType::Pedestrian) ? scales::GetUpperComfortScale()
int const scale = (m_currentRouterType == RouterType::Pedestrian) ? scales::GetPedestrianNavigationScale()
: scales::GetNavigationScale();
int const scale3d = (m_currentRouterType == RouterType::Pedestrian) ? scales::GetPedestrianNavigation3dScale()
: scales::GetNavigation3dScale();