From a4f1dc536dad91c6fd8d35900a251f432cdffb60 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Mon, 2 May 2016 19:05:38 +0200 Subject: [PATCH] Trip plugin does not have a continue_straight parameter, use false --- include/engine/plugins/trip.hpp | 1 - src/engine/plugins/trip.cpp | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/engine/plugins/trip.hpp b/include/engine/plugins/trip.hpp index cf368840b..0e97ce7a3 100644 --- a/include/engine/plugins/trip.hpp +++ b/include/engine/plugins/trip.hpp @@ -35,7 +35,6 @@ class TripPlugin final : public BasePlugin int max_locations_trip; InternalRouteResult ComputeRoute(const std::vector &phantom_node_list, - const api::TripParameters ¶meters, const std::vector &trip); public: diff --git a/src/engine/plugins/trip.cpp b/src/engine/plugins/trip.cpp index 796e03938..4303a477c 100644 --- a/src/engine/plugins/trip.cpp +++ b/src/engine/plugins/trip.cpp @@ -115,7 +115,6 @@ SCC_Component SplitUnaccessibleLocations(const std::size_t number_of_locations, } InternalRouteResult TripPlugin::ComputeRoute(const std::vector &snapped_phantoms, - const api::TripParameters ¶meters, const std::vector &trip) { InternalRouteResult min_route; @@ -135,7 +134,7 @@ InternalRouteResult TripPlugin::ComputeRoute(const std::vector &sna } BOOST_ASSERT(min_route.segment_end_coordinates.size() == trip.size()); - shortest_path(min_route.segment_end_coordinates, parameters.continue_straight, min_route); + shortest_path(min_route.segment_end_coordinates, {false}, min_route); BOOST_ASSERT_MSG(min_route.shortest_path_length < INVALID_EDGE_WEIGHT, "unroutable route"); return min_route; @@ -232,7 +231,7 @@ Status TripPlugin::HandleRequest(const api::TripParameters ¶meters, routes.reserve(trips.size()); for (const auto &trip : trips) { - routes.push_back(ComputeRoute(snapped_phantoms, parameters, trip)); + routes.push_back(ComputeRoute(snapped_phantoms, trip)); } api::TripAPI trip_api{BasePlugin::facade, parameters};