diff --git a/routing/routing_tests/turns_generator_test.cpp b/routing/routing_tests/turns_generator_test.cpp index 4c6e2ad275..2a7384c735 100644 --- a/routing/routing_tests/turns_generator_test.cpp +++ b/routing/routing_tests/turns_generator_test.cpp @@ -176,7 +176,8 @@ UNIT_TEST(TestIsLaneWayConformedTurnDirection) TEST(IsLaneWayConformedTurnDirection(LaneWay::Right, TurnDirection::TurnRight), ()); TEST(IsLaneWayConformedTurnDirection(LaneWay::SlightLeft, TurnDirection::TurnSlightLeft), ()); TEST(IsLaneWayConformedTurnDirection(LaneWay::SharpRight, TurnDirection::TurnSharpRight), ()); - TEST(IsLaneWayConformedTurnDirection(LaneWay::Reverse, TurnDirection::UTurn), ()); + TEST(IsLaneWayConformedTurnDirection(LaneWay::Reverse, TurnDirection::UTurnLeft), ()); + TEST(IsLaneWayConformedTurnDirection(LaneWay::Reverse, TurnDirection::UTurnRight), ()); TEST(IsLaneWayConformedTurnDirection(LaneWay::Through, TurnDirection::GoStraight), ()); TEST(!IsLaneWayConformedTurnDirection(LaneWay::Left, TurnDirection::TurnSlightLeft), ()); @@ -193,12 +194,15 @@ UNIT_TEST(TestIsLaneWayConformedTurnDirectionApproximately) TEST(IsLaneWayConformedTurnDirectionApproximately(LaneWay::Left, TurnDirection::TurnSlightLeft), ()); TEST(IsLaneWayConformedTurnDirectionApproximately(LaneWay::Right, TurnDirection::TurnSharpRight), ()); TEST(IsLaneWayConformedTurnDirectionApproximately(LaneWay::Right, TurnDirection::TurnRight), ()); - TEST(IsLaneWayConformedTurnDirectionApproximately(LaneWay::Reverse, TurnDirection::UTurn), ()); + TEST(IsLaneWayConformedTurnDirectionApproximately(LaneWay::Reverse, TurnDirection::UTurnLeft), ()); + TEST(IsLaneWayConformedTurnDirectionApproximately(LaneWay::Reverse, TurnDirection::UTurnRight), ()); TEST(IsLaneWayConformedTurnDirectionApproximately(LaneWay::SlightLeft, TurnDirection::GoStraight), ()); TEST(IsLaneWayConformedTurnDirectionApproximately(LaneWay::SlightRight, TurnDirection::GoStraight), ()); - TEST(!IsLaneWayConformedTurnDirectionApproximately(LaneWay::SharpLeft, TurnDirection::UTurn), ()); - TEST(!IsLaneWayConformedTurnDirectionApproximately(LaneWay::SharpRight, TurnDirection::UTurn), ()); + TEST(!IsLaneWayConformedTurnDirectionApproximately(LaneWay::SharpLeft, TurnDirection::UTurnLeft), ()); + TEST(!IsLaneWayConformedTurnDirectionApproximately(LaneWay::SharpLeft, TurnDirection::UTurnRight), ()); + TEST(!IsLaneWayConformedTurnDirectionApproximately(LaneWay::SharpRight, TurnDirection::UTurnLeft), ()); + TEST(!IsLaneWayConformedTurnDirectionApproximately(LaneWay::SharpRight, TurnDirection::UTurnRight), ()); TEST(!IsLaneWayConformedTurnDirection(LaneWay::Through, TurnDirection::ReachedYourDestination), ()); TEST(!IsLaneWayConformedTurnDirectionApproximately(LaneWay::Through, TurnDirection::TurnRight), ()); TEST(!IsLaneWayConformedTurnDirectionApproximately(LaneWay::SlightRight, diff --git a/routing/routing_tests/turns_tts_text_tests.cpp b/routing/routing_tests/turns_tts_text_tests.cpp index c2ecdb662a..ca2166b910 100644 --- a/routing/routing_tests/turns_tts_text_tests.cpp +++ b/routing/routing_tests/turns_tts_text_tests.cpp @@ -78,7 +78,7 @@ UNIT_TEST(GetDirectionTextIdTest) TEST_EQUAL(GetDirectionTextId(notifiation1), "make_a_right_turn", ()); Notification const notifiation2(1000, 0, false, TurnDirection::GoStraight, ::Settings::Metric); TEST_EQUAL(GetDirectionTextId(notifiation2), "go_straight", ()); - Notification const notifiation3(700, 0, false, TurnDirection::UTurn, ::Settings::Metric); + Notification const notifiation3(700, 0, false, TurnDirection::UTurnLeft, ::Settings::Metric); TEST_EQUAL(GetDirectionTextId(notifiation3), "make_a_u_turn", ()); Notification const notifiation4(200, 0, false, TurnDirection::ReachedYourDestination, ::Settings::Metric); TEST_EQUAL(GetDirectionTextId(notifiation4), "destination", ()); diff --git a/routing/turns.cpp b/routing/turns.cpp index 4e2f47e6cf..77f26194a8 100644 --- a/routing/turns.cpp +++ b/routing/turns.cpp @@ -35,7 +35,8 @@ array, static_cast(TurnDirection::Coun {TurnDirection::TurnLeft, "TurnLeft"}, {TurnDirection::TurnSharpLeft, "TurnSharpLeft"}, {TurnDirection::TurnSlightLeft, "TurnSlightLeft"}, - {TurnDirection::UTurn, "UTurn"}, + {TurnDirection::UTurnLeft, "UTurnLeft"}, + {TurnDirection::UTurnRight, "UTurnRight"}, {TurnDirection::TakeTheExit, "TakeTheExit"}, {TurnDirection::EnterRoundAbout, "EnterRoundAbout"}, {TurnDirection::LeaveRoundAbout, "LeaveRoundAbout"}, @@ -138,7 +139,8 @@ bool IsLaneWayConformedTurnDirection(LaneWay l, TurnDirection t) return l == LaneWay::SharpLeft; case TurnDirection::TurnSlightLeft: return l == LaneWay::SlightLeft; - case TurnDirection::UTurn: + case TurnDirection::UTurnLeft: + case TurnDirection::UTurnRight: return l == LaneWay::Reverse; } } @@ -163,7 +165,8 @@ bool IsLaneWayConformedTurnDirectionApproximately(LaneWay l, TurnDirection t) return l == LaneWay::SharpLeft || l == LaneWay::Left; case TurnDirection::TurnSlightLeft: return l == LaneWay::SlightLeft || l == LaneWay::Through || l == LaneWay::Left; - case TurnDirection::UTurn: + case TurnDirection::UTurnLeft: + case TurnDirection::UTurnRight: return l == LaneWay::Reverse; } } diff --git a/routing/turns.hpp b/routing/turns.hpp index 8b35be3d45..2086781612 100644 --- a/routing/turns.hpp +++ b/routing/turns.hpp @@ -36,7 +36,8 @@ enum class TurnDirection TurnSharpLeft, TurnSlightLeft, - UTurn, + UTurnLeft, + UTurnRight, TakeTheExit, diff --git a/routing/turns_tts_text.cpp b/routing/turns_tts_text.cpp index f296348818..f9416123d1 100644 --- a/routing/turns_tts_text.cpp +++ b/routing/turns_tts_text.cpp @@ -147,7 +147,8 @@ string GetDirectionTextId(Notification const & notification) return "make_a_sharp_left_turn"; case TurnDirection::TurnSlightLeft: return "make_a_slight_left_turn"; - case TurnDirection::UTurn: + case TurnDirection::UTurnLeft: + case TurnDirection::UTurnRight: return "make_a_u_turn"; case TurnDirection::EnterRoundAbout: return "enter_the_roundabout";