[routing] remove template argument

11 files changed, 213 insertions, 213 deletions

diff --git a/routing/routing_integration_tests/bicycle_route_test.cpp b/routing/routing_integration_tests/bicycle_route_test.cpp
index 6442f5dc11..a7bee9d6be 100644
--- a/routing/routing_integration_tests/bicycle_route_test.cpp
+++ b/routing/routing_integration_tests/bicycle_route_test.cpp
@@ -15,7 +15,7 @@ using namespace routing::turns;
 UNIT_TEST(RussiaMoscowSevTushinoParkPreferingBicycleWay)
 {
   CalculateRouteAndTestRouteLength(
-      GetVehicleComponents<VehicleType::Bicycle>(),
+      GetVehicleComponents(VehicleType::Bicycle),
       MercatorBounds::FromLatLon(55.87445, 37.43711), {0., 0.},
       MercatorBounds::FromLatLon(55.87203, 37.44274), 460.0);
 }
@@ -23,7 +23,7 @@ UNIT_TEST(RussiaMoscowSevTushinoParkPreferingBicycleWay)
 UNIT_TEST(RussiaMoscowNahimovskyLongRoute)
 {
   CalculateRouteAndTestRouteLength(
-      GetVehicleComponents<VehicleType::Bicycle>(),
+      GetVehicleComponents(VehicleType::Bicycle),
       MercatorBounds::FromLatLon(55.66151, 37.63320), {0., 0.},
       MercatorBounds::FromLatLon(55.67695, 37.56220), 5670.0);
 }
@@ -31,7 +31,7 @@ UNIT_TEST(RussiaMoscowNahimovskyLongRoute)
 UNIT_TEST(RussiaDomodedovoSteps)
 {
   CalculateRouteAndTestRouteLength(
-      GetVehicleComponents<VehicleType::Bicycle>(),
+      GetVehicleComponents(VehicleType::Bicycle),
       MercatorBounds::FromLatLon(55.44010, 37.77416), {0., 0.},
       MercatorBounds::FromLatLon(55.43975, 37.77272), 100.0);
 }
@@ -39,7 +39,7 @@ UNIT_TEST(RussiaDomodedovoSteps)
 UNIT_TEST(SwedenStockholmCyclewayPriority)
 {
   CalculateRouteAndTestRouteLength(
-      GetVehicleComponents<VehicleType::Bicycle>(),
+      GetVehicleComponents(VehicleType::Bicycle),
       MercatorBounds::FromLatLon(59.33151, 18.09347), {0., 0.},
       MercatorBounds::FromLatLon(59.33052, 18.09391), 113.0);
 }
@@ -49,7 +49,7 @@ UNIT_TEST(SwedenStockholmCyclewayPriority)
 UNIT_TEST(NetherlandsAmsterdamBicycleNo)
 {
   CalculateRouteAndTestRouteLength(
-      GetVehicleComponents<VehicleType::Bicycle>(),
+      GetVehicleComponents(VehicleType::Bicycle),
       MercatorBounds::FromLatLon(52.32716, 5.05932), {0., 0.},
       MercatorBounds::FromLatLon(52.32587, 5.06121), 363.4);
 }
@@ -57,7 +57,7 @@ UNIT_TEST(NetherlandsAmsterdamBicycleNo)
 UNIT_TEST(NetherlandsAmsterdamBicycleYes)
 {
   TRouteResult const routeResult =
-      CalculateRoute(GetVehicleComponents<VehicleType::Bicycle>(),
+      CalculateRoute(GetVehicleComponents(VehicleType::Bicycle),
                                   MercatorBounds::FromLatLon(52.32872, 5.07527), {0.0, 0.0},
                                   MercatorBounds::FromLatLon(52.33853, 5.08941));
 
@@ -72,7 +72,7 @@ UNIT_TEST(NetherlandsAmsterdamBicycleYes)
 UNIT_TEST(NetherlandsAmsterdamSingelStCyclewayOpposite)
 {
   CalculateRouteAndTestRouteLength(
-      GetVehicleComponents<VehicleType::Bicycle>(),
+      GetVehicleComponents(VehicleType::Bicycle),
       MercatorBounds::FromLatLon(52.37571, 4.88591), {0., 0.},
       MercatorBounds::FromLatLon(52.37736, 4.88744), 212.8);
 }
@@ -80,7 +80,7 @@ UNIT_TEST(NetherlandsAmsterdamSingelStCyclewayOpposite)
 UNIT_TEST(RussiaMoscowKashirskoe16ToCapLongRoute)
 {
   CalculateRouteAndTestRouteLength(
-      GetVehicleComponents<VehicleType::Bicycle>(),
+      GetVehicleComponents(VehicleType::Bicycle),
       MercatorBounds::FromLatLon(55.66230, 37.63214), {0., 0.},
       MercatorBounds::FromLatLon(55.68927, 37.70356), 7075.0);
 }
@@ -89,7 +89,7 @@ UNIT_TEST(RussiaMoscowKashirskoe16ToCapLongRoute)
 UNIT_TEST(RussiaMoscowNoServicePassThrough)
 {
   TRouteResult route =
-        integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Bicycle>(),
+        integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
                                     MercatorBounds::FromLatLon(55.66230, 37.63214), {0., 0.},
                                     MercatorBounds::FromLatLon(55.68895, 37.70286));
   TEST_EQUAL(route.second, RouterResultCode::RouteNotFound, ());
@@ -102,7 +102,7 @@ UNIT_TEST(RussiaMoscowNoServicePassThrough)
 //UNIT_TEST(RussiaKerchStraitFerryRoute)
 //{
 //  CalculateRouteAndTestRouteLength(
-//      GetVehicleComponents<VehicleType::Bicycle>(),
+//      GetVehicleComponents(VehicleType::Bicycle),
 //      MercatorBounds::FromLatLon(45.4167, 36.7658), {0.0, 0.0},
 //      MercatorBounds::FromLatLon(45.3653, 36.6161), 18000.0);
 //}
@@ -111,7 +111,7 @@ UNIT_TEST(RussiaMoscowNoServicePassThrough)
 UNIT_TEST(SwedenStockholmBicyclePastFerry)
 {
   CalculateRouteAndTestRouteLength(
-      GetVehicleComponents<VehicleType::Bicycle>(),
+      GetVehicleComponents(VehicleType::Bicycle),
       MercatorBounds::FromLatLon(59.4725, 18.51355), {0.0, 0.0},
       MercatorBounds::FromLatLon(59.32967, 18.075), 66161.2);
 }
@@ -119,7 +119,7 @@ UNIT_TEST(SwedenStockholmBicyclePastFerry)
 UNIT_TEST(CrossMwmKaliningradRegionToLiepaja)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Bicycle>(),
+      integration::GetVehicleComponents(VehicleType::Bicycle),
       MercatorBounds::FromLatLon(55.15414, 20.85378), {0., 0.},
       MercatorBounds::FromLatLon(56.51119, 21.01847), 192000);
 }
@@ -128,7 +128,7 @@ UNIT_TEST(CrossMwmKaliningradRegionToLiepaja)
 UNIT_TEST(SpainTenerifeAdejeVilaflor)
 {
   integration::CalculateRouteAndTestRouteTime(
-      integration::GetVehicleComponents<VehicleType::Bicycle>(),
+      integration::GetVehicleComponents(VehicleType::Bicycle),
       MercatorBounds::FromLatLon(28.11984, -16.72592), {0.0, 0.0},
       MercatorBounds::FromLatLon(28.15865, -16.63704), 18019.6 /* expectedTimeSeconds */);
 }
@@ -137,7 +137,7 @@ UNIT_TEST(SpainTenerifeAdejeVilaflor)
 UNIT_TEST(SpainTenerifeVilaflorAdeje)
 {
   integration::CalculateRouteAndTestRouteTime(
-      integration::GetVehicleComponents<VehicleType::Bicycle>(),
+      integration::GetVehicleComponents(VehicleType::Bicycle),
       MercatorBounds::FromLatLon(28.15865, -16.63704), {0.0, 0.0},
       MercatorBounds::FromLatLon(28.11984, -16.72592), 8868.36 /* expectedTimeSeconds */);
 }
diff --git a/routing/routing_integration_tests/bicycle_turn_test.cpp b/routing/routing_integration_tests/bicycle_turn_test.cpp
index bfaf73bd97..40ea42ad4f 100644
--- a/routing/routing_integration_tests/bicycle_turn_test.cpp
+++ b/routing/routing_integration_tests/bicycle_turn_test.cpp
@@ -12,7 +12,7 @@ using namespace routing::turns;
 UNIT_TEST(RussiaMoscowSevTushinoParkBicycleWayTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Bicycle>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
                                   MercatorBounds::FromLatLon(55.87467, 37.43658), {0.0, 0.0},
                                   MercatorBounds::FromLatLon(55.8719, 37.4464));
 
@@ -36,7 +36,7 @@ UNIT_TEST(RussiaMoscowSevTushinoParkBicycleWayTurnTest)
 UNIT_TEST(RussiaMoscowGerPanfilovtsev22BicycleWayTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Bicycle>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
                                   MercatorBounds::FromLatLon(55.85630, 37.41004), {0.0, 0.0},
                                   MercatorBounds::FromLatLon(55.85717, 37.41052));
 
@@ -53,7 +53,7 @@ UNIT_TEST(RussiaMoscowGerPanfilovtsev22BicycleWayTurnTest)
 UNIT_TEST(RussiaMoscowSalameiNerisPossibleTurnCorrectionBicycleWayTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Bicycle>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
                                   MercatorBounds::FromLatLon(55.85836, 37.36773), {0.0, 0.0},
                                   MercatorBounds::FromLatLon(55.85364, 37.37318));
 
@@ -71,7 +71,7 @@ UNIT_TEST(RussiaMoscowSalameiNerisPossibleTurnCorrectionBicycleWayTurnTest)
 UNIT_TEST(RussiaMoscowSalameiNerisNoUTurnBicycleWayTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Bicycle>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
                                   MercatorBounds::FromLatLon(55.85839, 37.3677), {0.0, 0.0},
                                   MercatorBounds::FromLatLon(55.85765, 37.36793));
 
@@ -88,7 +88,7 @@ UNIT_TEST(RussiaMoscowSevTushinoParkBicycleOnePointOnewayRoadTurnTest)
 {
   m2::PointD const point = MercatorBounds::FromLatLon(55.8719, 37.4464);
   TRouteResult const routeResult = integration::CalculateRoute(
-      integration::GetVehicleComponents<VehicleType::Bicycle>(), point, {0.0, 0.0}, point);
+      integration::GetVehicleComponents(VehicleType::Bicycle), point, {0.0, 0.0}, point);
 
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
@@ -98,7 +98,7 @@ UNIT_TEST(RussiaMoscowSevTushinoParkBicycleOnePointTwowayRoadTurnTest)
 {
   m2::PointD const point = MercatorBounds::FromLatLon(55.87102, 37.44222);
   TRouteResult const routeResult = integration::CalculateRoute(
-      integration::GetVehicleComponents<VehicleType::Bicycle>(), point, {0.0, 0.0}, point);
+      integration::GetVehicleComponents(VehicleType::Bicycle), point, {0.0, 0.0}, point);
 
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
@@ -107,7 +107,7 @@ UNIT_TEST(RussiaMoscowSevTushinoParkBicycleOnePointTwowayRoadTurnTest)
 UNIT_TEST(RussiaMoscowTatishchevaOnewayCarRoadTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Bicycle>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
                                   MercatorBounds::FromLatLon(55.71566, 37.61569), {0.0, 0.0},
                                   MercatorBounds::FromLatLon(55.71532, 37.61571));
 
@@ -128,7 +128,7 @@ UNIT_TEST(RussiaMoscowTatishchevaOnewayCarRoadTurnTest)
 UNIT_TEST(RussiaMoscowSvobodiOnewayBicycleWayTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Bicycle>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
                                   MercatorBounds::FromLatLon(55.87277, 37.44002), {0.0, 0.0},
                                   MercatorBounds::FromLatLon(55.87362, 37.43853));
 
diff --git a/routing/routing_integration_tests/online_cross_tests.cpp b/routing/routing_integration_tests/online_cross_tests.cpp
index bf94950fb1..0425c3ac12 100644
--- a/routing/routing_integration_tests/online_cross_tests.cpp
+++ b/routing/routing_integration_tests/online_cross_tests.cpp
@@ -8,7 +8,7 @@ namespace
 UNIT_TEST(OnlineCrossFetcherSmokeTest)
 {
   integration::IRouterComponents & routerComponents =
-      integration::GetVehicleComponents<VehicleType::Car>();
+      integration::GetVehicleComponents(VehicleType::Car);
   TestOnlineFetcher({61.76, 34.45}, {45.07, 38.94},
                     {"Russia_Republic of Karelia_South", "Russia_Leningradskaya Oblast_Southeast",
                      "Russia_Novgorod Oblast", "Russia_Tver Oblast", "Russia_Moscow Oblast_West",
@@ -21,7 +21,7 @@ UNIT_TEST(OnlineCrossFetcherSmokeTest)
 UNIT_TEST(OnlineRussiaNorthToSouthTest)
 {
   integration::IRouterComponents & routerComponents =
-      integration::GetVehicleComponents<VehicleType::Car>();
+      integration::GetVehicleComponents(VehicleType::Car);
   TestOnlineCrosses({61.76, 34.45}, {45.07, 38.94},
                     {"Russia_Republic of Karelia_South", "Russia_Leningradskaya Oblast_Southeast",
                      "Russia_Novgorod Oblast", "Russia_Tver Oblast", "Russia_Moscow Oblast_East",
@@ -34,14 +34,14 @@ UNIT_TEST(OnlineRussiaNorthToSouthTest)
 UNIT_TEST(OnlineRoadToSeaCenterTest)
 {
   integration::IRouterComponents & routerComponents =
-      integration::GetVehicleComponents<VehicleType::Car>();
+      integration::GetVehicleComponents(VehicleType::Car);
   TestOnlineCrosses({61.76, 34.45}, {42.25,30.10}, {}, routerComponents);
 }
 
 UNIT_TEST(OnlineEuropeTestNurnbergToMoscow)
 {
   integration::IRouterComponents & routerComponents =
-      integration::GetVehicleComponents<VehicleType::Car>();
+      integration::GetVehicleComponents(VehicleType::Car);
   TestOnlineCrosses(
       {49.45, 11.082}, {55.74, 37.56},
       {"Germany_Free State of Bavaria_Middle Franconia",
@@ -57,7 +57,7 @@ UNIT_TEST(OnlineEuropeTestNurnbergToMoscow)
 UNIT_TEST(OnlineAmericanTestOttawaToWashington)
 {
   integration::IRouterComponents & routerComponents =
-      integration::GetVehicleComponents<VehicleType::Car>();
+      integration::GetVehicleComponents(VehicleType::Car);
   TestOnlineCrosses({45.38, -75.69}, {38.91, -77.031},
                     {"Canada_Ontario_Kingston", "US_New York_North", "US_New York_West",
                      "US_Pennsylvania_Scranton", "US_Pennsylvania_Central", "US_Maryland_Baltimore",
@@ -68,7 +68,7 @@ UNIT_TEST(OnlineAmericanTestOttawaToWashington)
 UNIT_TEST(OnlineAsiaPhuketToPnompen)
 {
   integration::IRouterComponents & routerComponents =
-      integration::GetVehicleComponents<VehicleType::Car>();
+      integration::GetVehicleComponents(VehicleType::Car);
   TestOnlineCrosses({7.89, 98.30}, {11.56, 104.86}, {"Thailand_South", "Cambodia"},
                     routerComponents);
 }
@@ -76,7 +76,7 @@ UNIT_TEST(OnlineAsiaPhuketToPnompen)
 UNIT_TEST(OnlineAustraliaCanberraToPerth)
 {
   integration::IRouterComponents & routerComponents =
-      integration::GetVehicleComponents<VehicleType::Car>();
+      integration::GetVehicleComponents(VehicleType::Car);
   TestOnlineCrosses({-33.88, 151.13}, {-31.974, 115.88},
                     {"Australia_New South Wales", "Australia_Victoria", "Australia_South Australia",
                      "Australia_Western Australia", "Australia_Sydney"},
diff --git a/routing/routing_integration_tests/pedestrian_route_test.cpp b/routing/routing_integration_tests/pedestrian_route_test.cpp
index f9b25ab054..08e84b53f3 100644
--- a/routing/routing_integration_tests/pedestrian_route_test.cpp
+++ b/routing/routing_integration_tests/pedestrian_route_test.cpp
@@ -12,7 +12,7 @@ using namespace routing::turns;
 UNIT_TEST(GermanyBremenJunctionToCycleway)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(52.41947, 10.75148), {0., 0.},
       MercatorBounds::FromLatLon(52.41868, 10.75274), 137.);
 }
@@ -20,7 +20,7 @@ UNIT_TEST(GermanyBremenJunctionToCycleway)
 UNIT_TEST(Zgrad424aTo1207)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(55.9963, 37.2036), {0., 0.},
       MercatorBounds::FromLatLon(55.9955, 37.1948), 683.);
 }
@@ -28,7 +28,7 @@ UNIT_TEST(Zgrad424aTo1207)
 UNIT_TEST(Zgrad924aTo418)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(55.9844, 37.1808), {0., 0.},
       MercatorBounds::FromLatLon(55.9999, 37.2021), 2526.);
 }
@@ -36,7 +36,7 @@ UNIT_TEST(Zgrad924aTo418)
 UNIT_TEST(Zgrad924aToFilaretovskyChurch)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(55.9844, 37.1808), {0., 0.},
       MercatorBounds::FromLatLon(55.9915, 37.1808), 1220.);
 }
@@ -44,7 +44,7 @@ UNIT_TEST(Zgrad924aToFilaretovskyChurch)
 UNIT_TEST(Zgrad924aTo1145)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(55.9844, 37.1808), {0., 0.},
       MercatorBounds::FromLatLon(55.9924, 37.1853), 1400.);
 }
@@ -52,7 +52,7 @@ UNIT_TEST(Zgrad924aTo1145)
 UNIT_TEST(MoscowMuzeonToLebedinoeOzeroGorkyPark)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(55.7348, 37.606), {0., 0.},
       MercatorBounds::FromLatLon(55.724, 37.5956), 1617.);
 }
@@ -64,7 +64,7 @@ UNIT_TEST(Zgrad315parkingToMusicSchoolBus_BadRoute)
   // route goes through a highway-tertiary.
 
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(55.9996, 37.2174), {0., 0.},
       MercatorBounds::FromLatLon(55.9999, 37.2179), 161.);
 }
@@ -73,7 +73,7 @@ UNIT_TEST(Zgrad315parkingToMusicSchoolBus_BadRoute)
 UNIT_TEST(Zgrad924aToKrukovo)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(55.9844, 37.1808), {0., 0.},
       MercatorBounds::FromLatLon(55.9802, 37.1736), 974.);
 }
@@ -81,7 +81,7 @@ UNIT_TEST(Zgrad924aToKrukovo)
 UNIT_TEST(MoscowMailRuStarbucksToPetrovskoRazumovskyAlley)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(55.7971, 37.5376), {0., 0.},
       MercatorBounds::FromLatLon(55.7953, 37.5597), 1840.);
 }
@@ -89,7 +89,7 @@ UNIT_TEST(MoscowMailRuStarbucksToPetrovskoRazumovskyAlley)
 UNIT_TEST(AustraliaMelburn_AvoidMotorway)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(-37.7936, 144.985), {0., 0.},
       MercatorBounds::FromLatLon(-37.7896, 145.025), 5015.);
 }
@@ -97,7 +97,7 @@ UNIT_TEST(AustraliaMelburn_AvoidMotorway)
 UNIT_TEST(AustriaWein_AvoidTrunk)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(48.233, 16.3562), {0., 0.},
       MercatorBounds::FromLatLon(48.2458, 16.3704), 2301.);
 }
@@ -105,7 +105,7 @@ UNIT_TEST(AustriaWein_AvoidTrunk)
 UNIT_TEST(FranceParis_AvoidBridleway)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(48.859, 2.25452), {0., 0.},
       MercatorBounds::FromLatLon(48.8634, 2.24315), 1049.);
 }
@@ -113,7 +113,7 @@ UNIT_TEST(FranceParis_AvoidBridleway)
 UNIT_TEST(HungaryBudapest_AvoidMotorway)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(47.56566, 19.14942), {0., 0.},
       MercatorBounds::FromLatLon(47.593, 19.24018), 10890.);
 }
@@ -121,7 +121,7 @@ UNIT_TEST(HungaryBudapest_AvoidMotorway)
 UNIT_TEST(PolandWarshaw_AvoidCycleway)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(52.2487, 21.0173), {0., 0.},
       MercatorBounds::FromLatLon(52.25, 21.0164), 182.);
 }
@@ -129,7 +129,7 @@ UNIT_TEST(PolandWarshaw_AvoidCycleway)
 UNIT_TEST(SwedenStockholmSlussenHiltonToMaritimeMuseum)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(59.32046, 18.06924), {0., 0.},
       MercatorBounds::FromLatLon(59.32728, 18.09078), 3442.);
 }
@@ -137,7 +137,7 @@ UNIT_TEST(SwedenStockholmSlussenHiltonToMaritimeMuseum)
 UNIT_TEST(SwedenStockholmSlussenHiltonToAfChapmanHostel)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(59.32045, 18.06928), {0., 0.},
       MercatorBounds::FromLatLon(59.3254, 18.08022), 2410.);
 }
@@ -145,7 +145,7 @@ UNIT_TEST(SwedenStockholmSlussenHiltonToAfChapmanHostel)
 UNIT_TEST(EstoniaTallinnRadissonHiltonToCatherdalChurch)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(59.4362, 24.7682), {0., 0.},
       MercatorBounds::FromLatLon(59.437, 24.7392), 2016.);
 }
@@ -153,7 +153,7 @@ UNIT_TEST(EstoniaTallinnRadissonHiltonToCatherdalChurch)
 UNIT_TEST(EstoniaTallinnRadissonHiltonToSkypeOffice)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(59.4362, 24.7682), {0., 0.},
       MercatorBounds::FromLatLon(59.3971, 24.661), 8673.);
 }
@@ -161,7 +161,7 @@ UNIT_TEST(EstoniaTallinnRadissonHiltonToSkypeOffice)
 UNIT_TEST(BelarusMinksHotelYubileyniToChurchSaintsSimonAndHelen)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(53.9112, 27.5466), {0., 0.},
       MercatorBounds::FromLatLon(53.8965, 27.5476), 2244.);
 }
@@ -169,7 +169,7 @@ UNIT_TEST(BelarusMinksHotelYubileyniToChurchSaintsSimonAndHelen)
 UNIT_TEST(BelarusMinksBarURatushiToMoscowBusStation)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(53.9045, 27.5569), {0., 0.},
       MercatorBounds::FromLatLon(53.889, 27.5466), 2499.);
 }
@@ -177,7 +177,7 @@ UNIT_TEST(BelarusMinksBarURatushiToMoscowBusStation)
 UNIT_TEST(BelarusBobruisk50LetVlksmToSanatoryShinnik)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(53.1638, 29.1804), {0., 0.},
       MercatorBounds::FromLatLon(53.179, 29.1682), 2400.);
 }
@@ -185,7 +185,7 @@ UNIT_TEST(BelarusBobruisk50LetVlksmToSanatoryShinnik)
 UNIT_TEST(BelarusBobruisk50LetVlksmToArena)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(53.1638, 29.1804), {0., 0.},
       MercatorBounds::FromLatLon(53.1424, 29.2467), 6123.0);
 }
@@ -193,7 +193,7 @@ UNIT_TEST(BelarusBobruisk50LetVlksmToArena)
 UNIT_TEST(RussiaTaganrogSyzranov10k3ToSoftech)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(47.2183, 38.8634), {0., 0.},
       MercatorBounds::FromLatLon(47.2, 38.8878), 3868.);
 }
@@ -201,7 +201,7 @@ UNIT_TEST(RussiaTaganrogSyzranov10k3ToSoftech)
 UNIT_TEST(RussiaTaganrogSyzranov10k3ToTruseE)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(47.2183, 38.8634), {0., 0.},
       MercatorBounds::FromLatLon(47.2048, 38.9441), 7994.0);
 }
@@ -209,7 +209,7 @@ UNIT_TEST(RussiaTaganrogSyzranov10k3ToTruseE)
 UNIT_TEST(RussiaTaganrogSyzranov10k3ToLazo5k2)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(47.2183, 38.8634), {0., 0.},
       MercatorBounds::FromLatLon(47.2584, 38.9128), 8004.74);
 }
@@ -217,7 +217,7 @@ UNIT_TEST(RussiaTaganrogSyzranov10k3ToLazo5k2)
 UNIT_TEST(RussiaTaganrogJukova2ToBolBulvarnaya8)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(47.2768, 38.9282), {0., 0.},
       MercatorBounds::FromLatLon(47.2412, 38.8902), 6239.);
 }
@@ -225,7 +225,7 @@ UNIT_TEST(RussiaTaganrogJukova2ToBolBulvarnaya8)
 UNIT_TEST(RussiaTaganrogCheckhova267k2ToKotlostroy33)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(47.2200, 38.8906), {0., 0.},
       MercatorBounds::FromLatLon(47.2459, 38.8937), 3485.);
 }
@@ -233,7 +233,7 @@ UNIT_TEST(RussiaTaganrogCheckhova267k2ToKotlostroy33)
 UNIT_TEST(RussiaTaganrogCheckhova267k2ToBolBulvarnaya8)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(47.2200, 38.8906), {0., 0.},
       MercatorBounds::FromLatLon(47.2412, 38.8902), 2897.);
 }
@@ -241,7 +241,7 @@ UNIT_TEST(RussiaTaganrogCheckhova267k2ToBolBulvarnaya8)
 UNIT_TEST(RussiaRostovOnDonPrKosmonavtovToDneprovsky120b)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(47.2811, 39.7178), {0., 0.},
       MercatorBounds::FromLatLon(47.2875, 39.759), 4300.);
 }
@@ -249,7 +249,7 @@ UNIT_TEST(RussiaRostovOnDonPrKosmonavtovToDneprovsky120b)
 UNIT_TEST(TurkeyKemerPalmetResortToYachtClub)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(36.6143, 30.5572), {0., 0.},
       MercatorBounds::FromLatLon(36.6004, 30.576), 2992.);
 }
@@ -257,7 +257,7 @@ UNIT_TEST(TurkeyKemerPalmetResortToYachtClub)
 UNIT_TEST(CzechPragueNode5ToHilton)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(50.0653, 14.4031), {0., 0.},
       MercatorBounds::FromLatLon(50.0933, 14.4397), 5106.);
 }
@@ -265,7 +265,7 @@ UNIT_TEST(CzechPragueNode5ToHilton)
 UNIT_TEST(CzechPragueHiltonToKarlovMost)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(50.0933, 14.4397), {0., 0.},
       MercatorBounds::FromLatLon(50.0864, 14.4124), 2398.);
 }
@@ -273,7 +273,7 @@ UNIT_TEST(CzechPragueHiltonToKarlovMost)
 UNIT_TEST(CzechPragueHiltonToNicholasChurch)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(50.0933, 14.4397), {0., 0.},
       MercatorBounds::FromLatLon(50.088, 14.4032), 3103.);
 }
@@ -281,7 +281,7 @@ UNIT_TEST(CzechPragueHiltonToNicholasChurch)
 UNIT_TEST(CzechPragueHiltonToKvetniceViewpoint)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(50.0933, 14.4397), {0., 0.},
       MercatorBounds::FromLatLon(50.0806, 14.3973), 4335.);
 }
@@ -289,7 +289,7 @@ UNIT_TEST(CzechPragueHiltonToKvetniceViewpoint)
 UNIT_TEST(RussiaSaintPetersburgMoyka93ToAlexanderColumn)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(59.9241, 30.323), {0., 0.},
       MercatorBounds::FromLatLon(59.939, 30.3159), 2454.);
 }
@@ -297,7 +297,7 @@ UNIT_TEST(RussiaSaintPetersburgMoyka93ToAlexanderColumn)
 UNIT_TEST(RussiaSaintPetersburgMoyka93ToMarsovoPole)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(59.9241, 30.323), {0., 0.},
       MercatorBounds::FromLatLon(59.9436, 30.3318), 2891.);
 }
@@ -305,7 +305,7 @@ UNIT_TEST(RussiaSaintPetersburgMoyka93ToMarsovoPole)
 UNIT_TEST(RussiaSaintPetersburgMoyka93ToAvrora)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(59.9241, 30.323), {0., 0.},
       MercatorBounds::FromLatLon(59.9554, 30.3378), 4770.);
 }
@@ -313,7 +313,7 @@ UNIT_TEST(RussiaSaintPetersburgMoyka93ToAvrora)
 UNIT_TEST(RussiaSaintPetersburgPetrPaulChurchToDolphins)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(59.9502, 30.3165), {0., 0.},
       MercatorBounds::FromLatLon(59.973, 30.2702), 4507.);
 }
@@ -321,7 +321,7 @@ UNIT_TEST(RussiaSaintPetersburgPetrPaulChurchToDolphins)
 UNIT_TEST(RussiaPetergofEntranceToErmitagePalace)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(59.8806, 29.904), {0., 0.},
       MercatorBounds::FromLatLon(59.8889, 29.9034), 1073.);
 }
@@ -329,7 +329,7 @@ UNIT_TEST(RussiaPetergofEntranceToErmitagePalace)
 UNIT_TEST(RussiaPetergofMarlyPalaceToTrainStation)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(59.8887, 29.8963), {0., 0.},
       MercatorBounds::FromLatLon(59.8648, 29.9251), 3885.);
 }
@@ -337,7 +337,7 @@ UNIT_TEST(RussiaPetergofMarlyPalaceToTrainStation)
 UNIT_TEST(RussiaMoscowMailRuToTsarCannon)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(55.79703, 37.53761), {0., 0.},
       MercatorBounds::FromLatLon(55.75146, 37.61792), 7989.);
 }
@@ -345,7 +345,7 @@ UNIT_TEST(RussiaMoscowMailRuToTsarCannon)
 UNIT_TEST(RussiaMoscowHovrinoStationToKasperskyLab)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(55.8701, 37.50833), {0., 0.},
       MercatorBounds::FromLatLon(55.83715, 37.48132), 5162.);
 }
@@ -353,7 +353,7 @@ UNIT_TEST(RussiaMoscowHovrinoStationToKasperskyLab)
 UNIT_TEST(ItalyRome_WalkOverStreetWithSidewalkBoth)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(41.9052, 12.4106), {0., 0.},
       MercatorBounds::FromLatLon(41.9226, 12.4216), 2413.);
 }
@@ -361,7 +361,7 @@ UNIT_TEST(ItalyRome_WalkOverStreetWithSidewalkBoth)
 UNIT_TEST(USARedlandsEsriHQToRedlandsCommunity)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(34.0556, -117.19567), {0., 0.},
       MercatorBounds::FromLatLon(34.03682, -117.20649), 3330.);
 }
@@ -369,7 +369,7 @@ UNIT_TEST(USARedlandsEsriHQToRedlandsCommunity)
 UNIT_TEST(USANewYorkEmpireStateBuildingToUnitedNations)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(40.74844, -73.98566), {0., 0.},
       MercatorBounds::FromLatLon(40.75047, -73.96759), 2265.);
 }
@@ -377,7 +377,7 @@ UNIT_TEST(USANewYorkEmpireStateBuildingToUnitedNations)
 UNIT_TEST(CrossMwmRussiaPStaiToBelarusDrazdy)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(55.014, 30.95552), {0., 0.},
       MercatorBounds::FromLatLon(55.01437, 30.8858), 4834.5);
 }
@@ -385,7 +385,7 @@ UNIT_TEST(CrossMwmRussiaPStaiToBelarusDrazdy)
 UNIT_TEST(RussiaZgradPanfilovskyUndergroundCrossing)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Pedestrian),
                                   MercatorBounds::FromLatLon(55.98401, 37.17979), {0., 0.},
                                   MercatorBounds::FromLatLon(55.98419, 37.17938));
 
@@ -405,7 +405,7 @@ UNIT_TEST(RussiaZgradPanfilovskyUndergroundCrossing)
 UNIT_TEST(RussiaMoscowHydroprojectBridgeCrossing)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Pedestrian),
                                   MercatorBounds::FromLatLon(55.80867, 37.50575), {0., 0.},
                                   MercatorBounds::FromLatLon(55.80884, 37.50668));
 
@@ -425,7 +425,7 @@ UNIT_TEST(RussiaMoscowHydroprojectBridgeCrossing)
 UNIT_TEST(BelarusMinskRenaissanceHotelUndergroundCross)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Pedestrian),
                                   MercatorBounds::FromLatLon(53.89296, 27.52775), {0., 0.},
                                   MercatorBounds::FromLatLon(53.89262, 27.52838));
 
@@ -445,7 +445,7 @@ UNIT_TEST(BelarusMinskRenaissanceHotelUndergroundCross)
 UNIT_TEST(MoscowVodnyStadiumHighwayPlatform)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(55.83955, 37.48692), {0., 0.},
       MercatorBounds::FromLatLon(55.84061, 37.48636), 136.115);
 }
@@ -453,7 +453,7 @@ UNIT_TEST(MoscowVodnyStadiumHighwayPlatform)
 UNIT_TEST(MoscowChistiePrudiSelectPointsInConnectedGraph)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(55.76613, 37.63769), {0., 0.},
       MercatorBounds::FromLatLon(55.76593, 37.63893), 134.02);
 }
@@ -462,7 +462,7 @@ UNIT_TEST(RussiaMoscowSevTushinoParkPedestrianOnePointTurnTest)
 {
   m2::PointD const point = MercatorBounds::FromLatLon(55.8719, 37.4464);
   TRouteResult const routeResult = integration::CalculateRoute(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(), point, {0.0, 0.0}, point);
+      integration::GetVehicleComponents(VehicleType::Pedestrian), point, {0.0, 0.0}, point);
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -474,7 +474,7 @@ UNIT_TEST(RussiaMoscowSevTushinoParkPedestrianOnePointTurnTest)
 UNIT_TEST(MoscowKashirskoe16ToVorobeviGori)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(55.66230, 37.63214), {0., 0.},
       MercatorBounds::FromLatLon(55.70934, 37.54232), 9553.0);
 }
@@ -483,7 +483,7 @@ UNIT_TEST(MoscowKashirskoe16ToVorobeviGori)
 UNIT_TEST(SwitzerlandSaintBlaisePedestrianPastFerry)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(47.010336, 6.982954), {0.0, 0.0},
       MercatorBounds::FromLatLon(47.005817, 6.970227), 1532.3);
 }
@@ -492,7 +492,7 @@ UNIT_TEST(SwitzerlandSaintBlaisePedestrianPastFerry)
 UNIT_TEST(NetherlandsAmsterdamPedestrianPastFerry)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(52.38075, 4.89938), {0.0, 0.0},
       MercatorBounds::FromLatLon(52.40194, 4.89038), 3580.0);
 }
@@ -501,7 +501,7 @@ UNIT_TEST(NetherlandsAmsterdamPedestrianPastFerry)
 UNIT_TEST(ItalyVenicePedestrianPastFerry)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(45.4375, 12.33549), {0.0, 0.0},
       MercatorBounds::FromLatLon(45.44057, 12.33393), 725.4);
 }
@@ -510,7 +510,7 @@ UNIT_TEST(ItalyVenicePedestrianPastFerry)
 UNIT_TEST(RussiaPriut11Elbrus)
 {
   integration::CalculateRouteAndTestRouteTime(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(43.31475, 42.46035), {0., 0.},
       MercatorBounds::FromLatLon(43.35254, 42.43788), 32588.6 /* expectedTimeSeconds */);
 }
@@ -519,7 +519,7 @@ UNIT_TEST(RussiaPriut11Elbrus)
 UNIT_TEST(RussiaElbrusPriut11)
 {
   integration::CalculateRouteAndTestRouteTime(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(43.35254, 42.43788), {0., 0.},
       MercatorBounds::FromLatLon(43.31475, 42.46035), 5998.61 /* expectedTimeSeconds */);
 }
@@ -528,7 +528,7 @@ UNIT_TEST(RussiaElbrusPriut11)
 UNIT_TEST(BudvaPrimaryRoad)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
+      integration::GetVehicleComponents(VehicleType::Pedestrian),
       MercatorBounds::FromLatLon(42.2884527, 18.8456794), {0., 0.},
       MercatorBounds::FromLatLon(42.2880575, 18.8492896), 368.85);
 }
diff --git a/routing/routing_integration_tests/route_test.cpp b/routing/routing_integration_tests/route_test.cpp
index de31b8f22f..91658629f7 100644
--- a/routing/routing_integration_tests/route_test.cpp
+++ b/routing/routing_integration_tests/route_test.cpp
@@ -16,7 +16,7 @@ namespace
   UNIT_TEST(StrangeCaseInAfrica)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(19.20789, 30.50663), {0., 0.},
         MercatorBounds::FromLatLon(19.17289, 30.47315), 7645.0);
   }
@@ -24,7 +24,7 @@ namespace
   UNIT_TEST(MoscowKashirskoeShosseCrossing)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(55.66216, 37.63259), {0., 0.},
         MercatorBounds::FromLatLon(55.66237, 37.63560), 2320.);
   }
@@ -32,11 +32,11 @@ namespace
   UNIT_TEST(MoscowToSVOAirport)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(55.75100, 37.61790), {0., 0.},
         MercatorBounds::FromLatLon(55.97310, 37.41460), 37284.);
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(55.97310, 37.41460), {0., 0.},
         MercatorBounds::FromLatLon(55.75100, 37.61790), 39449.);
   }
@@ -45,7 +45,7 @@ namespace
   UNIT_TEST(RestrictionTestNeatBaumanAndTTK)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(55.77397, 37.68465), {0., 0.},
         MercatorBounds::FromLatLon(55.77198, 37.68782), 1032.);
   }
@@ -53,7 +53,7 @@ namespace
   UNIT_TEST(RestrictionTestNearMetroShodnenskaya)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(55.85043, 37.43824), {0., 0.},
         MercatorBounds::FromLatLon(55.85191, 37.43910), 510.);
   }
@@ -62,7 +62,7 @@ namespace
   UNIT_TEST(CaliforniaCupertinoFindPhantomAssertTest)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(37.33409, -122.03458), {0., 0.},
         MercatorBounds::FromLatLon(37.33498, -122.03575), 1438.);
   }
@@ -71,7 +71,7 @@ namespace
   UNIT_TEST(RussiaUfaToUstKatavTest)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(54.7304, 55.9554), {0., 0.},
         MercatorBounds::FromLatLon(54.9228, 58.1469), 164667.);
   }
@@ -79,7 +79,7 @@ namespace
   UNIT_TEST(RussiaMoscowNoServiceCrossing)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(55.77787, 37.70405), {0., 0.},
         MercatorBounds::FromLatLon(55.77682, 37.70391), 3140.);
   }
@@ -87,7 +87,7 @@ namespace
   UNIT_TEST(RussiaMoscowShortWayToService)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(55.77787, 37.70405), {0., 0.},
         MercatorBounds::FromLatLon(55.77691, 37.70428), 150.);
   }
@@ -97,14 +97,14 @@ namespace
     size_t constexpr kExpectedPointsNumber = 56;
     // Forward
     TRouteResult route =
-        integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                     MercatorBounds::FromLatLon(46.16255, -63.81643), {0., 0.},
                                     MercatorBounds::FromLatLon(46.25401, -63.70213));
     TEST_EQUAL(route.second, RouterResultCode::NoError, ());
     CHECK(route.first, ());
     integration::TestRoutePointsNumber(*route.first, kExpectedPointsNumber);
     // And backward case
-    route = integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+    route = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                         MercatorBounds::FromLatLon(46.25401, -63.70213), {0., 0.},
                                         MercatorBounds::FromLatLon(46.16255, -63.81643));
     TEST_EQUAL(route.second, RouterResultCode::NoError, ());
@@ -116,7 +116,7 @@ namespace
   UNIT_TEST(RussiaMoscowLeningradskiy39GerPanfilovtsev22RouteTest)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         {37.53758809983519, 67.536162466434234}, {0., 0.}, {37.40993977728661, 67.644784047393685},
         14296.);
   }
@@ -124,7 +124,7 @@ namespace
   UNIT_TEST(NederlandLeeuwardenToDenOeverTest)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(53.2076, 5.7082), {0., 0.},
         MercatorBounds::FromLatLon(52.9337, 5.0308), 59500.);
   }
@@ -132,7 +132,7 @@ namespace
   UNIT_TEST(RussiaMoscowGerPanfilovtsev22SolodchaPravdiRouteTest)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(55.85792, 37.40992), {0., 0.},
         MercatorBounds::FromLatLon(54.79390, 39.83656), 239426.);
   }
@@ -140,7 +140,7 @@ namespace
   UNIT_TEST(RussiaMoscowBelarusMinsk)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(55.750650, 37.617673), {0., 0.},
         MercatorBounds::FromLatLon(53.902114, 27.562020), 712649.0);
   }
@@ -148,7 +148,7 @@ namespace
   UNIT_TEST(UKRugbyStIvesRouteTest)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(52.37076, -1.26530), {0., 0.},
         MercatorBounds::FromLatLon(50.21480, -5.47994), 455902.);
   }
@@ -156,7 +156,7 @@ namespace
   UNIT_TEST(RussiaMoscowLenigradskiy39ItalySienaCenterRouteTest)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(55.79690, 37.53759), {0., 0.},
         MercatorBounds::FromLatLon(43.32677, 11.32792), 2870710.);
   }
@@ -164,7 +164,7 @@ namespace
   UNIT_TEST(PeruSingleRoadTest)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(-14.22061, -73.35969), {0., 0.},
         MercatorBounds::FromLatLon(-14.22389, -73.44281), 15900.);
   }
@@ -172,7 +172,7 @@ namespace
   UNIT_TEST(RussiaMoscowFranceParisCenterRouteTest)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(55.75271, 37.62618), {0., 0.},
         MercatorBounds::FromLatLon(48.86123, 2.34129), 2840940.);
   }
@@ -180,7 +180,7 @@ namespace
   UNIT_TEST(EnglandToFranceRouteLeMansTest)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(51.09276, 1.11369), {0., 0.},
         MercatorBounds::FromLatLon(50.93227, 1.82725), 64753.0);
   }
@@ -188,7 +188,7 @@ namespace
   UNIT_TEST(RussiaMoscowStartAtTwowayFeatureTest)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(55.771, 37.5184), {0., 0.},
         MercatorBounds::FromLatLon(55.7718, 37.5178), 147.4);
   }
@@ -196,7 +196,7 @@ namespace
   UNIT_TEST(RussiaMoscowRegionToBelarusBorder)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(55.464182, 35.943947), {0.0, 0.0},
         MercatorBounds::FromLatLon(52.442467, 31.609642), 554000.);
   }
@@ -204,7 +204,7 @@ namespace
   UNIT_TEST(GermanyToTallinCrossMwmRoute)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(48.397416, 16.515289), {0.0, 0.0},
         MercatorBounds::FromLatLon(59.437214, 24.745355), 1650000.);
   }
@@ -214,7 +214,7 @@ namespace
   UNIT_TEST(RussiaMoscowLenigradskiy39RepublicOfSouthAfricaCapeTownCenterRouteTest)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(55.79721, 37.53786), {0., 0.},
               MercatorBounds::FromLatLon(-33.9286, 18.41837), 13701400.0);
   }
@@ -223,11 +223,11 @@ namespace
   UNIT_TEST(MoroccoToSahrawiCrossMwmTest)
   {
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(27.15587, -13.23059), {0., 0.},
         MercatorBounds::FromLatLon(27.94049, -12.88800), 100864);
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(27.94049, -12.88800), {0., 0.},
         MercatorBounds::FromLatLon(27.15587, -13.23059), 100864);
   }
@@ -238,12 +238,12 @@ namespace
     // points are inside borders and one of segments has outside points).
     // Forward
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(42.01535, 19.40044), {0., 0.},
         MercatorBounds::FromLatLon(42.01201, 19.36286), 3674.);
     // And backward case
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(42.01201, 19.36286), {0., 0.},
         MercatorBounds::FromLatLon(42.01535, 19.40044), 3674.);
   }
@@ -252,12 +252,12 @@ namespace
   {
     // Forward
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(46.13418, -63.84656), {0., 0.},
         MercatorBounds::FromLatLon(46.26739, -63.63907), 23000.);
     // And backward case
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(46.26739, -63.63907), {0., 0.},
         MercatorBounds::FromLatLon(46.13418, -63.84656), 23000.);
   }
@@ -266,12 +266,12 @@ namespace
   {
     // Forward
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(49.85015, 2.24296), {0., 0.},
         MercatorBounds::FromLatLon(48.85458, 2.36291), 127162.0);
     // And backward case
     integration::CalculateRouteAndTestRouteLength(
-        integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::GetVehicleComponents(VehicleType::Car),
         MercatorBounds::FromLatLon(48.85458, 2.36291), {0., 0.},
         MercatorBounds::FromLatLon(49.85015, 2.24296), 137009.0);
   }
@@ -279,7 +279,7 @@ namespace
   UNIT_TEST(RussiaSmolenskRussiaMoscowTimeTest)
   {
     TRouteResult const routeResult =
-        integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                     MercatorBounds::FromLatLon(54.7998, 32.05489), {0., 0.},
                                     MercatorBounds::FromLatLon(55.753, 37.60169));
 
@@ -294,7 +294,7 @@ namespace
   UNIT_TEST(RussiaMoscowLenigradskiy39GeroevPanfilovtsev22TimeTest)
   {
     TRouteResult const routeResult =
-        integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                     MercatorBounds::FromLatLon(55.7971, 37.53804), {0., 0.},
                                     MercatorBounds::FromLatLon(55.8579, 37.40990));
     RouterResultCode const result = routeResult.second;
@@ -308,7 +308,7 @@ namespace
   UNIT_TEST(RussiaMoscowLenigradskiy39GeroevPanfilovtsev22SubrouteTest)
   {
     TRouteResult const routeResult =
-        integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                     MercatorBounds::FromLatLon(55.7971, 37.53804), {0., 0.},
                                     MercatorBounds::FromLatLon(55.8579, 37.40990));
 
@@ -328,7 +328,7 @@ namespace
   UNIT_TEST(USALosAnglesAriaTwentyninePalmsHighwayTimeTest)
   {
     TRouteResult const routeResult =
-        integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                     MercatorBounds::FromLatLon(34.0739, -115.3212), {0.0, 0.0},
                                     MercatorBounds::FromLatLon(34.0928, -115.5930));
     RouterResultCode const result = routeResult.second;
@@ -342,7 +342,7 @@ namespace
   UNIT_TEST(CanadaVictoriaVancouverTest)
   {
     TRouteResult const routeResult =
-        integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                     MercatorBounds::FromLatLon(48.47831, -123.32749), {0.0, 0.0},
                                     MercatorBounds::FromLatLon(49.26242, -123.11553));
     RouterResultCode const result = routeResult.second;
@@ -353,7 +353,7 @@ namespace
   UNIT_TEST(BelarusSlonimFinishNearZeroEdgeTest)
   {
     TRouteResult const routeResult =
-        integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                     MercatorBounds::FromLatLon(53.08279, 25.30036), {0.0, 0.0},
                                     MercatorBounds::FromLatLon(53.09443, 25.34356));
     RouterResultCode const result = routeResult.second;
@@ -364,7 +364,7 @@ namespace
   UNIT_TEST(BelarusSlonimStartNearZeroEdgeTest)
   {
     TRouteResult const routeResult =
-        integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                     MercatorBounds::FromLatLon(53.09422, 25.34411), {0.0, 0.0},
                                     MercatorBounds::FromLatLon(53.09271, 25.3467));
     RouterResultCode const result = routeResult.second;
@@ -375,7 +375,7 @@ namespace
   UNIT_TEST(GermanyBerlinMunichTimeTest)
   {
     TRouteResult const routeResult =
-        integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                     MercatorBounds::FromLatLon(52.51172, 13.39468), {0., 0.},
                                     MercatorBounds::FromLatLon(48.13294, 11.60352));
 
@@ -391,7 +391,7 @@ namespace
   UNIT_TEST(GermanyShuttleTrainTest)
   {
     TRouteResult const routeResult =
-        integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                     MercatorBounds::FromLatLon(54.78370, 8.83528), {0., 0.},
                                     MercatorBounds::FromLatLon(54.91681, 8.31346));
 
@@ -406,7 +406,7 @@ namespace
   UNIT_TEST(TolyattiFeatureThatCrossSeveralMwmsTest)
   {
     TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(52.67316, 48.22478), {0., 0.},
                                   MercatorBounds::FromLatLon(53.49143, 49.52386));
 
@@ -420,7 +420,7 @@ namespace
   UNIT_TEST(SwitzerlandNoSpeedCamerasInRouteTest)
   {
     TRouteResult const routeResult =
-        integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                     MercatorBounds::FromLatLon(47.5194, 8.73093), {0., 0.},
                                     MercatorBounds::FromLatLon(46.80592, 7.13724));
 
@@ -441,7 +441,7 @@ namespace
   UNIT_TEST(GermanyWarningAboutSpeedCamerasTest)
   {
     TRouteResult const routeResult =
-        integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+        integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                     MercatorBounds::FromLatLon(52.38465, 13.41906), {0., 0.},
                                     MercatorBounds::FromLatLon(52.67564, 13.27453));
 
diff --git a/routing/routing_integration_tests/routing_test_tools.cpp b/routing/routing_integration_tests/routing_test_tools.cpp
index 8f879c9842..ef2a0018a4 100644
--- a/routing/routing_integration_tests/routing_test_tools.cpp
+++ b/routing/routing_integration_tests/routing_test_tools.cpp
@@ -147,6 +147,13 @@ shared_ptr<VehicleRouterComponents> CreateAllMapsComponents(VehicleType vehicleT
   return make_shared<VehicleRouterComponents>(localFiles, vehicleType);
 }
 
+IRouterComponents & GetVehicleComponents(VehicleType vehicleType)
+{
+  static auto const instance = CreateAllMapsComponents(vehicleType);
+  ASSERT(instance, ());
+  return *instance;
+}
+
 TRouteResult CalculateRoute(IRouterComponents const & routerComponents,
                             m2::PointD const & startPoint, m2::PointD const & startDirection,
                             m2::PointD const & finalPoint)
diff --git a/routing/routing_integration_tests/routing_test_tools.hpp b/routing/routing_integration_tests/routing_test_tools.hpp
index 81524ad54d..582d3016bb 100644
--- a/routing/routing_integration_tests/routing_test_tools.hpp
+++ b/routing/routing_integration_tests/routing_test_tools.hpp
@@ -99,14 +99,7 @@ void TestOnlineFetcher(ms::LatLon const & startPoint, ms::LatLon const & finalPo
                        vector<string> const & expected, IRouterComponents & routerComponents);
 
 shared_ptr<VehicleRouterComponents> CreateAllMapsComponents(VehicleType vehicleType);
-
-template <VehicleType type>
-IRouterComponents & GetVehicleComponents()
-{
-  static auto const instance = CreateAllMapsComponents(type);
-  ASSERT(instance, ());
-  return *instance;
-}
+IRouterComponents & GetVehicleComponents(VehicleType vehicleType);
 
 TRouteResult CalculateRoute(IRouterComponents const & routerComponents,
                             m2::PointD const & startPoint, m2::PointD const & startDirection,
diff --git a/routing/routing_integration_tests/speed_camera_notifications_tests.cpp b/routing/routing_integration_tests/speed_camera_notifications_tests.cpp
index 1c7448144e..701ade9ccf 100644
--- a/routing/routing_integration_tests/speed_camera_notifications_tests.cpp
+++ b/routing/routing_integration_tests/speed_camera_notifications_tests.cpp
@@ -52,7 +52,7 @@ void InitRoutingSession(ms::LatLon const & from, ms::LatLon const & to, RoutingS
                         SpeedCameraManagerMode mode = SpeedCameraManagerMode::Auto)
 {
   TRouteResult const routeResult =
-    integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+    integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                 MercatorBounds::FromLatLon(from), m2::PointD::Zero(),
                                 MercatorBounds::FromLatLon(to));
 
diff --git a/routing/routing_integration_tests/street_names_test.cpp b/routing/routing_integration_tests/street_names_test.cpp
index 50dabe4226..5f640017b2 100644
--- a/routing/routing_integration_tests/street_names_test.cpp
+++ b/routing/routing_integration_tests/street_names_test.cpp
@@ -23,7 +23,7 @@ void MoveRoute(Route & route, ms::LatLon const & coords)
 UNIT_TEST(RussiaTulskayaToPaveletskayaStreetNamesTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.70839, 37.62145), {0., 0.},
                                   MercatorBounds::FromLatLon(55.73198, 37.63945));
 
diff --git a/routing/routing_integration_tests/transit_route_test.cpp b/routing/routing_integration_tests/transit_route_test.cpp
index f61b93378d..4aaf62dd02 100644
--- a/routing/routing_integration_tests/transit_route_test.cpp
+++ b/routing/routing_integration_tests/transit_route_test.cpp
@@ -11,7 +11,7 @@ namespace
 UNIT_TEST(Moscow_CenterToKotelniki_CrossMwm)
 {
   TRouteResult routeResult =
-    integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Transit>(),
+    integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
                                 MercatorBounds::FromLatLon(55.75018, 37.60971), {0.0, 0.0},
                                 MercatorBounds::FromLatLon(55.67245, 37.86130));
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
@@ -25,7 +25,7 @@ UNIT_TEST(Moscow_CenterToKotelniki_CrossMwm)
 UNIT_TEST(Moscow_DubrovkaToTrtykovskya)
 {
   TRouteResult routeResult =
-    integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Transit>(),
+    integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
                                 MercatorBounds::FromLatLon(55.71813, 37.67756), {0.0, 0.0},
                                 MercatorBounds::FromLatLon(55.74089, 37.62831));
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
@@ -39,7 +39,7 @@ UNIT_TEST(Moscow_DubrovkaToTrtykovskya)
 UNIT_TEST(Moscow_NoSubwayTest)
 {
   TRouteResult routeResult =
-    integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Transit>(),
+    integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
                                 MercatorBounds::FromLatLon(55.73893, 37.62438), {0.0, 0.0},
                                 MercatorBounds::FromLatLon(55.73470, 37.62617));
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
@@ -53,7 +53,7 @@ UNIT_TEST(Moscow_NoSubwayTest)
 UNIT_TEST(Piter_FrunzenskyaToPlochadVosstaniya)
 {
   TRouteResult routeResult =
-    integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Transit>(),
+    integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
                                 MercatorBounds::FromLatLon(59.90511, 30.31425), {0.0, 0.0},
                                 MercatorBounds::FromLatLon(59.93096, 30.35872));
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
@@ -67,7 +67,7 @@ UNIT_TEST(Piter_FrunzenskyaToPlochadVosstaniya)
 UNIT_TEST(Piter_TooLongPedestrian)
 {
   TRouteResult routeResult =
-    integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Transit>(),
+    integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
                                 MercatorBounds::FromLatLon(59.90511, 30.31425), {0.0, 0.0},
                                 MercatorBounds::FromLatLon(59.80677, 30.44749));
 
@@ -77,7 +77,7 @@ UNIT_TEST(Piter_TooLongPedestrian)
 UNIT_TEST(Vatikan_NotEnoughGraphDataAtThenEnd)
 {
   TRouteResult routeResult =
-    integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Transit>(),
+    integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
                                 MercatorBounds::FromLatLon(41.90052, 12.42642), {0.0, 0.0},
                                 MercatorBounds::FromLatLon(41.90253, 12.45574));
 
@@ -88,7 +88,7 @@ UNIT_TEST(Vatikan_NotEnoughGraphDataAtThenEnd)
 UNIT_TEST(Vatikan_CorneliaToOttaviano)
 {
   TRouteResult routeResult =
-    integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Transit>(),
+    integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
                                 MercatorBounds::FromLatLon(41.90052, 12.42642), {0.0, 0.0},
                                 MercatorBounds::FromLatLon(41.90414, 12.45640));
 
@@ -103,7 +103,7 @@ UNIT_TEST(Vatikan_CorneliaToOttaviano)
 UNIT_TEST(London_PoplarToOval)
 {
   TRouteResult routeResult =
-    integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Transit>(),
+    integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
                                 MercatorBounds::FromLatLon(51.50818, -0.01634), {0.0, 0.0},
                                 MercatorBounds::FromLatLon(51.48041, -0.10843));
 
@@ -118,7 +118,7 @@ UNIT_TEST(London_PoplarToOval)
 UNIT_TEST(London_DeptfordBridgeToCyprus)
 {
   TRouteResult routeResult =
-    integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Transit>(),
+    integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
                                 MercatorBounds::FromLatLon(51.47149, -0.030558), {0.0, 0.0},
                                 MercatorBounds::FromLatLon(51.51242, 0.07101));
 
@@ -133,7 +133,7 @@ UNIT_TEST(London_DeptfordBridgeToCyprus)
 UNIT_TEST(Vashington_FoggyToShaw)
 {
   TRouteResult routeResult =
-    integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Transit>(),
+    integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
                                 MercatorBounds::FromLatLon(38.89582, -77.04934), {0.0, 0.0},
                                 MercatorBounds::FromLatLon(38.91516, -77.01513));
 
@@ -148,7 +148,7 @@ UNIT_TEST(Vashington_FoggyToShaw)
 UNIT_TEST(NewYork_GrassmereToPleasantPlains)
 {
   TRouteResult routeResult =
-    integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Transit>(),
+    integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
                                 MercatorBounds::FromLatLon(40.60536, -74.07736), {0.0, 0.0},
                                 MercatorBounds::FromLatLon(40.53015, -74.21559));
 
diff --git a/routing/routing_integration_tests/turn_test.cpp b/routing/routing_integration_tests/turn_test.cpp
index 5641e1aeb1..b3c1d7f327 100644
--- a/routing/routing_integration_tests/turn_test.cpp
+++ b/routing/routing_integration_tests/turn_test.cpp
@@ -11,7 +11,7 @@ using namespace routing::turns;
 UNIT_TEST(RussiaMoscowNagatinoUturnTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.67251, 37.63604), {0.01, -0.01},
                                   MercatorBounds::FromLatLon(55.67293, 37.63507));
 
@@ -32,7 +32,7 @@ UNIT_TEST(RussiaMoscowNagatinoUturnTurnTest)
 UNIT_TEST(StPetersburgSideRoadPenaltyTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(59.85157, 30.28033), {0., 0.},
                                   MercatorBounds::FromLatLon(59.84268, 30.27589));
 
@@ -46,7 +46,7 @@ UNIT_TEST(StPetersburgSideRoadPenaltyTest)
 UNIT_TEST(RussiaMoscowLenigradskiy39UturnTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.79683, 37.5379), {0., 0.},
                                   MercatorBounds::FromLatLon(55.80212, 37.5389));
 
@@ -73,7 +73,7 @@ UNIT_TEST(RussiaMoscowLenigradskiy39UturnTurnTest)
 UNIT_TEST(RussiaMoscowSalameiNerisUturnTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.85182, 37.39533), {0., 0.},
                                   MercatorBounds::FromLatLon(55.84386, 37.39250));
   Route const & route = *routeResult.first;
@@ -107,7 +107,7 @@ UNIT_TEST(RussiaMoscowSalameiNerisUturnTurnTest)
 UNIT_TEST(RussiaMoscowTrikotagniAndPohodniRoundaboutTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.83118, 37.40515), {0., 0.},
                                   MercatorBounds::FromLatLon(55.83384, 37.40521));
   Route const & route = *routeResult.first;
@@ -128,7 +128,7 @@ UNIT_TEST(RussiaMoscowTrikotagniAndPohodniRoundaboutTurnTest)
 UNIT_TEST(SwedenBarlangeRoundaboutTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(60.48278, 15.42356), {0., 0.},
                                   MercatorBounds::FromLatLon(60.48462, 15.42120));
   Route const & route = *routeResult.first;
@@ -149,7 +149,7 @@ UNIT_TEST(SwedenBarlangeRoundaboutTurnTest)
 UNIT_TEST(RussiaMoscowPlanetnayaOnlyStraightTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.80216, 37.54668), {0., 0.},
                                   MercatorBounds::FromLatLon(55.80169, 37.54915));
 
@@ -170,7 +170,7 @@ UNIT_TEST(RussiaMoscowPlanetnayaOnlyStraightTest)
 UNIT_TEST(RussiaMoscowNoTurnsOnMKADTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.84656, 37.39163), {0., 0.},
                                   MercatorBounds::FromLatLon(55.56661, 37.69254));
 
@@ -190,7 +190,7 @@ UNIT_TEST(RussiaMoscowNoTurnsOnMKADTurnTest)
 UNIT_TEST(RussiaMoscowTTKVarshavskoeShosseOutTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.70160, 37.60632), {0., 0.},
                                   MercatorBounds::FromLatLon(55.69349, 37.62122));
 
@@ -205,7 +205,7 @@ UNIT_TEST(RussiaMoscowTTKVarshavskoeShosseOutTurnTest)
 UNIT_TEST(RussiaMoscowTTKUTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.792848, 37.624424), {0., 0.},
                                   MercatorBounds::FromLatLon(55.792544, 37.624914));
 
@@ -223,7 +223,7 @@ UNIT_TEST(RussiaMoscowTTKUTurnTest)
 UNIT_TEST(RussiaMoscowParallelResidentalUTurnAvoiding)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.66192, 37.62852), {0., 0.},
                                   MercatorBounds::FromLatLon(55.66189, 37.63254));
 
@@ -240,7 +240,7 @@ UNIT_TEST(RussiaMoscowParallelResidentalUTurnAvoiding)
 UNIT_TEST(RussiaMoscowPankratevskiPerBolshaySuharedskazPloschadTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.77177, 37.63556), {0., 0.},
                                   MercatorBounds::FromLatLon(55.77209, 37.63707));
 
@@ -258,7 +258,7 @@ UNIT_TEST(RussiaMoscowPankratevskiPerBolshaySuharedskazPloschadTurnTest)
 UNIT_TEST(RussiaMoscowMKADPutilkovskeShosseTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.85305, 37.39414), {0., 0.},
                                   MercatorBounds::FromLatLon(55.85099, 37.39105));
 
@@ -273,7 +273,7 @@ UNIT_TEST(RussiaMoscowMKADPutilkovskeShosseTurnTest)
 UNIT_TEST(RussiaMoscowPetushkovaShodniaReverTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.84104, 37.40591), {0., 0.},
                                   MercatorBounds::FromLatLon(55.83929, 37.40855));
 
@@ -287,7 +287,7 @@ UNIT_TEST(RussiaMoscowPetushkovaShodniaReverTurnTest)
 UNIT_TEST(RussiaHugeRoundaboutTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.80141, 37.32581), {0., 0.},
                                   MercatorBounds::FromLatLon(55.80075, 37.32536));
 
@@ -309,7 +309,7 @@ UNIT_TEST(RussiaHugeRoundaboutTurnTest)
 UNIT_TEST(BelarusMiskProspNezavisimostiMKADTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(53.93642, 27.65857), {0., 0.},
                                   MercatorBounds::FromLatLon(53.93933, 27.67046));
 
@@ -326,7 +326,7 @@ UNIT_TEST(BelarusMiskProspNezavisimostiMKADTurnTest)
 UNIT_TEST(RussiaMoscowPetushkovaPetushkovaTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.83636, 37.40555), {0., 0.},
                                   MercatorBounds::FromLatLon(55.83707, 37.40489));
 
@@ -343,7 +343,7 @@ UNIT_TEST(RussiaMoscowPetushkovaPetushkovaTest)
 UNIT_TEST(RussiaMoscowMKADLeningradkaTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.87961, 37.43838), {0.0, 0.0},
                                   MercatorBounds::FromLatLon(55.87854, 37.44865));
 
@@ -358,7 +358,7 @@ UNIT_TEST(RussiaMoscowMKADLeningradkaTest)
 UNIT_TEST(BelarusMKADShosseinai)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.31541, 29.43123), {0., 0.},
                                   MercatorBounds::FromLatLon(55.31656, 29.42626));
 
@@ -375,7 +375,7 @@ UNIT_TEST(BelarusMKADShosseinai)
 UNIT_TEST(ThailandPhuketNearPrabarameeRoad)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(7.91797, 98.36937), {0., 0.},
                                   MercatorBounds::FromLatLon(7.90724, 98.3679));
 
@@ -393,7 +393,7 @@ UNIT_TEST(ThailandPhuketNearPrabarameeRoad)
 UNIT_TEST(RussiaMoscowVarshavskoeShosseMKAD)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.58210, 37.59695), {0., 0.},
                                   MercatorBounds::FromLatLon(55.57514, 37.61020));
 
@@ -408,7 +408,7 @@ UNIT_TEST(RussiaMoscowVarshavskoeShosseMKAD)
 UNIT_TEST(RussiaMoscowBolshayaNikitskayaOkhotnyRyadTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.75509, 37.61067), {0., 0.},
                                   MercatorBounds::FromLatLon(55.75737, 37.61601));
 
@@ -424,7 +424,7 @@ UNIT_TEST(RussiaMoscowBolshayaNikitskayaOkhotnyRyadTest)
 UNIT_TEST(RussiaMoscowTverskajaOkhotnyRyadTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.75765, 37.61355), {0., 0.},
                                   MercatorBounds::FromLatLon(55.75737, 37.61601));
 
@@ -439,7 +439,7 @@ UNIT_TEST(RussiaMoscowTverskajaOkhotnyRyadTest)
 UNIT_TEST(RussiaMoscowBolshoyKislovskiyPerBolshayaNikitinskayaUlTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.75574, 37.60702), {0., 0.},
                                   MercatorBounds::FromLatLon(55.75586, 37.60819));
 
@@ -455,7 +455,7 @@ UNIT_TEST(RussiaMoscowBolshoyKislovskiyPerBolshayaNikitinskayaUlTest)
 UNIT_TEST(RussiaMoscowLeningradskiyPrptToTheCenterUTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.79231, 37.54951), {0., 0.},
                                   MercatorBounds::FromLatLon(55.79280, 37.55028));
 
@@ -470,7 +470,7 @@ UNIT_TEST(RussiaMoscowLeningradskiyPrptToTheCenterUTurnTest)
 UNIT_TEST(SwitzerlandSamstagernBergstrasseTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(47.19307, 8.67594), {0., 0.},
                                   MercatorBounds::FromLatLon(47.19162, 8.67590));
 
@@ -485,7 +485,7 @@ UNIT_TEST(SwitzerlandSamstagernBergstrasseTest)
 UNIT_TEST(RussiaMoscowMikoiankNoUTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.79041, 37.53770), {0., 0.},
                                   MercatorBounds::FromLatLon(55.79182, 37.53008));
 
@@ -499,7 +499,7 @@ UNIT_TEST(RussiaMoscowMikoiankNoUTurnTest)
 UNIT_TEST(RussiaMoscowLeningradskiyPrptToTTKTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.78926, 37.55706), {0., 0.},
                                   MercatorBounds::FromLatLon(55.78925, 37.57110));
 
@@ -517,7 +517,7 @@ UNIT_TEST(RussiaMoscowLeningradskiyPrptToTTKTest)
 UNIT_TEST(RussiaMoscowLeningradskiyPrptDublToTTKTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.79059, 37.55345), {0., 0.},
                                   MercatorBounds::FromLatLon(55.78925, 37.57110));
 
@@ -533,7 +533,7 @@ UNIT_TEST(RussiaMoscowLeningradskiyPrptDublToTTKTest)
 UNIT_TEST(RussiaMoscowSvobodaStTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.82484, 37.45151), {0., 0.},
                                   MercatorBounds::FromLatLon(55.81941, 37.45073));
 
@@ -548,7 +548,7 @@ UNIT_TEST(RussiaMoscowSvobodaStTest)
 UNIT_TEST(RussiaTiinskTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(54.37738, 49.63878), {0., 0.},
                                   MercatorBounds::FromLatLon(54.3967, 49.64924));
 
@@ -564,7 +564,7 @@ UNIT_TEST(RussiaTiinskTest)
 UNIT_TEST(NetherlandsGorinchemBridgeTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(51.84131, 4.94825), {0., 0.},
                                   MercatorBounds::FromLatLon(51.81518, 4.93773));
 
@@ -578,7 +578,7 @@ UNIT_TEST(NetherlandsGorinchemBridgeTest)
 UNIT_TEST(RussiaVoronezhProspTrudaTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(51.67205, 39.16334), {0., 0.},
                                   MercatorBounds::FromLatLon(51.67193, 39.15636));
 
@@ -595,7 +595,7 @@ UNIT_TEST(RussiaVoronezhProspTrudaTest)
 UNIT_TEST(GermanyFrankfurtAirportTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(50.07094, 8.61299), {0., 0.},
                                   MercatorBounds::FromLatLon(50.05807, 8.59542));
 
@@ -613,7 +613,7 @@ UNIT_TEST(GermanyFrankfurtAirportTest)
 UNIT_TEST(GermanyFrankfurtAirport2Test)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(50.03249, 8.50814), {0., 0.},
                                   MercatorBounds::FromLatLon(50.02079, 8.49445));
 
@@ -632,7 +632,7 @@ UNIT_TEST(GermanyFrankfurtAirport2Test)
 UNIT_TEST(RussiaKubinkaTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.58533, 36.83779), {0., 0.},
                                   MercatorBounds::FromLatLon(55.58365, 36.8333));
 
@@ -651,7 +651,7 @@ UNIT_TEST(RussiaKubinkaTest)
 UNIT_TEST(AustriaKitzbuhelTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(47.46894, 12.3841), {0., 0.},
                                   MercatorBounds::FromLatLon(47.46543, 12.38599));
 
@@ -666,7 +666,7 @@ UNIT_TEST(AustriaKitzbuhelTest)
 UNIT_TEST(AustriaKitzbuhel2Test)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(47.45119, 12.3841), {0., 0.},
                                   MercatorBounds::FromLatLon(47.45021, 12.382));
 
@@ -681,7 +681,7 @@ UNIT_TEST(AustriaKitzbuhel2Test)
 UNIT_TEST(AustriaKitzbuhel3Test)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(47.45362, 12.38709), {0., 0.},
                                   MercatorBounds::FromLatLon(47.45255, 12.38498));
 
@@ -696,7 +696,7 @@ UNIT_TEST(AustriaKitzbuhel3Test)
 UNIT_TEST(AustriaBrixentalStrasseTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(47.45091, 12.33453), {0., 0.},
                                   MercatorBounds::FromLatLon(47.45038, 12.32592));
 
@@ -711,7 +711,7 @@ UNIT_TEST(AustriaBrixentalStrasseTest)
 UNIT_TEST(RussiaMoscowLeningradkaToMKADTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.87192, 37.45772), {0., 0.},
                                   MercatorBounds::FromLatLon(55.87594, 37.45266));
 
@@ -726,7 +726,7 @@ UNIT_TEST(RussiaMoscowLeningradkaToMKADTest)
 UNIT_TEST(RussiaMoscowMKADToSvobodaTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.8801, 37.43862), {0., 0.},
                                   MercatorBounds::FromLatLon(55.87583, 37.43046));
 
@@ -742,7 +742,7 @@ UNIT_TEST(RussiaMoscowMKADToSvobodaTest)
 UNIT_TEST(RussiaMoscowMKADTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(52.15866, 5.56538), {0., 0.},
                                   MercatorBounds::FromLatLon(52.16668, 5.55665));
 
@@ -756,7 +756,7 @@ UNIT_TEST(RussiaMoscowMKADTest)
 UNIT_TEST(NetherlandsBarneveldTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(52.15866, 5.56538), {0., 0.},
                                   MercatorBounds::FromLatLon(52.16667, 5.55663));
 
@@ -771,7 +771,7 @@ UNIT_TEST(NetherlandsBarneveldTest)
 UNIT_TEST(BelorussiaMinskTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(53.90991, 27.57946), {0., 0.},
                                   MercatorBounds::FromLatLon(53.91552, 27.58211));
 
@@ -792,7 +792,7 @@ UNIT_TEST(BelorussiaMinskTest)
 UNIT_TEST(EnglandLondonExitToLeftTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(51.603582, 0.266995), {0., 0.},
                                   MercatorBounds::FromLatLon(51.606785, 0.264055));
 
@@ -808,7 +808,7 @@ UNIT_TEST(EnglandLondonExitToLeftTest)
 UNIT_TEST(RussiaMoscowLeninskyProspTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.69035, 37.54948), {0., 0.},
                                   MercatorBounds::FromLatLon(55.69188, 37.55293));
 
@@ -825,7 +825,7 @@ UNIT_TEST(RussiaMoscowLeninskyProspTest)
 UNIT_TEST(RussiaMoscowTTKToLinkTest)
 {
 TRouteResult const routeResult =
-    integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+    integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                 MercatorBounds::FromLatLon(55.78594, 37.56656), {0., 0.},
                                 MercatorBounds::FromLatLon(55.78598, 37.56737));
 
@@ -841,7 +841,7 @@ TRouteResult const routeResult =
 UNIT_TEST(RussiaMoscowTTKToBegovayAlleyaTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.77946, 37.55779), {0., 0.},
                                   MercatorBounds::FromLatLon(55.77956, 37.55891));
 
@@ -857,7 +857,7 @@ UNIT_TEST(RussiaMoscowTTKToBegovayAlleyaTest)
 UNIT_TEST(RussiaMoscowTTKToServiceTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.78874, 37.5704), {0., 0.},
                                   MercatorBounds::FromLatLon(55.78881, 37.57106));
 
@@ -873,7 +873,7 @@ UNIT_TEST(RussiaMoscowTTKToServiceTest)
 UNIT_TEST(RussiaMoscowTTKToNMaslovkaTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.79057, 37.57292), {0., 0.},
                                   MercatorBounds::FromLatLon(55.79132, 37.57481));
 
@@ -888,7 +888,7 @@ UNIT_TEST(RussiaMoscowTTKToNMaslovkaTest)
 UNIT_TEST(RussiaMoscowComplicatedTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.68412, 37.60166), {0., 0.},
                                   MercatorBounds::FromLatLon(55.68426, 37.59854));
 
@@ -905,7 +905,7 @@ UNIT_TEST(RussiaMoscowComplicatedTurnTest)
 UNIT_TEST(USATampaTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(28.04875, -82.58292), {0., 0.},
                                   MercatorBounds::FromLatLon(28.04459, -82.58448));
 
@@ -922,7 +922,7 @@ UNIT_TEST(USATampaTest)
 UNIT_TEST(RussiaMoscowMinskia1TurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.7355, 37.48717), {0., 0.},
                                   MercatorBounds::FromLatLon(55.73694, 37.48587));
 
@@ -936,7 +936,7 @@ UNIT_TEST(RussiaMoscowMinskia1TurnTest)
 UNIT_TEST(RussiaMoscowMinskia2TurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.74244, 37.4808), {0., 0.},
                                   MercatorBounds::FromLatLon(55.74336, 37.48124));
 
@@ -953,7 +953,7 @@ UNIT_TEST(RussiaMoscowMinskia2TurnTest)
 UNIT_TEST(RussiaMoscowBarikadnaiTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.75979, 37.58502), {0., 0.},
                                   MercatorBounds::FromLatLon(55.75936, 37.58286));
 
@@ -969,7 +969,7 @@ UNIT_TEST(RussiaMoscowBarikadnaiTurnTest)
 UNIT_TEST(RussiaMoscowKomsomolskyTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.73442, 37.59391), {0., 0.},
                                   MercatorBounds::FromLatLon(55.73485, 37.59543));
 
@@ -985,7 +985,7 @@ UNIT_TEST(RussiaMoscowKomsomolskyTurnTest)
 UNIT_TEST(RussiaMoscowTTKNoGoStraightTurnTest)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.78949, 37.5711), {0., 0.},
                                   MercatorBounds::FromLatLon(55.78673, 37.56726));
 
@@ -999,7 +999,7 @@ UNIT_TEST(RussiaMoscowTTKNoGoStraightTurnTest)
 UNIT_TEST(RussiaMoscowLeninskyProsp2Test)
 {
   TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
                                   MercatorBounds::FromLatLon(55.80376, 37.52048), {0., 0.},
                                   MercatorBounds::FromLatLon(55.80442, 37.51802));