Use maxTravelTime to filter results

openapi.yaml

@@ -359,22 +359,20 @@ paths:
           schema:
             type: integer
 
-        - name: maxHours
+        - name: maxTravelTime
           in: query
           required: false
           description: |
-            The maximum travel time in hours.
+            The maximum travel time in minutes.
             If not provided, the routing to uses the value
             hardcoded in the server which is usually quite high.
 
             *Warning*: Use with care. Setting this too low can lead to
             optimal (e.g. the least transfers) journeys not being found.
             If this value is too low to reach the destination at all,
             it can lead to slow routing performance.
-
-            TODO: pass parameter to nigiri
           schema:
-            type: number
+            type: integer
 
         - name: minTransferTime
           in: query

src/endpoints/routing.cc

@@ -1,5 +1,7 @@
 #include "motis/endpoints/routing.h"
 
+#include <algorithm>
+
 #include "boost/thread/tss.hpp"
 
 #include "utl/erase_duplicates.h"
@@ -291,6 +293,22 @@ stats_map_t join(auto&&... maps) {
   return ret;
 }
 
+// Get cutoff to remove journeys with slower or equal duration
+std::optional<n::duration_t> calculate_search_cutoff_time(
+    n::duration_t const fastest_direct,
+    std::optional<int> const& max_travel_time) {
+  if (max_travel_time.has_value()) {
+    // Add +1 to keep journeys with equal duration
+    auto const max_travel_duration = n::duration_t{*max_travel_time + 1};
+    return fastest_direct == kInfinityDuration
+               ? max_travel_duration
+               : std::min(fastest_direct, max_travel_duration);
+  } else {
+    return fastest_direct == kInfinityDuration ? std::nullopt
+                                               : std::optional{fastest_direct};
+  }
+}
+
 void remove_slower_than_fastest_direct(n::routing::query& q) {
   if (!q.fastest_direct_) {
     return;
@@ -473,9 +491,8 @@ api::plan_response routing::operator()(boost::urls::url_view const& url) const {
                 .factor_ = static_cast<float>(query.transferTimeFactor_)},
         .via_stops_ =
             get_via_stops(*tt_, *tags_, query.via_, query.viaMinimumStay_),
-        .fastest_direct_ = fastest_direct == kInfinityDuration
-                               ? std::nullopt
-                               : std::optional{fastest_direct}};
+        .fastest_direct_ =
+            calculate_search_cutoff_time(fastest_direct, query.maxTravelTime_)};
     remove_slower_than_fastest_direct(q);
     UTL_STOP_TIMING(query_preparation);