diff options
| author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2018-02-21 16:02:09 +0300 |
|---|---|---|
| committer | mpimenov <mpimenov@users.noreply.github.com> | 2018-02-28 14:09:16 +0300 |
| commit | 1d735246e0c32a5caef972084523afedca05e711 (patch) | |
| tree | b6f5c0f6f6824b96229d343fba75255b9601ce4c /routing | |
| parent | df726efe29f8e6d7a78ea2cc993b80a080416f79 (diff) | |
Removing outdated TakeTheExit and adding ExitHighwayToRight and ExitHighwayToLeft.
Diffstat (limited to 'routing')
| -rw-r--r-- | routing/turns.cpp | 3 | ||||
| -rw-r--r-- | routing/turns.hpp | 5 | ||||
| -rw-r--r-- | routing/turns_tts_text.cpp | 3 |
3 files changed, 7 insertions, 4 deletions
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<pair<CarDirection, char const *>, static_cast<size_t>(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, ()); |