Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
Mapbox welcomes participation and contributions from everyone.

### main
- Fixed malformed URL that resulted from previous inclusion of `contours_meters` as an Isochrone option. [#1599](https://github.com/mapbox/mapbox-java/pull/1599)

- Fixed an issue where Isochrone API's `contours_meters` required at least two input values, instead of only one.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ protected Call<FeatureCollection> initializeCall() {
public static Builder builder() {
return new AutoValue_MapboxIsochrone.Builder()
.baseUrl(Constants.BASE_API_URL)
.contoursMinutes("")
.contoursMeters("")
.contoursMinutes(null)
.contoursMeters(null)
.user(IsochroneCriteria.PROFILE_DEFAULT_USER);
}

Expand All @@ -108,7 +108,7 @@ public static Builder builder() {
@NonNull
abstract String coordinates();

@NonNull
@Nullable
abstract String contoursMinutes();

@Nullable
Expand Down Expand Up @@ -268,7 +268,7 @@ public Builder addContoursMeters(Integer... listOfMeterValues) {
*/
// Required for matching with MapboxIsochrone addContoursMinutes() method.
@SuppressWarnings("WeakerAccess")
abstract Builder contoursMinutes(@NonNull String stringListOfMinuteValues);
abstract Builder contoursMinutes(@Nullable String stringListOfMinuteValues);

/**
* A single String which is a comma-separated list of values(s) in meters
Expand All @@ -281,7 +281,7 @@ public Builder addContoursMeters(Integer... listOfMeterValues) {
* meters which represent each contour
* @return this builder for chaining options together
*/
abstract Builder contoursMeters(@NonNull String stringListOfMeterValues);
abstract Builder contoursMeters(@Nullable String stringListOfMeterValues);

/**
* A list of separate String which has a list of comma-separated
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,25 @@ public void build_usingIntegerListForMinutes() throws ServicesException, IOExcep

assertTrue(requestUrlString.contains("contours_minutes=14" + commaEquivalent
+ "36" + commaEquivalent + "52"));
assertFalse(requestUrlString.contains("contours_meters"));
}

@Test
public void build_usingIntegerListForMeters() throws ServicesException, IOException {
MapboxIsochrone client = MapboxIsochrone.builder()
.accessToken(ACCESS_TOKEN)
.coordinates(testPoint)
.addContoursMeters(14,36,52)
.profile(testProfile)
.baseUrl(mockUrl.toString())
.build();
String requestUrlString = client.cloneCall().request().url().toString();

System.out.print(requestUrlString);

assertTrue(requestUrlString.contains("contours_meters=14" + commaEquivalent
+ "36" + commaEquivalent + "52"));
assertFalse(requestUrlString.contains("contours_minutes"));
}

@Test
Expand Down Expand Up @@ -200,6 +219,7 @@ public void build_usingRawStringForMinutes() throws ServicesException, IOExcepti
String requestUrlString = client.cloneCall().request().url().toString();
assertTrue(requestUrlString.contains("contours_minutes=5" + commaEquivalent +
"30" + commaEquivalent + "55"));
assertFalse(requestUrlString.contains("contours_meters"));
}

@Test
Expand Down