Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'map/framework.cpp')
-rw-r--r--map/framework.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/map/framework.cpp b/map/framework.cpp
index daff132424..4f724ff9c3 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -2380,8 +2380,10 @@ void Framework::InsertRoute(Route const & route)
vector<double> turns;
if (m_currentRouterType == RouterType::Vehicle || m_currentRouterType == RouterType::Bicycle ||
- m_currentRouterType == RouterType::Uber)
+ m_currentRouterType == RouterType::Taxi)
+ {
route.GetTurnsDistances(turns);
+ }
df::ColorConstant routeColor = df::Route;
df::RoutePattern pattern;
@@ -2481,8 +2483,9 @@ RouterType Framework::GetBestRouter(m2::PointD const & startPoint, m2::PointD co
case RouterType::Pedestrian:
case RouterType::Bicycle:
return lastUsedRouter;
+ case RouterType::Taxi:
+ ASSERT(false, ("GetLastUsedRouter sould not to return RouterType::Taxi"));
case RouterType::Vehicle:
- case RouterType::Uber:
; // fall through
}
@@ -2559,10 +2562,10 @@ bool Framework::LoadAutoZoom()
void Framework::AllowAutoZoom(bool allowAutoZoom)
{
bool const isPedestrianRoute = m_currentRouterType == RouterType::Pedestrian;
- bool const isUberRoute = m_currentRouterType == RouterType::Uber;
+ bool const isTaxiRoute = m_currentRouterType == RouterType::Taxi;
CallDrapeFunction(bind(&df::DrapeEngine::AllowAutoZoom, _1,
- allowAutoZoom && !isPedestrianRoute && !isUberRoute));
+ allowAutoZoom && !isPedestrianRoute && !isTaxiRoute));
}
void Framework::SaveAutoZoom(bool allowAutoZoom)