Add rental system to GraphQL API

src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java

@@ -76,6 +76,7 @@
 import org.opentripplanner.apis.gtfs.datafetchers.VehicleParkingImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.VehiclePositionImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.VehicleRentalStationImpl;
+import org.opentripplanner.apis.gtfs.datafetchers.VehicleRentalSystemImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.debugOutputImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.elevationProfileComponentImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.placeAtDistanceImpl;
@@ -166,6 +167,7 @@ protected static GraphQLSchema buildSchema() {
         .type(typeWiring.build(BookingTimeImpl.class))
         .type(typeWiring.build(BookingInfoImpl.class))
         .type(typeWiring.build(VehicleRentalStationImpl.class))
+        .type(typeWiring.build(VehicleRentalSystemImpl.class))
         .type(typeWiring.build(RentalVehicleImpl.class))
         .type(typeWiring.build(RentalVehicleTypeImpl.class))
         .type(typeWiring.build(StopOnRouteImpl.class))

src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java

@@ -330,6 +330,7 @@ public DataFetcher<Connection<PlaceAtDistance>> nearest() {
       List<PlaceType> filterByPlaceTypes = args.getGraphQLFilterByPlaceTypes() != null
         ? args.getGraphQLFilterByPlaceTypes().stream().map(GraphQLUtils::toModel).toList()
         : DEFAULT_PLACE_TYPES;
+      List<String> filterByNetwork = args.getGraphQLFilterByNetwork();
 
       List<PlaceAtDistance> places;
       try {
@@ -347,6 +348,7 @@ public DataFetcher<Connection<PlaceAtDistance>> nearest() {
                 filterByStations,
                 filterByRoutes,
                 filterByBikeRentalStations,
+                filterByNetwork,
                 getTransitService(environment)
               )
           );

src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java

@@ -6,6 +6,7 @@
 import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers;
 import org.opentripplanner.service.vehiclerental.model.RentalVehicleType;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris;
+import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle;
 
 public class RentalVehicleImpl implements GraphQLDataFetchers.GraphQLRentalVehicle {
@@ -61,6 +62,11 @@ public DataFetcher<RentalVehicleType> vehicleType() {
     return environment -> getSource(environment).vehicleType;
   }
 
+  @Override
+  public DataFetcher<VehicleRentalSystem> vehicleRentalSystem() {
+    return environment -> getSource(environment).getVehicleRentalSystem();
+  }
+
   private VehicleRentalVehicle getSource(DataFetchingEnvironment environment) {
     return environment.getSource();
   }

src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalStationImpl.java

@@ -7,6 +7,7 @@
 import org.opentripplanner.service.vehiclerental.model.RentalVehicleEntityCounts;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris;
+import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem;
 
 public class VehicleRentalStationImpl implements GraphQLDataFetchers.GraphQLVehicleRentalStation {
 
@@ -107,6 +108,11 @@ public DataFetcher<RentalVehicleEntityCounts> availableSpaces() {
     return environment -> getSource(environment).getVehicleSpaceCounts();
   }
 
+  @Override
+  public DataFetcher<VehicleRentalSystem> vehicleRentalSystem() {
+    return environment -> getSource(environment).getVehicleRentalSystem();
+  }
+
   private VehicleRentalStation getSource(DataFetchingEnvironment environment) {
     return environment.getSource();
   }

src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalSystemImpl.java

@@ -0,0 +1,18 @@
+package org.opentripplanner.apis.gtfs.datafetchers;
+
+import graphql.schema.DataFetcher;
+import graphql.schema.DataFetchingEnvironment;
+import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers;
+import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem;
+
+public class VehicleRentalSystemImpl implements GraphQLDataFetchers.GraphQLVehicleRentalSystem {
+
+  @Override
+  public DataFetcher<String> url() {
+    return environment -> getSource(environment).url;
+  }
+
+  private VehicleRentalSystem getSource(DataFetchingEnvironment environment) {
+    return environment.getSource();
+  }
+}

src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java

@@ -58,6 +58,7 @@
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris;
+import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle;
 import org.opentripplanner.transit.model.basic.Money;
 import org.opentripplanner.transit.model.network.Route;
@@ -857,6 +858,8 @@ public interface GraphQLRentalVehicle {
     public DataFetcher<String> vehicleId();
 
     public DataFetcher<RentalVehicleType> vehicleType();
+
+    DataFetcher<VehicleRentalSystem> vehicleRentalSystem();
   }
 
   public interface GraphQLRentalVehicleEntityCounts {
@@ -1300,13 +1303,19 @@ public interface GraphQLVehicleRentalStation {
 
     public DataFetcher<VehicleRentalStationUris> rentalUris();
 
+    public DataFetcher<VehicleRentalSystem> vehicleRentalSystem();
+
     public DataFetcher<Integer> spacesAvailable();
 
     public DataFetcher<String> stationId();
 
     public DataFetcher<Integer> vehiclesAvailable();
   }
 
+  public interface GraphQLVehicleRentalSystem {
+    public DataFetcher<String> url();
+  }
+
   public interface GraphQLVehicleRentalUris {
     public DataFetcher<String> android();
 

src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java

@@ -2416,6 +2416,7 @@ public static class GraphQLQueryTypeNearestArgs {
     private Double lon;
     private Integer maxDistance;
     private Integer maxResults;
+    private List<String> filterByNetwork;
 
     public GraphQLQueryTypeNearestArgs(Map<String, Object> args) {
       if (args != null) {
@@ -2447,6 +2448,7 @@ public GraphQLQueryTypeNearestArgs(Map<String, Object> args) {
         this.lon = (Double) args.get("lon");
         this.maxDistance = (Integer) args.get("maxDistance");
         this.maxResults = (Integer) args.get("maxResults");
+        this.filterByNetwork = (List<String>) args.get("filterByNetwork");
       }
     }
 
@@ -2537,6 +2539,14 @@ public void setGraphQLMaxDistance(Integer maxDistance) {
     public void setGraphQLMaxResults(Integer maxResults) {
       this.maxResults = maxResults;
     }
+
+    public List<String> getGraphQLFilterByNetwork() {
+      return this.filterByNetwork;
+    }
+
+    public void setGraphQLFilterByNetwork(List<String> networks) {
+      this.filterByNetwork = networks;
+    }
   }
 
   public static class GraphQLQueryTypeNodeArgs {

src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml

@@ -47,6 +47,7 @@ config:
     BikeRentalStation: org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace#VehicleRentalPlace
     BikeRentalStationUris: org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris#VehicleRentalStationUris
     VehicleRentalStation: org.opentripplanner.service.vehiclerental.model.VehicleRentalStation#VehicleRentalStation
+    VehicleRentalSystem: org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem#VehicleRentalSystem
     RentalVehicleEntityCounts: org.opentripplanner.service.vehiclerental.model.RentalVehicleEntityCounts#RentalVehicleEntityCounts
     RentalVehicleTypeCount: org.opentripplanner.service.vehiclerental.model.RentalVehicleTypeCount#RentalVehicleTypeCount
     RentalVehicle: org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle#VehicleRentalVehicle

src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java

@@ -912,6 +912,7 @@ private GraphQLSchema create() {
             List<String> filterByBikeRentalStations = null;
             List<String> filterByBikeParks = null;
             List<String> filterByCarParks = null;
+            List<String> filterByNetwork = null;
             @SuppressWarnings("rawtypes")
             Map filterByIds = environment.getArgument("filterByIds");
             if (filterByIds != null) {
@@ -960,6 +961,7 @@ private GraphQLSchema create() {
                   filterByStations,
                   filterByRoutes,
                   filterByBikeRentalStations,
+                  filterByNetwork,
                   GqlUtil.getTransitService(environment)
                 );
 

src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java

@@ -10,7 +10,6 @@ public interface LayerParameters<T extends Enum<T>> {
   int MAX_ZOOM = 20;
   int CACHE_MAX_SECONDS = -1;
   double EXPANSION_FACTOR = 0.25d;
-
   /**
    * User-visible name of the layer
    */

src/main/java/org/opentripplanner/routing/graphfinder/DirectGraphFinder.java

@@ -63,6 +63,7 @@ public List<PlaceAtDistance> findClosestPlaces(
     List<FeedScopedId> filterByStations,
     List<FeedScopedId> filterByRoutes,
     List<String> filterByBikeRentalStations,
+    List<String> filterByNetwork,
     TransitService transitService
   ) {
     throw new UnsupportedOperationException("Not implemented");

src/main/java/org/opentripplanner/routing/graphfinder/GraphFinder.java

@@ -69,6 +69,7 @@ List<PlaceAtDistance> findClosestPlaces(
     List<FeedScopedId> filterByStations,
     List<FeedScopedId> filterByRoutes,
     List<String> filterByBikeRentalStations,
+    List<String> filterByNetwork,
     TransitService transitService
   );
 }

src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java

@@ -31,6 +31,7 @@ public class PlaceFinderTraverseVisitor implements TraverseVisitor<State, Edge>
   private final Set<FeedScopedId> filterByStops;
   private final Set<FeedScopedId> filterByStations;
   private final Set<FeedScopedId> filterByRoutes;
+  private final Set<String> filterByNetwork;
   private final Set<String> filterByVehicleRental;
   private final Set<String> seenPatternAtStops = new HashSet<>();
   private final Set<FeedScopedId> seenStops = new HashSet<>();
@@ -69,6 +70,7 @@ public PlaceFinderTraverseVisitor(
     List<FeedScopedId> filterByStations,
     List<FeedScopedId> filterByRoutes,
     List<String> filterByBikeRentalStations,
+    List<String> filterByNetwork,
     int maxResults,
     double radiusMeters
   ) {
@@ -82,6 +84,7 @@ public PlaceFinderTraverseVisitor(
     this.filterByStations = toSet(filterByStations);
     this.filterByRoutes = toSet(filterByRoutes);
     this.filterByVehicleRental = toSet(filterByBikeRentalStations);
+    this.filterByNetwork = toSet(filterByNetwork);
     includeStops = shouldInclude(filterByPlaceTypes, PlaceType.STOP);
 
     includePatternAtStops = shouldInclude(filterByPlaceTypes, PlaceType.PATTERN_AT_STOP);
@@ -264,6 +267,9 @@ private void handleVehicleRental(VehicleRentalPlace station, double distance) {
     if (seenVehicleRentalPlaces.contains(station.getId())) {
       return;
     }
+    if (!filterByNetwork.isEmpty() && !filterByNetwork.contains(station.getNetwork())) {
+      return;
+    }
     seenVehicleRentalPlaces.add(station.getId());
     placesFound.add(new PlaceAtDistance(station, distance));
   }

src/main/java/org/opentripplanner/routing/graphfinder/StreetGraphFinder.java

@@ -56,6 +56,7 @@ public List<PlaceAtDistance> findClosestPlaces(
     List<FeedScopedId> filterByStations,
     List<FeedScopedId> filterByRoutes,
     List<String> filterByBikeRentalStations,
+    List<String> filterByNetwork,
     TransitService transitService
   ) {
     PlaceFinderTraverseVisitor visitor = new PlaceFinderTraverseVisitor(
@@ -66,6 +67,7 @@ public List<PlaceAtDistance> findClosestPlaces(
       filterByStations,
       filterByRoutes,
       filterByBikeRentalStations,
+      filterByNetwork,
       maxResults,
       radiusMeters
     );

src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java

@@ -80,6 +80,9 @@ public interface VehicleRentalPlace {
   /** Deep links for this rental station or individual vehicle */
   VehicleRentalStationUris getRentalUris();
 
+  /** System information for the vehicle rental provider */
+  VehicleRentalSystem getVehicleRentalSystem();
+
   default boolean networkIsNotAllowed(VehicleRentalPreferences preferences) {
     if (
       getNetwork() == null &&

src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java

@@ -172,6 +172,11 @@ public VehicleRentalStationUris getRentalUris() {
     return rentalUris;
   }
 
+  @Override
+  public VehicleRentalSystem getVehicleRentalSystem() {
+    return system;
+  }
+
   @Override
   public String toString() {
     return String.format(

src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java

@@ -128,4 +128,9 @@ public boolean isRealTimeData() {
   public VehicleRentalStationUris getRentalUris() {
     return rentalUris;
   }
+
+  @Override
+  public VehicleRentalSystem getVehicleRentalSystem() {
+    return system;
+  }
 }

src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java

@@ -10,6 +10,7 @@
 import org.mobilitydata.gbfs.v2_3.geofencing_zones.GBFSGeofencingZones;
 import org.opentripplanner.framework.geometry.GeometryUtils;
 import org.opentripplanner.framework.geometry.UnsupportedGeometryException;
+import org.opentripplanner.framework.lang.StringUtils;
 import org.opentripplanner.service.vehiclerental.model.GeofencingZone;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.slf4j.Logger;
@@ -52,6 +53,9 @@ private GeofencingZone toInternalModel(GBFSFeature f) {
       return null;
     }
     var name = Objects.requireNonNullElseGet(f.getProperties().getName(), () -> fallbackId(g));
+    if (!StringUtils.hasValue(name)) {
+      name = fallbackId(g);
+    }
     var dropOffBanned = !f.getProperties().getRules().get(0).getRideAllowed();
     var passThroughBanned = !f.getProperties().getRules().get(0).getRideThroughAllowed();
     return new GeofencingZone(

src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls

@@ -1183,6 +1183,8 @@ type QueryType {
     nearest places related to bicycling.
     """
     filterByModes: [Mode],
+    "Only include vehicle rental networks that match one of the given network names."
+    filterByNetwork: [String],
     "Only return places that are one of these types, e.g. `STOP` or `VEHICLE_RENT`"
     filterByPlaceTypes: [FilterPlaceType],
     first: Int,
@@ -1746,6 +1748,8 @@ type RentalVehicle implements Node & PlaceInterface {
   rentalUris: VehicleRentalUris
   "ID of the vehicle in the format of network:id"
   vehicleId: String
+  "The vehicle rental system information."
+  vehicleRentalSystem: VehicleRentalSystem
   "The type of the rental vehicle (scooter, bicycle, car...)"
   vehicleType: RentalVehicleType
 }
@@ -2464,13 +2468,20 @@ type VehicleRentalStation implements Node & PlaceInterface {
   spacesAvailable: Int @deprecated(reason : "Use `availableSpaces` instead, which also contains the space vehicle types")
   "ID of the vehicle in the format of network:id"
   stationId: String
+  "The vehicle rental system information."
+  vehicleRentalSystem: VehicleRentalSystem
   """
   Number of vehicles currently available on the rental station.
   See field `allowPickupNow` to know if is currently possible to pick up a vehicle.
   """
   vehiclesAvailable: Int @deprecated(reason : "Use `availableVehicles` instead, which also contains vehicle types")
 }
 
+type VehicleRentalSystem {
+  "The rental vehicle operator's system URL."
+  url: String
+}
+
 type VehicleRentalUris {
   """
   A URI that can be passed to an Android app with an {@code android.intent.action.VIEW} Android