added exit convenience method (#303)

* added convenience method for directions exit property

Author: ghoshkaj

Makefile

@@ -91,6 +91,10 @@ directions-fixtures:
 	curl "https://api.mapbox.com/directions/v5/mapbox/driving/-122.416667,37.783333;-121.900000,37.333333?geometries=polyline6&steps=true&access_token=$(MAPBOX_ACCESS_TOKEN)" \
 		-o mapbox/libjava-services/src/test/fixtures/directions_v5_precision_6.json
 
+directions-fixtures-exit-property:
+	curl "https://api.mapbox.com/directions/v5/mapbox/driving/-77.02962040901184,38.90728142481329;-77.02808618545532,38.910111607145296?geometries=polyline&steps=true&access_token=$(MAPBOX_ACCESS_TOKEN)" \
+		-o mapbox/libjava-services/src/test/fixtures/directions_v5_exit_property.json
+
 directions-traffic-fixtures:
 	curl "https://api.mapbox.com/directions/v5/mapbox/driving-traffic/-122.416667,37.783333;-121.900000,37.333333?geometries=polyline&steps=true&access_token=$(MAPBOX_ACCESS_TOKEN)" \
 		-o mapbox/libjava-services/src/test/fixtures/directions_v5_traffic.json

mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/models/StepManeuver.java

@@ -21,6 +21,7 @@ public class StepManeuver {
   private String pronunciation;
   private String modifier;
   private String instruction;
+  private Integer exit;
 
   /**
    * @return double array of [longitude, latitude] for the snapped coordinate.
@@ -75,6 +76,22 @@ public String getType() {
     return type;
   }
 
+  /**
+   * An optional integer indicating number of the exit to take.
+   * If exit is undefined the destination is on the roundabout.
+   * The property exists for the following type properties:
+   *
+   * else - indicates the number of intersections passed until the turn.
+   * roundabout - traverse roundabout
+   * rotary - a traffic circle
+   *
+   * @return String of an integer indicating number of the exit to take.
+   * @since 2.0.0
+   */
+  public Integer getExit() {
+    return exit;
+  }
+
   /**
    * The pronunciation hint of the way name. Will be undefined if no pronunciation is hit.
    *
@@ -132,6 +149,7 @@ public String toString() {
       + ", type='" + type + '\''
       + ", pronunciation='" + pronunciation + '\''
       + ", modifier='" + modifier + '\''
+      + ", exit=" + exit
       + '}';
   }
 }

mapbox/libjava-services/src/test/fixtures/directions_v5_exit_property.json

@@ -0,0 +1 @@
+{"routes":[{"legs":[{"steps":[{"intersections":[{"out":0,"entry":[true],"bearings":[0],"location":[-77.029629,38.90728]},{"out":0,"location":[-77.029631,38.908575],"bearings":[0,90,180,270],"entry":[true,true,false,false],"in":2},{"out":0,"location":[-77.029621,38.908746],"bearings":[15,180,345],"entry":[true,false,false],"in":1}],"geometry":"oanlFdzcuMG?mF?M?M?SAQESIEEMKSY","maneuver":{"bearing_after":0,"location":[-77.029629,38.90728],"bearing_before":0,"type":"depart","instruction":"Head north on 13th Street Northwest"},"duration":17.6,"distance":215.8,"name":"13th Street Northwest","mode":"driving"},{"intersections":[{"out":0,"location":[-77.029315,38.909144],"bearings":[60,225,240],"entry":[true,false,false],"in":1},{"out":0,"location":[-77.028943,38.909474],"bearings":[15,45,195],"entry":[true,true,false],"in":2},{"out":0,"location":[-77.028904,38.909711],"bearings":[30,120,180,345],"entry":[true,false,false,true],"in":2}],"geometry":"cmnlFfxcuMEMCGEICEEEEGEEGEECMGGAMCE?SAGCECEEGGEIAEMe@W_AEU","maneuver":{"exit":2,"bearing_after":63,"type":"roundabout","modifier":"straight","bearing_before":43,"location":[-77.029315,38.909144],"instruction":"Enter the roundabout and take the 2nd exit onto Rhode Island Avenue Northwest"},"duration":10.9,"distance":162.8,"name":"Rhode Island Avenue Northwest","mode":"driving"},{"intersections":[{"in":0,"entry":[true],"bearings":[246],"location":[-77.028088,38.910114]}],"geometry":"esnlFppcuM","maneuver":{"bearing_after":0,"location":[-77.028088,38.910114],"bearing_before":66,"type":"arrive","instruction":"You have arrived at your destination"},"duration":0,"distance":0,"name":"Rhode Island Avenue Northwest","mode":"driving"}],"summary":"13th Street Northwest, Rhode Island Avenue Northwest","duration":28.5,"distance":378.6}],"geometry":"oanlFdzcuMcG?s@Gg@[g@_AYY[Mg@E[Us@kC","duration":28.5,"distance":378.6}],"waypoints":[{"name":"13th Street Northwest","location":[-77.029629,38.90728]},{"name":"Rhode Island Avenue Northwest","location":[-77.028088,38.910114]}],"code":"Ok"}

mapbox/libjava-services/src/test/java/com/mapbox/services/api/directions/v5/MapboxDirectionsTest.java

@@ -22,6 +22,7 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 
 import okhttp3.HttpUrl;
@@ -42,7 +43,7 @@ public class MapboxDirectionsTest {
   public static final String DIRECTIONS_V5_FIXTURE = "src/test/fixtures/directions_v5.json";
   public static final String DIRECTIONS_V5_PRECISION6_FIXTURE = "src/test/fixtures/directions_v5_precision_6.json";
   public static final String DIRECTIONS_TRAFFIC_FIXTURE = "src/test/fixtures/directions_v5_traffic.json";
-
+  public static final String DIRECTIONS_EXIT_FIXTURE = "src/test/fixtures/directions_v5_exit_property.json";
   private static final double DELTA = 1E-10;
 
   private MockWebServer server;
@@ -58,13 +59,18 @@ public void setUp() throws IOException {
 
       @Override
       public MockResponse dispatch(RecordedRequest request) throws InterruptedException {
+
         // Switch response on geometry parameter (only false supported, so nice and simple)
         String resource = DIRECTIONS_V5_FIXTURE;
         if (request.getPath().contains("geometries=polyline6")) {
           resource = DIRECTIONS_V5_PRECISION6_FIXTURE;
-        } else if (request.getPath().contains("driving-traffic")) {
+        }
+        if (request.getPath().contains("driving-traffic")) {
           resource = DIRECTIONS_TRAFFIC_FIXTURE;
         }
+        if (request.getPath().contains("-77.02962")) {
+          resource = DIRECTIONS_EXIT_FIXTURE;
+        }
 
         try {
           String body = new String(Files.readAllBytes(Paths.get(resource)), Charset.forName("utf-8"));
@@ -347,8 +353,37 @@ public void testStepManeuver() throws ServicesException, IOException {
     assertEquals(maneuver.getType(), "depart");
     assertEquals(maneuver.getModifier(), "left");
     assertEquals(maneuver.getInstruction(), "Head west on Eddy Street");
+    assertEquals(maneuver.getExit(), null);
   }
 
+
+  @Test
+  public void testStepManeuverForExit() throws ServicesException, IOException {
+    List<Position> positionsExit = new ArrayList<>();
+    positionsExit.add(Position.fromCoordinates(-77.02962040901184, 38.90728142481329));
+    positionsExit.add(Position.fromCoordinates(-77.02808618545532, 38.910111607145296));
+
+    MapboxDirections client = new MapboxDirections.Builder()
+      .setAccessToken("pk.XXX")
+      .setCoordinates(positionsExit)
+      .setProfile(DirectionsCriteria.PROFILE_DRIVING)
+      .setBaseUrl(mockUrl.toString())
+      .build();
+    Response<DirectionsResponse> response = client.executeCall();
+
+    StepManeuver maneuver = response.body().getRoutes().get(0).getLegs().get(0).getSteps().get(1).getManeuver();
+    assertEquals(maneuver.asPosition().getLongitude(), -77.029315, DELTA);
+    assertEquals(maneuver.asPosition().getLatitude(), 38.909144, DELTA);
+    assertEquals(maneuver.getBearingBefore(), 43.0, DELTA);
+    assertEquals(maneuver.getBearingAfter(), 63.0, DELTA);
+    assertEquals(maneuver.getType(), "roundabout");
+    assertEquals(maneuver.getModifier(), "straight");
+    assertEquals(maneuver.getInstruction(),
+      "Enter the roundabout and take the 2nd exit onto Rhode Island Avenue Northwest");
+    assertEquals(maneuver.getExit(), new Integer(2));
+  }
+
+
   @Test
   public void testSetCoordinates() {
     ArrayList test = new ArrayList<>();