Move Incidents from LegStep to RouteLeg (#1207)

* move Incidents from LegStep to RouteLeg

* test Incidents parsing with MockWebServer

Author: korshaknn

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

@@ -59,14 +59,6 @@ public static Builder builder() {
   @SerializedName("duration_typical")
   public abstract Double durationTypical();
 
-  /**
-   * A list of incidents that occur on the route.
-   *
-   * @return a list of {@link Incident}
-   */
-  @Nullable
-  public abstract List<Incident> incidents();
-
   /**
    * Gives the geometry of the leg step.
    *
@@ -296,14 +288,6 @@ public abstract static class Builder {
      */
     public abstract Builder durationTypical(@Nullable Double durationTypical);
 
-    /**
-     * A list of incidents that occur on the route.
-     *
-     * @param incidents a list of {@link Incident}
-     * @return this builder for chaining options together
-     */
-    public abstract Builder incidents(@Nullable List<Incident> incidents);
-
     /**
      * Gives the geometry of the leg step.
      *

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

@@ -85,6 +85,14 @@ public static Builder builder() {
   @Nullable
   public abstract List<LegStep> steps();
 
+  /**
+   * A list of incidents that occur on this leg.
+   *
+   * @return a list of {@link Incident}
+   */
+  @Nullable
+  public abstract List<Incident> incidents();
+
   /**
    * A {@link LegAnnotation} that contains additional details about each line segment along the
    * route geometry. If you'd like to receiving this, you must request it inside your Directions
@@ -199,6 +207,14 @@ public abstract static class Builder {
      */
     public abstract Builder steps(@Nullable List<LegStep> steps);
 
+    /**
+     * A list of incidents that occur on this leg.
+     *
+     * @param incidents a list of {@link Incident}
+     * @return this builder for chaining options together
+     */
+    public abstract Builder incidents(@Nullable List<Incident> incidents);
+
     /**
      * A {@link LegAnnotation} that contains additional details about each line segment along the
      * route geometry. If you'd like to receiving this, you must request it inside your Directions

services-directions-models/src/test/java/com/mapbox/api/directions/v5/models/RouteLegTest.java

@@ -73,6 +73,8 @@ public void testToFromJson1() {
 
     List<LegStep> steps = new ArrayList<>();
 
+    List<Incident> incidents = new ArrayList<>();
+
     LegAnnotation annotation = LegAnnotation.builder()
       .congestion(new ArrayList<String>())
       .distance(distanceList)
@@ -84,9 +86,9 @@ public void testToFromJson1() {
     RouteLeg routeLeg = RouteLeg.builder()
       .annotation(annotation)
       .distance(53.4)
-      //.weight(14.3)
       .duration(14.3)
       .steps(steps)
+      .incidents(incidents)
       .summary("")
       .build();
 
@@ -97,21 +99,26 @@ public void testToFromJson1() {
   }
 
   @Test
-  public void testAdmins() {
+  public void testFromJson() {
     String routeLegJsonString = "{"
       + "\"distance\": 53.4,"
       + "\"duration\": 14.3,"
       + "\"summary\": \"route summary\","
-      + "\"admins\": [{ \"iso_3166_1_alpha3\": \"USA\", \"iso_3166_1\": \"US\" }]"
+      + "\"admins\": [{ \"iso_3166_1_alpha3\": \"USA\", \"iso_3166_1\": \"US\" }],"
+      + "\"incidents\": [{ \"id\": \"15985415522454461962\" }]"
       + "}";
     List<Admin> admins = new ArrayList<>();
     admins.add(Admin.builder().countryCode("US").countryCodeAlpha3("USA").build());
 
+    List<Incident> incidents = new ArrayList<>();
+    incidents.add(Incident.builder().id("15985415522454461962").build());
+
     RouteLeg routeLeg = RouteLeg.builder()
       .distance(53.4)
       .duration(14.3)
       .summary("route summary")
       .admins(admins)
+      .incidents(incidents)
       .build();
 
     RouteLeg routeLegFromJson = RouteLeg.fromJson(routeLegJsonString);

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

@@ -6,6 +6,7 @@
 import com.mapbox.api.directions.v5.models.BannerInstructions;
 import com.mapbox.api.directions.v5.models.DirectionsResponse;
 import com.mapbox.api.directions.v5.models.DirectionsRoute;
+import com.mapbox.api.directions.v5.models.Incident;
 import com.mapbox.api.directions.v5.models.LegAnnotation;
 import com.mapbox.api.directions.v5.models.RouteOptions;
 import com.mapbox.api.directions.v5.utils.ParseUtils;
@@ -1344,6 +1345,48 @@ public void getIsUsed() {
     assertEquals("GET", call.request().method());
   }
 
+  @Test
+  public void withIncidents() throws Exception {
+    MapboxDirections mapboxDirections = MapboxDirections.builder()
+        .baseUrl(mockUrl.toString())
+        .geometries(GEOMETRY_POLYLINE)
+        .accessToken(ACCESS_TOKEN)
+        .origin(Point.fromLngLat(1.0, 1.0))
+        .destination(Point.fromLngLat(2.0, 2.0))
+        .build();
+
+    assertNotNull(mapboxDirections);
+
+    Response<DirectionsResponse> response = mapboxDirections.executeCall();
+    assertEquals(200, response.code());
+    assertEquals("Ok", response.body().code());
+    assertEquals(1, response.body().routes().size());
+
+    List<Incident> incidents = response.body().routes().get(0).legs().get(0).incidents();
+    assertEquals(1, incidents.size());
+
+    List<Integer> alertcCodes = new ArrayList<>();
+    alertcCodes.add(501);
+    alertcCodes.add(803);
+
+    Incident incident = incidents.get(0);
+    assertEquals("15985415522454461962", incident.id());
+    assertEquals("construction", incident.type());
+    assertEquals(true, incident.closed());
+    assertEquals(55, incident.congestion().value());
+    assertEquals("Zwischen Eching", incident.description());
+    assertEquals("Zwischen Eching und Oberpfaffenhofen", incident.longDescription());
+    assertEquals("minor", incident.impact());
+    assertEquals("CONSTRUCTION", incident.subType());
+    assertEquals("construction description", incident.subTypeDescription());
+    assertEquals(alertcCodes, incident.alertcCodes());
+    assertEquals(805, (int) incident.geometryIndexStart());
+    assertEquals(896, (int) incident.geometryIndexEnd());
+    assertEquals("2020-10-08T11:34:14Z", incident.creationTime());
+    assertEquals("2020-10-06T12:52:02Z", incident.startTime());
+    assertEquals("2020-11-27T16:00:00Z", incident.endTime());
+  }
+
   private void addWaypoints(MapboxDirections.Builder builder, int number) {
     for (int i = 0; i < number; i++) {
       builder.addWaypoint(Point.fromLngLat(getRandomLng(), getRandomLat()));