Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--android/src/com/mapswithme/maps/routing/RoutingInfo.java6
-rw-r--r--map/routing_manager.cpp3
-rw-r--r--routing/turns.cpp3
-rw-r--r--routing/turns.hpp5
-rw-r--r--routing/turns_tts_text.cpp3
5 files changed, 12 insertions, 8 deletions
diff --git a/android/src/com/mapswithme/maps/routing/RoutingInfo.java b/android/src/com/mapswithme/maps/routing/RoutingInfo.java
index 641b45c1fd..9debd17c72 100644
--- a/android/src/com/mapswithme/maps/routing/RoutingInfo.java
+++ b/android/src/com/mapswithme/maps/routing/RoutingInfo.java
@@ -49,14 +49,16 @@ public class RoutingInfo
U_TURN_LEFT(R.drawable.ic_turn_uleft, R.drawable.ic_then_uleft),
U_TURN_RIGHT(R.drawable.ic_turn_uright, R.drawable.ic_then_uright),
- TAKE_THE_EXIT(R.drawable.ic_turn_finish, R.drawable.ic_then_finish),
ENTER_ROUND_ABOUT(R.drawable.ic_turn_round, R.drawable.ic_then_round),
LEAVE_ROUND_ABOUT(R.drawable.ic_turn_round, R.drawable.ic_then_round),
STAY_ON_ROUND_ABOUT(R.drawable.ic_turn_round, R.drawable.ic_then_round),
START_AT_THE_END_OF_STREET(0, 0),
- REACHED_YOUR_DESTINATION(R.drawable.ic_turn_finish, R.drawable.ic_then_finish);
+ REACHED_YOUR_DESTINATION(R.drawable.ic_turn_finish, R.drawable.ic_then_finish),
+
+ EXIT_HIGHWAY_TO_RIGHT(0, 0),
+ EXIT_HIGHWAY_TO_LEFT(0, 0);
private final int mTurnRes;
private final int mNextTurnRes;
diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp
index 61d90a9df1..fffc907617 100644
--- a/map/routing_manager.cpp
+++ b/map/routing_manager.cpp
@@ -71,8 +71,7 @@ void FillTurnsDistancesForRendering(vector<RouteSegment> const & segments,
CHECK_NOT_EQUAL(t.m_turn, CarDirection::Count, ());
// We do not render some of turn directions.
if (t.m_turn == CarDirection::None || t.m_turn == CarDirection::StartAtEndOfStreet ||
- t.m_turn == CarDirection::StayOnRoundAbout || t.m_turn == CarDirection::TakeTheExit ||
- t.m_turn == CarDirection::ReachedYourDestination)
+ t.m_turn == CarDirection::StayOnRoundAbout || t.m_turn == CarDirection::ReachedYourDestination)
{
continue;
}
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, ());