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

Adapts MakeResponse to not pass vector by pointer

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-03-03 14:35:00 +01:00 committed by Patrick Niklaus
parent 0f600c9262
commit 5bc0595591
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/engine/api/trip_api.hpp
View File

@ -29,7 +29,7 @@ class TripAPI final : public RouteAPI
const std::vector<InternalRouteResult> &sub_routes, const std::vector<InternalRouteResult> &sub_routes,
const std::vector<PhantomNode> &phantoms, const std::vector<PhantomNode> &phantoms,
util::json::Object &response, util::json::Object &response,
const std::vector<std::vector<util::Coordinate>> *const coordinates) const const std::vector<std::vector<util::Coordinate>> &coordinates) const
{ {
auto number_of_routes = sub_trips.size(); auto number_of_routes = sub_trips.size();
util::json::Array routes; util::json::Array routes;
@ -37,11 +37,10 @@ class TripAPI final : public RouteAPI
BOOST_ASSERT(sub_trips.size() == sub_routes.size()); BOOST_ASSERT(sub_trips.size() == sub_routes.size());
for (auto index : util::irange<std::size_t>(0UL, sub_trips.size())) for (auto index : util::irange<std::size_t>(0UL, sub_trips.size()))
{ {
auto route = MakeRoute(sub_routes[index].segment_end_coordinates, auto route = MakeRoute(
sub_routes[index].unpacked_path_segments, sub_routes[index].segment_end_coordinates, sub_routes[index].unpacked_path_segments,
sub_routes[index].source_traversed_in_reverse, sub_routes[index].source_traversed_in_reverse,
sub_routes[index].target_traversed_in_reverse, sub_routes[index].target_traversed_in_reverse, &coordinates[index]);
coordinates ? &((*coordinates)[index]) : nullptr);
routes.values.push_back(std::move(route)); routes.values.push_back(std::move(route));
} }
response.values["waypoints"] = MakeWaypoints(sub_trips, phantoms); response.values["waypoints"] = MakeWaypoints(sub_trips, phantoms);

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

@ -254,7 +254,7 @@ Status TripPlugin::HandleRequest(const api::TripParameters &parameters,
} }
api::TripAPI trip_api{BasePlugin::facade, parameters}; api::TripAPI trip_api{BasePlugin::facade, parameters};
trip_api.MakeResponse(trips, routes, snapped_phantoms, json_result, &ordered_coordinates); trip_api.MakeResponse(trips, routes, snapped_phantoms, json_result, ordered_coordinates);
return Status::Ok; return Status::Ok;
} }