Skip to content

Commit 1b867fe

Browse files
committed
NAVAND-822: add supported amenity types
1 parent 6b63f16 commit 1b867fe

3 files changed

Lines changed: 105 additions & 1 deletion

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
Mapbox welcomes participation and contributions from everyone.
44

55
### main
6+
- Specified supported amenity types via `DirectionsCriteria#AmenityTypeCriteria`. [#1515](https://github.com/mapbox/mapbox-java/pull/1515)
67

78
### v6.10.0-beta.2 - November 11, 2022
89
- Added `paymentMethods` parameter for `RouteOptions` and `IntersectionLanes`. [#1449](https://github.com/mapbox/mapbox-java/pull/1449)

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

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import androidx.annotation.IntDef;
44
import androidx.annotation.StringDef;
5+
import com.mapbox.api.directions.v5.models.Amenity;
56

67
import java.lang.annotation.Retention;
78
import java.lang.annotation.RetentionPolicy;
@@ -394,6 +395,79 @@ public final class DirectionsCriteria {
394395
@SuppressWarnings("checkstyle:javadocvariable")
395396
public static final String PAYMENT_METHOD_APP = "app";
396397

398+
/**
399+
* Gas station amenity type.
400+
*/
401+
public static final String AMENITY_TYPE_GAS_STATION = "gas_station";
402+
/**
403+
* Electric charging station amenity type.
404+
*/
405+
public static final String AMENITY_TYPE_ELECTRIC_CHARGING_STATION = "electric_charging_station";
406+
/**
407+
* Toilet amenity type.
408+
*/
409+
public static final String AMENITY_TYPE_TOILET = "toilet";
410+
/**
411+
* Coffee amenity type.
412+
*/
413+
public static final String AMENITY_TYPE_COFFEE = "coffee";
414+
/**
415+
* Restaurant amenity type.
416+
*/
417+
public static final String AMENITY_TYPE_RESTAURANT = "restaurant";
418+
/**
419+
* Snack amenity type.
420+
*/
421+
public static final String AMENITY_TYPE_SNACK = "snack";
422+
/**
423+
* ATM amenity type.
424+
*/
425+
public static final String AMENITY_TYPE_ATM = "ATM";
426+
/**
427+
* Info amenity type.
428+
*/
429+
public static final String AMENITY_TYPE_INFO = "info";
430+
/**
431+
* Baby care amenity type.
432+
*/
433+
public static final String AMENITY_TYPE_BABY_CARE = "baby_care";
434+
/**
435+
* Facilities for disabled amenity type.
436+
*/
437+
public static final String AMENITY_TYPE_FACILITIES_FOR_DISABLED = "facilities_for_disabled";
438+
/**
439+
* Shop amenity type.
440+
*/
441+
public static final String AMENITY_TYPE_SHOP = "shop";
442+
/**
443+
* Telephone amenity type.
444+
*/
445+
public static final String AMENITY_TYPE_TELEPHONE = "telephone";
446+
/**
447+
* Hotel amenity type.
448+
*/
449+
public static final String AMENITY_TYPE_HOTEL = "hotel";
450+
/**
451+
* Hotspring amenity type.
452+
*/
453+
public static final String AMENITY_TYPE_HOTSPRING = "hotspring";
454+
/**
455+
* Shower amenity type.
456+
*/
457+
public static final String AMENITY_TYPE_SHOWER = "shower";
458+
/**
459+
* Picnic shelter amenity type.
460+
*/
461+
public static final String AMENITY_TYPE_PICNIC_SHELTER = "picnic_shelter";
462+
/**
463+
* Post amenity type.
464+
*/
465+
public static final String AMENITY_TYPE_POST = "post";
466+
/**
467+
* FAX amenity type.
468+
*/
469+
public static final String AMENITY_TYPE_FAX = "FAX";
470+
397471
private DirectionsCriteria() {
398472
//not called
399473
}
@@ -584,4 +658,31 @@ private DirectionsCriteria() {
584658
})
585659
public @interface PaymentMethodsCriteria {
586660
}
661+
662+
/**
663+
* Supported amenity types. See {@link Amenity#type()}.
664+
*/
665+
@Retention(RetentionPolicy.CLASS)
666+
@StringDef({
667+
AMENITY_TYPE_GAS_STATION,
668+
AMENITY_TYPE_ELECTRIC_CHARGING_STATION,
669+
AMENITY_TYPE_TOILET,
670+
AMENITY_TYPE_COFFEE,
671+
AMENITY_TYPE_RESTAURANT,
672+
AMENITY_TYPE_SNACK,
673+
AMENITY_TYPE_ATM,
674+
AMENITY_TYPE_INFO,
675+
AMENITY_TYPE_BABY_CARE,
676+
AMENITY_TYPE_FACILITIES_FOR_DISABLED,
677+
AMENITY_TYPE_SHOP,
678+
AMENITY_TYPE_TELEPHONE,
679+
AMENITY_TYPE_HOTEL,
680+
AMENITY_TYPE_HOTSPRING,
681+
AMENITY_TYPE_SHOWER,
682+
AMENITY_TYPE_PICNIC_SHELTER,
683+
AMENITY_TYPE_POST,
684+
AMENITY_TYPE_FAX,
685+
})
686+
public @interface AmenityTypeCriteria {
687+
}
587688
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ public abstract class Amenity extends DirectionsJsonObject {
1818

1919
/**
2020
* The type of amenities such as gas, restaurants, shopping, bank, atm etc.
21-
* Note that adding new possible types is not considered a breaking change.
21+
* For a list of supported amenity types
22+
* see {@link com.mapbox.api.directions.v5.DirectionsCriteria.AmenityTypeCriteria}.
2223
*/
2324
@NonNull
25+
@DirectionsCriteria.AmenityTypeCriteria
2426
public abstract String type();
2527

2628
/**

0 commit comments

Comments
 (0)