fixed an issue where "avoid_maneuver_radius" was represented as integ…

…er instead of double
mapbox · Mar 10, 2022 · 6b84207 · 6b84207
1 parent 18d8941
commit 6b84207
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/...ces-directions-models/src/main/java/com/mapbox/api/directions/v5/models/RouteOptions.java b/...ces-directions-models/src/main/java/com/mapbox/api/directions/v5/models/RouteOptions.java
@@ -218,7 +218,7 @@ public List<Bearing> bearingsList() {
    */
   @SerializedName("avoid_maneuver_radius")
   @Nullable
-  public abstract Integer avoidManeuverRadius();
+  public abstract Double avoidManeuverRadius();
 
   /**
    * Influences layer of road from where route starts from a waypoint. Useful in ambiguous
@@ -1324,7 +1324,7 @@ public Builder bearingsList(@Nullable List<Bearing> bearings) {
      */
     @NonNull
     public abstract Builder avoidManeuverRadius(
-      @Nullable Integer avoidManeuverRadius
+      @Nullable Double avoidManeuverRadius
     );
 
     /**

diff --git a/...directions-models/src/test/java/com/mapbox/api/directions/v5/models/RouteOptionsTest.java b/...directions-models/src/test/java/com/mapbox/api/directions/v5/models/RouteOptionsTest.java
@@ -29,7 +29,7 @@ public class RouteOptionsTest extends TestUtils {
    */
   private static final String ROUTE_OPTIONS_JSON = "route_options_v5.json";
   private static final String ROUTE_OPTIONS_URL =
-    "https://api.mapbox.com/directions/v5/mapbox/driving/-122.4003312,37.7736941;-122.4187529,37.7689715;-122.4255172,37.7775835?access_token=pk.token&geometries=polyline6&alternatives=false&overview=full&radiuses=;unlimited;5.1&steps=true&avoid_maneuver_radius=200&bearings=0,90;90,0;&layers=-42;;0&continue_straight=false&annotations=congestion,distance,duration&language=ru&roundabout_exits=false&voice_instructions=true&banner_instructions=true&voice_units=metric&exclude=toll,ferry,point(11.0%20-22.0)&include=hot,hov2&approaches=;curb;&waypoints=0;1;2&waypoint_names=;two;&waypoint_targets=;12.2,21.2;&enable_refresh=true&walking_speed=5.11&walkway_bias=-0.2&alley_bias=0.75&snapping_include_closures=;false;true&arrive_by=2021-01-01'T'01:01&depart_at=2021-02-02'T'02:02&max_height=1.5&max_width=1.4&metadata=true&engine=electric&ev_initial_charge=80000&ev_max_charge=80000&ev_connector_types=ccs_combo_type1,ccs_combo_type2&energy_consumption_curve=0,300;20,160;80,140;120,180&ev_ascent=5.0&ev_descent=6.0&ev_charging_curve=0,100000;40000,70000;60000,30000;80000,10000&ev_max_ac_charging_power=1&ev_min_charge_at_destination=2&ev_min_charge_at_charging_station=3";
+    "https://api.mapbox.com/directions/v5/mapbox/driving/-122.4003312,37.7736941;-122.4187529,37.7689715;-122.4255172,37.7775835?access_token=pk.token&geometries=polyline6&alternatives=false&overview=full&radiuses=;unlimited;5.1&steps=true&avoid_maneuver_radius=200.0&bearings=0,90;90,0;&layers=-42;;0&continue_straight=false&annotations=congestion,distance,duration&language=ru&roundabout_exits=false&voice_instructions=true&banner_instructions=true&voice_units=metric&exclude=toll,ferry,point(11.0%20-22.0)&include=hot,hov2&approaches=;curb;&waypoints=0;1;2&waypoint_names=;two;&waypoint_targets=;12.2,21.2;&enable_refresh=true&walking_speed=5.11&walkway_bias=-0.2&alley_bias=0.75&snapping_include_closures=;false;true&arrive_by=2021-01-01'T'01:01&depart_at=2021-02-02'T'02:02&max_height=1.5&max_width=1.4&metadata=true&engine=electric&ev_initial_charge=80000&ev_max_charge=80000&ev_connector_types=ccs_combo_type1,ccs_combo_type2&energy_consumption_curve=0,300;20,160;80,140;120,180&ev_ascent=5.0&ev_descent=6.0&ev_charging_curve=0,100000;40000,70000;60000,30000;80000,10000&ev_max_ac_charging_power=1&ev_min_charge_at_destination=2&ev_min_charge_at_charging_station=3";
   private static final String ACCESS_TOKEN = "pk.token";
 
   private final String optionsJson = loadJsonFixture(ROUTE_OPTIONS_JSON);
@@ -609,7 +609,7 @@ private RouteOptions routeOptions() {
       .alternatives(false)
       .annotations("congestion,distance,duration")
       .bearings("0,90;90,0;")
-      .avoidManeuverRadius(200)
+      .avoidManeuverRadius(200.0)
       .layers("-42;;0")
       .continueStraight(false)
       .exclude(DirectionsCriteria.EXCLUDE_TOLL + "," + DirectionsCriteria.EXCLUDE_FERRY + ",point(11.0 -22.0)")
@@ -680,7 +680,7 @@ private RouteOptions routeOptionsList() {
         add(Bearing.builder().angle(90.0).degrees(0.0).build());
         add(null);
       }})
-      .avoidManeuverRadius(200)
+      .avoidManeuverRadius(200.0)
       .layersList(new ArrayList<Integer>() {{
         add(-42);
         add(null);

diff --git a/services-directions-models/src/test/resources/route_options_v5.json b/services-directions-models/src/test/resources/route_options_v5.json
@@ -7,7 +7,7 @@
   "language": "ru",
   "radiuses": ";unlimited;5.1",
   "bearings": "0,90;90,0;",
-  "avoid_maneuver_radius": 200,
+  "avoid_maneuver_radius": 200.0,
   "layers": "-42;;0",
   "continue_straight": false,
   "roundabout_exits": false,

diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/DirectionsService.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/DirectionsService.java
@@ -71,7 +71,7 @@ Call<DirectionsResponse> getCall(
     @Query("radiuses") String radiuses,
     @Query("steps") Boolean steps,
     @Query("bearings") String bearings,
-    @Query("avoid_maneuver_radius") Integer avoidManeuverRadius,
+    @Query("avoid_maneuver_radius") Double avoidManeuverRadius,
     @Query("layers") String layers,
     @Query("continue_straight") Boolean continueStraight,
     @Query("annotations") String annotations,
@@ -166,7 +166,7 @@ Call<DirectionsResponse> postCall(
     @Field("radiuses") String radiuses,
     @Field("steps") Boolean steps,
     @Field("bearings") String bearings,
-    @Field("avoid_maneuver_radius") Integer avoidManeuverRadius,
+    @Field("avoid_maneuver_radius") Double avoidManeuverRadius,
     @Field("layers") String layers,
     @Field("continue_straight") Boolean continueStraight,
     @Field("annotations") String annotations,

diff --git a/services-directions/src/test/resources/route_options_v5.json b/services-directions/src/test/resources/route_options_v5.json
@@ -7,7 +7,7 @@
   "language": "ru",
   "radiuses": ";unlimited;5.1",
   "bearings": "0,90;90,0;",
-  "avoid_maneuver_radius": 200,
+  "avoid_maneuver_radius": 200.0,
   "layers": "-42;;0",
   "continue_straight": false,
   "roundabout_exits": false,