Skip to content

Commit 6b84207

Browse files
author
Łukasz Paczos
committed
fixed an issue where "avoid_maneuver_radius" was represented as integer instead of double
1 parent 18d8941 commit 6b84207

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public List<Bearing> bearingsList() {
218218
*/
219219
@SerializedName("avoid_maneuver_radius")
220220
@Nullable
221-
public abstract Integer avoidManeuverRadius();
221+
public abstract Double avoidManeuverRadius();
222222

223223
/**
224224
* 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) {
13241324
*/
13251325
@NonNull
13261326
public abstract Builder avoidManeuverRadius(
1327-
@Nullable Integer avoidManeuverRadius
1327+
@Nullable Double avoidManeuverRadius
13281328
);
13291329

13301330
/**

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class RouteOptionsTest extends TestUtils {
2929
*/
3030
private static final String ROUTE_OPTIONS_JSON = "route_options_v5.json";
3131
private static final String ROUTE_OPTIONS_URL =
32-
"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";
32+
"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";
3333
private static final String ACCESS_TOKEN = "pk.token";
3434

3535
private final String optionsJson = loadJsonFixture(ROUTE_OPTIONS_JSON);
@@ -609,7 +609,7 @@ private RouteOptions routeOptions() {
609609
.alternatives(false)
610610
.annotations("congestion,distance,duration")
611611
.bearings("0,90;90,0;")
612-
.avoidManeuverRadius(200)
612+
.avoidManeuverRadius(200.0)
613613
.layers("-42;;0")
614614
.continueStraight(false)
615615
.exclude(DirectionsCriteria.EXCLUDE_TOLL + "," + DirectionsCriteria.EXCLUDE_FERRY + ",point(11.0 -22.0)")
@@ -680,7 +680,7 @@ private RouteOptions routeOptionsList() {
680680
add(Bearing.builder().angle(90.0).degrees(0.0).build());
681681
add(null);
682682
}})
683-
.avoidManeuverRadius(200)
683+
.avoidManeuverRadius(200.0)
684684
.layersList(new ArrayList<Integer>() {{
685685
add(-42);
686686
add(null);

services-directions-models/src/test/resources/route_options_v5.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"language": "ru",
88
"radiuses": ";unlimited;5.1",
99
"bearings": "0,90;90,0;",
10-
"avoid_maneuver_radius": 200,
10+
"avoid_maneuver_radius": 200.0,
1111
"layers": "-42;;0",
1212
"continue_straight": false,
1313
"roundabout_exits": false,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Call<DirectionsResponse> getCall(
7171
@Query("radiuses") String radiuses,
7272
@Query("steps") Boolean steps,
7373
@Query("bearings") String bearings,
74-
@Query("avoid_maneuver_radius") Integer avoidManeuverRadius,
74+
@Query("avoid_maneuver_radius") Double avoidManeuverRadius,
7575
@Query("layers") String layers,
7676
@Query("continue_straight") Boolean continueStraight,
7777
@Query("annotations") String annotations,
@@ -166,7 +166,7 @@ Call<DirectionsResponse> postCall(
166166
@Field("radiuses") String radiuses,
167167
@Field("steps") Boolean steps,
168168
@Field("bearings") String bearings,
169-
@Field("avoid_maneuver_radius") Integer avoidManeuverRadius,
169+
@Field("avoid_maneuver_radius") Double avoidManeuverRadius,
170170
@Field("layers") String layers,
171171
@Field("continue_straight") Boolean continueStraight,
172172
@Field("annotations") String annotations,

services-directions/src/test/resources/route_options_v5.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"language": "ru",
88
"radiuses": ";unlimited;5.1",
99
"bearings": "0,90;90,0;",
10-
"avoid_maneuver_radius": 200,
10+
"avoid_maneuver_radius": 200.0,
1111
"layers": "-42;;0",
1212
"continue_straight": false,
1313
"roundabout_exits": false,

0 commit comments

Comments
 (0)