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

Adds fix for origin and destination overriding list #420

Merged
merged 3 commits into from
Mar 30, 2017
Merged

Adds fix for origin and destination overriding list #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
778d959
adds fix for origin and destination overriding list
Mar 30, 2017
6254262
fixed test method name
Mar 30, 2017
de9576d
fixed up test
Mar 30, 2017
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
42 changes: 21 additions & 21 deletions ...ibjava-services/src/main/java/com/mapbox/services/api/directions/v5/MapboxDirections.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ public static class Builder<T extends Builder> extends MapboxBuilder {
private double[][] bearings = null;
private Boolean steps = null;
private Boolean continueStraight = null;
private Position origin = null;
private Position destination = null;

/**
* Constructor
Expand Down Expand Up @@ -219,16 +221,7 @@ public T setCoordinates(List<Position> coordinates) {
* @since 1.0.0
*/
public T setOrigin(Position origin) {
if (coordinates == null) {
coordinates = new ArrayList<>();
}

// The default behavior of ArrayList is to inserts the specified element at the
// specified position in this list (beginning) and to shift the element currently at
// that position (if any) and any subsequent elements to the right (adds one to
// their indices)
coordinates.add(0, origin);

this.origin = origin;
return (T) this;
}

Expand All @@ -242,14 +235,7 @@ public T setOrigin(Position origin) {
* @since 1.0.0
*/
public T setDestination(Position destination) {
if (coordinates == null) {
coordinates = new ArrayList<>();
}

// The default behavior for ArrayList is to appends the specified element
// to the end of this list.
coordinates.add(destination);

this.destination = destination;
return (T) this;
}

Expand Down Expand Up @@ -392,10 +378,24 @@ public String getProfile() {
*/
public String getCoordinates() {
List<String> coordinatesFormatted = new ArrayList<>();
for (Position coordinate : coordinates) {
// Insert origin at beginning of list if one is provided.
if (origin != null) {
coordinatesFormatted.add(String.format(Locale.US, "%f,%f",
origin.getLongitude(),
origin.getLatitude()));
}
if (coordinates != null) {
for (Position coordinate : coordinates) {
coordinatesFormatted.add(String.format(Locale.US, "%f,%f",
coordinate.getLongitude(),
coordinate.getLatitude()));
}
}
// Insert destination at end of list if one is provided.
if (destination != null) {
coordinatesFormatted.add(String.format(Locale.US, "%f,%f",
coordinate.getLongitude(),
coordinate.getLatitude()));
destination.getLongitude(),
destination.getLatitude()));
}

return TextUtils.join(";", coordinatesFormatted.toArray());
Expand Down
60 changes: 31 additions & 29 deletions ...va-services/src/test/java/com/mapbox/services/api/directions/v5/MapboxDirectionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@

public class MapboxDirectionsTest {

public static final String DIRECTIONS_V5_FIXTURE = "src/test/fixtures/directions_v5.json";
public static final String DIRECTIONS_V5_PRECISION6_FIXTURE = "src/test/fixtures/directions_v5_precision_6.json";
public static final String DIRECTIONS_TRAFFIC_FIXTURE = "src/test/fixtures/directions_v5_traffic.json";
public static final String DIRECTIONS_ROTARY_FIXTURE = "src/test/fixtures/directions_v5_fixtures_rotary.json";
private static final String DIRECTIONS_V5_FIXTURE = "src/test/fixtures/directions_v5.json";
private static final String DIRECTIONS_V5_PRECISION6_FIXTURE = "src/test/fixtures/directions_v5_precision_6.json";
private static final String DIRECTIONS_TRAFFIC_FIXTURE = "src/test/fixtures/directions_v5_traffic.json";
private static final String DIRECTIONS_ROTARY_FIXTURE = "src/test/fixtures/directions_v5_fixtures_rotary.json";
private static final double DELTA = 1E-10;

private MockWebServer server;
Expand Down Expand Up @@ -108,11 +108,11 @@ public void requiredAccessToken() throws ServicesException {
@Test
public void callFactoryNonNull() throws ServicesException, IOException {
MapboxDirections client = new MapboxDirections.Builder()
.setAccessToken("pk.XXX")
.setCoordinates(positions)
.setProfile(DirectionsCriteria.PROFILE_DRIVING)
.setBaseUrl(mockUrl.toString())
.build();
.setAccessToken("pk.XXX")
.setCoordinates(positions)
.setProfile(DirectionsCriteria.PROFILE_DRIVING)
.setBaseUrl(mockUrl.toString())
.build();

// Setting a null call factory doesn't make the request fail
// (the default OkHttp client is used)
Expand Down Expand Up @@ -499,7 +499,7 @@ public void testRotaryLegStepAndStepManeuver() throws ServicesException, IOExcep
assertEquals(maneuver.getModifier(), "slight right");
assertEquals(maneuver.getInstruction(),
"Enter Dupont Circle Northwest and take the 3rd exit onto P Street Northwest");
assertEquals(maneuver.getExit(), new Integer(3));
assertEquals(maneuver.getExit(), Integer.valueOf(3));


LegStep step = response.body().getRoutes().get(0).getLegs().get(0).getSteps().get(1);
Expand All @@ -510,7 +510,7 @@ public void testRotaryLegStepAndStepManeuver() throws ServicesException, IOExcep

@Test
public void testSetCoordinates() {
ArrayList test = new ArrayList<>();
List<Position> test = new ArrayList<>();
test.add(Position.fromCoordinates(2.1, 2.2));
test.add(Position.fromCoordinates(3.1, 3.2));

Expand All @@ -531,7 +531,7 @@ public void setOriginDestination() {

@Test
public void testSetCoordinatesMixed() {
ArrayList test = new ArrayList<>();
List<Position> test = new ArrayList<>();
test.add(Position.fromCoordinates(2.1, 2.2));
test.add(Position.fromCoordinates(3.1, 3.2));

Expand All @@ -544,24 +544,9 @@ public void testSetCoordinatesMixed() {
assertEquals(coordinates, "1.100000,1.200000;2.100000,2.200000;3.100000,3.200000;4.100000,4.200000");
}

@Test
public void testSetCoordinatesMixedHidden() {
ArrayList test = new ArrayList<>();
test.add(Position.fromCoordinates(2.1, 2.2));
test.add(Position.fromCoordinates(3.1, 3.2));

// The order matters
String coordinates = new MapboxDirections.Builder()
.setOrigin(Position.fromCoordinates(1.1, 1.2))
.setDestination(Position.fromCoordinates(4.1, 4.2))
.setCoordinates(test)
.getCoordinates();
assertEquals(coordinates, "2.100000,2.200000;3.100000,3.200000");
}

@Test
public void testLocale() {
ArrayList test = new ArrayList<>();
List<Position> test = new ArrayList<>();
test.add(Position.fromCoordinates(2.1, 2.2));
test.add(Position.fromCoordinates(3.1, 3.2));

Expand All @@ -572,7 +557,7 @@ public void testLocale() {
.setDestination(Position.fromCoordinates(4.1, 4.2))
.setCoordinates(test)
.getCoordinates();
assertEquals(coordinates, "2.100000,2.200000;3.100000,3.200000");
assertEquals(coordinates, "1.100000,1.200000;2.100000,2.200000;3.100000,3.200000;4.100000,4.200000");
}

@Test
Expand All @@ -586,4 +571,21 @@ public void testUserAgent() throws ServicesException, IOException {
.build();
assertTrue(service.executeCall().raw().request().header("User-Agent").contains("APP"));
}

@Test
public void originDestinationCoordinatesListCorrectOrder() throws ServicesException, IOException {
MapboxDirections client = new MapboxDirections.Builder()
.setAccessToken("pk.XXX")
.setOrigin(Position.fromCoordinates(-122.4313, 37.7789))
.setCoordinates(positions)
.setDestination(Position.fromCoordinates(-121.8001, 37.2275))
.setProfile(DirectionsCriteria.PROFILE_DRIVING)
.setBaseUrl(mockUrl.toString())
.build();

String callUrl = client.executeCall().raw().request().url().toString();
assertTrue(
callUrl.contains("-122.431300,37.778900;-122.416667,37.783333;-121.900000,37.333333;-121.800100,37.227500")
);
}
}