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

Merge pull request #3346 from bykoianko/master-style-fix

Browse source 
Style fix.
This commit is contained in:
ygorshenin 2016-05-26 12:56:53 +03:00
commit 6d5b599cf0
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
map/framework.cpp
View file

@ -2420,10 +2420,15 @@ RouterType Framework::GetBestRouter(m2::PointD const & startPoint, m2::PointD co
{
if (MercatorBounds::DistanceOnEarth(startPoint, finalPoint) < kKeepPedestrianDistanceMeters)
{
if (GetLastUsedRouter() == RouterType::Pedestrian)
return RouterType::Pedestrian;
if (GetLastUsedRouter() == RouterType::Bicycle)
return RouterType::Bicycle;
auto const lastUsedRouter = GetLastUsedRouter();
switch (lastUsedRouter)
{
case RouterType::Pedestrian:
case RouterType::Bicycle:
return lastUsedRouter;
case RouterType::Vehicle:
; // fall through
}
// Return on a short distance the vehicle router flag only if we are already have routing files.
auto countryFileGetter = [this](m2::PointD const & pt)