Merge pull request #370 from HSLdevcom/gbfs-update

Make GBFS code better suitable for newer GBFS versions
HSLdevcom · Mar 29, 2022 · 45bcda5 · 45bcda5
2 parents 56f0905 + fc4fc9e
commit 45bcda5
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/main/java/org/opentripplanner/updater/bike_rental/GbfsBikeRentalDataSource.java b/src/main/java/org/opentripplanner/updater/bike_rental/GbfsBikeRentalDataSource.java
@@ -74,6 +74,7 @@ public List<BikeRentalStation> getStations() {
             BikeRentalStation status = statusLookup.get(station.id);
             station.bikesAvailable = status.bikesAvailable;
             station.spacesAvailable = status.spacesAvailable;
+            station.state = status.state;
             if (station.capacity == 0) {
                 station.capacity = station.bikesAvailable + station.spacesAvailable;
             }
@@ -120,7 +121,7 @@ public GbfsStationDataSource (boolean allowOverloading) {
         @Override
         public BikeRentalStation makeStation(JsonNode stationNode) {
             BikeRentalStation brstation = new BikeRentalStation();
-            brstation.id = stationNode.path("station_id").toString();
+            brstation.id = stationNode.path("station_id").asText();
             brstation.x = stationNode.path("lon").asDouble();
             brstation.y = stationNode.path("lat").asDouble();
             brstation.name =  new NonLocalizedString(stationNode.path("name").asText());
@@ -140,9 +141,18 @@ public GbfsStationStatusDataSource () {
         @Override
         public BikeRentalStation makeStation(JsonNode stationNode) {
             BikeRentalStation brstation = new BikeRentalStation();
-            brstation.id = stationNode.path("station_id").toString();
+            brstation.id = stationNode.path("station_id").asText();
             brstation.bikesAvailable = stationNode.path("num_bikes_available").asInt();
             brstation.spacesAvailable = stationNode.path("num_docks_available").asInt();
+            if (
+                stationNode.path("is_installed").asBoolean(false) &&
+                stationNode.path("is_renting").asBoolean(false) &&
+                stationNode.path("is_returning").asBoolean(false)
+            ) {
+                brstation.state = "Station on";
+            } else {
+                brstation.state = "Station off";
+            }
             brstation.isCarStation = routeAsCar;
             return brstation;
         }