Add currentFuelPercent and currentRangeMeters to RentalVehichle in the GTFS GraphQL API

application/src/ext-test/java/org/opentripplanner/ext/fares/impl/GtfsFaresV2ServiceTest.java

@@ -12,7 +12,7 @@
 import java.util.Set;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.opentripplanner.ext.fares.model.Distance;
+import org.opentripplanner.transit.model.basic.Distance;
 import org.opentripplanner.ext.fares.model.FareDistance;
 import org.opentripplanner.ext.fares.model.FareDistance.LinearDistance;
 import org.opentripplanner.ext.fares.model.FareLegRule;
@@ -331,15 +331,22 @@ class DistanceFares {
     List<FareLegRule> distanceRules = List.of(
       FareLegRule
         .of(DISTANCE_ID, tenKmProduct)
-        .withFareDistance(new LinearDistance(Distance.ofKilometers(7), Distance.ofKilometers(10)))
+        .withFareDistance(new LinearDistance(
+          Distance.ofKilometersBoxed(7d, ignore -> {}).orElse(null),
+          Distance.ofKilometersBoxed(10d, ignore -> {}).orElse(null)))
         .build(),
       FareLegRule
         .of(DISTANCE_ID, threeKmProduct)
-        .withFareDistance(new LinearDistance(Distance.ofKilometers(3), Distance.ofKilometers(6)))
+        .withFareDistance(new LinearDistance(
+          Distance.ofKilometersBoxed(3d, ignore -> {}).orElse(null),
+          Distance.ofKilometersBoxed(6d, ignore -> {}).orElse(null)))
         .build(),
       FareLegRule
         .of(DISTANCE_ID, twoKmProduct)
-        .withFareDistance(new LinearDistance(Distance.ofMeters(0), Distance.ofMeters(2000)))
+        .withFareDistance(new LinearDistance(
+          Distance.ofMetersBoxed(0d, ignore -> {}).orElse(null),
+          Distance.ofMetersBoxed(2000d, ignore -> {}).orElse(null))
+        )
         .build()
     );
 

application/src/ext/java/org/opentripplanner/ext/fares/model/FareDistance.java

@@ -1,5 +1,7 @@
 package org.opentripplanner.ext.fares.model;
 
+import org.opentripplanner.transit.model.basic.Distance;
+
 /** Represents a distance metric used in distance-based fare computation*/
 public sealed interface FareDistance {
   /** Represents the number of stops as a distance metric in fare computation */

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

@@ -59,6 +59,7 @@
 import org.opentripplanner.apis.gtfs.datafetchers.QueryTypeImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.RealTimeEstimateImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.RentalPlaceTypeResolver;
+import org.opentripplanner.apis.gtfs.datafetchers.RentalVehicleFuelImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.RentalVehicleImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.RentalVehicleTypeImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.RideHailingEstimateImpl;
@@ -199,6 +200,7 @@ protected static GraphQLSchema buildSchema() {
         .type(typeWiring.build(RealTimeEstimateImpl.class))
         .type(typeWiring.build(EstimatedTimeImpl.class))
         .type(typeWiring.build(EntranceImpl.class))
+        .type(typeWiring.build(RentalVehicleFuelImpl.class))
         .build();
       SchemaGenerator schemaGenerator = new SchemaGenerator();
       return schemaGenerator.makeExecutableSchema(typeRegistry, runtimeWiring);

application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleFuelImpl.java

@@ -0,0 +1,29 @@
+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.RentalVehicleFuel;
+
+public class RentalVehicleFuelImpl implements GraphQLDataFetchers.GraphQLRentalVehicleFuel {
+
+  @Override
+  public DataFetcher<Double> percent() {
+    return environment ->
+      getSource(environment).getPercent() != null
+        ? getSource(environment).getPercent().asDouble()
+        : null;
+  }
+
+  @Override
+  public DataFetcher<Integer> range() {
+    return environment ->
+      getSource(environment).getRange() != null
+        ? getSource(environment).getRange().toMeters()
+        : null;
+  }
+
+  private RentalVehicleFuel getSource(DataFetchingEnvironment environment) {
+    return environment.getSource();
+  }
+}

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

@@ -4,6 +4,7 @@
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers;
+import org.opentripplanner.service.vehiclerental.model.RentalVehicleFuel;
 import org.opentripplanner.service.vehiclerental.model.RentalVehicleType;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem;
@@ -16,6 +17,11 @@ public DataFetcher<Boolean> allowPickupNow() {
     return environment -> getSource(environment).allowPickupNow();
   }
 
+  @Override
+  public DataFetcher<RentalVehicleFuel> fuel() {
+    return environment -> getSource(environment).getFuel();
+  }
+
   @Override
   public DataFetcher<Relay.ResolvedGlobalId> id() {
     return environment ->

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

@@ -58,6 +58,7 @@
 import org.opentripplanner.service.vehicleparking.model.VehicleParkingSpaces;
 import org.opentripplanner.service.vehicleparking.model.VehicleParkingState;
 import org.opentripplanner.service.vehiclerental.model.RentalVehicleEntityCounts;
+import org.opentripplanner.service.vehiclerental.model.RentalVehicleFuel;
 import org.opentripplanner.service.vehiclerental.model.RentalVehicleType;
 import org.opentripplanner.service.vehiclerental.model.RentalVehicleTypeCount;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace;
@@ -908,6 +909,8 @@ public interface GraphQLRentalPlace extends TypeResolver {}
   public interface GraphQLRentalVehicle {
     public DataFetcher<Boolean> allowPickupNow();
 
+    public DataFetcher<RentalVehicleFuel> fuel();
+
     public DataFetcher<graphql.relay.Relay.ResolvedGlobalId> id();
 
     public DataFetcher<Double> lat();
@@ -935,6 +938,13 @@ public interface GraphQLRentalVehicleEntityCounts {
     public DataFetcher<Integer> total();
   }
 
+  /** Rental vehicle fuel represent the current status of the battery or fuel of a rental vehicle */
+  public interface GraphQLRentalVehicleFuel {
+    public DataFetcher<Double> percent();
+
+    public DataFetcher<Integer> range();
+  }
+
   public interface GraphQLRentalVehicleType {
     public DataFetcher<org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLFormFactor> formFactor();
 

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

@@ -134,4 +134,5 @@ config:
     CallRealTime: org.opentripplanner.apis.gtfs.model.CallRealTime#CallRealTime
     RentalPlace: org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace#VehicleRentalPlace
     CallSchedule: org.opentripplanner.apis.gtfs.model.CallSchedule#CallSchedule
+    RentalVehicleFuel: org.opentripplanner.service.vehiclerental.model.RentalVehicleFuel#RentalVehicleFuel
 

application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/RentalVehicleType.java

@@ -71,7 +71,7 @@ public static GraphQLObjectType create(
           .name("currentRangeMeters")
           .type(Scalars.GraphQLFloat)
           .dataFetcher(environment ->
-            ((VehicleRentalVehicle) environment.getSource()).currentRangeMeters
+            ((VehicleRentalVehicle) environment.getSource()).getFuel().getRange()
           )
           .build()
       )

application/src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java

@@ -4,14 +4,18 @@
 
 import java.util.Collection;
 import java.util.Objects;
-import org.opentripplanner.ext.fares.model.Distance;
 import org.opentripplanner.ext.fares.model.FareDistance;
 import org.opentripplanner.ext.fares.model.FareLegRule;
 import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
+import org.opentripplanner.transit.model.basic.Distance;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class FareLegRuleMapper {
 
+  private static final Logger LOG = LoggerFactory.getLogger(FareLegRuleMapper.class);
+
   private final FareProductMapper fareProductMapper;
   private final DataImportIssueStore issueStore;
 
@@ -75,8 +79,28 @@ private static FareDistance createFareDistance(
         fareLegRule.getMaxDistance().intValue()
       );
       case 1 -> new FareDistance.LinearDistance(
-        Distance.ofMeters(fareLegRule.getMinDistance()),
-        Distance.ofMeters(fareLegRule.getMaxDistance())
+        Distance
+          .ofMetersBoxed(
+            fareLegRule.getMinDistance(),
+            error ->
+              LOG.warn(
+                "Fare leg rule min distance not valid: {} - {}",
+                fareLegRule.getMinDistance(),
+                error
+              )
+          )
+          .orElse(null),
+        Distance
+          .ofMetersBoxed(
+            fareLegRule.getMaxDistance(),
+            error ->
+              LOG.warn(
+                "Fare leg rule max distance not valid: {} - {}",
+                fareLegRule.getMaxDistance(),
+                error
+              )
+          )
+          .orElse(null)
       );
       default -> null;
     };

application/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleFuel.java

@@ -0,0 +1,40 @@
+package org.opentripplanner.service.vehiclerental.model;
+
+import javax.annotation.Nullable;
+import org.opentripplanner.transit.model.basic.Distance;
+import org.opentripplanner.transit.model.basic.Ratio;
+
+/**
+ * Contains information about the current battery or fuel status.
+ * See the <a href="https://github.com/MobilityData/gbfs/blob/v3.0/gbfs.md#vehicle_statusjson">GBFS
+ * vehicle_status specification</a> for more details.
+ */
+public class RentalVehicleFuel {
+
+  /**
+   * Current fuel percentage, expressed from 0 to 1.
+   */
+  @Nullable
+  public final Ratio percent;
+
+  /**
+   * Distance that the vehicle can travel with the current fuel.
+   */
+  @Nullable
+  public final Distance range;
+
+  public RentalVehicleFuel(@Nullable Ratio fuelPercent, @Nullable Distance range) {
+    this.percent = fuelPercent;
+    this.range = range;
+  }
+
+  @Nullable
+  public Ratio getPercent() {
+    return this.percent;
+  }
+
+  @Nullable
+  public Distance getRange() {
+    return range;
+  }
+}

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

@@ -22,9 +22,9 @@ public class VehicleRentalVehicle implements VehicleRentalPlace {
   public boolean isReserved = false;
   public boolean isDisabled = false;
   public Instant lastReported;
-  public Double currentRangeMeters;
   public VehicleRentalStation station;
   public String pricingPlanId;
+  public RentalVehicleFuel fuel;
 
   @Override
   public FeedScopedId getId() {
@@ -133,4 +133,8 @@ public VehicleRentalStationUris getRentalUris() {
   public VehicleRentalSystem getVehicleRentalSystem() {
     return system;
   }
+
+  public RentalVehicleFuel getFuel() {
+    return fuel;
+  }
 }