Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Workaround for some '&' char encoding #1410

Merged
merged 1 commit into from
Apr 21, 2022
Merged

Workaround for some '&' char encoding #1410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...ces-directions-models/src/main/java/com/mapbox/api/directions/v5/models/RouteOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,7 +1104,9 @@ public URL toUrl(@NonNull String accessToken) {
decodedUrl.getQuery(),
decodedUrl.getRef()
);
return new URL(encodedUri.toASCIIString());
// workaround to encode `&` chars in Strings like "me & you".
// need a better solution to fix encoding in general.
return new URL(encodedUri.toASCIIString().replace("%20&%20", "%20%26%20"));
korshaknn marked this conversation as resolved.
Show resolved Hide resolved
} catch (MalformedURLException | URISyntaxException ex) {
throw new RuntimeException(ex);
}
Expand Down
10 changes: 5 additions & 5 deletions ...directions-models/src/test/java/com/mapbox/api/directions/v5/models/RouteOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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";
"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=one;Serangoon%20Garden%20Market%20%26%20Food%20Centre;&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);
Expand Down Expand Up @@ -237,7 +237,7 @@ public void waypointIndicesStringIsValid_fromJson() {
public void waypointNamesStringIsValid_fromJson() {
RouteOptions routeOptions = RouteOptions.fromJson(optionsJson);

assertEquals(";two;", routeOptions.waypointNames());
assertEquals("one;Serangoon Garden Market & Food Centre;", routeOptions.waypointNames());
}

@Test
Expand Down Expand Up @@ -664,7 +664,7 @@ private RouteOptions routeOptions() {
.roundaboutExits(false)
.voiceInstructions(true)
.voiceUnits(DirectionsCriteria.METRIC)
.waypointNames(";two;")
.waypointNames("one;Serangoon Garden Market & Food Centre;")
.waypointTargets(";12.2,21.2;")
.waypointIndices("0;1;2")
.alleyBias(0.75)
Expand Down Expand Up @@ -755,8 +755,8 @@ private RouteOptions routeOptionsList() {
.voiceInstructions(true)
.voiceUnits(DirectionsCriteria.METRIC)
.waypointNamesList(new ArrayList<String>() {{
add(null);
add("two");
add("one");
add("Serangoon Garden Market & Food Centre");
add(null);
}})
.waypointTargetsList(new ArrayList<Point>() {{
Expand Down
2 changes: 1 addition & 1 deletion services-directions-models/src/test/resources/route_options_v5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"voice_units": "metric",
"approaches": ";curb;",
"waypoints": "0;1;2",
"waypoint_names": ";two;",
"waypoint_names": "one;Serangoon Garden Market & Food Centre;",
"waypoint_targets": ";12.2,21.2;",
"snapping_include_closures": ";false;true",
"alley_bias": 0.75,
Expand Down