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.

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

feat: [maps-routing] Add HTML Navigation Instructions feature to ComputeRoutes #9589

Merged
merged 2 commits into from
Jun 30, 2023
Merged
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions java-maps-routing/README.md
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>26.16.0</version>
<version>26.18.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -195,7 +195,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-maps-routing/java11.html
[stability-image]: https://img.shields.io/badge/stability-stable-green
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.maps/google-maps-routing.svg
[maven-version-link]: https://central.sonatype.com/artifact/com.google.maps/google-maps-routing/1.4.0
[maven-version-link]: https://central.sonatype.com/artifact/com.google.maps/google-maps-routing/1.5.0
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
Original file line number Diff line number Diff line change
@@ -49,13 +49,17 @@
* .setPolylineQuality(PolylineQuality.forNumber(0))
* .setPolylineEncoding(PolylineEncoding.forNumber(0))
* .setDepartureTime(Timestamp.newBuilder().build())
* .setArrivalTime(Timestamp.newBuilder().build())
* .setComputeAlternativeRoutes(true)
* .setRouteModifiers(RouteModifiers.newBuilder().build())
* .setLanguageCode("languageCode-2092349083")
* .setRegionCode("regionCode-1991004415")
* .setUnits(Units.forNumber(0))
* .setOptimizeWaypointOrder(true)
* .addAllRequestedReferenceRoutes(new ArrayList<ComputeRoutesRequest.ReferenceRoute>())
* .addAllExtraComputations(new ArrayList<ComputeRoutesRequest.ExtraComputation>())
* .setTrafficModel(TrafficModel.forNumber(0))
* .setTransitPreferences(TransitPreferences.newBuilder().build())
* .build();
* ComputeRoutesResponse response = routesClient.computeRoutes(request);
* }
@@ -231,13 +235,17 @@ public RoutesStub getStub() {
* .setPolylineQuality(PolylineQuality.forNumber(0))
* .setPolylineEncoding(PolylineEncoding.forNumber(0))
* .setDepartureTime(Timestamp.newBuilder().build())
* .setArrivalTime(Timestamp.newBuilder().build())
* .setComputeAlternativeRoutes(true)
* .setRouteModifiers(RouteModifiers.newBuilder().build())
* .setLanguageCode("languageCode-2092349083")
* .setRegionCode("regionCode-1991004415")
* .setUnits(Units.forNumber(0))
* .setOptimizeWaypointOrder(true)
* .addAllRequestedReferenceRoutes(new ArrayList<ComputeRoutesRequest.ReferenceRoute>())
* .addAllExtraComputations(new ArrayList<ComputeRoutesRequest.ExtraComputation>())
* .setTrafficModel(TrafficModel.forNumber(0))
* .setTransitPreferences(TransitPreferences.newBuilder().build())
* .build();
* ComputeRoutesResponse response = routesClient.computeRoutes(request);
* }
@@ -304,13 +312,17 @@ public final ComputeRoutesResponse computeRoutes(ComputeRoutesRequest request) {
* .setPolylineQuality(PolylineQuality.forNumber(0))
* .setPolylineEncoding(PolylineEncoding.forNumber(0))
* .setDepartureTime(Timestamp.newBuilder().build())
* .setArrivalTime(Timestamp.newBuilder().build())
* .setComputeAlternativeRoutes(true)
* .setRouteModifiers(RouteModifiers.newBuilder().build())
* .setLanguageCode("languageCode-2092349083")
* .setRegionCode("regionCode-1991004415")
* .setUnits(Units.forNumber(0))
* .setOptimizeWaypointOrder(true)
* .addAllRequestedReferenceRoutes(new ArrayList<ComputeRoutesRequest.ReferenceRoute>())
* .addAllExtraComputations(new ArrayList<ComputeRoutesRequest.ExtraComputation>())
* .setTrafficModel(TrafficModel.forNumber(0))
* .setTransitPreferences(TransitPreferences.newBuilder().build())
* .build();
* ApiFuture<ComputeRoutesResponse> future =
* routesClient.computeRoutesCallable().futureCall(request);
@@ -377,9 +389,12 @@ public final UnaryCallable<ComputeRoutesRequest, ComputeRoutesResponse> computeR
* .setTravelMode(RouteTravelMode.forNumber(0))
* .setRoutingPreference(RoutingPreference.forNumber(0))
* .setDepartureTime(Timestamp.newBuilder().build())
* .setArrivalTime(Timestamp.newBuilder().build())
* .setLanguageCode("languageCode-2092349083")
* .setRegionCode("regionCode-1991004415")
* .addAllExtraComputations(new ArrayList<ComputeRouteMatrixRequest.ExtraComputation>())
* .setTrafficModel(TrafficModel.forNumber(0))
* .setTransitPreferences(TransitPreferences.newBuilder().build())
* .build();
* ServerStream<RouteMatrixElement> stream =
* routesClient.computeRouteMatrixCallable().call(request);
Original file line number Diff line number Diff line change
@@ -42,13 +42,17 @@
* .setPolylineQuality(PolylineQuality.forNumber(0))
* .setPolylineEncoding(PolylineEncoding.forNumber(0))
* .setDepartureTime(Timestamp.newBuilder().build())
* .setArrivalTime(Timestamp.newBuilder().build())
* .setComputeAlternativeRoutes(true)
* .setRouteModifiers(RouteModifiers.newBuilder().build())
* .setLanguageCode("languageCode-2092349083")
* .setRegionCode("regionCode-1991004415")
* .setUnits(Units.forNumber(0))
* .setOptimizeWaypointOrder(true)
* .addAllRequestedReferenceRoutes(new ArrayList<ComputeRoutesRequest.ReferenceRoute>())
* .addAllExtraComputations(new ArrayList<ComputeRoutesRequest.ExtraComputation>())
* .setTrafficModel(TrafficModel.forNumber(0))
* .setTransitPreferences(TransitPreferences.newBuilder().build())
* .build();
* ComputeRoutesResponse response = routesClient.computeRoutes(request);
* }
Original file line number Diff line number Diff line change
@@ -92,13 +92,17 @@ public void computeRoutesTest() throws Exception {
.setPolylineQuality(PolylineQuality.forNumber(0))
.setPolylineEncoding(PolylineEncoding.forNumber(0))
.setDepartureTime(Timestamp.newBuilder().build())
.setArrivalTime(Timestamp.newBuilder().build())
.setComputeAlternativeRoutes(true)
.setRouteModifiers(RouteModifiers.newBuilder().build())
.setLanguageCode("languageCode-2092349083")
.setRegionCode("regionCode-1991004415")
.setUnits(Units.forNumber(0))
.setOptimizeWaypointOrder(true)
.addAllRequestedReferenceRoutes(new ArrayList<ComputeRoutesRequest.ReferenceRoute>())
.addAllExtraComputations(new ArrayList<ComputeRoutesRequest.ExtraComputation>())
.setTrafficModel(TrafficModel.forNumber(0))
.setTransitPreferences(TransitPreferences.newBuilder().build())
.build();

ComputeRoutesResponse actualResponse = client.computeRoutes(request);
@@ -137,13 +141,17 @@ public void computeRoutesExceptionTest() throws Exception {
.setPolylineQuality(PolylineQuality.forNumber(0))
.setPolylineEncoding(PolylineEncoding.forNumber(0))
.setDepartureTime(Timestamp.newBuilder().build())
.setArrivalTime(Timestamp.newBuilder().build())
.setComputeAlternativeRoutes(true)
.setRouteModifiers(RouteModifiers.newBuilder().build())
.setLanguageCode("languageCode-2092349083")
.setRegionCode("regionCode-1991004415")
.setUnits(Units.forNumber(0))
.setOptimizeWaypointOrder(true)
.addAllRequestedReferenceRoutes(new ArrayList<ComputeRoutesRequest.ReferenceRoute>())
.addAllExtraComputations(new ArrayList<ComputeRoutesRequest.ExtraComputation>())
.setTrafficModel(TrafficModel.forNumber(0))
.setTransitPreferences(TransitPreferences.newBuilder().build())
.build();
client.computeRoutes(request);
Assert.fail("No exception raised");
Original file line number Diff line number Diff line change
@@ -103,13 +103,17 @@ public void computeRoutesTest() throws Exception {
.setPolylineQuality(PolylineQuality.forNumber(0))
.setPolylineEncoding(PolylineEncoding.forNumber(0))
.setDepartureTime(Timestamp.newBuilder().build())
.setArrivalTime(Timestamp.newBuilder().build())
.setComputeAlternativeRoutes(true)
.setRouteModifiers(RouteModifiers.newBuilder().build())
.setLanguageCode("languageCode-2092349083")
.setRegionCode("regionCode-1991004415")
.setUnits(Units.forNumber(0))
.setOptimizeWaypointOrder(true)
.addAllRequestedReferenceRoutes(new ArrayList<ComputeRoutesRequest.ReferenceRoute>())
.addAllExtraComputations(new ArrayList<ComputeRoutesRequest.ExtraComputation>())
.setTrafficModel(TrafficModel.forNumber(0))
.setTransitPreferences(TransitPreferences.newBuilder().build())
.build();

ComputeRoutesResponse actualResponse = client.computeRoutes(request);
@@ -127,16 +131,21 @@ public void computeRoutesTest() throws Exception {
Assert.assertEquals(request.getPolylineQuality(), actualRequest.getPolylineQuality());
Assert.assertEquals(request.getPolylineEncoding(), actualRequest.getPolylineEncoding());
Assert.assertEquals(request.getDepartureTime(), actualRequest.getDepartureTime());
Assert.assertEquals(request.getArrivalTime(), actualRequest.getArrivalTime());
Assert.assertEquals(
request.getComputeAlternativeRoutes(), actualRequest.getComputeAlternativeRoutes());
Assert.assertEquals(request.getRouteModifiers(), actualRequest.getRouteModifiers());
Assert.assertEquals(request.getLanguageCode(), actualRequest.getLanguageCode());
Assert.assertEquals(request.getRegionCode(), actualRequest.getRegionCode());
Assert.assertEquals(request.getUnits(), actualRequest.getUnits());
Assert.assertEquals(
request.getOptimizeWaypointOrder(), actualRequest.getOptimizeWaypointOrder());
Assert.assertEquals(
request.getRequestedReferenceRoutesList(), actualRequest.getRequestedReferenceRoutesList());
Assert.assertEquals(
request.getExtraComputationsList(), actualRequest.getExtraComputationsList());
Assert.assertEquals(request.getTrafficModel(), actualRequest.getTrafficModel());
Assert.assertEquals(request.getTransitPreferences(), actualRequest.getTransitPreferences());
Assert.assertTrue(
channelProvider.isHeaderSent(
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -159,13 +168,17 @@ public void computeRoutesExceptionTest() throws Exception {
.setPolylineQuality(PolylineQuality.forNumber(0))
.setPolylineEncoding(PolylineEncoding.forNumber(0))
.setDepartureTime(Timestamp.newBuilder().build())
.setArrivalTime(Timestamp.newBuilder().build())
.setComputeAlternativeRoutes(true)
.setRouteModifiers(RouteModifiers.newBuilder().build())
.setLanguageCode("languageCode-2092349083")
.setRegionCode("regionCode-1991004415")
.setUnits(Units.forNumber(0))
.setOptimizeWaypointOrder(true)
.addAllRequestedReferenceRoutes(new ArrayList<ComputeRoutesRequest.ReferenceRoute>())
.addAllExtraComputations(new ArrayList<ComputeRoutesRequest.ExtraComputation>())
.setTrafficModel(TrafficModel.forNumber(0))
.setTransitPreferences(TransitPreferences.newBuilder().build())
.build();
client.computeRoutes(request);
Assert.fail("No exception raised");
@@ -187,6 +200,7 @@ public void computeRouteMatrixTest() throws Exception {
.setStaticDuration(Duration.newBuilder().build())
.setTravelAdvisory(RouteTravelAdvisory.newBuilder().build())
.setFallbackInfo(FallbackInfo.newBuilder().build())
.setLocalizedValues(RouteMatrixElement.LocalizedValues.newBuilder().build())
.build();
mockRoutes.addResponse(expectedResponse);
ComputeRouteMatrixRequest request =
@@ -196,9 +210,12 @@ public void computeRouteMatrixTest() throws Exception {
.setTravelMode(RouteTravelMode.forNumber(0))
.setRoutingPreference(RoutingPreference.forNumber(0))
.setDepartureTime(Timestamp.newBuilder().build())
.setArrivalTime(Timestamp.newBuilder().build())
.setLanguageCode("languageCode-2092349083")
.setRegionCode("regionCode-1991004415")
.addAllExtraComputations(new ArrayList<ComputeRouteMatrixRequest.ExtraComputation>())
.setTrafficModel(TrafficModel.forNumber(0))
.setTransitPreferences(TransitPreferences.newBuilder().build())
.build();

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

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