From 04673739f1a61309c72547f2ebab825fa88ff708 Mon Sep 17 00:00:00 2001
From: Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru>
Date: Tue, 22 Jan 2019 10:57:52 +0300
Subject: [PATCH] Routing integration test fix for maps 2019.01.13.

---
 .../bicycle_route_test.cpp                    |  8 ++++++++
 .../pedestrian_route_test.cpp                 | 10 +---------
 .../routing_integration_tests/turn_test.cpp   | 20 +++----------------
 3 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/routing/routing_integration_tests/bicycle_route_test.cpp b/routing/routing_integration_tests/bicycle_route_test.cpp
index b2022274e5..a9bfb4ac9f 100644
--- a/routing/routing_integration_tests/bicycle_route_test.cpp
+++ b/routing/routing_integration_tests/bicycle_route_test.cpp
@@ -111,3 +111,11 @@ UNIT_TEST(SwedenStockholmBicyclePastFerry)
       MercatorBounds::FromLatLon(59.4725, 18.51355), {0.0, 0.0},
       MercatorBounds::FromLatLon(59.32967, 18.075), 66161.2);
 }
+
+UNIT_TEST(CrossMwmKaliningradRegionToLiepaja)
+{
+  integration::CalculateRouteAndTestRouteLength(
+      integration::GetVehicleComponents<VehicleType::Bicycle>(),
+      MercatorBounds::FromLatLon(55.15414, 20.85378), {0., 0.},
+      MercatorBounds::FromLatLon(56.51119, 21.01847), 192000);
+}
diff --git a/routing/routing_integration_tests/pedestrian_route_test.cpp b/routing/routing_integration_tests/pedestrian_route_test.cpp
index 9be9e10c7d..35256e1a8a 100644
--- a/routing/routing_integration_tests/pedestrian_route_test.cpp
+++ b/routing/routing_integration_tests/pedestrian_route_test.cpp
@@ -211,7 +211,7 @@ UNIT_TEST(RussiaTaganrogSyzranov10k3ToLazo5k2)
   integration::CalculateRouteAndTestRouteLength(
       integration::GetVehicleComponents<VehicleType::Pedestrian>(),
       MercatorBounds::FromLatLon(47.2183, 38.8634), {0., 0.},
-      MercatorBounds::FromLatLon(47.2584, 38.9128), 9200.);
+      MercatorBounds::FromLatLon(47.2584, 38.9128), 8004.74);
 }
 
 UNIT_TEST(RussiaTaganrogJukova2ToBolBulvarnaya8)
@@ -374,14 +374,6 @@ UNIT_TEST(USANewYorkEmpireStateBuildingToUnitedNations)
       MercatorBounds::FromLatLon(40.75047, -73.96759), 2265.);
 }
 
-UNIT_TEST(CrossMwmKaliningradRegionToLiepaja)
-{
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents<VehicleType::Pedestrian>(),
-      MercatorBounds::FromLatLon(55.15414, 20.85378), {0., 0.},
-      MercatorBounds::FromLatLon(56.51119, 21.01847), 192000);
-}
-
 UNIT_TEST(CrossMwmRussiaPStaiToBelarusDrazdy)
 {
   integration::CalculateRouteAndTestRouteLength(
diff --git a/routing/routing_integration_tests/turn_test.cpp b/routing/routing_integration_tests/turn_test.cpp
index 8407b899c4..7a0cc2dea6 100644
--- a/routing/routing_integration_tests/turn_test.cpp
+++ b/routing/routing_integration_tests/turn_test.cpp
@@ -623,9 +623,10 @@ UNIT_TEST(GermanyFrankfurtAirport2Test)
   RouterResultCode const result = routeResult.second;
 
   TEST_EQUAL(result, RouterResultCode::NoError, ());
-  integration::TestTurnCount(route, 1 /* expectedTurnCount */);
+  integration::TestTurnCount(route, 2 /* expectedTurnCount */);
 
-  integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnSlightRight);
+  integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::ExitHighwayToRight);
+  integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnSlightLeft);
 }
 
 
@@ -769,21 +770,6 @@ UNIT_TEST(NetherlandsBarneveldTest)
   integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnSlightRight);
 }
 
-UNIT_TEST(GermanyRaunheimAirportTest)
-{
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
-                                  MercatorBounds::FromLatLon(50.03322, 8.50995), {0., 0.},
-                                  MercatorBounds::FromLatLon(50.02089, 8.49441));
-
-  Route const & route = *routeResult.first;
-  RouterResultCode const result = routeResult.second;
-
-  TEST_EQUAL(result, RouterResultCode::NoError, ());
-  integration::TestTurnCount(route, 1 /* expectedTurnCount */);
-  integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnSlightRight);
-}
-
 UNIT_TEST(BelorussiaMinskTest)
 {
   TRouteResult const routeResult =