Odm taxi

.github/workflows/ci.yml

@@ -191,7 +191,8 @@ jobs:
             buildcache-${{ matrix.config.preset }}-
 
       - name: Dependencies Cache
-        uses: actions/cache@v4
+        uses: actions/cache/restore@v4
+        id: restore-deps
         with:
           path: ${{ github.workspace }}/deps
           key: deps-${{ hashFiles('.pkg') }}
@@ -220,6 +221,13 @@ jobs:
           path: ${{ github.workspace }}/.buildcache
           key: ${{ steps.restore-buildcache.outputs.cache-primary-key }}
 
+      - name: Save deps cache
+        if: always()
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ github.workspace }}/deps
+          key: ${{ steps.restore-deps.outputs.cache-primary-key }}
+
       # ==== DISTRIBUTION ====
       - name: Create Distribution
         run: |

.pkg

@@ -25,7 +25,7 @@
 [net]
   [email protected]:motis-project/net.git
   branch=master
-  commit=6a457f5eaa077078fcac4153c5a178657737eee8
+  commit=43423bb08c636c9dd91e4d58b5b557c6d2f25efe
 [openapi-cpp]
   [email protected]:triptix-tech/openapi-cpp.git
   branch=master
@@ -45,7 +45,7 @@
 [boost]
   [email protected]:motis-project/boost.git
   branch=boost-1.86.0
-  commit=930f38eb0365ceb7853273e03da4d9e7787abfb9
+  commit=4a9aca6cb8af75be6e58f28c09cc7e39f61e6173
 [tg]
   [email protected]:triptix-tech/tg.git
   branch=main

.pkg.lock

@@ -1,7 +1,7 @@
-16722610972019258869
+3612327711671169474
 cista 6362f3ad8c3133a0abf64e5d8c9ea3e21f531ee8
 zlib-ng 68ab3e2d80253ec5dc3c83691d9ff70477b32cd3
-boost 930f38eb0365ceb7853273e03da4d9e7787abfb9
+boost 4a9aca6cb8af75be6e58f28c09cc7e39f61e6173
 googletest 7b64fca6ea0833628d6f86255a81424365f7cc0c
 lz4 c4765545ebb14b0a56c663e21923166923f8280e
 mimalloc e2f4fe647e8aff4603a7d5119b8639fd1a47c8a6
@@ -13,7 +13,7 @@ res b759b93316afeb529b6cb5b2548b24c41e382fb0
 date ce88cc33b5551f66655614eeebb7c5b7189025fb
 yaml-cpp 1d8ca1f35eb3a9c9142462b28282a848e5d29a91
 openapi-cpp 688d45bd96addb26eaccc5d264761030e5ef43f9
-net 6a457f5eaa077078fcac4153c5a178657737eee8
+net 43423bb08c636c9dd91e4d58b5b557c6d2f25efe
 PEGTL 1c1aa6e650e4d26f10fa398f148ec0cdc5f0808d
 oh d21c30f40e52a83d6dc09bcffd0067598b5ec069
 doctest 70e8f76437b76dd5e9c0a2eb9b907df190ab71a0

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.20)
 
-project(motis)
+project(motis LANGUAGES C CXX ASM)
 
 set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 
@@ -81,6 +81,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
             -Wno-shadow-uncaptured-local
             -Wno-documentation-deprecated-sync
             -Wno-float-equal
+            -Wno-deprecated-declarations
             -Werror)
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
     set(motis-compile-options -Wall -Wextra -Werror -Wno-unknown-pragmas)
@@ -113,6 +114,7 @@ target_link_libraries(motislib
     osr
     adr
     boost-json
+    Boost::fiber
     motis-api
     reflectcpp
     web-server

CMakePresets.json

@@ -12,6 +12,8 @@
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/build/macos-x86_64-release",
       "cacheVariables": {
+        "BOOST_CONTEXT_ABI": "sysv",
+        "BOOST_CONTEXT_ARCHITECTURE": "x86_64",
         "CMAKE_OSX_ARCHITECTURES": "x86_64",
         "CMAKE_CXX_FLAGS": "-stdlib=libc++",
         "CMAKE_BUILD_TYPE": "Release"

include/motis/config.h

@@ -28,6 +28,7 @@ struct config {
 
   bool requires_rt_timetable_updates() const;
   bool has_gbfs_feeds() const;
+  bool has_odm_providers() const;
 
   bool operator==(config const&) const = default;
 
@@ -121,6 +122,19 @@ struct config {
   };
   std::optional<gbfs> gbfs_{};
 
+  struct odm {
+    bool operator==(odm const&) const = default;
+
+    struct provider {
+      bool operator==(provider const&) const = default;
+      std::optional<std::string> blacklist_url_;
+      std::string whitelist_url_;
+      std::string booking_url_;
+    };
+    std::map<std::string, provider> providers_{};
+  };
+  std::optional<odm> odm_{};
+
   bool street_routing_{false};
   bool osr_footpath_{false};
   bool elevators_{false};

include/motis/endpoints/routing.h

@@ -4,18 +4,48 @@
 #include <utility>
 #include <vector>
 
+#include "boost/thread/tss.hpp"
+
 #include "osr/location.h"
 #include "osr/types.h"
 
 #include "nigiri/routing/clasz_mask.h"
+#include "nigiri/routing/raptor/raptor_state.h"
+#include "nigiri/routing/raptor_search.h"
 
 #include "motis-api/motis-api.h"
 #include "motis/elevators/elevators.h"
 #include "motis/fwd.h"
 #include "motis/match_platforms.h"
+#include "motis/place.h"
 
 namespace motis::ep {
 
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
+extern boost::thread_specific_ptr<nigiri::routing::search_state> search_state;
+
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
+extern boost::thread_specific_ptr<nigiri::routing::raptor_state> raptor_state;
+
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
+extern boost::thread_specific_ptr<osr::bitvec<osr::node_idx_t>> blocked;
+
+using stats_map_t = std::map<std::string, std::uint64_t>;
+
+bool is_intermodal(place_t const&);
+
+nigiri::routing::location_match_mode get_match_mode(place_t const&);
+
+std::vector<nigiri::routing::offset> station_start(nigiri::location_idx_t);
+
+std::vector<nigiri::routing::via_stop> get_via_stops(
+    nigiri::timetable const&,
+    tag_lookup const&,
+    std::optional<std::vector<std::string>> const& vias,
+    std::vector<std::int64_t> const& times);
+
+void remove_slower_than_fastest_direct(nigiri::routing::query&);
+
 struct routing {
   api::plan_response operator()(boost::urls::url_view const&) const;
 

include/motis/http_client.h

@@ -54,6 +54,11 @@ struct http_client {
   boost::asio::awaitable<http_response> get(
       boost::urls::url url, std::map<std::string, std::string> headers);
 
+  boost::asio::awaitable<http_response> post(
+      boost::urls::url,
+      std::map<std::string, std::string> headers,
+      std::string body);
+
   void set_proxy(boost::urls::url const&);
 
   hash_map<connection_key, std::shared_ptr<connection>> connections_;

include/motis/http_req.h

@@ -19,6 +19,12 @@ boost::asio::awaitable<http_response> http_GET(
     std::map<std::string, std::string> const& headers,
     std::chrono::seconds timeout);
 
+boost::asio::awaitable<http_response> http_POST(
+    boost::urls::url,
+    std::map<std::string, std::string> const& headers,
+    std::string const& body,
+    std::chrono::seconds timeout);
+
 std::string get_http_body(http_response const&);
 
 }  // namespace motis

include/motis/odm/equal_journeys.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include "nigiri/routing/journey.h"
+
+namespace motis::odm {
+
+bool operator==(nigiri::routing::journey const&,
+                nigiri::routing::journey const&);
+
+}  // namespace motis::odm

include/motis/odm/meta_router.h

@@ -0,0 +1,92 @@
+#pragma once
+
+#include <optional>
+#include <variant>
+#include <vector>
+
+#include "osr/location.h"
+
+#include "nigiri/types.h"
+
+#include "motis-api/motis-api.h"
+
+#include "motis/endpoints/routing.h"
+#include "motis/fwd.h"
+#include "motis/gbfs/routing_data.h"
+#include "motis/place.h"
+
+namespace nigiri {
+struct timetable;
+struct rt_timetable;
+}  // namespace nigiri
+
+namespace nigiri::routing {
+struct query;
+struct journey;
+}  // namespace nigiri::routing
+
+namespace motis::odm {
+
+struct meta_router {
+  meta_router(ep::routing const&,
+              api::plan_params const&,
+              std::vector<api::ModeEnum> const& pre_transit_modes,
+              std::vector<api::ModeEnum> const& post_transit_modes,
+              std::vector<api::ModeEnum> const& direct_modes,
+              std::variant<osr::location, tt_location> const& from,
+              std::variant<osr::location, tt_location> const& to,
+              api::Place const& from_p,
+              api::Place const& to_p,
+              nigiri::routing::query const& start_time,
+              std::vector<api::Itinerary>& direct,
+              nigiri::duration_t fastest_direct_,
+              bool odm_pre_transit,
+              bool odm_post_transit,
+              bool odm_direct);
+
+  api::plan_response run();
+
+private:
+  void init_prima(nigiri::interval<nigiri::unixtime_t> const& from_intvl,
+                  nigiri::interval<nigiri::unixtime_t> const& to_intvl);
+  void extract_direct();
+
+  ep::routing const& r_;
+  api::plan_params const& query_;
+  std::vector<api::ModeEnum> const& pre_transit_modes_;
+  std::vector<api::ModeEnum> const& post_transit_modes_;
+  std::vector<api::ModeEnum> const& direct_modes_;
+  std::variant<osr::location, tt_location> const& from_;
+  std::variant<osr::location, tt_location> const& to_;
+  api::Place const& from_place_;
+  api::Place const& to_place_;
+  nigiri::routing::query const& start_time_;
+  std::vector<api::Itinerary>& direct_;
+  nigiri::duration_t fastest_direct_;
+  bool odm_pre_transit_;
+  bool odm_post_transit_;
+  bool odm_direct_;
+
+  nigiri::timetable const* tt_;
+  std::shared_ptr<rt> const rt_;
+  nigiri::rt_timetable const* rtt_;
+  motis::elevators const* e_;
+  gbfs::gbfs_routing_data gbfs_rd_;
+  std::variant<osr::location, tt_location> const& start_;
+  std::variant<osr::location, tt_location> const& dest_;
+  std::vector<api::ModeEnum> start_modes_;
+  std::vector<api::ModeEnum> dest_modes_;
+
+  std::optional<std::vector<api::RentalFormFactorEnum>> const&
+      start_form_factors_;
+  std::optional<std::vector<api::RentalFormFactorEnum>> const&
+      dest_form_factors_;
+  std::optional<std::vector<api::RentalPropulsionTypeEnum>> const&
+      start_propulsion_types_;
+  std::optional<std::vector<api::RentalPropulsionTypeEnum>> const&
+      dest_propulsion_types_;
+  std::optional<std::vector<std::string>> const& start_rental_providers_;
+  std::optional<std::vector<std::string>> const& dest_rental_providers_;
+};
+
+}  // namespace motis::odm

include/motis/odm/mixer.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#include "nigiri/routing/journey.h"
+#include "nigiri/routing/pareto_set.h"
+#include "nigiri/types.h"
+
+#include "motis-api/motis-api.h"
+
+namespace motis::odm {
+
+struct cost_threshold {
+  std::int32_t threshold_;
+  std::int32_t cost_;
+};
+
+std::int32_t tally(std::int32_t, std::vector<cost_threshold> const&);
+
+struct mixer {
+  void mix(nigiri::pareto_set<nigiri::routing::journey> const& pt_journeys,
+           std::vector<nigiri::routing::journey>& odm_journeys) const;
+  std::int32_t transfer_cost(nigiri::routing::journey const&) const;
+  void cost_domination(
+      nigiri::pareto_set<nigiri::routing::journey> const& pt_journeys,
+      std::vector<nigiri::routing::journey>& odm_journeys) const;
+  void productivity_domination(
+      std::vector<nigiri::routing::journey>& odm_journeys) const;
+
+  double alpha_;
+  double beta_;
+  std::vector<cost_threshold> walk_cost_;
+  std::vector<cost_threshold> taxi_cost_;
+  std::vector<cost_threshold> transfer_cost_;
+};
+
+}  // namespace motis::odm

include/motis/odm/odm.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include "nigiri/routing/journey.h"
+#include "nigiri/types.h"
+
+#include "motis-api/motis-api.h"
+
+namespace motis::odm {
+
+static constexpr auto const kODMTransferBuffer = nigiri::duration_t{5};
+constexpr auto const kODM =
+    static_cast<nigiri::transport_mode_id_t>(api::ModeEnum::ODM);
+constexpr auto const kWalk =
+    static_cast<nigiri::transport_mode_id_t>(api::ModeEnum::WALK);
+
+enum which_mile { kFirstMile, kLastMile };
+
+bool is_odm_leg(nigiri::routing::journey::leg const&);
+
+}  // namespace motis::odm