From 3049bc005361b247c7310f0c5759fd364b1e9152 Mon Sep 17 00:00:00 2001 From: vng Date: Sun, 30 May 2021 14:31:40 +0300 Subject: [PATCH] Removed obsolete RouterType::Taxi option. Signed-off-by: vng --- android/jni/com/mapswithme/maps/Framework.cpp | 2 ++ iphone/Maps/Core/Routing/MWMCoreRouterType.h | 9 +++++---- map/framework.cpp | 3 +-- map/routing_manager.cpp | 7 +------ qt/routing_settings_dialog.cpp | 1 - routing/router.cpp | 3 --- routing/router.hpp | 1 - 7 files changed, 9 insertions(+), 17 deletions(-) diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index 3a8a2066d8..8b8e193caa 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -1369,9 +1369,11 @@ Java_com_mapswithme_maps_Framework_nativeSetRouter(JNIEnv * env, jclass, jint ro Type type = Type::Vehicle; switch (routerType) { + case 0: break; case 1: type = Type::Pedestrian; break; case 2: type = Type::Bicycle; break; case 3: type = Type::Transit; break; + default: assert(false); break; } g_framework->GetRoutingManager().SetRouter(type); } diff --git a/iphone/Maps/Core/Routing/MWMCoreRouterType.h b/iphone/Maps/Core/Routing/MWMCoreRouterType.h index 084fd27841..7d9550dd27 100644 --- a/iphone/Maps/Core/Routing/MWMCoreRouterType.h +++ b/iphone/Maps/Core/Routing/MWMCoreRouterType.h @@ -10,7 +10,9 @@ static inline routing::RouterType coreRouterType(MWMRouterType type) case MWMRouterTypePedestrian: return routing::RouterType::Pedestrian; case MWMRouterTypePublicTransport: return routing::RouterType::Transit; case MWMRouterTypeBicycle: return routing::RouterType::Bicycle; - case MWMRouterTypeTaxi: return routing::RouterType::Taxi; + default: + ASSERT(false, ("Invalid routing type")); + return routing::RouterType::Vehicle; } } @@ -22,9 +24,8 @@ static inline MWMRouterType routerType(routing::RouterType type) case routing::RouterType::Transit: return MWMRouterTypePublicTransport; case routing::RouterType::Pedestrian: return MWMRouterTypePedestrian; case routing::RouterType::Bicycle: return MWMRouterTypeBicycle; - case routing::RouterType::Taxi: return MWMRouterTypeTaxi; - case routing::RouterType::Count: - ASSERT(false, ("RouterType is Count.")); + default: + ASSERT(false, ("Invalid routing type")); return MWMRouterTypeVehicle; } } diff --git a/map/framework.cpp b/map/framework.cpp index 0837b35c1e..8aba83b88d 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -2500,10 +2500,9 @@ void Framework::AllowAutoZoom(bool allowAutoZoom) { routing::RouterType const type = m_routingManager.GetRouter(); bool const isPedestrianRoute = type == RouterType::Pedestrian; - bool const isTaxiRoute = type == RouterType::Taxi; if (m_drapeEngine != nullptr) - m_drapeEngine->AllowAutoZoom(allowAutoZoom && !isPedestrianRoute && !isTaxiRoute); + m_drapeEngine->AllowAutoZoom(allowAutoZoom && !isPedestrianRoute); } void Framework::SaveAutoZoom(bool allowAutoZoom) diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp index 5fba868204..e0d5960d16 100644 --- a/map/routing_manager.cpp +++ b/map/routing_manager.cpp @@ -203,8 +203,7 @@ VehicleType GetVehicleType(RouterType routerType) { case RouterType::Pedestrian: return VehicleType::Pedestrian; case RouterType::Bicycle: return VehicleType::Bicycle; - case RouterType::Vehicle: - case RouterType::Taxi: return VehicleType::Car; + case RouterType::Vehicle: return VehicleType::Car; case RouterType::Transit: return VehicleType::Transit; case RouterType::Count: CHECK(false, ("Invalid type", routerType)); return VehicleType::Count; } @@ -686,7 +685,6 @@ bool RoutingManager::InsertRoute(Route const & route) switch (m_currentRouterType) { case RouterType::Vehicle: - case RouterType::Taxi: { subroute->m_routeType = m_currentRouterType == RouterType::Vehicle ? df::RouteType::Car : df::RouteType::Taxi; subroute->AddStyle(df::SubrouteStyle(df::kRouteColor, df::kRouteOutlineColor)); @@ -963,9 +961,6 @@ void RoutingManager::ReorderIntermediatePoints() void RoutingManager::GenerateNotifications(vector & turnNotifications) { - if (m_currentRouterType == RouterType::Taxi) - return; - m_routingSession.GenerateNotifications(turnNotifications); } diff --git a/qt/routing_settings_dialog.cpp b/qt/routing_settings_dialog.cpp index f510e987aa..a3c0892a89 100644 --- a/qt/routing_settings_dialog.cpp +++ b/qt/routing_settings_dialog.cpp @@ -154,7 +154,6 @@ void RoutingSettings::AddListWidgetWithRoutingTypes() m_routerType->insertItem(static_cast(RouterType::Vehicle), "car"); m_routerType->insertItem(static_cast(RouterType::Pedestrian), "pedestrian"); m_routerType->insertItem(static_cast(RouterType::Bicycle), "bicycle"); - m_routerType->insertItem(static_cast(RouterType::Taxi), "taxi"); m_routerType->insertItem(static_cast(RouterType::Transit), "transit"); m_form.addRow("Choose router:", m_routerType); diff --git a/routing/router.cpp b/routing/router.cpp index 4135cfc84f..f05e70ca60 100644 --- a/routing/router.cpp +++ b/routing/router.cpp @@ -9,7 +9,6 @@ std::string ToString(RouterType type) case RouterType::Vehicle: return "vehicle"; case RouterType::Pedestrian: return "pedestrian"; case RouterType::Bicycle: return "bicycle"; - case RouterType::Taxi: return "taxi"; case RouterType::Transit: return "transit"; case RouterType::Count: return "count"; } @@ -25,8 +24,6 @@ RouterType FromString(std::string const & str) return RouterType::Pedestrian; if (str == "bicycle") return RouterType::Bicycle; - if (str == "taxi") - return RouterType::Taxi; if (str == "transit") return RouterType::Transit; diff --git a/routing/router.hpp b/routing/router.hpp index 73c76ebc5b..60461a06bb 100644 --- a/routing/router.hpp +++ b/routing/router.hpp @@ -44,7 +44,6 @@ enum class RouterType Vehicle = 0, /// For Car routing. Pedestrian, /// For A star pedestrian routing. Bicycle, /// For A star bicycle routing. - Taxi, /// For taxi route calculation Vehicle routing is used. Transit, /// For A star pedestrian + transit routing. Count /// Number of router types. };