From 1d735246e0c32a5caef972084523afedca05e711 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Wed, 21 Feb 2018 16:02:09 +0300 Subject: Removing outdated TakeTheExit and adding ExitHighwayToRight and ExitHighwayToLeft. --- routing/turns.cpp | 3 ++- routing/turns.hpp | 5 +++-- routing/turns_tts_text.cpp | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'routing') diff --git a/routing/turns.cpp b/routing/turns.cpp index 5c55fa22f7..6aaf370a01 100644 --- a/routing/turns.cpp +++ b/routing/turns.cpp @@ -47,7 +47,8 @@ array, static_cast(CarDirection::Count) {CarDirection::TurnSlightLeft, "TurnSlightLeft"}, {CarDirection::UTurnLeft, "UTurnLeft"}, {CarDirection::UTurnRight, "UTurnRight"}, - {CarDirection::TakeTheExit, "TakeTheExit"}, + {CarDirection::ExitHighwayToRight, "ExitHighwayToRight"}, + {CarDirection::ExitHighwayToLeft, "ExitHighwayToLeft"}, {CarDirection::EnterRoundAbout, "EnterRoundAbout"}, {CarDirection::LeaveRoundAbout, "LeaveRoundAbout"}, {CarDirection::StayOnRoundAbout, "StayOnRoundAbout"}, diff --git a/routing/turns.hpp b/routing/turns.hpp index b58e523c43..ce7e51976a 100644 --- a/routing/turns.hpp +++ b/routing/turns.hpp @@ -91,14 +91,15 @@ enum class CarDirection UTurnLeft, UTurnRight, - TakeTheExit, - EnterRoundAbout, LeaveRoundAbout, StayOnRoundAbout, StartAtEndOfStreet, ReachedYourDestination, + + ExitHighwayToRight, + ExitHighwayToLeft, Count /**< This value is used for internals only. */ }; diff --git a/routing/turns_tts_text.cpp b/routing/turns_tts_text.cpp index 13fcc8fd5c..8f464b66b6 100644 --- a/routing/turns_tts_text.cpp +++ b/routing/turns_tts_text.cpp @@ -159,7 +159,8 @@ string GetDirectionTextId(Notification const & notification) return GetYouArriveTextId(notification); case CarDirection::StayOnRoundAbout: case CarDirection::StartAtEndOfStreet: - case CarDirection::TakeTheExit: + case CarDirection::ExitHighwayToRight: + case CarDirection::ExitHighwayToLeft: case CarDirection::None: case CarDirection::Count: ASSERT(false, ()); -- cgit v1.2.3