diff options
author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2018-01-31 11:05:35 +0300 |
---|---|---|
committer | mpimenov <mpimenov@users.noreply.github.com> | 2018-02-19 20:26:27 +0300 |
commit | 896439001935f7d624a5a9484bb0ab5cff860883 (patch) | |
tree | 314360f1ae8b05c8d38b79fed28c83dcbadad7c2 /routing | |
parent | e528875c523161e571b8ee8121a9beba748dfe83 (diff) |
Removing Gate and LiftGate pedestrian turn information tests.
Diffstat (limited to 'routing')
-rw-r--r-- | routing/pedestrian_directions.cpp | 1 | ||||
-rw-r--r-- | routing/routing_integration_tests/pedestrian_route_test.cpp | 61 |
2 files changed, 1 insertions, 61 deletions
diff --git a/routing/pedestrian_directions.cpp b/routing/pedestrian_directions.cpp index 593f2953d5..7694dea3ab 100644 --- a/routing/pedestrian_directions.cpp +++ b/routing/pedestrian_directions.cpp @@ -90,6 +90,7 @@ void PedestrianDirectionsEngine::CalculateTurns(IndexRoadGraph const & graph, { graph.GetJunctionTypes(edge.GetStartJunction(), types); + // @TODO(bykoianko) Turn types Gate and LiftGate should be removed. if (HasType(m_typeLiftGate, types)) turns.emplace_back(i, turns::PedestrianDirection::LiftGate); else if (HasType(m_typeGate, types)) diff --git a/routing/routing_integration_tests/pedestrian_route_test.cpp b/routing/routing_integration_tests/pedestrian_route_test.cpp index d320c8394b..570feb862e 100644 --- a/routing/routing_integration_tests/pedestrian_route_test.cpp +++ b/routing/routing_integration_tests/pedestrian_route_test.cpp @@ -449,67 +449,6 @@ UNIT_TEST(BelarusMinskRenaissanceHotelUndergroundCross) TEST_EQUAL(t[2].m_pedestrianTurn, PedestrianDirection::ReachedYourDestination, ()); } -// Fails to generate "LiftGate" direction. -UNIT_TEST(RussiaMoscowTrubnikovPereulok30Ac1LiftGate) -{ - TRouteResult const routeResult = - integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Pedestrian>(), - MercatorBounds::FromLatLon(55.75533, 37.58789), {0., 0.}, - MercatorBounds::FromLatLon(55.75543, 37.58717)); - - Route const & route = *routeResult.first; - IRouter::ResultCode const result = routeResult.second; - TEST_EQUAL(result, IRouter::NoError, ()); - - vector<turns::TurnItem> t; - route.GetTurnsForTesting(t); - TEST_EQUAL(t.size(), 2, ()); - - TEST_EQUAL(t[0].m_pedestrianTurn, PedestrianDirection::LiftGate, ()); - TEST_EQUAL(t[1].m_pedestrianTurn, PedestrianDirection::ReachedYourDestination, ()); -} - -// Fails to generate "Gate" direction. -UNIT_TEST(RussiaMoscowKhlebnyyLane15c1Gate) -{ - TRouteResult const routeResult = - integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Pedestrian>(), - MercatorBounds::FromLatLon(55.755, 37.59461), {0., 0.}, - MercatorBounds::FromLatLon(55.75522, 37.59494)); - - Route const & route = *routeResult.first; - IRouter::ResultCode const result = routeResult.second; - TEST_EQUAL(result, IRouter::NoError, ()); - - vector<turns::TurnItem> t; - route.GetTurnsForTesting(t); - TEST_EQUAL(t.size(), 2, ()); - - TEST_EQUAL(t[0].m_pedestrianTurn, PedestrianDirection::Gate, ()); - TEST_EQUAL(t[1].m_pedestrianTurn, PedestrianDirection::ReachedYourDestination, ()); -} - -// Fails to generate "LiftGate"/"Gate" directions. -UNIT_TEST(RussiaMoscowKhlebnyyLane19LiftGateAndGate) -{ - TRouteResult const routeResult = - integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Pedestrian>(), - MercatorBounds::FromLatLon(55.75518, 37.59382), {0., 0.}, - MercatorBounds::FromLatLon(55.7554, 37.59327)); - - Route const & route = *routeResult.first; - IRouter::ResultCode const result = routeResult.second; - TEST_EQUAL(result, IRouter::NoError, ()); - - vector<turns::TurnItem> t; - route.GetTurnsForTesting(t); - TEST_EQUAL(t.size(), 3, ()); - - TEST_EQUAL(t[0].m_pedestrianTurn, PedestrianDirection::LiftGate, ()); - TEST_EQUAL(t[1].m_pedestrianTurn, PedestrianDirection::Gate, ()); - TEST_EQUAL(t[2].m_pedestrianTurn, PedestrianDirection::ReachedYourDestination, ()); -} - UNIT_TEST(MoscowVodnyStadiumHighwayPlatform) { integration::CalculateRouteAndTestRouteLength( |