Skip to content

Remove character waypoint names limit from MapboxMapMatching and MapboxDirections #941

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

Merged
Guardiola31337 merged 1 commit into from
Dec 17, 2018
Merged

Remove character waypoint names limit from MapboxMapMatching and MapboxDirections #941

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
3 changes: 0 additions & 3 deletions services-directions/src/main/java/com/mapbox/api/directions/v5/MapboxDirections.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,9 +754,6 @@ public MapboxDirections build() {
+ " the number of waypoints provided.");
}
final String waypointNamesStr = TextUtils.formatWaypointNames(waypointNames);
if (!waypointNamesStr.isEmpty() && waypointNamesStr.length() > 500) {
throw new ServicesException("Waypoint names exceed 500 character limit.");
}
waypointNames(waypointNamesStr);
}

Expand Down
31 changes: 0 additions & 31 deletions services-directions/src/test/java/com/mapbox/api/directions/v5/MapboxDirectionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,37 +680,6 @@ public void build_exceptionThrownWhenWaypointNamesDoNotMatchCoordinates() throws
.build();
}

@Test
public void build_exceptionThrownWhenWaypointNamesExceedLimit() throws Exception {
thrown.expect(ServicesException.class);
thrown.expectMessage(
startsWith("Waypoint names exceed 500 character limit"));

StringBuilder longWpName = new StringBuilder();
for (int i = 0; i < 124; i++) {
longWpName.append("Home");
}
MapboxDirections mapboxDirections = MapboxDirections.builder()
.origin(Point.fromLngLat(2.0, 2.0))
.destination(Point.fromLngLat(4.0, 4.0))
.addWaypointNames(longWpName.toString(), "Work")
.baseUrl("https://foobar.com")
.accessToken(ACCESS_TOKEN)
.build();

assertTrue(mapboxDirections.cloneCall().request().url().toString()
.contains("waypoint_names=Home"));

// one more char results in exception
mapboxDirections = MapboxDirections.builder()
.origin(Point.fromLngLat(2.0, 2.0))
.destination(Point.fromLngLat(4.0, 4.0))
.addWaypointNames(longWpName.toString(), "Work1")
.baseUrl("https://foobar.com")
.accessToken(ACCESS_TOKEN)
.build();
}

@Test
public void testWithWaypointNames() throws Exception {

Expand Down
3 changes: 0 additions & 3 deletions services-matching/src/main/java/com/mapbox/api/matching/v5/MapboxMapMatching.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,9 +731,6 @@ public MapboxMapMatching build() {
+ " the number of waypoints provided.");
}
final String waypointNamesStr = TextUtils.formatWaypointNames(waypointNames);
if (!waypointNamesStr.isEmpty() && waypointNamesStr.length() > 500) {
throw new ServicesException("Waypoint names exceed 500 character limit.");
}
waypointNames(waypointNamesStr);
}

Expand Down
33 changes: 0 additions & 33 deletions services-matching/src/test/java/com/mapbox/api/matching/v5/MapboxMapMatchingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,39 +650,6 @@ public void build_exceptionThrownWhenWaypointNamesDoNotMatchWaypoints() throws E
.build();
}

@Test
public void build_exceptionThrownWhenWaypointNamesExceedLimit() throws Exception {
thrown.expect(ServicesException.class);
thrown.expectMessage(
startsWith("Waypoint names exceed 500 character limit"));

StringBuilder longWpName = new StringBuilder();
for (int i = 0; i < 124; i++) {
longWpName.append("Home");
}
MapboxMapMatching mapMatching = MapboxMapMatching.builder()
.baseUrl("https://foobar.com")
.accessToken(ACCESS_TOKEN)
.coordinate(Point.fromLngLat(2.0, 2.0))
.coordinate(Point.fromLngLat(4.0, 4.0))
.waypoints(0, 1)
.addWaypointNames(longWpName.toString(), "Work")
.build();

assertTrue(mapMatching.cloneCall().request().url().toString()
.contains("waypoint_names=Home"));

// one more char results in exception
mapMatching = MapboxMapMatching.builder()
.baseUrl("https://foobar.com")
.accessToken(ACCESS_TOKEN)
.coordinate(Point.fromLngLat(2.0, 2.0))
.coordinate(Point.fromLngLat(4.0, 4.0))
.waypoints(0, 1)
.addWaypointNames(longWpName.toString(), "Work1") // waypoint ar too long
.build();
}

@Test
public void testWithWaypointNames() throws Exception {

Expand Down