Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Trip plugin does not have a continue_straight parameter, use false

Browse Source
This commit is contained in:
Patrick Niklaus 2016-05-02 19:05:38 +02:00
parent 57a30dd375
commit a4f1dc536d
No known key found for this signature in database
GPG Key ID: E426891B5F978B1B
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/engine/plugins/trip.hpp
View File

@ -35,7 +35,6 @@ class TripPlugin final : public BasePlugin
int max_locations_trip; int max_locations_trip;
InternalRouteResult ComputeRoute(const std::vector<PhantomNode> &phantom_node_list, InternalRouteResult ComputeRoute(const std::vector<PhantomNode> &phantom_node_list,
const api::TripParameters &parameters,
const std::vector<NodeID> &trip); const std::vector<NodeID> &trip);
public: public:

5
src/engine/plugins/trip.cpp
View File

@ -115,7 +115,6 @@ SCC_Component SplitUnaccessibleLocations(const std::size_t number_of_locations,
} }
InternalRouteResult TripPlugin::ComputeRoute(const std::vector<PhantomNode> &snapped_phantoms, InternalRouteResult TripPlugin::ComputeRoute(const std::vector<PhantomNode> &snapped_phantoms,
const api::TripParameters &parameters,
const std::vector<NodeID> &trip) const std::vector<NodeID> &trip)
{ {
InternalRouteResult min_route; InternalRouteResult min_route;
@ -135,7 +134,7 @@ InternalRouteResult TripPlugin::ComputeRoute(const std::vector<PhantomNode> &sna
} }
BOOST_ASSERT(min_route.segment_end_coordinates.size() == trip.size()); 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"); BOOST_ASSERT_MSG(min_route.shortest_path_length < INVALID_EDGE_WEIGHT, "unroutable route");
return min_route; return min_route;
@ -232,7 +231,7 @@ Status TripPlugin::HandleRequest(const api::TripParameters &parameters,
routes.reserve(trips.size()); routes.reserve(trips.size());
for (const auto &trip : trips) 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}; api::TripAPI trip_api{BasePlugin::facade, parameters};