AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Changing turn angles in rightmost and leftmost direction.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-04-24 18:23:51 +03:00 • committed by Aleksandr Zatsepin
parent b566fcf487
commit 033e383431
3 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
routing/routing_integration_tests/bicycle_turn_test.cpp
View file

@ -63,7 +63,7 @@ UNIT_TEST(RussiaMoscowSalameiNerisPossibleTurnCorrectionBicycleWayTurnTest)
integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnSlightRight);
integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnSlightLeft);
integration::GetNthTurn(route, 2).TestValid().TestDirection(CarDirection::TurnSlightLeft);
integration::GetNthTurn(route, 3).TestValid().TestDirection(CarDirection::GoStraight);
integration::GetNthTurn(route, 3).TestValid().TestDirection(CarDirection::TurnSlightRight);
}
// Test that there's no uturn notification in case of zero point edges on two way edges.
@ -79,7 +79,7 @@ UNIT_TEST(RussiaMoscowSalameiNerisNoUTurnBicycleWayTurnTest)
TEST_EQUAL(result, IRouter::NoError, ());
integration::TestTurnCount(route, 1 /* expectedTurnCount */);
integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnRight);
integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnSlightRight);
}
UNIT_TEST(RussiaMoscowSevTushinoParkBicycleOnePointOnewayRoadTurnTest)
@ -139,7 +139,7 @@ UNIT_TEST(RussiaMoscowSvobodiOnewayBicycleWayTurnTest)
integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnLeft);
integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnSlightRight);
integration::GetNthTurn(route, 2).TestValid().TestDirection(CarDirection::TurnSlightLeft);
integration::GetNthTurn(route, 3).TestValid().TestDirection(CarDirection::GoStraight);
integration::GetNthTurn(route, 3).TestValid().TestDirection(CarDirection::TurnSlightRight);
integration::GetNthTurn(route, 4).TestValid().TestOneOfDirections(
{CarDirection::TurnSlightRight, CarDirection::TurnRight});
integration::GetNthTurn(route, 5).TestValid().TestDirection(CarDirection::TurnLeft);

18
routing/routing_integration_tests/turn_test.cpp
View file

@ -160,7 +160,7 @@ UNIT_TEST(RussiaMoscowPlanetnayaOnlyStraightTest)
integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnRight);
integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnRight);
integration::GetNthTurn(route, 2).TestValid().TestDirection(CarDirection::TurnLeft);
integration::GetNthTurn(route, 3).TestValid().TestDirection(CarDirection::GoStraight);
integration::GetNthTurn(route, 3).TestValid().TestDirection(CarDirection::TurnSlightRight);
integration::GetNthTurn(route, 4).TestValid().TestDirection(CarDirection::TurnRight);
integration::TestRouteLength(route, 454.);
@ -199,7 +199,7 @@ UNIT_TEST(RussiaMoscowTTKVarshavskoeShosseOutTurnTest)
TEST_EQUAL(result, IRouter::NoError, ());
integration::TestTurnCount(route, 2 /* expectedTurnCount */);
integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::ExitHighwayToRight);
integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnSlightLeft);
integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::GoStraight);
}
UNIT_TEST(RussiaMoscowTTKUTurnTest)
@ -216,7 +216,7 @@ UNIT_TEST(RussiaMoscowTTKUTurnTest)
integration::TestTurnCount(route, 4 /* expectedTurnCount */);
integration::GetNthTurn(route, 0).TestValid().TestOneOfDirections(
{CarDirection::TurnSlightRight, CarDirection::TurnRight});
integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnSlightLeft);
integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::GoStraight);
integration::GetNthTurn(route, 2).TestValid().TestDirection(CarDirection::UTurnLeft);
integration::GetNthTurn(route, 3).TestValid().TestDirection(CarDirection::TurnSlightLeft);
}
@ -385,7 +385,7 @@ UNIT_TEST(ThailandPhuketNearPrabarameeRoad)
TEST_EQUAL(result, IRouter::NoError, ());
integration::TestTurnCount(route, 1 /* expectedTurnCount */);
integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnSlightLeft);
integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::GoStraight);
}
// Test case: a route goes in Moscow from Varshavskoe shosse (from the city center direction)
@ -512,7 +512,9 @@ UNIT_TEST(RussiaMoscowLeningradskiyPrptToTTKTest)
TEST_EQUAL(result, IRouter::NoError, ());
integration::TestTurnCount(route, 2 /* expectedTurnCount */);
integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::ExitHighwayToRight);
integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::GoStraight);
// @TODO(bykoianko) It's a case when two possible ways go slight left.
// A special processing should be implemented for such cases.
integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnSlightLeft);
}
UNIT_TEST(RussiaMoscowLeningradskiyPrptDublToTTKTest)
@ -528,7 +530,7 @@ UNIT_TEST(RussiaMoscowLeningradskiyPrptDublToTTKTest)
TEST_EQUAL(result, IRouter::NoError, ());
integration::TestTurnCount(route, 2 /* expectedTurnCount */);
integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnSlightLeft);
integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::GoStraight);
integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnSlightLeft);
}
UNIT_TEST(RussiaMoscowSvobodaStTest)
@ -543,7 +545,7 @@ UNIT_TEST(RussiaMoscowSvobodaStTest)
TEST_EQUAL(result, IRouter::NoError, ());
integration::TestTurnCount(route, 1 /* expectedTurnCount */);
integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnSlightLeft);
integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::GoStraight);
}
UNIT_TEST(RussiaTiinskTest)
@ -766,7 +768,7 @@ UNIT_TEST(NetherlandsBarneveldTest)
TEST_EQUAL(result, IRouter::NoError, ());
integration::TestTurnCount(route, 1 /* expectedTurnCount */);
integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnSlightRight);
integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::GoStraight);
}
UNIT_TEST(GermanyRaunheimAirportTest)

8
routing/turns_generator.cpp
View file

@ -628,10 +628,10 @@ CarDirection RightmostDirection(const double angle)
{
static vector<pair<double, CarDirection>> const kLowerBounds = {
{157., CarDirection::TurnSharpRight},
{40., CarDirection::TurnRight},
{-10., CarDirection::TurnSlightRight},
{-20., CarDirection::GoStraight},
{-60., CarDirection::TurnSlightLeft},
{50., CarDirection::TurnRight},
{2., CarDirection::TurnSlightRight},
{-10., CarDirection::GoStraight},
{-50., CarDirection::TurnSlightLeft},
{-157., CarDirection::TurnLeft},
{-180., CarDirection::TurnSharpLeft}};