count odm transfers (#757)

motis-project · Feb 21, 2025 · cb06524 · cb06524
1 parent cb852dc
commit cb06524
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/journey_to_response.cc b/src/journey_to_response.cc
@@ -19,6 +19,7 @@
 #include "motis/constants.h"
 #include "motis/gbfs/mode.h"
 #include "motis/gbfs/routing_data.h"
+#include "motis/odm/odm.h"
 #include "motis/place.h"
 #include "motis/street_routing.h"
 #include "motis/tag_lookup.h"
@@ -84,7 +85,8 @@ api::Itinerary journey_to_response(osr::ways const* w,
               decltype(j.legs_)::iterator>::difference_type>(0),
           utl::count_if(j.legs_, [](auto&& leg) {
             return holds_alternative<n::routing::journey::run_enter_exit>(
-                leg.uses_);
+                       leg.uses_) ||
+                   odm::is_odm_leg(leg);
           }) - 1)};
 
   auto const append = [&](api::Itinerary&& x) {

diff --git a/src/odm/meta_router.cc b/src/odm/meta_router.cc
@@ -404,9 +404,9 @@ std::vector<meta_router::routing_result> meta_router::search_interval(
 void collect_odm_journeys(
     std::vector<meta_router::routing_result> const& results) {
   p->odm_journeys_.clear();
-  for (auto& r : results | std::views::drop(1)) {
-    for (auto& j : r.journeys_) {
-      p->odm_journeys_.push_back(std::move(j));
+  for (auto const& r : results | std::views::drop(1)) {
+    for (auto const& j : r.journeys_) {
+      p->odm_journeys_.push_back(j);
     }
   }
   fmt::println("[routing] collected {} ODM-PT journeys",