Skip to content

Commit 5794da6

Browse files
vadzim-vysvadzim-vys
authored
Revert "Traffic tendency (#1451)" (#1452)
This reverts commit 4c0fe94.
1 parent 4c0fe94 commit 5794da6

10 files changed

Lines changed: 2 additions & 1036 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ Mapbox welcomes participation and contributions from everyone.
44

55
### main
66
- Fixed `RouteOptions#toUrl` for a case when `RouteOptions` was deserialized from a json generated by an old version of mapbox-java. [#1447](https://github.com/mapbox/mapbox-java/pull/1447)
7-
- Added traffic tendency annotations. [#1451](https://github.com/mapbox/mapbox-java/pull/1451)
87

98
### v6.5.0 - May 25, 2022
109
- No additional changes

‎samples/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ dependencies {
3030

3131
buildConfig {
3232
packageName = 'com.mapbox.sample'
33-
buildConfigField 'String', 'MAPBOX_ACCESS_TOKEN', project.hasProperty('MAPBOX_ACCESS_TOKEN') ? project.property('MAPBOX_ACCESS_TOKEN') : System.getenv('MAPBOX_ACCESS_TOKEN')
33+
buildConfigField 'String', 'MAPBOX_ACCESS_TOKEN', System.getenv("MAPBOX_ACCESS_TOKEN")
3434
}
3535

‎services-directions-models/src/main/java/com/mapbox/api/directions/v5/DirectionsCriteria.java‎

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.mapbox.api.directions.v5;
22

3-
import androidx.annotation.IntDef;
43
import androidx.annotation.StringDef;
54

65
import java.lang.annotation.Retention;
@@ -144,12 +143,6 @@ public final class DirectionsCriteria {
144143
*/
145144
public static final String ANNOTATION_CLOSURE = "closure";
146145

147-
/**
148-
* The tendency value conveys the changing
149-
* state of traffic congestion (increasing, decreasing, constant etc).
150-
*/
151-
public static final String ANNOTATION_TRAFFIC_TENDENCY = "traffic_tendency";
152-
153146
/**
154147
* Exclude all tolls along the returned directions route.
155148
*
@@ -277,36 +270,6 @@ public final class DirectionsCriteria {
277270
*/
278271
public static final String APPROACH_CURB = "curb";
279272

280-
/***
281-
* Conveys the changing state of traffic congestion: unknown.
282-
*/
283-
public static final int TRAFFIC_TENDENCY_UNKNOWN = 0;
284-
285-
/***
286-
* Conveys the changing state of traffic congestion: constant.
287-
*/
288-
public static final int TRAFFIC_TENDENCY_CONSTANT_CONGESTION = 1;
289-
290-
/***
291-
* Conveys the changing state of traffic congestion: increasing.
292-
*/
293-
public static final int TRAFFIC_TENDENCY_INCREASING_CONGESTION = 2;
294-
295-
/***
296-
* Conveys the changing state of traffic congestion: decreasing.
297-
*/
298-
public static final int TRAFFIC_TENDENCY_DECREASING_CONGESTION = 3;
299-
300-
/***
301-
* Conveys the changing state of traffic congestion: rapidly increasing.
302-
*/
303-
public static final int TRAFFIC_TENDENCY_RAPIDLY_INCREASING_CONGESTION = 4;
304-
305-
/***
306-
* Conveys the changing state of traffic congestion: rapidly decreasing.
307-
*/
308-
public static final int TRAFFIC_TENDENCY_RAPIDLY_DECREASING_CONGESTION = 5;
309-
310273
private DirectionsCriteria() {
311274
//not called
312275
}
@@ -366,8 +329,7 @@ private DirectionsCriteria() {
366329
ANNOTATION_CONGESTION,
367330
ANNOTATION_CONGESTION_NUMERIC,
368331
ANNOTATION_MAXSPEED,
369-
ANNOTATION_CLOSURE,
370-
ANNOTATION_TRAFFIC_TENDENCY
332+
ANNOTATION_CLOSURE
371333
})
372334
public @interface AnnotationCriteria {
373335
}
@@ -455,22 +417,4 @@ private DirectionsCriteria() {
455417
})
456418
public @interface ApproachesCriteria {
457419
}
458-
459-
/**
460-
* Retention policy for the traffic tendency annotations.
461-
* The tendency value conveys the changing state of traffic
462-
* congestion (increasing, decreasing, constant etc). New values
463-
* could be introduced in the future without an API version change.
464-
*/
465-
@Retention(RetentionPolicy.CLASS)
466-
@IntDef({
467-
TRAFFIC_TENDENCY_UNKNOWN,
468-
TRAFFIC_TENDENCY_CONSTANT_CONGESTION,
469-
TRAFFIC_TENDENCY_INCREASING_CONGESTION,
470-
TRAFFIC_TENDENCY_DECREASING_CONGESTION,
471-
TRAFFIC_TENDENCY_RAPIDLY_INCREASING_CONGESTION,
472-
TRAFFIC_TENDENCY_RAPIDLY_DECREASING_CONGESTION
473-
})
474-
public @interface TrafficTendencyCriteria {
475-
}
476420
}

‎services-directions-models/src/main/java/com/mapbox/api/directions/v5/models/LegAnnotation.java‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.mapbox.api.directions.v5.models;
22

3-
import androidx.annotation.NonNull;
43
import androidx.annotation.Nullable;
54
import com.google.auto.value.AutoValue;
65
import com.google.gson.Gson;
@@ -93,17 +92,6 @@ public static Builder builder() {
9392
@SerializedName("congestion_numeric")
9493
public abstract List<Integer> congestionNumeric();
9594

96-
/**
97-
* The traffic tendency between each pair of coordinates.
98-
* @return a list of {@link Integer} where each value matches
99-
* {@link DirectionsCriteria.TrafficTendencyCriteria}. The tendency value conveys the changing
100-
* state of traffic congestion (increasing, decreasing, constant etc). New values
101-
* could be introduced in the future without an API version change.
102-
*/
103-
@Nullable
104-
@SerializedName("traffic_tendency")
105-
public abstract List<Integer> trafficTendency();
106-
10795
/**
10896
* Convert the current {@link LegAnnotation} to its builder holding the currently assigned
10997
* values. This allows you to modify a single property and then rebuild the object resulting in
@@ -208,22 +196,12 @@ public abstract static class Builder extends DirectionsJsonObject.Builder<Builde
208196
*/
209197
public abstract Builder congestionNumeric(@Nullable List<Integer> congestionNumeric);
210198

211-
/**
212-
* The traffic tendency between each pair of coordinates.
213-
* @param trafficTendency is a list of {@link Integer} where each value matches
214-
* {@link DirectionsCriteria.TrafficTendencyCriteria}. The tendency value conveys the changing
215-
* state of traffic congestion (increasing, decreasing, constant etc).
216-
*/
217-
@NonNull
218-
public abstract Builder trafficTendency(@Nullable List<Integer> trafficTendency);
219-
220199
/**
221200
* Build a new {@link LegAnnotation} object.
222201
*
223202
* @return a new {@link LegAnnotation} using the provided values in this builder
224203
* @since 3.0.0
225204
*/
226205
public abstract LegAnnotation build();
227-
228206
}
229207
}

‎services-directions-models/src/main/java/com/mapbox/api/directions/v5/models/RouteOptions.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,6 @@ public List<Integer> layersList() {
348348
* {@link DirectionsCriteria#ANNOTATION_CONGESTION_NUMERIC}
349349
* {@link DirectionsCriteria#ANNOTATION_MAXSPEED}
350350
* {@link DirectionsCriteria#ANNOTATION_CLOSURE}
351-
* {@link DirectionsCriteria#ANNOTATION_TRAFFIC_TENDENCY}
352351
* See the {@link RouteLeg} object for more details on what is included with annotations.
353352
* <p>
354353
* Must be used in conjunction with {@link DirectionsCriteria#OVERVIEW_FULL}
@@ -369,7 +368,6 @@ public List<Integer> layersList() {
369368
* {@link DirectionsCriteria#ANNOTATION_CONGESTION_NUMERIC}
370369
* {@link DirectionsCriteria#ANNOTATION_MAXSPEED}
371370
* {@link DirectionsCriteria#ANNOTATION_CLOSURE}
372-
* {@link DirectionsCriteria#ANNOTATION_TRAFFIC_TENDENCY}
373371
* See the {@link RouteLeg} object for more details on what is included with annotations.
374372
* <p>
375373
* Must be used in conjunction with {@link DirectionsCriteria#OVERVIEW_FULL}
@@ -1393,7 +1391,6 @@ public abstract Builder overview(
13931391
* {@link DirectionsCriteria#ANNOTATION_CONGESTION_NUMERIC}
13941392
* {@link DirectionsCriteria#ANNOTATION_MAXSPEED}
13951393
* {@link DirectionsCriteria#ANNOTATION_CLOSURE}
1396-
* {@link DirectionsCriteria#ANNOTATION_TRAFFIC_TENDENCY}
13971394
* See the {@link RouteLeg} object for more details on what is included with annotations.
13981395
* <p>
13991396
* Must be used in conjunction with {@link DirectionsCriteria#OVERVIEW_FULL}
@@ -1415,7 +1412,6 @@ public abstract Builder overview(
14151412
* {@link DirectionsCriteria#ANNOTATION_CONGESTION_NUMERIC}
14161413
* {@link DirectionsCriteria#ANNOTATION_MAXSPEED}
14171414
* {@link DirectionsCriteria#ANNOTATION_CLOSURE}
1418-
* {@link DirectionsCriteria#ANNOTATION_TRAFFIC_TENDENCY}
14191415
* See the {@link RouteLeg} object for more details on what is included with annotations.
14201416
* <p>
14211417
* Must be used in conjunction with {@link DirectionsCriteria#OVERVIEW_FULL}

‎services-directions-refresh-models/src/test/java/com.mapbox.api.directionsrefresh.v1.models/DirectionsRefreshResponseTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public void testSerialization() throws IOException {
3838
assertNotNull(directionsRefreshResponse.route().legs().get(0).annotation());
3939
assertTrue(directionsRefreshResponse.route().legs().get(0).annotation().congestion().size() > 0);
4040
assertTrue(directionsRefreshResponse.route().legs().get(0).incidents().size() > 0);
41-
assertTrue(directionsRefreshResponse.route().legs().get(0).annotation().trafficTendency().size() > 0);
4241
}
4342

4443
@Test

‎services-directions-refresh-models/src/test/java/com.mapbox.api.directionsrefresh.v1.models/DirectionsRouteRefreshTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public void testSerialization() throws IOException {
3535
assertNotNull(directionsRouteRefresh.legs().get(0).annotation().congestion());
3636
assertNotNull(directionsRouteRefresh.legs().get(0).incidents());
3737
assertTrue(directionsRouteRefresh.legs().get(0).incidents().size() > 0);
38-
assertTrue(directionsRouteRefresh.legs().get(0).annotation().trafficTendency().size() > 0);
3938
}
4039

4140
@Test

‎services-directions-refresh-models/src/test/java/com.mapbox.api.directionsrefresh.v1.models/RouteLegRefreshTest.java‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static org.junit.Assert.assertEquals;
44
import static org.junit.Assert.assertNotNull;
55

6-
import com.mapbox.api.directions.v5.DirectionsCriteria;
76
import com.mapbox.api.directions.v5.models.Congestion;
87
import com.mapbox.api.directions.v5.models.Incident;
98
import com.mapbox.api.directions.v5.models.LegAnnotation;
@@ -71,14 +70,6 @@ public void fromJson() {
7170
0.1,
7271
10.2
7372
);
74-
List<Integer> trafficTendency = Arrays.asList(
75-
DirectionsCriteria.TRAFFIC_TENDENCY_UNKNOWN,
76-
DirectionsCriteria.TRAFFIC_TENDENCY_CONSTANT_CONGESTION,
77-
DirectionsCriteria.TRAFFIC_TENDENCY_INCREASING_CONGESTION,
78-
DirectionsCriteria.TRAFFIC_TENDENCY_DECREASING_CONGESTION,
79-
DirectionsCriteria.TRAFFIC_TENDENCY_RAPIDLY_INCREASING_CONGESTION,
80-
DirectionsCriteria.TRAFFIC_TENDENCY_RAPIDLY_DECREASING_CONGESTION
81-
);
8273

8374
List<Incident> incidents = Arrays.asList(
8475
Incident.builder()
@@ -119,7 +110,6 @@ public void fromJson() {
119110
.duration(durations)
120111
.maxspeed(maxSpeeds)
121112
.speed(speeds)
122-
.trafficTendency(trafficTendency)
123113
.build()
124114
)
125115
.incidents(incidents)
@@ -133,22 +123,4 @@ public void fromJson() {
133123
assertEquals(routeLegRefresh, fromJson);
134124
}
135125

136-
@Test
137-
public void trafficTendencyFromJson() {
138-
String json = "{\"traffic_tendency\": [0,1,2,3,4,5]}";
139-
LegAnnotation expectedAnnotations = LegAnnotation.builder()
140-
.trafficTendency(Arrays.asList(
141-
DirectionsCriteria.TRAFFIC_TENDENCY_UNKNOWN,
142-
DirectionsCriteria.TRAFFIC_TENDENCY_CONSTANT_CONGESTION,
143-
DirectionsCriteria.TRAFFIC_TENDENCY_INCREASING_CONGESTION,
144-
DirectionsCriteria.TRAFFIC_TENDENCY_DECREASING_CONGESTION,
145-
DirectionsCriteria.TRAFFIC_TENDENCY_RAPIDLY_INCREASING_CONGESTION,
146-
DirectionsCriteria.TRAFFIC_TENDENCY_RAPIDLY_DECREASING_CONGESTION
147-
))
148-
.build();
149-
150-
LegAnnotation fromJson = LegAnnotation.fromJson(json);
151-
152-
assertEquals(expectedAnnotations, fromJson);
153-
}
154126
}

0 commit comments

Comments
 (0)