Added voice unit param

Cameron Mace · Cameron Mace · commit 6bcedcd4bcd1 · 2017-11-17T21:09:03.000-05:00
diff --git a/samples/src/main/java/com/mapbox/samples/BasicDirections.java b/samples/src/main/java/com/mapbox/samples/BasicDirections.java
@@ -54,6 +54,7 @@ private static MapboxDirections buildMapboxDirections() {
       .addBearing(null, null)
       .radiuses(Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY)
       .steps(true)
+      .voiceUnits(DirectionsCriteria.METRIC)
       .build();
   }
 }
diff --git a/services-directions/src/main/java/com/mapbox/directions/v5/DirectionsCriteria.java b/services-directions/src/main/java/com/mapbox/directions/v5/DirectionsCriteria.java
@@ -211,6 +211,18 @@ private DirectionsCriteria() {
   public @interface ExcludeCriteria {
   }
 
+  public static final String IMPERIAL = "imperial";
+
+  public static final String METRIC = "metric";
+
+  @Retention(RetentionPolicy.SOURCE)
+  @StringDef( {
+    IMPERIAL,
+    METRIC
+  })
+  public @interface VoiceUnitCriteria {
+  }
+
   // Optimization API criteria's
 
   /**
diff --git a/services-directions/src/main/java/com/mapbox/directions/v5/DirectionsService.java b/services-directions/src/main/java/com/mapbox/directions/v5/DirectionsService.java
@@ -64,6 +64,7 @@ Call<DirectionsResponse> getCall(
     @Query("roundabout_exits") Boolean roundaboutExits,
     @Query("voice_instructions") Boolean voiceInstructions,
     @Query("banner_instructions") Boolean bannerInstructions,
+    @Query("voice_units") String voiceUnits,
     @Query("exclude") String exclude
   );
 }
diff --git a/services-directions/src/main/java/com/mapbox/directions/v5/MapboxDirections.java b/services-directions/src/main/java/com/mapbox/directions/v5/MapboxDirections.java
@@ -12,6 +12,7 @@
 import com.mapbox.directions.v5.DirectionsCriteria.GeometriesCriteria;
 import com.mapbox.directions.v5.DirectionsCriteria.OverviewCriteria;
 import com.mapbox.directions.v5.DirectionsCriteria.ProfileCriteria;
+import com.mapbox.directions.v5.DirectionsCriteria.VoiceUnitCriteria;
 import com.mapbox.directions.v5.models.DirectionsError;
 import com.mapbox.directions.v5.models.DirectionsResponse;
 import com.mapbox.directions.v5.models.DirectionsRoute;
@@ -109,6 +110,7 @@ private Call<DirectionsResponse> getCall() {
       roundaboutExits(),
       voiceInstructions(),
       bannerInstructions(),
+      voiceUnits(),
       exclude());
 
     // Done
@@ -199,6 +201,7 @@ private List<DirectionsRoute> generateRouteOptions(List<DirectionsRoute> routes)
           .voiceInstructions(voiceInstructions())
           .bannerInstructions(bannerInstructions())
           .exclude(exclude())
+          .voiceUnits(voiceUnits())
           .build()
       ).build());
     }
@@ -281,6 +284,9 @@ public Call<DirectionsResponse> cloneCall() {
   @Nullable
   abstract Boolean bannerInstructions();
 
+  @Nullable
+  abstract String voiceUnits();
+
   @Nullable
   abstract String exclude();
 
@@ -644,6 +650,8 @@ public Builder radiuses(@FloatRange(from = 0) double... radiuses) {
      */
     public abstract Builder bannerInstructions(@Nullable Boolean bannerInstructions);
 
+    public abstract Builder voiceUnits(@Nullable @VoiceUnitCriteria String voiceUnits);
+
     /**
      * Base package name or other simple string identifier. Used inside the calls user agent header.
      *
diff --git a/services-directions/src/main/java/com/mapbox/directions/v5/models/RouteOptions.java b/services-directions/src/main/java/com/mapbox/directions/v5/models/RouteOptions.java
@@ -137,6 +137,8 @@ public static Builder builder() {
   @Nullable
   public abstract Boolean bannerInstructions();
 
+  public abstract String voiceUnits();
+
   /**
    * Gson type adapter for parsing Gson to this class.
    *
@@ -244,6 +246,8 @@ public abstract static class Builder {
 
     public abstract Builder bannerInstructions(Boolean bannerInstructions);
 
+    public abstract Builder voiceUnits(String voiceUnits);
+
     /**
      * The same exclusions the user originally made when the request was made.
      *

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ private static MapboxDirections buildMapboxDirections() {`
`54`	`54`	`.addBearing(null, null)`
`55`	`55`	`.radiuses(Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY)`
`56`	`56`	`.steps(true)`
	`57`	`+ .voiceUnits(DirectionsCriteria.METRIC)`
`57`	`58`	`.build();`
`58`	`59`	`}`
`59`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ Call<DirectionsResponse> getCall(`
`64`	`64`	`@Query("roundabout_exits") Boolean roundaboutExits,`
`65`	`65`	`@Query("voice_instructions") Boolean voiceInstructions,`
`66`	`66`	`@Query("banner_instructions") Boolean bannerInstructions,`
	`67`	`+ @Query("voice_units") String voiceUnits,`
`67`	`68`	`@Query("exclude") String exclude`
`68`	`69`	`);`
`69`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,8 @@ public static Builder builder() {`
`137`	`137`	`@Nullable`
`138`	`138`	`public abstract Boolean bannerInstructions();`
`139`	`139`
	`140`	`+ public abstract String voiceUnits();`
	`141`	`+`
`140`	`142`	`/**`
`141`	`143`	`* Gson type adapter for parsing Gson to this class.`
`142`	`144`	`*`
`@@ -244,6 +246,8 @@ public abstract static class Builder {`
`244`	`246`
`245`	`247`	`public abstract Builder bannerInstructions(Boolean bannerInstructions);`
`246`	`248`
	`249`	`+ public abstract Builder voiceUnits(String voiceUnits);`
	`250`	`+`
`247`	`251`	`/**`
`248`	`252`	`* The same exclusions the user originally made when the request was made.`
`249`	`253`	`*`