From ea462e675e37061cbc596f2e87b5f6f92a0de26a Mon Sep 17 00:00:00 2001 From: Cameron Mace Date: Fri, 26 May 2017 17:30:23 -0400 Subject: [PATCH 1/2] added annotation congestion --- .../api/directions/v5/DirectionsCriteria.java | 7 +++ .../api/directions/v5/MapboxDirections.java | 8 ++- .../directions/v5/models/LegAnnotation.java | 56 ++++++++++++++++++- 3 files changed, 67 insertions(+), 4 deletions(-) diff --git a/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/DirectionsCriteria.java b/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/DirectionsCriteria.java index 2a5e3ace9..e7fe1563a 100644 --- a/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/DirectionsCriteria.java +++ b/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/DirectionsCriteria.java @@ -110,6 +110,13 @@ public class DirectionsCriteria { */ public static final String ANNOTATION_SPEED = "speed"; + /** + * The congestion, provided as a String, between each pair of coordinates + * + * @since 2.2.0 + */ + public static final String ANNOTATION_CONGESTION = "congestion"; + /** * Server responds with no errors. * diff --git a/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/MapboxDirections.java b/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/MapboxDirections.java index a75da544e..dddec9f28 100644 --- a/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/MapboxDirections.java +++ b/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/MapboxDirections.java @@ -344,8 +344,9 @@ public T setContinueStraight(Boolean continueStraight) { /** * Whether or not to return additional metadata along the route. Possible values are: - * {@link DirectionsCriteria#ANNOTATION_DISTANCE}, {@link DirectionsCriteria#ANNOTATION_DURATION}, and - * {@link DirectionsCriteria#ANNOTATION_SPEED}. Several annotation can be used by separating them with {@code ,}. + * {@link DirectionsCriteria#ANNOTATION_DISTANCE}, {@link DirectionsCriteria#ANNOTATION_DURATION}, + * {@link DirectionsCriteria#ANNOTATION_DURATION} and {@link DirectionsCriteria#ANNOTATION_CONGESTION}. Several + * annotation can be used by separating them with {@code ,}. * * @param annotation String referencing one of the annotation direction criteria's. * @return Builder @@ -648,7 +649,8 @@ public MapboxDirections build() throws ServicesException { for (String annotationEntry : annotation) { if (!annotationEntry.equals(DirectionsCriteria.ANNOTATION_DISTANCE) && !annotationEntry.equals(DirectionsCriteria.ANNOTATION_DURATION) - && !annotationEntry.equals(DirectionsCriteria.ANNOTATION_SPEED)) { + && !annotationEntry.equals(DirectionsCriteria.ANNOTATION_SPEED) + && !annotationEntry.equals(DirectionsCriteria.ANNOTATION_CONGESTION)) { throw new ServicesException( "Annotation value must be one of the constant values found inside DirectionsCriteria"); } diff --git a/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/models/LegAnnotation.java b/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/models/LegAnnotation.java index c4a4a676b..09f8fc378 100644 --- a/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/models/LegAnnotation.java +++ b/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/models/LegAnnotation.java @@ -11,6 +11,7 @@ public class LegAnnotation { private double[] distance; private double[] duration; private double[] speed; + private String[] congestion; public LegAnnotation() { } @@ -25,6 +26,17 @@ public double[] getDistance() { return distance; } + /** + * Set the duration, in seconds, between each pair of coordinates. + * + * @param distance a double array with each entry being a duration value between two of the routeLeg geometry + * coordinates. + * @since 2.2.0 + */ + public void setDistance(double[] distance) { + this.distance = distance; + } + /** * The duration, in seconds, between each pair of coordinates. * @@ -35,13 +47,55 @@ public double[] getDuration() { return duration; } + /** + * Set the duration, in seconds, between each pair of coordinates. + * + * @param duration a double array with each entry being a duration value between two of the routeLeg geometry + * coordinates. + * @since 2.2.0 + */ + public void setDuration(double[] duration) { + this.duration = duration; + } + /** * The speed, in meters per second, between each pair of coordinates. * * @return a double array with each entry being a speed value between two of the routeLeg geometry coordinates. - * @since 2.1.0 + * @since 2.2.0 */ public double[] getSpeed() { return speed; } + + /** + * Set the speed, in meters per second, between each pair of coordinates. + * + * @param speed a double array with each entry being a speed value between two of the routeLeg geometry coordinates. + * @since 2.2.0 + */ + public void setSpeed(double[] speed) { + this.speed = speed; + } + + /** + * The congestion between each pair of coordinates. + * + * @return a String array with each entry being a congestion value between two of the routeLeg geometry coordinates. + * @since 2.2.0 + */ + public String[] getCongestion() { + return congestion; + } + + /** + * Set the congestion between each pair of coordinates. + * + * @param congestion a String array with each entry being a congestion value between two of the routeLeg geometry + * coordinates. + * @since 2.2.0 + */ + public void setCongestion(String[] congestion) { + this.congestion = congestion; + } } From 89024913dafc8c8b18efad7d799d9fca0b36ae93 Mon Sep 17 00:00:00 2001 From: Cameron Mace Date: Fri, 26 May 2017 17:32:49 -0400 Subject: [PATCH 2/2] reverted version number --- .../mapbox/services/api/directions/v5/models/LegAnnotation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/models/LegAnnotation.java b/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/models/LegAnnotation.java index 09f8fc378..f1c8eb6f7 100644 --- a/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/models/LegAnnotation.java +++ b/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/models/LegAnnotation.java @@ -62,7 +62,7 @@ public void setDuration(double[] duration) { * The speed, in meters per second, between each pair of coordinates. * * @return a double array with each entry being a speed value between two of the routeLeg geometry coordinates. - * @since 2.2.0 + * @since 2.1.0 */ public double[] getSpeed() { return speed;