Merge pull request #512 from mobidata-bw/issues/502_current_range_meters

Map current_range_meters as provided instead of setting a missing value to 0.0
entur · Jul 29, 2024 · d4d5ef1 · d4d5ef1
2 parents 616685e + b09c92c
commit d4d5ef1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/src/main/java/org/entur/lamassu/mapper/entitymapper/VehicleMapper.java b/src/main/java/org/entur/lamassu/mapper/entitymapper/VehicleMapper.java
@@ -50,7 +50,9 @@ public Vehicle mapVehicle(
     mappedVehicle.setLon(vehicle.getLon());
     mappedVehicle.setReserved(vehicle.getIsReserved());
     mappedVehicle.setDisabled(vehicle.getIsDisabled());
-    mappedVehicle.setCurrentRangeMeters(vehicle.getCurrentRangeMeters());
+    mappedVehicle.setCurrentRangeMeters(
+      vehicle.getCurrentRangeMeters() == null ? 0.0 : vehicle.getCurrentRangeMeters()
+    );
     mappedVehicle.setCurrentFuelPercent(vehicle.getCurrentFuelPercent());
     mappedVehicle.setVehicleType(vehicleType);
     mappedVehicle.setPricingPlan(pricingPlan);

diff --git a/src/main/java/org/entur/lamassu/mapper/feedmapper/v2/FreeBikeStatusFeedMapper.java b/src/main/java/org/entur/lamassu/mapper/feedmapper/v2/FreeBikeStatusFeedMapper.java
@@ -80,9 +80,7 @@ protected GBFSBike mapBike(GBFSBike bike, FeedProvider feedProvider) {
     mapped.setRentalUris(bike.getRentalUris());
     mapped.setVehicleTypeId(mapVehicleTypeId(bike.getVehicleTypeId(), feedProvider));
     mapped.setLastReported(bike.getLastReported());
-    mapped.setCurrentRangeMeters(
-      bike.getCurrentRangeMeters() != null ? bike.getCurrentRangeMeters() : 0
-    );
+    mapped.setCurrentRangeMeters(bike.getCurrentRangeMeters());
     mapped.setCurrentFuelPercent(bike.getCurrentFuelPercent());
     mapped.setStationId(mapStationId(bike.getStationId(), feedProvider));
     mapped.setHomeStationId(mapStationId(bike.getHomeStationId(), feedProvider));

diff --git a/src/main/java/org/entur/lamassu/mapper/feedmapper/v3/VehicleStatusFeedMapper.java b/src/main/java/org/entur/lamassu/mapper/feedmapper/v3/VehicleStatusFeedMapper.java
@@ -78,9 +78,7 @@ protected GBFSVehicle mapVehicle(GBFSVehicle vehicle, FeedProvider feedProvider)
     mapped.setRentalUris(vehicle.getRentalUris());
     mapped.setVehicleTypeId(mapVehicleTypeId(vehicle.getVehicleTypeId(), feedProvider));
     mapped.setLastReported(vehicle.getLastReported());
-    mapped.setCurrentRangeMeters(
-      vehicle.getCurrentRangeMeters() != null ? vehicle.getCurrentRangeMeters() : 0
-    );
+    mapped.setCurrentRangeMeters(vehicle.getCurrentRangeMeters());
     mapped.setCurrentFuelPercent(vehicle.getCurrentFuelPercent());
     mapped.setStationId(mapStationId(vehicle.getStationId(), feedProvider));
     mapped.setHomeStationId(mapStationId(vehicle.getHomeStationId(), feedProvider));

diff --git a/src/test/java/org/entur/lamassu/mapper/feedmapper/v2/FreeBikeStatusFeedMapperTest.java b/src/test/java/org/entur/lamassu/mapper/feedmapper/v2/FreeBikeStatusFeedMapperTest.java
@@ -41,7 +41,8 @@ void prepare() {
   void testMissingCurrentRangeMeters() {
     var feedProvider = getTestProvider();
     var mapped = mapper.mapBike(new GBFSBike(), feedProvider);
-    Assertions.assertNotNull(mapped.getCurrentRangeMeters());
+    // if no current_range_meters is provided, we explicitly don't want Lamassu to fill it in
+    Assertions.assertNull(mapped.getCurrentRangeMeters());
   }
 
   @Test