From f8aec2ae3c90c159a93f40b7524d3c356c7956a1 Mon Sep 17 00:00:00 2001
From: Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru>
Date: Fri, 21 Jul 2017 18:48:58 +0300
Subject: [PATCH] Renaming to enum CarDirection at Android.

---
 .../maps/routing/NavigationController.java         | 11 +++++------
 .../com/mapswithme/maps/routing/RoutingInfo.java   | 14 +++++++-------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/android/src/com/mapswithme/maps/routing/NavigationController.java b/android/src/com/mapswithme/maps/routing/NavigationController.java
index ca35ace630..970ef35989 100644
--- a/android/src/com/mapswithme/maps/routing/NavigationController.java
+++ b/android/src/com/mapswithme/maps/routing/NavigationController.java
@@ -41,7 +41,6 @@ import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
 import static com.mapswithme.util.statistics.Statistics.EventName.ROUTING_BOOKMARKS_CLICK;
-import static com.mapswithme.util.statistics.Statistics.EventName.ROUTING_SEARCH_CLICK;
 
 public class NavigationController implements TrafficManager.TrafficCallback, View.OnClickListener
 {
@@ -204,15 +203,15 @@ public class NavigationController implements TrafficManager.TrafficCallback, Vie
                                                     R.dimen.text_size_nav_dimension,
                                                     info.distToTurn,
                                                     info.turnUnits));
-    info.vehicleTurnDirection.setTurnDrawable(mNextTurnImage);
-    if (RoutingInfo.VehicleTurnDirection.isRoundAbout(info.vehicleTurnDirection))
+    info.carDirection.setTurnDrawable(mNextTurnImage);
+    if (RoutingInfo.CarDirection.isRoundAbout(info.carDirection))
       UiUtils.setTextAndShow(mCircleExit, String.valueOf(info.exitNum));
     else
       UiUtils.hide(mCircleExit);
 
-    UiUtils.showIf(info.vehicleNextTurnDirection.containsNextTurn(), mNextNextTurnFrame);
-    if (info.vehicleNextTurnDirection.containsNextTurn())
-      info.vehicleNextTurnDirection.setNextTurnDrawable(mNextNextTurnImage);
+    UiUtils.showIf(info.nextCarDirection.containsNextTurn(), mNextNextTurnFrame);
+    if (info.nextCarDirection.containsNextTurn())
+      info.nextCarDirection.setNextTurnDrawable(mNextNextTurnImage);
   }
 
   private void updatePedestrian(RoutingInfo info)
diff --git a/android/src/com/mapswithme/maps/routing/RoutingInfo.java b/android/src/com/mapswithme/maps/routing/RoutingInfo.java
index 321a74a1c6..641b45c1fd 100644
--- a/android/src/com/mapswithme/maps/routing/RoutingInfo.java
+++ b/android/src/com/mapswithme/maps/routing/RoutingInfo.java
@@ -23,8 +23,8 @@ public class RoutingInfo
   public final String nextStreet;
   public final double completionPercent;
   // For vehicle routing.
-  public final VehicleTurnDirection vehicleTurnDirection;
-  public final VehicleTurnDirection vehicleNextTurnDirection;
+  public final CarDirection carDirection;
+  public final CarDirection nextCarDirection;
   public final int exitNum;
   public final SingleLaneInfo[] lanes;
   // For pedestrian routing.
@@ -34,7 +34,7 @@ public class RoutingInfo
   /**
    * IMPORTANT : Order of enum values MUST BE the same as native CarDirection enum.
    */
-  public enum VehicleTurnDirection
+  public enum CarDirection
   {
     NO_TURN(R.drawable.ic_turn_straight, 0),
     GO_STRAIGHT(R.drawable.ic_turn_straight, 0),
@@ -61,7 +61,7 @@ public class RoutingInfo
     private final int mTurnRes;
     private final int mNextTurnRes;
 
-    VehicleTurnDirection(@DrawableRes int mainResId, @DrawableRes int nextResId)
+    CarDirection(@DrawableRes int mainResId, @DrawableRes int nextResId)
     {
       mTurnRes = mainResId;
       mNextTurnRes = nextResId;
@@ -83,7 +83,7 @@ public class RoutingInfo
       return mNextTurnRes != 0;
     }
 
-    public static boolean isRoundAbout(VehicleTurnDirection turn)
+    public static boolean isRoundAbout(CarDirection turn)
     {
       return turn == ENTER_ROUND_ABOUT || turn == LEAVE_ROUND_ABOUT || turn == STAY_ON_ROUND_ABOUT;
     }
@@ -138,8 +138,8 @@ public class RoutingInfo
     this.nextStreet = nextStreet;
     this.totalTimeInSeconds = totalTime;
     this.completionPercent = completionPercent;
-    this.vehicleTurnDirection = VehicleTurnDirection.values()[vehicleTurnOrdinal];
-    this.vehicleNextTurnDirection = VehicleTurnDirection.values()[vehicleNextTurnOrdinal];
+    this.carDirection = CarDirection.values()[vehicleTurnOrdinal];
+    this.nextCarDirection = CarDirection.values()[vehicleNextTurnOrdinal];
     this.lanes = lanes;
     this.exitNum = exitNum;
     this.pedestrianTurnDirection = PedestrianTurnDirection.values()[pedestrianTurnOrdinal];