Add openingHours and feeHours to vehicle parkings, and use time restricted routing based on openingHours

pom.xml

@@ -690,6 +690,11 @@
             <artifactId>commons-math3</artifactId>
             <version>3.6.1</version>
         </dependency>
+        <dependency>
+            <groupId>io.leonard</groupId>
+            <artifactId>opening-hours-evaluator</artifactId>
+            <version>1.2.1</version>
+        </dependency>
         <dependency>
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-java</artifactId>

src/main/java/org/opentripplanner/api/mapping/PlaceMapper.java

@@ -87,6 +87,7 @@ private ApiVehicleParkingWithEntrance mapVehicleParking(VehicleParkingWithEntran
                 .hasWheelchairAccessibleCarPlaces(vp.hasWheelchairAccessibleCarPlaces())
                 .availability(mapVehicleParkingSpaces(vp.getAvailability()))
                 .capacity(mapVehicleParkingSpaces(vp.getCapacity()))
+                .closesSoon(vehicleParkingWithEntrance.isClosesSoon())
                 .realtime(vehicleParkingWithEntrance.isRealtime())
                 .build();
     }

src/main/java/org/opentripplanner/api/model/ApiVehicleParkingWithEntrance.java

@@ -78,6 +78,14 @@ public class ApiVehicleParkingWithEntrance {
      */
     public final ApiVehicleParkingSpaces availability;
 
+    /**
+     * True if the difference of visiting time for a  {@link org.opentripplanner.routing.vehicle_parking.VehicleParking
+     * VehicleParking} and the closing time is inside the request's {@link
+     * org.opentripplanner.routing.api.request.RoutingRequest#vehicleParkingClosesSoonSeconds
+     * RoutingRequest#vehicleParkingClosesSoonSeconds} interval.
+     */
+    public final boolean closesSoon;
+
     /**
      * True if realtime information is used for checking availability.
      */
@@ -98,6 +106,7 @@ public class ApiVehicleParkingWithEntrance {
             boolean hasWheelchairAccessibleCarPlaces,
             ApiVehicleParkingSpaces capacity,
             ApiVehicleParkingSpaces availability,
+            boolean closesSoon,
             boolean realtime
     ) {
         this.id = id;
@@ -114,6 +123,7 @@ public class ApiVehicleParkingWithEntrance {
         this.hasWheelchairAccessibleCarPlaces = hasWheelchairAccessibleCarPlaces;
         this.capacity = capacity;
         this.availability = availability;
+        this.closesSoon = closesSoon;
         this.realtime = realtime;
     }
 
@@ -137,6 +147,7 @@ public static class ApiVehicleParkingWithEntranceBuilder {
         private boolean hasWheelchairAccessibleCarPlaces;
         private ApiVehicleParkingSpaces capacity;
         private ApiVehicleParkingSpaces availability;
+        private boolean closesSoon;
         private boolean realtime;
 
         ApiVehicleParkingWithEntranceBuilder() {}
@@ -221,6 +232,12 @@ public ApiVehicleParkingWithEntranceBuilder availability(
             return this;
         }
 
+        public ApiVehicleParkingWithEntranceBuilder closesSoon(
+                boolean closesSoon
+        ) {
+            this.closesSoon = closesSoon;
+            return this;
+        }
 
         public ApiVehicleParkingWithEntranceBuilder realtime(
                 boolean realtime
@@ -233,7 +250,7 @@ public ApiVehicleParkingWithEntrance build() {
             return new ApiVehicleParkingWithEntrance(
                     id, name, entranceId, entranceName, detailsUrl,
                     imageUrl, note, tags, hasBicyclePlaces, hasAnyCarPlaces, hasCarPlaces,
-                    hasWheelchairAccessibleCarPlaces, capacity, availability, realtime
+                    hasWheelchairAccessibleCarPlaces, capacity, availability, closesSoon, realtime
             );
         }
     }

src/main/java/org/opentripplanner/api/resource/PlannerResource.java

@@ -97,7 +97,7 @@ public TripPlannerResponse plan(@Context UriInfo uriInfo, @Context Request grizz
 
             response.debugOutput = res.getDebugTimingAggregator().finishedRendering();
         }
-        catch (Exception e) {
+        catch (Throwable e) {
             LOG.error("System error", e);
             PlannerError error = new PlannerError(Message.SYSTEM_ERROR);
             response.setError(error);

src/main/java/org/opentripplanner/graph_builder/issues/ParkAndRideOpeningHoursUnparsed.java

@@ -0,0 +1,31 @@
+package org.opentripplanner.graph_builder.issues;
+
+import org.opentripplanner.graph_builder.DataImportIssue;
+import org.opentripplanner.openstreetmap.model.OSMWithTags;
+
+public class ParkAndRideOpeningHoursUnparsed implements DataImportIssue {
+
+    public static final String FMT = "Park and ride '%s' (%s) has an invalid opening_hours value, it will always be open: %s";
+    public static final String HTMLFMT = "Park and ride <a href='%s'>'%s' (%s)</a> has an invalid opening_hours value, it will always be open: <code>%s</code>\"";
+
+    private final String name;
+    private final OSMWithTags entity;
+    private final String openingHours;
+
+    public ParkAndRideOpeningHoursUnparsed(String name, OSMWithTags entity, String openingHours){
+    	this.name = name;
+    	this.entity = entity;
+    	this.openingHours = openingHours;
+    }
+
+    @Override
+    public String getMessage() {
+        return String.format(FMT, name, entity, openingHours);
+    }
+
+    @Override
+    public String getHTMLMessage() {
+        return String.format(HTMLFMT, entity.getOpenStreetMapLink(), name, entity, openingHours);
+    }
+
+}

src/main/java/org/opentripplanner/graph_builder/module/osm/OpenStreetMapModule.java

@@ -1,5 +1,6 @@
 package org.opentripplanner.graph_builder.module.osm;
 
+import ch.poole.openinghoursparser.OpeningHoursParseException;
 import com.google.common.collect.Iterables;
 import gnu.trove.iterator.TLongIterator;
 import gnu.trove.list.TLongList;
@@ -27,6 +28,7 @@
 import org.opentripplanner.graph_builder.DataImportIssueStore;
 import org.opentripplanner.graph_builder.issues.Graphwide;
 import org.opentripplanner.graph_builder.issues.InvalidVehicleParkingCapacity;
+import org.opentripplanner.graph_builder.issues.ParkAndRideOpeningHoursUnparsed;
 import org.opentripplanner.graph_builder.issues.ParkAndRideUnlinked;
 import org.opentripplanner.graph_builder.issues.StreetCarSpeedZero;
 import org.opentripplanner.graph_builder.issues.TurnRestrictionBad;
@@ -43,6 +45,8 @@
 import org.opentripplanner.openstreetmap.model.OSMWay;
 import org.opentripplanner.openstreetmap.model.OSMWithTags;
 import org.opentripplanner.routing.api.request.RoutingRequest;
+import org.opentripplanner.routing.core.OsmOpeningHours;
+import org.opentripplanner.routing.core.TimeRestriction;
 import org.opentripplanner.routing.core.TraversalRequirements;
 import org.opentripplanner.routing.core.TraverseMode;
 import org.opentripplanner.routing.edgetype.AreaEdge;
@@ -544,6 +548,8 @@ private VehicleParking createVehicleParkingObjectFromOsmEntity(
             ) || carCapacity.orElse(0) > 0;
             var wheelchairAccessibleCarPlaces = wheelchairAccessibleCarCapacity.orElse(0) > 0;
 
+            var openingHours = parseVehicleParkingOpeningHours(entity, creativeName);
+
             var id = new FeedScopedId(
                     VEHICLE_PARKING_OSM_FEED_ID,
                     String.format("%s/%d", entity.getClass().getSimpleName(), entity.getId())
@@ -573,6 +579,7 @@ private VehicleParking createVehicleParkingObjectFromOsmEntity(
                     .y(lat)
                     .tags(tags)
                     .detailsUrl(entity.getTag("website"))
+                    .openingHours(openingHours)
                     .bicyclePlaces(bicyclePlaces)
                     .carPlaces(carPlaces)
                     .wheelchairAccessibleCarPlaces(wheelchairAccessibleCarPlaces)
@@ -581,6 +588,20 @@ private VehicleParking createVehicleParkingObjectFromOsmEntity(
                     .build();
         }
 
+        private TimeRestriction parseVehicleParkingOpeningHours(OSMWithTags entity, I18NString creativeName) {
+            final var openingHoursTag = entity.getTag("opening_hours");
+            if (openingHoursTag != null) {
+                try {
+                    return OsmOpeningHours.parseFromOsm(openingHoursTag);
+                } catch (OpeningHoursParseException e) {
+                    issueStore.add(new ParkAndRideOpeningHoursUnparsed(
+                            creativeName.toString(), entity, openingHoursTag
+                    ));
+                }
+            }
+            return null;
+        }
+
         private I18NString nameParkAndRideEntity(OSMWithTags osmWithTags) {
             // If there is an explicit name user that. The explicit name is used so that tag-based
             // translations are used, which are not handled by "CreativeNamer"s.

src/main/java/org/opentripplanner/model/plan/Place.java

@@ -206,7 +206,12 @@ public static Place forVehicleRentalPlace(VehicleRentalStationVertex vertex, Str
         );
     }
 
-    public static Place forVehicleParkingEntrance(VehicleParkingEntranceVertex vertex, String name, RoutingRequest request) {
+    public static Place forVehicleParkingEntrance(
+            VehicleParkingEntranceVertex vertex,
+            String name,
+            boolean closesSoon,
+            RoutingRequest request
+    ) {
         TraverseMode traverseMode = null;
         if (request.streetSubRequestModes.getCar()) {
             traverseMode = TraverseMode.CAR;
@@ -228,6 +233,7 @@ public static Place forVehicleParkingEntrance(VehicleParkingEntranceVertex verte
                 VehicleParkingWithEntrance.builder()
                         .vehicleParking(vertex.getVehicleParking())
                         .entrance(vertex.getParkingEntrance())
+                        .closesSoon(closesSoon)
                         .realtime(realTime)
                         .build()
         );

src/main/java/org/opentripplanner/model/plan/VehicleParkingWithEntrance.java

@@ -9,6 +9,14 @@ public class VehicleParkingWithEntrance {
 
     private final VehicleParkingEntrance entrance;
 
+    /**
+     * True if the difference of visiting time for a  {@link org.opentripplanner.routing.vehicle_parking.VehicleParking
+     * VehicleParking} and the closing time is inside the request's {@link
+     * org.opentripplanner.routing.api.request.RoutingRequest#vehicleParkingClosesSoonSeconds
+     * RoutingRequest#vehicleParkingClosesSoonSeconds} interval.
+     */
+    public final boolean closesSoon;
+
     /**
      * Was realtime data used when parking at this VehicleParking.
      */
@@ -17,10 +25,12 @@ public class VehicleParkingWithEntrance {
     VehicleParkingWithEntrance(
             VehicleParking vehicleParking,
             VehicleParkingEntrance entrance,
+            boolean closesSoon,
             boolean realtime
     ) {
         this.vehicleParking = vehicleParking;
         this.entrance = entrance;
+        this.closesSoon = closesSoon;
         this.realtime = realtime;
     }
 
@@ -32,6 +42,10 @@ public VehicleParkingEntrance getEntrance() {
         return this.entrance;
     }
 
+    public boolean isClosesSoon() {
+        return closesSoon;
+    }
+
     public boolean isRealtime() {
         return realtime;
     }
@@ -44,6 +58,7 @@ public static class VehicleParkingWithEntranceBuilder {
 
         private VehicleParking vehicleParking;
         private VehicleParkingEntrance entrance;
+        private boolean closesSoon;
         private boolean realtime;
 
         VehicleParkingWithEntranceBuilder() {}
@@ -62,6 +77,13 @@ public VehicleParkingWithEntranceBuilder entrance(
             return this;
         }
 
+        public VehicleParkingWithEntranceBuilder closesSoon(
+                boolean closesSoon
+        ) {
+            this.closesSoon = closesSoon;
+            return this;
+        }
+
         public VehicleParkingWithEntranceBuilder realtime(
                 boolean realtime
         ) {
@@ -70,7 +92,7 @@ public VehicleParkingWithEntranceBuilder realtime(
         }
 
         public VehicleParkingWithEntrance build() {
-            return new VehicleParkingWithEntrance(vehicleParking, entrance, realtime);
+            return new VehicleParkingWithEntrance(vehicleParking, entrance, closesSoon, realtime);
         }
     }
 }

src/main/java/org/opentripplanner/routing/algorithm/mapping/GraphPathToItineraryMapper.java

@@ -503,7 +503,17 @@ private static Place makePlace(State state, Locale requestedLocale) {
         } else if(vertex instanceof VehicleRentalStationVertex) {
             return Place.forVehicleRentalPlace((VehicleRentalStationVertex) vertex, name);
         } else if (vertex instanceof VehicleParkingEntranceVertex) {
-            return Place.forVehicleParkingEntrance((VehicleParkingEntranceVertex) vertex, name, state.getOptions());
+            var vehicleParking = ((VehicleParkingEntranceVertex) vertex).getVehicleParking();
+            var limit = state.getTimeAsZonedDateTime()
+                    .plusSeconds(state.getOptions().vehicleParkingClosesSoonSeconds);
+            var closesSoon = false;
+            if (vehicleParking.getOpeningHours() != null) {
+                // This ignores the parking being closed for less than vehicleParkingClosesSoonSeconds
+                closesSoon = !vehicleParking.getOpeningHours()
+                        .isTraverseableAt(limit.toLocalDateTime());
+            }
+            return Place.forVehicleParkingEntrance(
+                    (VehicleParkingEntranceVertex) vertex, name, closesSoon, state.getOptions());
         } else {
             return Place.normal(vertex, name);
         }

src/main/java/org/opentripplanner/routing/algorithm/raptor/router/TransitRouter.java

@@ -82,7 +82,7 @@ private TransitRouterResult route() {
 
         debugTimingAggregator.finishedPatternFiltering();
 
-        var accessEgresses = getAccessEgresses(transitLayer);
+        var accessEgresses = getAccessEgresses(transitLayer, searchStartTime);
 
         debugTimingAggregator.finishedAccessEgress(
                 accessEgresses.getAccesses().size(),
@@ -149,21 +149,22 @@ private TransitRouterResult route() {
     }
 
     private AccessEgresses getAccessEgresses(
-            TransitLayer transitLayer
+            TransitLayer transitLayer,
+            ZonedDateTime startOfTime
     ) {
         var accessEgressMapper = new AccessEgressMapper(transitLayer.getStopIndex());
         var accessList = new ArrayList<AccessEgress>();
         var egressList = new ArrayList<AccessEgress>();
 
         var accessCalculator = (Runnable) () -> {
             debugTimingAggregator.startedAccessCalculating();
-            accessList.addAll(getAccessEgresses(accessEgressMapper, false));
+            accessList.addAll(getAccessEgresses(accessEgressMapper, startOfTime, false));
             debugTimingAggregator.finishedAccessCalculating();
         };
 
         var egressCalculator = (Runnable) () -> {
             debugTimingAggregator.startedEgressCalculating();
-            egressList.addAll(getAccessEgresses(accessEgressMapper, true));
+            egressList.addAll(getAccessEgresses(accessEgressMapper, startOfTime, true));
             debugTimingAggregator.finishedEgressCalculating();
         };
 
@@ -194,7 +195,7 @@ private AccessEgresses getAccessEgresses(
 
     private Collection<AccessEgress> getAccessEgresses(
             AccessEgressMapper accessEgressMapper,
-            boolean isEgress
+            ZonedDateTime startOfTime, boolean isEgress
     ) {
         var results = new ArrayList<AccessEgress>();
         var mode = isEgress ? request.modes.egressMode : request.modes.accessMode;
@@ -213,7 +214,7 @@ private Collection<AccessEgress> getAccessEgresses(
                     isEgress
             );
 
-            results.addAll(accessEgressMapper.mapNearbyStops(nearbyStops, isEgress));
+            results.addAll(accessEgressMapper.mapNearbyStops(nearbyStops, startOfTime, isEgress));
 
             // Special handling of flex accesses
             if (OTPFeature.FlexRouting.isOn() && mode == StreetMode.FLEXIBLE) {
@@ -223,7 +224,7 @@ private Collection<AccessEgress> getAccessEgresses(
                         isEgress
                 );
 
-                results.addAll(accessEgressMapper.mapFlexAccessEgresses(flexAccessList, isEgress));
+                results.addAll(accessEgressMapper.mapFlexAccessEgresses(flexAccessList, startOfTime, isEgress));
             }
         }
 

src/main/java/org/opentripplanner/routing/algorithm/raptor/router/street/AccessEgressRouter.java

@@ -40,6 +40,7 @@ public static Collection<NearbyStop> streetSearch(
         // the routingContext (rctx), which results in the created temporary edges being removed prematurely.
         // findNearbyStopsViaStreets() will call cleanup() on the created routing request.
         RoutingRequest nearbyRequest = rr.getStreetSearchRequest(streetMode);
+        nearbyRequest.ignoreAndCollectTimeRestrictions = true;
 
         NearbyStopFinder nearbyStopFinder = new NearbyStopFinder(
             rr.rctx.graph,