From 39abaf3c6596b098ec98f7a041bfd3bf7519ae28 Mon Sep 17 00:00:00 2001
From: Olga Khlopkova <o.khlopkova@corp.mail.ru>
Date: Thu, 1 Oct 2020 16:35:45 +0300
Subject: [PATCH] [android] Update PedestrianTurnDirection according to the C++
 enum.

---
 .../mapswithme/maps/routing/RoutingInfo.java  | 38 ++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/android/src/com/mapswithme/maps/routing/RoutingInfo.java b/android/src/com/mapswithme/maps/routing/RoutingInfo.java
index 7b75a49963..6bae93077f 100644
--- a/android/src/com/mapswithme/maps/routing/RoutingInfo.java
+++ b/android/src/com/mapswithme/maps/routing/RoutingInfo.java
@@ -95,17 +95,37 @@ public class RoutingInfo
 
   enum PedestrianTurnDirection
   {
-    NONE,
-    UPSTAIRS,
-    DOWNSTAIRS,
-    LIFT_GATE,
-    GATE,
-    REACHED_YOUR_DESTINATION;
+    NO_TURN(R.drawable.ic_turn_straight, 0),
+    GO_STRAIGHT(R.drawable.ic_turn_straight, 0),
 
-    public static void setTurnDrawable(ImageView view, DistanceAndAzimut distanceAndAzimut)
+    TURN_RIGHT(R.drawable.ic_turn_right, R.drawable.ic_then_right),
+    TURN_LEFT(R.drawable.ic_turn_left, R.drawable.ic_then_left),
+
+    REACHED_YOUR_DESTINATION(R.drawable.ic_turn_finish, R.drawable.ic_then_finish);
+
+    private final int mTurnRes;
+    private final int mNextTurnRes;
+
+    PedestrianTurnDirection(@DrawableRes int mainResId, @DrawableRes int nextResId)
     {
-      view.setImageResource(R.drawable.ic_turn_direction);
-      view.setRotation((float) Math.toDegrees(distanceAndAzimut.getAzimuth()));
+      mTurnRes = mainResId;
+      mNextTurnRes = nextResId;
+    }
+
+    public void setTurnDrawable(ImageView imageView)
+    {
+      imageView.setImageResource(mTurnRes);
+      imageView.setRotation(0.0f);
+    }
+
+    public void setNextTurnDrawable(ImageView imageView)
+    {
+      imageView.setImageResource(mNextTurnRes);
+    }
+
+    public boolean containsNextTurn()
+    {
+      return mNextTurnRes != 0;
     }
   }