RouteLegRefresh: added incidents (#1421)

* RouteLegRefresh: added incidents

Author: RingerJK

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

@@ -119,7 +119,7 @@ public static Builder builder() {
   /**
    * A list of closures that occur on this leg.
    *
-   * @return a list of {@link Incident}
+   * @return a list of {@link Closure}
    */
   @Nullable
   public abstract List<Closure> closures();

services-directions-refresh-models/src/main/java/com/mapbox/api/directionsrefresh/v1/models/RouteLegRefresh.java

@@ -1,15 +1,19 @@
 package com.mapbox.api.directionsrefresh.v1.models;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.auto.value.AutoValue;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.TypeAdapter;
 import com.mapbox.api.directions.v5.DirectionsAdapterFactory;
 import com.mapbox.api.directions.v5.models.DirectionsWaypoint;
+import com.mapbox.api.directions.v5.models.Incident;
 import com.mapbox.api.directions.v5.models.LegAnnotation;
 import com.mapbox.api.directionsrefresh.v1.DirectionsRefreshAdapterFactory;
 
+import java.util.List;
+
 /**
  * A route refresh data between only two {@link DirectionsWaypoint}.
  */
@@ -25,6 +29,14 @@ public static Builder builder() {
     return new AutoValue_RouteLegRefresh.Builder();
   }
 
+  /**
+   * 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
@@ -76,6 +88,15 @@ public static RouteLegRefresh fromJson(String json) {
   @AutoValue.Builder
   public abstract static class Builder {
 
+    /**
+     * A list of incidents that occur on this leg.
+     *
+     * @param incidents a list of {@link Incident}
+     * @return this builder for chaining options together
+     */
+    @NonNull
+    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
@@ -84,6 +105,7 @@ public abstract static class Builder {
      * @param annotation a {@link LegAnnotation} object
      * @return this builder for chaining options together
      */
+    @NonNull
     public abstract Builder annotation(@Nullable LegAnnotation annotation);
 
     /**

services-directions-refresh-models/src/test/java/com.mapbox.api.directionsrefresh.v1.models/DirectionsRefreshResponseTest.java

@@ -37,6 +37,7 @@ public void testSerialization() throws IOException {
     assertNotNull(directionsRefreshResponse.route().legs().get(0));
     assertNotNull(directionsRefreshResponse.route().legs().get(0).annotation());
     assertTrue(directionsRefreshResponse.route().legs().get(0).annotation().congestion().size() > 0);
+    assertTrue(directionsRefreshResponse.route().legs().get(0).incidents().size() > 0);
   }
 
   @Test

services-directions-refresh-models/src/test/java/com.mapbox.api.directionsrefresh.v1.models/DirectionsRouteRefreshTest.java

@@ -10,6 +10,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 public class DirectionsRouteRefreshTest extends TestUtils {
 
@@ -32,6 +33,8 @@ public void testSerialization() throws IOException {
     assertNotNull(directionsRouteRefresh.legs());
     assertNotNull(directionsRouteRefresh.legs().get(0).annotation());
     assertNotNull(directionsRouteRefresh.legs().get(0).annotation().congestion());
+    assertNotNull(directionsRouteRefresh.legs().get(0).incidents());
+    assertTrue(directionsRouteRefresh.legs().get(0).incidents().size() > 0);
   }
 
   @Test
@@ -46,6 +49,7 @@ public void testSerializationFirstLegPassed() throws IOException {
     assertNull(directionsRouteRefresh.legs().get(0).annotation().duration());
     assertNull(directionsRouteRefresh.legs().get(0).annotation().maxspeed());
     assertNull(directionsRouteRefresh.legs().get(0).annotation().speed());
+    assertNull(directionsRouteRefresh.legs().get(0).incidents());
   }
 
   @Test

services-directions-refresh-models/src/test/java/com.mapbox.api.directionsrefresh.v1.models/RouteLegRefreshTest.java

@@ -1,16 +1,20 @@
 package com.mapbox.api.directionsrefresh.v1.models;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import com.mapbox.api.directions.v5.models.Congestion;
+import com.mapbox.api.directions.v5.models.Incident;
 import com.mapbox.api.directions.v5.models.LegAnnotation;
 import com.mapbox.api.directions.v5.models.MaxSpeed;
 import com.mapbox.api.directions.v5.models.SpeedLimit;
 import com.mapbox.core.TestUtils;
+
+import org.junit.Test;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 
 public class RouteLegRefreshTest extends TestUtils {
 
@@ -26,6 +30,13 @@ public void sanity() {
           .duration(Collections.<Double>emptyList())
           .build()
       )
+      .incidents(
+        Arrays.asList(
+          Incident.builder()
+            .id("incident_id")
+            .build()
+        )
+      )
       .build();
   }
 
@@ -59,6 +70,38 @@ public void fromJson() {
       0.1,
       10.2
     );
+
+    List<Incident> incidents = Arrays.asList(
+      Incident.builder()
+        .id("incident_1")
+        .creationTime("creation_time")
+        .closed(true)
+        .congestion(
+          Congestion.builder()
+            .value(80)
+            .build()
+        )
+        .alertcCodes(Arrays.asList(1, 2, 5))
+        .countryCodeAlpha3("USA")
+        .countryCodeAlpha2("US")
+        .startTime("start_time")
+        .endTime("end_time")
+        .geometryIndexStart(4)
+        .geometryIndexEnd(50)
+        .impact(Incident.IMPACT_MAJOR)
+        .numLanesBlocked(2)
+        .description("somedescription")
+        .type(Incident.INCIDENT_OTHER_NEWS)
+        .subType("subType")
+        .subTypeDescription("someSubTypeDescription")
+        .lanesBlocked(Arrays.asList("lane_blocked_1"))
+        .build(),
+      Incident.builder()
+        .id("incident_2")
+        .type(Incident.INCIDENT_ACCIDENT)
+        .build()
+    );
+
     RouteLegRefresh routeLegRefresh = RouteLegRefresh.builder()
       .annotation(
         LegAnnotation.builder()
@@ -69,12 +112,14 @@ public void fromJson() {
           .speed(speeds)
           .build()
       )
+      .incidents(incidents)
       .build();
 
     String json = routeLegRefresh.toJson();
     RouteLegRefresh fromJson = RouteLegRefresh.fromJson(json);
 
     assertNotNull(routeLegRefresh.annotation());
+    assertNotNull(routeLegRefresh.incidents());
     assertEquals(routeLegRefresh, fromJson);
   }