Skip to content

Commit 7be2b86

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: [maps-routing] Add HTML Navigation Instructions feature to ComputeRoutes (#9589)
- [ ] Regenerate this pull request now. feat: Add Waypoint Optimization feature to ComputeRoutes feat: Support Transit routes in ComputeRoutes and ComputeRouteMatrix feat: Add TrafficModel feature in ComputeRoutes and ComputeRouteMatrix feat: Support returning localized values in ComputeRoutes and ComputeRouteMatrix feat: Add more navigation instruction maneuvers feat: Add more toll pass values PiperOrigin-RevId: 544137630 Source-Link: https://togithub.life-white.uk/googleapis/googleapis/commit/6e0f749ee337b9aa343d09db8f4e674298ff8e7f Source-Link: https://togithub.life-white.uk/googleapis/googleapis-gen/commit/cb29cc19eb4fa96ecc75bc49511fe9eba325e297 Copy-Tag: eyJwIjoiamF2YS1tYXBzLXJvdXRpbmcvLk93bEJvdC55YW1sIiwiaCI6ImNiMjljYzE5ZWI0ZmE5NmVjYzc1YmM0OTUxMWZlOWViYTMyNWUyOTcifQ==
1 parent c35bd0b commit 7be2b86

70 files changed

Lines changed: 31635 additions & 2469 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎java-maps-routing/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
2020
<dependency>
2121
<groupId>com.google.cloud</groupId>
2222
<artifactId>libraries-bom</artifactId>
23-
<version>26.16.0</version>
23+
<version>26.18.0</version>
2424
<type>pom</type>
2525
<scope>import</scope>
2626
</dependency>
@@ -195,7 +195,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
195195
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-maps-routing/java11.html
196196
[stability-image]: https://img.shields.io/badge/stability-stable-green
197197
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.maps/google-maps-routing.svg
198-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.maps/google-maps-routing/1.4.0
198+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.maps/google-maps-routing/1.5.0
199199
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
200200
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
201201
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

‎java-maps-routing/google-maps-routing/src/main/java/com/google/maps/routing/v2/RoutesClient.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,17 @@
4949
* .setPolylineQuality(PolylineQuality.forNumber(0))
5050
* .setPolylineEncoding(PolylineEncoding.forNumber(0))
5151
* .setDepartureTime(Timestamp.newBuilder().build())
52+
* .setArrivalTime(Timestamp.newBuilder().build())
5253
* .setComputeAlternativeRoutes(true)
5354
* .setRouteModifiers(RouteModifiers.newBuilder().build())
5455
* .setLanguageCode("languageCode-2092349083")
5556
* .setRegionCode("regionCode-1991004415")
5657
* .setUnits(Units.forNumber(0))
58+
* .setOptimizeWaypointOrder(true)
5759
* .addAllRequestedReferenceRoutes(new ArrayList<ComputeRoutesRequest.ReferenceRoute>())
5860
* .addAllExtraComputations(new ArrayList<ComputeRoutesRequest.ExtraComputation>())
61+
* .setTrafficModel(TrafficModel.forNumber(0))
62+
* .setTransitPreferences(TransitPreferences.newBuilder().build())
5963
* .build();
6064
* ComputeRoutesResponse response = routesClient.computeRoutes(request);
6165
* }
@@ -231,13 +235,17 @@ public RoutesStub getStub() {
231235
* .setPolylineQuality(PolylineQuality.forNumber(0))
232236
* .setPolylineEncoding(PolylineEncoding.forNumber(0))
233237
* .setDepartureTime(Timestamp.newBuilder().build())
238+
* .setArrivalTime(Timestamp.newBuilder().build())
234239
* .setComputeAlternativeRoutes(true)
235240
* .setRouteModifiers(RouteModifiers.newBuilder().build())
236241
* .setLanguageCode("languageCode-2092349083")
237242
* .setRegionCode("regionCode-1991004415")
238243
* .setUnits(Units.forNumber(0))
244+
* .setOptimizeWaypointOrder(true)
239245
* .addAllRequestedReferenceRoutes(new ArrayList<ComputeRoutesRequest.ReferenceRoute>())
240246
* .addAllExtraComputations(new ArrayList<ComputeRoutesRequest.ExtraComputation>())
247+
* .setTrafficModel(TrafficModel.forNumber(0))
248+
* .setTransitPreferences(TransitPreferences.newBuilder().build())
241249
* .build();
242250
* ComputeRoutesResponse response = routesClient.computeRoutes(request);
243251
* }
@@ -304,13 +312,17 @@ public final ComputeRoutesResponse computeRoutes(ComputeRoutesRequest request) {
304312
* .setPolylineQuality(PolylineQuality.forNumber(0))
305313
* .setPolylineEncoding(PolylineEncoding.forNumber(0))
306314
* .setDepartureTime(Timestamp.newBuilder().build())
315+
* .setArrivalTime(Timestamp.newBuilder().build())
307316
* .setComputeAlternativeRoutes(true)
308317
* .setRouteModifiers(RouteModifiers.newBuilder().build())
309318
* .setLanguageCode("languageCode-2092349083")
310319
* .setRegionCode("regionCode-1991004415")
311320
* .setUnits(Units.forNumber(0))
321+
* .setOptimizeWaypointOrder(true)
312322
* .addAllRequestedReferenceRoutes(new ArrayList<ComputeRoutesRequest.ReferenceRoute>())
313323
* .addAllExtraComputations(new ArrayList<ComputeRoutesRequest.ExtraComputation>())
324+
* .setTrafficModel(TrafficModel.forNumber(0))
325+
* .setTransitPreferences(TransitPreferences.newBuilder().build())
314326
* .build();
315327
* ApiFuture<ComputeRoutesResponse> future =
316328
* routesClient.computeRoutesCallable().futureCall(request);
@@ -377,9 +389,12 @@ public final UnaryCallable<ComputeRoutesRequest, ComputeRoutesResponse> computeR
377389
* .setTravelMode(RouteTravelMode.forNumber(0))
378390
* .setRoutingPreference(RoutingPreference.forNumber(0))
379391
* .setDepartureTime(Timestamp.newBuilder().build())
392+
* .setArrivalTime(Timestamp.newBuilder().build())
380393
* .setLanguageCode("languageCode-2092349083")
381394
* .setRegionCode("regionCode-1991004415")
382395
* .addAllExtraComputations(new ArrayList<ComputeRouteMatrixRequest.ExtraComputation>())
396+
* .setTrafficModel(TrafficModel.forNumber(0))
397+
* .setTransitPreferences(TransitPreferences.newBuilder().build())
383398
* .build();
384399
* ServerStream<RouteMatrixElement> stream =
385400
* routesClient.computeRouteMatrixCallable().call(request);

‎java-maps-routing/google-maps-routing/src/main/java/com/google/maps/routing/v2/package-info.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,17 @@
4242
* .setPolylineQuality(PolylineQuality.forNumber(0))
4343
* .setPolylineEncoding(PolylineEncoding.forNumber(0))
4444
* .setDepartureTime(Timestamp.newBuilder().build())
45+
* .setArrivalTime(Timestamp.newBuilder().build())
4546
* .setComputeAlternativeRoutes(true)
4647
* .setRouteModifiers(RouteModifiers.newBuilder().build())
4748
* .setLanguageCode("languageCode-2092349083")
4849
* .setRegionCode("regionCode-1991004415")
4950
* .setUnits(Units.forNumber(0))
51+
* .setOptimizeWaypointOrder(true)
5052
* .addAllRequestedReferenceRoutes(new ArrayList<ComputeRoutesRequest.ReferenceRoute>())
5153
* .addAllExtraComputations(new ArrayList<ComputeRoutesRequest.ExtraComputation>())
54+
* .setTrafficModel(TrafficModel.forNumber(0))
55+
* .setTransitPreferences(TransitPreferences.newBuilder().build())
5256
* .build();
5357
* ComputeRoutesResponse response = routesClient.computeRoutes(request);
5458
* }

‎java-maps-routing/google-maps-routing/src/test/java/com/google/maps/routing/v2/RoutesClientHttpJsonTest.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,17 @@ public void computeRoutesTest() throws Exception {
9292
.setPolylineQuality(PolylineQuality.forNumber(0))
9393
.setPolylineEncoding(PolylineEncoding.forNumber(0))
9494
.setDepartureTime(Timestamp.newBuilder().build())
95+
.setArrivalTime(Timestamp.newBuilder().build())
9596
.setComputeAlternativeRoutes(true)
9697
.setRouteModifiers(RouteModifiers.newBuilder().build())
9798
.setLanguageCode("languageCode-2092349083")
9899
.setRegionCode("regionCode-1991004415")
99100
.setUnits(Units.forNumber(0))
101+
.setOptimizeWaypointOrder(true)
100102
.addAllRequestedReferenceRoutes(new ArrayList<ComputeRoutesRequest.ReferenceRoute>())
101103
.addAllExtraComputations(new ArrayList<ComputeRoutesRequest.ExtraComputation>())
104+
.setTrafficModel(TrafficModel.forNumber(0))
105+
.setTransitPreferences(TransitPreferences.newBuilder().build())
102106
.build();
103107

104108
ComputeRoutesResponse actualResponse = client.computeRoutes(request);
@@ -137,13 +141,17 @@ public void computeRoutesExceptionTest() throws Exception {
137141
.setPolylineQuality(PolylineQuality.forNumber(0))
138142
.setPolylineEncoding(PolylineEncoding.forNumber(0))
139143
.setDepartureTime(Timestamp.newBuilder().build())
144+
.setArrivalTime(Timestamp.newBuilder().build())
140145
.setComputeAlternativeRoutes(true)
141146
.setRouteModifiers(RouteModifiers.newBuilder().build())
142147
.setLanguageCode("languageCode-2092349083")
143148
.setRegionCode("regionCode-1991004415")
144149
.setUnits(Units.forNumber(0))
150+
.setOptimizeWaypointOrder(true)
145151
.addAllRequestedReferenceRoutes(new ArrayList<ComputeRoutesRequest.ReferenceRoute>())
146152
.addAllExtraComputations(new ArrayList<ComputeRoutesRequest.ExtraComputation>())
153+
.setTrafficModel(TrafficModel.forNumber(0))
154+
.setTransitPreferences(TransitPreferences.newBuilder().build())
147155
.build();
148156
client.computeRoutes(request);
149157
Assert.fail("No exception raised");

‎java-maps-routing/google-maps-routing/src/test/java/com/google/maps/routing/v2/RoutesClientTest.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,17 @@ public void computeRoutesTest() throws Exception {
103103
.setPolylineQuality(PolylineQuality.forNumber(0))
104104
.setPolylineEncoding(PolylineEncoding.forNumber(0))
105105
.setDepartureTime(Timestamp.newBuilder().build())
106+
.setArrivalTime(Timestamp.newBuilder().build())
106107
.setComputeAlternativeRoutes(true)
107108
.setRouteModifiers(RouteModifiers.newBuilder().build())
108109
.setLanguageCode("languageCode-2092349083")
109110
.setRegionCode("regionCode-1991004415")
110111
.setUnits(Units.forNumber(0))
112+
.setOptimizeWaypointOrder(true)
111113
.addAllRequestedReferenceRoutes(new ArrayList<ComputeRoutesRequest.ReferenceRoute>())
112114
.addAllExtraComputations(new ArrayList<ComputeRoutesRequest.ExtraComputation>())
115+
.setTrafficModel(TrafficModel.forNumber(0))
116+
.setTransitPreferences(TransitPreferences.newBuilder().build())
113117
.build();
114118

115119
ComputeRoutesResponse actualResponse = client.computeRoutes(request);
@@ -127,16 +131,21 @@ public void computeRoutesTest() throws Exception {
127131
Assert.assertEquals(request.getPolylineQuality(), actualRequest.getPolylineQuality());
128132
Assert.assertEquals(request.getPolylineEncoding(), actualRequest.getPolylineEncoding());
129133
Assert.assertEquals(request.getDepartureTime(), actualRequest.getDepartureTime());
134+
Assert.assertEquals(request.getArrivalTime(), actualRequest.getArrivalTime());
130135
Assert.assertEquals(
131136
request.getComputeAlternativeRoutes(), actualRequest.getComputeAlternativeRoutes());
132137
Assert.assertEquals(request.getRouteModifiers(), actualRequest.getRouteModifiers());
133138
Assert.assertEquals(request.getLanguageCode(), actualRequest.getLanguageCode());
134139
Assert.assertEquals(request.getRegionCode(), actualRequest.getRegionCode());
135140
Assert.assertEquals(request.getUnits(), actualRequest.getUnits());
141+
Assert.assertEquals(
142+
request.getOptimizeWaypointOrder(), actualRequest.getOptimizeWaypointOrder());
136143
Assert.assertEquals(
137144
request.getRequestedReferenceRoutesList(), actualRequest.getRequestedReferenceRoutesList());
138145
Assert.assertEquals(
139146
request.getExtraComputationsList(), actualRequest.getExtraComputationsList());
147+
Assert.assertEquals(request.getTrafficModel(), actualRequest.getTrafficModel());
148+
Assert.assertEquals(request.getTransitPreferences(), actualRequest.getTransitPreferences());
140149
Assert.assertTrue(
141150
channelProvider.isHeaderSent(
142151
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -159,13 +168,17 @@ public void computeRoutesExceptionTest() throws Exception {
159168
.setPolylineQuality(PolylineQuality.forNumber(0))
160169
.setPolylineEncoding(PolylineEncoding.forNumber(0))
161170
.setDepartureTime(Timestamp.newBuilder().build())
171+
.setArrivalTime(Timestamp.newBuilder().build())
162172
.setComputeAlternativeRoutes(true)
163173
.setRouteModifiers(RouteModifiers.newBuilder().build())
164174
.setLanguageCode("languageCode-2092349083")
165175
.setRegionCode("regionCode-1991004415")
166176
.setUnits(Units.forNumber(0))
177+
.setOptimizeWaypointOrder(true)
167178
.addAllRequestedReferenceRoutes(new ArrayList<ComputeRoutesRequest.ReferenceRoute>())
168179
.addAllExtraComputations(new ArrayList<ComputeRoutesRequest.ExtraComputation>())
180+
.setTrafficModel(TrafficModel.forNumber(0))
181+
.setTransitPreferences(TransitPreferences.newBuilder().build())
169182
.build();
170183
client.computeRoutes(request);
171184
Assert.fail("No exception raised");
@@ -187,6 +200,7 @@ public void computeRouteMatrixTest() throws Exception {
187200
.setStaticDuration(Duration.newBuilder().build())
188201
.setTravelAdvisory(RouteTravelAdvisory.newBuilder().build())
189202
.setFallbackInfo(FallbackInfo.newBuilder().build())
203+
.setLocalizedValues(RouteMatrixElement.LocalizedValues.newBuilder().build())
190204
.build();
191205
mockRoutes.addResponse(expectedResponse);
192206
ComputeRouteMatrixRequest request =
@@ -196,9 +210,12 @@ public void computeRouteMatrixTest() throws Exception {
196210
.setTravelMode(RouteTravelMode.forNumber(0))
197211
.setRoutingPreference(RoutingPreference.forNumber(0))
198212
.setDepartureTime(Timestamp.newBuilder().build())
213+
.setArrivalTime(Timestamp.newBuilder().build())
199214
.setLanguageCode("languageCode-2092349083")
200215
.setRegionCode("regionCode-1991004415")
201216
.addAllExtraComputations(new ArrayList<ComputeRouteMatrixRequest.ExtraComputation>())
217+
.setTrafficModel(TrafficModel.forNumber(0))
218+
.setTransitPreferences(TransitPreferences.newBuilder().build())
202219
.build();
203220

204221
MockStreamObserver<RouteMatrixElement> responseObserver = new MockStreamObserver<>();
@@ -223,9 +240,12 @@ public void computeRouteMatrixExceptionTest() throws Exception {
223240
.setTravelMode(RouteTravelMode.forNumber(0))
224241
.setRoutingPreference(RoutingPreference.forNumber(0))
225242
.setDepartureTime(Timestamp.newBuilder().build())
243+
.setArrivalTime(Timestamp.newBuilder().build())
226244
.setLanguageCode("languageCode-2092349083")
227245
.setRegionCode("regionCode-1991004415")
228246
.addAllExtraComputations(new ArrayList<ComputeRouteMatrixRequest.ExtraComputation>())
247+
.setTrafficModel(TrafficModel.forNumber(0))
248+
.setTransitPreferences(TransitPreferences.newBuilder().build())
229249
.build();
230250

231251
MockStreamObserver<RouteMatrixElement> responseObserver = new MockStreamObserver<>();

0 commit comments

Comments
 (0)