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

Implemented 'skip_waypoints' support in 'Route', 'Trip', 'Match' services.

Browse Source
This commit is contained in:
Denis Chaplygin 2019-09-16 13:54:25 +03:00
parent 1b47242a58
commit 600f48e15a
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/engine/api/match_api.hpp
View File

@ -83,7 +83,9 @@ class MatchAPI final : public RouteAPI
route.values["confidence"] = sub_matchings[index].confidence; route.values["confidence"] = sub_matchings[index].confidence;
routes.values.push_back(std::move(route)); routes.values.push_back(std::move(route));
} }
response.values["tracepoints"] = MakeTracepoints(sub_matchings); if (!parameters.skip_waypoints) {
response.values["tracepoints"] = MakeTracepoints(sub_matchings);
}
response.values["matchings"] = std::move(routes); response.values["matchings"] = std::move(routes);
response.values["code"] = "Ok"; response.values["code"] = "Ok";
} }

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

@ -109,7 +109,9 @@ class RouteAPI : public BaseAPI
route.target_traversed_in_reverse)); route.target_traversed_in_reverse));
} }
response.values["waypoints"] = BaseAPI::MakeWaypoints(all_start_end_points); if (!parameters.skip_waypoints) {
response.values["waypoints"] = BaseAPI::MakeWaypoints(all_start_end_points);
}
response.values["routes"] = std::move(jsRoutes); response.values["routes"] = std::move(jsRoutes);
response.values["code"] = "Ok"; response.values["code"] = "Ok";
auto data_timestamp = facade.GetTimestamp(); auto data_timestamp = facade.GetTimestamp();
@ -140,7 +142,10 @@ class RouteAPI : public BaseAPI
} }
auto routes_vector = fb_result.CreateVector(routes); auto routes_vector = fb_result.CreateVector(routes);
auto waypoints_vector = getWaypoints(); flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<fbresult::Waypoint>>> waypoints_vector;
if (!parameters.skip_waypoints) {
waypoints_vector = getWaypoints();
}
fbresult::FBResultBuilder response(fb_result); fbresult::FBResultBuilder response(fb_result);
response.add_routes(routes_vector); response.add_routes(routes_vector);

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

@ -81,7 +81,9 @@ class TripAPI final : public RouteAPI
sub_routes[index].target_traversed_in_reverse); sub_routes[index].target_traversed_in_reverse);
routes.values.push_back(std::move(route)); routes.values.push_back(std::move(route));
} }
response.values["waypoints"] = MakeWaypoints(sub_trips, phantoms); if (!parameters.skip_waypoints) {
response.values["waypoints"] = MakeWaypoints(sub_trips, phantoms);
}
response.values["trips"] = std::move(routes); response.values["trips"] = std::move(routes);
response.values["code"] = "Ok"; response.values["code"] = "Ok";
} }