Commit24ce7b2

committed

add etc2

1 parentca820fb commit24ce7b2Copy full SHA for 24ce7b2

File tree

+37

-0

lines changed

+37

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ Mapbox welcomes participation and contributions from everyone.`
`4`	`4`
`5`	`5`	`###main`
`6`	`6`
	`7`	+- Added`DirectionsCriteria#PAYMENT_METHOD_ETC2` option to pass as`RouteOptions#computeTollCosts` and to receive in`IntersectionsLanes#paymentMethods`.
	`8`	`+`
`7`	`9`	`###v6.14.0 - October 26, 2023`
`8`	`10`
`9`	`11`	- Added`LegAnnotation#freeflowSpeed` and`LegAnnotation#currentSpeed`. To receive these annotations, pass`DirectionsCriteria.ANNOTATION_FREEFLOW_SPEED` and`DirectionsCriteria.ANNOTATION_CURRENT_SPEED` in the request in the "annotations" parameter.

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -338,6 +338,15 @@ public final class DirectionsCriteria {`
`338`	`338`	`@SuppressWarnings("checkstyle:javadocvariable")`
`339`	`339`	`publicstaticfinalStringPAYMENT_METHOD_ETC ="etc";`
`340`	`340`
	`341`	`+/*`
	`342`	`+ * A ETC 2.0 transponder.`
	`343`	+ * NOTE: If the specified `payment_methods` parameter includes `etc2`,
	`344`	+ * `etc` lane will be validated and activated.
	`345`	`+ * This is because ETC2 user can pass through ETC tollbooths.`
	`346`	`+ */`
	`347`	`+@SuppressWarnings("checkstyle:javadocvariable")`
	`348`	`+publicstaticfinalStringPAYMENT_METHOD_ETC2 ="etc2";`
	`349`	`+`
`341`	`350`	`/*`
`342`	`351`	`* A transponder only used for several specific roads in Japan.`
`343`	`352`	`*/`
`@@ -668,6 +677,7 @@ private DirectionsCriteria() {`
`668`	`677`	`PAYMENT_METHOD_VIDEO,`
`669`	`678`	`PAYMENT_METHOD_CRYPTOCURRENCIES,`
`670`	`679`	`PAYMENT_METHOD_APP,`
	`680`	`+PAYMENT_METHOD_ETC2,`
`671`	`681`	`})`
`672`	`682`	`public @interfacePaymentMethodsCriteria {`
`673`	`683`	`}`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -88,4 +88,18 @@ public void testFromJson_etcAndGeneralPayment() {`
`88`	`88`
`89`	`89`	`assertEquals(intersectionLanes,intersectionLanesFromJson);`
`90`	`90`	`}`
	`91`	`+`
	`92`	`+@Test`
	`93`	`+publicvoidtestFromJson_etc2Payment() {`
	`94`	`+IntersectionLanesintersectionLanes =IntersectionLanes.builder()`
	`95`	`+ .paymentMethods(Arrays.asList(`
	`96`	`+DirectionsCriteria.PAYMENT_METHOD_ETC2`
	`97`	`+ ))`
	`98`	`+ .build();`
	`99`	`+`
	`100`	`+StringjsonString ="{\"payment_methods\": [\"etc2\"]}";`
	`101`	`+IntersectionLanesintersectionLanesFromJson =IntersectionLanes.fromJson(jsonString);`
	`102`	`+`
	`103`	`+assertEquals(intersectionLanes,intersectionLanesFromJson);`
	`104`	`+ }`
`91`	`105`	`}`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1037,6 +1037,17 @@ public void etcPaymentMethod() {`
`1037`	`1037`	`assertContains(query,"payment_methods=etc");`
`1038`	`1038`	`}`
`1039`	`1039`
	`1040`	`+@Test`
	`1041`	`+publicvoidetc2PaymentMethod() {`
	`1042`	`+RouteOptionsrouteOptions =routeOptions().toBuilder()`
	`1043`	`+ .paymentMethodsList(Arrays.asList(DirectionsCriteria.PAYMENT_METHOD_ETC2))`
	`1044`	`+ .build();`
	`1045`	`+Stringquery =routeOptions.toUrl("test").getQuery();`
	`1046`	`+`
	`1047`	`+assertEquals("etc2",routeOptions.paymentMethods());`
	`1048`	`+assertContains(query,"payment_methods=etc2");`
	`1049`	`+ }`
	`1050`	`+`
`1040`	`1051`	`@Test`
`1041`	`1052`	`publicvoidgeneralAndEtcPaymentsMethod() {`
`1042`	`1053`	`List<String>paymentMethods =Arrays.asList(`

Comments

(0)