Add trip plugin

include/engine/api/trip_api.hpp

@@ -0,0 +1,110 @@
+#ifndef ENGINE_API_TRIP_HPP
+#define ENGINE_API_TRIP_HPP
+
+#include "engine/api/route_api.hpp"
+#include "engine/api/trip_parameters.hpp"
+
+#include "engine/datafacade/datafacade_base.hpp"
+
+#include "engine/internal_route_result.hpp"
+
+#include "util/integer_range.hpp"
+
+namespace osrm
+{
+namespace engine
+{
+namespace api
+{
+
+class TripAPI final : public RouteAPI
+{
+  public:
+    TripAPI(const datafacade::BaseDataFacade &facade_, const TripParameters &parameters_)
+        : RouteAPI(facade_, parameters_), parameters(parameters_)
+    {
+    }
+
+    void MakeResponse(const std::vector<std::vector<NodeID>> &sub_trips,
+                      const std::vector<InternalRouteResult> &sub_routes,
+                      const std::vector<PhantomNode> &phantoms,
+                      util::json::Object &response) const
+    {
+        auto number_of_routes = sub_trips.size();
+        util::json::Array routes;
+        routes.values.reserve(number_of_routes);
+        BOOST_ASSERT(sub_trips.size() == sub_routes.size());
+        for (auto index : util::irange<std::size_t>(0UL, sub_trips.size()))
+        {
+            auto route = MakeRoute(sub_routes[index].segment_end_coordinates,
+                                   sub_routes[index].unpacked_path_segments,
+                                   sub_routes[index].source_traversed_in_reverse,
+                                   sub_routes[index].target_traversed_in_reverse);
+            routes.values.push_back(std::move(route));
+        }
+        response.values["waypoints"] = MakeWaypoints(sub_trips, phantoms);
+        response.values["routes"] = std::move(routes);
+        response.values["code"] = "ok";
+    }
+
+  protected:
+    // FIXME this logic is a little backwards. We should change the output format of the
+    // trip plugin routing algorithm to be easier to consume here.
+    util::json::Array MakeWaypoints(const std::vector<std::vector<NodeID>> &sub_trips,
+                                    const std::vector<PhantomNode> &phantoms) const
+    {
+        util::json::Array waypoints;
+        waypoints.values.reserve(parameters.coordinates.size());
+
+        struct TripIndex
+        {
+            TripIndex() = default;
+            TripIndex(unsigned sub_trip_index_, unsigned point_index_)
+                : sub_trip_index(sub_trip_index_), point_index(point_index_)
+            {
+            }
+
+            unsigned sub_trip_index = std::numeric_limits<unsigned>::max();
+            unsigned point_index = std::numeric_limits<unsigned>::max();
+
+            bool NotUsed()
+            {
+                return sub_trip_index == std::numeric_limits<unsigned>::max() &&
+                       point_index == std::numeric_limits<unsigned>::max();
+            }
+        };
+
+        std::vector<TripIndex> input_idx_to_trip_idx(parameters.coordinates.size());
+        for (auto sub_trip_index : util::irange(0u, static_cast<unsigned>(sub_trips.size())))
+        {
+            for (auto point_index :
+                 util::irange(0u, static_cast<unsigned>(sub_trips[sub_trip_index].size())))
+            {
+                input_idx_to_trip_idx[sub_trips[sub_trip_index][point_index]] =
+                    TripIndex{sub_trip_index, point_index};
+            }
+        }
+
+        for (auto input_index : util::irange(0UL, parameters.coordinates.size()))
+        {
+            auto trip_index = input_idx_to_trip_idx[input_index];
+            BOOST_ASSERT(!trip_index.NotUsed());
+
+            auto waypoint =
+                BaseAPI::MakeWaypoint(parameters.coordinates[input_index], phantoms[input_index]);
+            waypoint.values["trips_index"] = trip_index.sub_trip_index;
+            waypoint.values["waypoint_index"] = trip_index.point_index;
+            waypoints.values.push_back(std::move(waypoint));
+        }
+
+        return waypoints;
+    }
+
+    const TripParameters &parameters;
+};
+
+} // ns api
+} // ns engine
+} // ns osrm
+
+#endif

include/engine/api/trip_parameters.hpp

@@ -14,7 +14,7 @@ namespace api
 
 struct TripParameters : public RouteParameters
 {
-    bool IsValid() const;
+    //bool IsValid() const; Falls back to base class
 };
 
 }

include/engine/engine.hpp

@@ -73,7 +73,7 @@ class Engine final
     std::unique_ptr<plugins::ViaRoutePlugin> route_plugin;
     std::unique_ptr<plugins::TablePlugin> table_plugin;
     std::unique_ptr<plugins::NearestPlugin> nearest_plugin;
-    // std::unique_ptr<plugins::TripPlugin> trip_plugin;
+    std::unique_ptr<plugins::TripPlugin> trip_plugin;
     std::unique_ptr<plugins::MatchPlugin> match_plugin;
 
     std::unique_ptr<datafacade::BaseDataFacade> query_data_facade;