diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf index a639ba30ce..bd2b9c8122 100644 --- a/data/resources-6plus_dark/symbols.sdf +++ b/data/resources-6plus_dark/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-hdpi/symbols.sdf b/data/resources-hdpi/symbols.sdf index 5b2c2ec2ea..2fe16013c4 100644 --- a/data/resources-hdpi/symbols.sdf +++ b/data/resources-hdpi/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/data/resources-ldpi/symbols.sdf b/data/resources-ldpi/symbols.sdf index 568311fc86..62fc4b4217 100644 --- a/data/resources-ldpi/symbols.sdf +++ b/data/resources-ldpi/symbols.sdf @@ -1,179 +1,179 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf index 00a8c464b0..bd522818fb 100644 --- a/data/resources-mdpi_dark/symbols.sdf +++ b/data/resources-mdpi_dark/symbols.sdf @@ -1,181 +1,181 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi/symbols.sdf b/data/resources-xxhdpi/symbols.sdf index 2d2a512040..4d2da024c0 100644 --- a/data/resources-xxhdpi/symbols.sdf +++ b/data/resources-xxhdpi/symbols.sdf @@ -1,182 +1,182 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf index e6c0b015c8..2f0406b362 100644 --- a/data/resources-xxhdpi_dark/symbols.sdf +++ b/data/resources-xxhdpi_dark/symbols.sdf @@ -1,6 +1,6 @@ - + diff --git a/map/framework.cpp b/map/framework.cpp index 2ab6c61d72..be9a374c9c 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -1784,7 +1784,10 @@ void Framework::FollowRoute() m_drapeEngine->MyPositionNextMode(); m2::PointD const & position = m_routingSession.GetUserCurrentPosition(); - m_drapeEngine->SetModelViewCenter(position, scales::GetNavigationScale(), true); + int const scale = (m_currentRouterType == RouterType::Pedestrian) ? + scales::GetUpperComfortScale() : + scales::GetNavigationScale(); + m_drapeEngine->SetModelViewCenter(position, scale, true); } void Framework::SetRouter(RouterType type) @@ -1841,21 +1844,6 @@ void Framework::RemoveRoute(bool deactivateFollowing) m_drapeEngine->RemoveRoute(deactivateFollowing); } -bool Framework::DisableFollowMode() -{ - GetLocationState()->SetRoutingNotFollow(); - return m_routingSession.DisableFollowMode(); -} - -void Framework::FollowRoute() -{ - int const scale = (m_currentRouterType == RouterType::Pedestrian) ? - scales::GetPedestrianNavigationScale() : - scales::GetNavigationScale(); - - GetLocationState()->StartRouteFollow(scale); -} - void Framework::CloseRouting() { ASSERT_THREAD_CHECKER(m_threadChecker, ("CloseRouting"));