From e97ec13064201799332eaf3d7501b9c9b45d6ded Mon Sep 17 00:00:00 2001 From: Denis Chaplygin Date: Mon, 16 Sep 2019 17:13:33 +0300 Subject: [PATCH] Formatted the sources --- include/engine/api/match_api.hpp | 3 +- include/engine/api/nearest_api.hpp | 32 +++++++++++-------- include/engine/api/route_api.hpp | 9 ++++-- include/engine/api/table_api.hpp | 24 +++++++++----- include/engine/api/trip_api.hpp | 3 +- .../server/api/base_parameters_grammar.hpp | 4 +-- unit_tests/library/nearest.cpp | 2 +- unit_tests/library/route.cpp | 2 +- unit_tests/library/trip.cpp | 2 +- 9 files changed, 49 insertions(+), 32 deletions(-) diff --git a/include/engine/api/match_api.hpp b/include/engine/api/match_api.hpp index 19db1ad3a..d005c3a32 100644 --- a/include/engine/api/match_api.hpp +++ b/include/engine/api/match_api.hpp @@ -83,7 +83,8 @@ class MatchAPI final : public RouteAPI route.values["confidence"] = sub_matchings[index].confidence; routes.values.push_back(std::move(route)); } - if (!parameters.skip_waypoints) { + if (!parameters.skip_waypoints) + { response.values["tracepoints"] = MakeTracepoints(sub_matchings); } response.values["matchings"] = std::move(routes); diff --git a/include/engine/api/nearest_api.hpp b/include/engine/api/nearest_api.hpp index 7f2d519ca..6e0788ef4 100644 --- a/include/engine/api/nearest_api.hpp +++ b/include/engine/api/nearest_api.hpp @@ -55,24 +55,27 @@ class NearestAPI final : public BaseAPI data_version_string = fb_result.CreateString(data_timestamp); } - flatbuffers::Offset>> waypoints_vector; - if (!parameters.skip_waypoints) { + flatbuffers::Offset>> + waypoints_vector; + if (!parameters.skip_waypoints) + { std::vector> waypoints; waypoints.resize(phantom_nodes.front().size()); - std::transform(phantom_nodes.front().begin(), - phantom_nodes.front().end(), - waypoints.begin(), - [this, &fb_result](const PhantomNodeWithDistance &phantom_with_distance) { - auto &phantom_node = phantom_with_distance.phantom_node; + std::transform( + phantom_nodes.front().begin(), + phantom_nodes.front().end(), + waypoints.begin(), + [this, &fb_result](const PhantomNodeWithDistance &phantom_with_distance) { + auto &phantom_node = phantom_with_distance.phantom_node; - auto node_values = MakeNodes(phantom_node); - fbresult::Uint64Pair nodes{node_values.first, node_values.second}; + auto node_values = MakeNodes(phantom_node); + fbresult::Uint64Pair nodes{node_values.first, node_values.second}; - auto waypoint = MakeWaypoint(fb_result, phantom_node); - waypoint.add_nodes(&nodes); + auto waypoint = MakeWaypoint(fb_result, phantom_node); + waypoint.add_nodes(&nodes); - return waypoint.Finish(); - }); + return waypoint.Finish(); + }); waypoints_vector = fb_result.CreateVector(waypoints); } @@ -89,7 +92,8 @@ class NearestAPI final : public BaseAPI void MakeResponse(const std::vector> &phantom_nodes, util::json::Object &response) const { - if (!parameters.skip_waypoints) { + if (!parameters.skip_waypoints) + { util::json::Array waypoints; waypoints.values.resize(phantom_nodes.front().size()); std::transform(phantom_nodes.front().begin(), diff --git a/include/engine/api/route_api.hpp b/include/engine/api/route_api.hpp index ee1cd8d39..8adac88ef 100644 --- a/include/engine/api/route_api.hpp +++ b/include/engine/api/route_api.hpp @@ -110,7 +110,8 @@ class RouteAPI : public BaseAPI route.target_traversed_in_reverse)); } - if (!parameters.skip_waypoints) { + if (!parameters.skip_waypoints) + { response.values["waypoints"] = BaseAPI::MakeWaypoints(all_start_end_points); } response.values["routes"] = std::move(jsRoutes); @@ -143,8 +144,10 @@ class RouteAPI : public BaseAPI } auto routes_vector = fb_result.CreateVector(routes); - flatbuffers::Offset>> waypoints_vector; - if (!parameters.skip_waypoints) { + flatbuffers::Offset>> + waypoints_vector; + if (!parameters.skip_waypoints) + { waypoints_vector = getWaypoints(); } diff --git a/include/engine/api/table_api.hpp b/include/engine/api/table_api.hpp index bdb9db7a9..4fe21b665 100644 --- a/include/engine/api/table_api.hpp +++ b/include/engine/api/table_api.hpp @@ -84,14 +84,16 @@ class TableAPI final : public BaseAPI flatbuffers::Offset>> sources; if (parameters.sources.empty()) { - if (!parameters.skip_waypoints) { + if (!parameters.skip_waypoints) + { sources = MakeWaypoints(fb_result, phantoms); } number_of_sources = phantoms.size(); } else { - if (!parameters.skip_waypoints) { + if (!parameters.skip_waypoints) + { sources = MakeWaypoints(fb_result, phantoms, parameters.sources); } } @@ -100,14 +102,16 @@ class TableAPI final : public BaseAPI destinations; if (parameters.destinations.empty()) { - if (!parameters.skip_waypoints) { + if (!parameters.skip_waypoints) + { destinations = MakeWaypoints(fb_result, phantoms); } number_of_destinations = phantoms.size(); } else { - if (!parameters.skip_waypoints) { + if (!parameters.skip_waypoints) + { destinations = MakeWaypoints(fb_result, phantoms, parameters.destinations); } } @@ -171,28 +175,32 @@ class TableAPI final : public BaseAPI // symmetric case if (parameters.sources.empty()) { - if (!parameters.skip_waypoints) { + if (!parameters.skip_waypoints) + { response.values["sources"] = MakeWaypoints(phantoms); } number_of_sources = phantoms.size(); } else { - if (!parameters.skip_waypoints) { + if (!parameters.skip_waypoints) + { response.values["sources"] = MakeWaypoints(phantoms, parameters.sources); } } if (parameters.destinations.empty()) { - if (!parameters.skip_waypoints) { + if (!parameters.skip_waypoints) + { response.values["destinations"] = MakeWaypoints(phantoms); } number_of_destinations = phantoms.size(); } else { - if (!parameters.skip_waypoints) { + if (!parameters.skip_waypoints) + { response.values["destinations"] = MakeWaypoints(phantoms, parameters.destinations); } } diff --git a/include/engine/api/trip_api.hpp b/include/engine/api/trip_api.hpp index 1a28d3011..a38275f54 100644 --- a/include/engine/api/trip_api.hpp +++ b/include/engine/api/trip_api.hpp @@ -81,7 +81,8 @@ class TripAPI final : public RouteAPI sub_routes[index].target_traversed_in_reverse); routes.values.push_back(std::move(route)); } - if (!parameters.skip_waypoints) { + if (!parameters.skip_waypoints) + { response.values["waypoints"] = MakeWaypoints(sub_trips, phantoms); } response.values["trips"] = std::move(routes); diff --git a/include/server/api/base_parameters_grammar.hpp b/include/server/api/base_parameters_grammar.hpp index 0c5791202..31bc4a717 100644 --- a/include/server/api/base_parameters_grammar.hpp +++ b/include/server/api/base_parameters_grammar.hpp @@ -153,8 +153,8 @@ struct BaseParametersGrammar : boost::spirit::qi::grammar qi::bool_[ph::bind(&engine::api::BaseParameters::generate_hints, qi::_r1) = qi::_1]; skip_waypoints_rule = - qi::lit("skip_waypoints=") > - qi::bool_[ph::bind(&engine::api::BaseParameters::skip_waypoints, qi::_r1) = qi::_1]; + qi::lit("skip_waypoints=") > + qi::bool_[ph::bind(&engine::api::BaseParameters::skip_waypoints, qi::_r1) = qi::_1]; bearings_rule = qi::lit("bearings=") > diff --git a/unit_tests/library/nearest.cpp b/unit_tests/library/nearest.cpp index 899a35c8e..5f4568dc8 100644 --- a/unit_tests/library/nearest.cpp +++ b/unit_tests/library/nearest.cpp @@ -175,7 +175,7 @@ BOOST_AUTO_TEST_CASE(test_nearest_fb_serialization_skip_waypoints) using namespace osrm; NearestParameters params; - params.skip_waypoints=true; + params.skip_waypoints = true; params.coordinates.push_back(get_dummy_location()); engine::api::ResultT result = flatbuffers::FlatBufferBuilder(); diff --git a/unit_tests/library/route.cpp b/unit_tests/library/route.cpp index 49187f00f..a2984530b 100644 --- a/unit_tests/library/route.cpp +++ b/unit_tests/library/route.cpp @@ -313,7 +313,7 @@ BOOST_AUTO_TEST_CASE(test_route_same_coordinates_no_waypoints) const auto &legs = route_object.values.at("legs").get().values; BOOST_CHECK(!legs.empty()); - //The rest of legs contents is verified by test_route_same_coordinates + // The rest of legs contents is verified by test_route_same_coordinates } } diff --git a/unit_tests/library/trip.cpp b/unit_tests/library/trip.cpp index d519661ef..e41e14aee 100644 --- a/unit_tests/library/trip.cpp +++ b/unit_tests/library/trip.cpp @@ -4,8 +4,8 @@ #include "coordinates.hpp" #include "fixture.hpp" -#include #include "osrm/trip_parameters.hpp" +#include #include "osrm/coordinate.hpp" #include "osrm/engine_config.hpp"