For driving: driving, ferry, movable bridge, unaccessible. - *
For walking: walking, ferry, unaccessible. - *
For cycling: cycling, walking, ferry, train, movable bridge, unaccessible.
- *
- * @return string with possibly one of the values given above.
- * @since 1.0.0
- * @deprecated Use Directions v5 instead
- */
- @Deprecated
- public String getMode() {
- return mode;
- }
-
- /**
- * @param mode string with possibly one of the values given above.
- * @since 1.0.0
- * @deprecated Use Directions v5 instead
- */
- @Deprecated
- public void setMode(String mode) {
- this.mode = mode;
- }
-}
diff --git a/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v4/models/Waypoint.java b/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v4/models/Waypoint.java
deleted file mode 100644
index cf4e02418..000000000
--- a/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v4/models/Waypoint.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.mapbox.services.api.directions.v4.models;
-
-/**
- * A point on earth represented by a longitude/latitude pair.
- *
- * @since 1.0.0
- * @deprecated Use Directions v5 instead
- */
-@Deprecated
-public class Waypoint {
-
- private double latitude;
- private double longitude;
-
- /**
- * Construct a location with a longitude latitude pair.
- *
- * @param longitude double value ranging from -180.0 to 180.0.
- * @param latitude double value ranging from -90.0 to 90.0.
- * @since 1.0.0
- * @deprecated Use Directions v5 instead
- */
- @Deprecated
- public Waypoint(double longitude, double latitude) {
- this.longitude = longitude;
- this.latitude = latitude;
- }
-
- /**
- * The latitude of the location.
- *
- * @return double value ranging from -90.0 to 90.0.
- * @since 1.0.0
- * @deprecated Use Directions v5 instead
- */
- @Deprecated
- public double getLatitude() {
- return latitude;
- }
-
- /**
- * @param latitude double value ranging from -90.0 to 90.0.
- * @since 1.0.0
- * @deprecated Use Directions v5 instead
- */
- @Deprecated
- public void setLatitude(double latitude) {
- this.latitude = latitude;
- }
-
- /**
- * The longitude of the location.
- *
- * @return double value ranging from -180.0 to 180.0.
- * @since 1.0.0
- * @deprecated Use Directions v5 instead
- */
- @Deprecated
- public double getLongitude() {
- return longitude;
- }
-
- /**
- * @param longitude double value ranging from -180.0 to 180.0.
- * @since 1.0.0
- * @deprecated Use Directions v5 instead
- */
- @Deprecated
- public void setLongitude(double longitude) {
- this.longitude = longitude;
- }
-}
diff --git a/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v4/models/package-info.java b/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v4/models/package-info.java
deleted file mode 100644
index 763046fe4..000000000
--- a/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v4/models/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Contains the Mapbox Java Services classes.
- *
- * @deprecated Use Directions v5 instead
- */
-package com.mapbox.services.api.directions.v4.models;
diff --git a/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v4/package-info.java b/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v4/package-info.java
deleted file mode 100644
index 73d3727c7..000000000
--- a/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v4/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Contains the Mapbox Java Services classes.
- *
- * @deprecated Use Directions v5 instead
- */
-package com.mapbox.services.api.directions.v4;
diff --git a/mapbox/libjava-services/src/test/java/com/mapbox/services/api/mapmatching/v4/MapboxMapMatchingTest.java b/mapbox/libjava-services/src/test/java/com/mapbox/services/api/mapmatching/v4/MapboxMapMatchingTest.java
index 83c975e5f..d30d5e145 100644
--- a/mapbox/libjava-services/src/test/java/com/mapbox/services/api/mapmatching/v4/MapboxMapMatchingTest.java
+++ b/mapbox/libjava-services/src/test/java/com/mapbox/services/api/mapmatching/v4/MapboxMapMatchingTest.java
@@ -1,7 +1,6 @@
package com.mapbox.services.api.mapmatching.v4;
import com.mapbox.services.api.ServicesException;
-import com.mapbox.services.api.directions.v4.DirectionsCriteria;
import com.mapbox.services.api.mapmatching.v4.models.MapMatchingResponse;
import com.mapbox.services.commons.geojson.LineString;
import com.mapbox.services.commons.models.Position;
@@ -93,7 +92,7 @@ public void tearDown() throws IOException {
public void testCallSanity() throws ServicesException, IOException {
MapboxMapMatching client = new MapboxMapMatching.Builder()
.setAccessToken(ACCESS_TOKEN)
- .setProfile(DirectionsCriteria.PROFILE_WALKING)
+ .setProfile(MapMatchingCriteria.PROFILE_WALKING)
.setTrace(trace)
.setBaseUrl(mockUrl.toString())
.build();
@@ -113,7 +112,7 @@ public void testCallSanity() throws ServicesException, IOException {
public void testNoGeometryResponse() throws ServicesException, IOException {
MapboxMapMatching client = new MapboxMapMatching.Builder()
.setAccessToken(ACCESS_TOKEN)
- .setProfile(DirectionsCriteria.PROFILE_WALKING)
+ .setProfile(MapMatchingCriteria.PROFILE_WALKING)
.setTrace(trace)
.setNoGeometry()
.setBaseUrl(mockUrl.toString())
@@ -140,7 +139,7 @@ public void validGpsPrecisionLowerBounds() throws ServicesException {
thrown.expectMessage(startsWith("Using Mapbox Map Matching requires setting a valid GPS precision"));
new MapboxMapMatching.Builder()
.setAccessToken(ACCESS_TOKEN)
- .setProfile(DirectionsCriteria.PROFILE_WALKING)
+ .setProfile(MapMatchingCriteria.PROFILE_WALKING)
.setGpsPrecison(0)
.build();
}
@@ -151,7 +150,7 @@ public void validGpsPrecisionUpperBounds() throws ServicesException {
thrown.expectMessage(startsWith("Using Mapbox Map Matching requires setting a valid GPS precision"));
new MapboxMapMatching.Builder()
.setAccessToken(ACCESS_TOKEN)
- .setProfile(DirectionsCriteria.PROFILE_WALKING)
+ .setProfile(MapMatchingCriteria.PROFILE_WALKING)
.setGpsPrecison(11)
.build();
}
@@ -182,7 +181,7 @@ public void validCoordinates() throws ServicesException {
thrown.expectMessage(startsWith("Using Mapbox Map Matching requires to set some coordinates"));
new MapboxMapMatching.Builder()
.setAccessToken(ACCESS_TOKEN)
- .setProfile(DirectionsCriteria.PROFILE_DRIVING)
+ .setProfile(MapMatchingCriteria.PROFILE_DRIVING)
.build();
}
@@ -198,7 +197,7 @@ public void validCoordinatesTotal() throws ServicesException {
thrown.expectMessage(startsWith("The Map Matching API is limited to processing traces with up to 100 coordinates"));
new MapboxMapMatching.Builder()
.setAccessToken(ACCESS_TOKEN)
- .setProfile(DirectionsCriteria.PROFILE_DRIVING)
+ .setProfile(MapMatchingCriteria.PROFILE_DRIVING)
.setTrace(LineString.fromCoordinates(positions))
.build();
}
@@ -209,7 +208,7 @@ public void testUserAgent() throws ServicesException, IOException {
MapboxMapMatching service = new MapboxMapMatching.Builder()
.setClientAppName("APP")
.setAccessToken("pk.XXX")
- .setProfile(DirectionsCriteria.PROFILE_DRIVING)
+ .setProfile(MapMatchingCriteria.PROFILE_DRIVING)
.setTrace(LineString.fromCoordinates(new ArrayList