From f883555a42911674f5ba730a82b951f6aae5fa22 Mon Sep 17 00:00:00 2001 From: Whytro Date: Sun, 12 Mar 2023 18:22:43 +0900 Subject: [PATCH] Fix formatting issues --- include/server/service/utils.hpp | 3 +- src/engine/plugins/table.cpp | 2 +- src/server/service/match_service.cpp | 41 +++++++++++++++++++------- src/server/service/nearest_service.cpp | 32 +++++++++++++++----- src/server/service/route_service.cpp | 41 +++++++++++++++++++------- src/server/service/table_service.cpp | 41 +++++++++++++++++++------- src/server/service/trip_service.cpp | 41 +++++++++++++++++++------- 7 files changed, 147 insertions(+), 54 deletions(-) diff --git a/include/server/service/utils.hpp b/include/server/service/utils.hpp index a9a0a73e1..223b42820 100644 --- a/include/server/service/utils.hpp +++ b/include/server/service/utils.hpp @@ -16,7 +16,8 @@ bool constrainParamSize(const char *msg_template, { if (param.size() > 0 && param.size() != target_size) { - help = (boost::format(msg_template) % param_name % param.size() % target_name % target_size).str(); + help = (boost::format(msg_template) % param_name % param.size() % target_name % target_size) + .str(); return true; } return false; diff --git a/src/engine/plugins/table.cpp b/src/engine/plugins/table.cpp index dd7a04649..b3094cdf7 100644 --- a/src/engine/plugins/table.cpp +++ b/src/engine/plugins/table.cpp @@ -42,7 +42,7 @@ Status TablePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms, return Error( "InvalidOptions", "Number of bearings does not match number of coordinates", result); } - + if (!params.bearings.empty() && params.radiuses.size() != params.bearings.size()) { return Error( diff --git a/src/server/service/match_service.cpp b/src/server/service/match_service.cpp index c14f8d592..5acce7a73 100644 --- a/src/server/service/match_service.cpp +++ b/src/server/service/match_service.cpp @@ -17,17 +17,36 @@ std::string getWrongOptionHelp(const engine::api::MatchParameters ¶meters) const auto coord_size = parameters.coordinates.size(); const auto bearings_size = parameters.bearings.size(); - const bool param_size_mismatch = - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, "coordinates", coord_size, help) || - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "bearings", parameters.bearings, "coordinates", coord_size, help) || - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "bearings", bearings_size, help) || - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "coordinates", coord_size, help) || - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "timestamps", parameters.timestamps, "coordinates", coord_size, help); + const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "hints", + parameters.hints, + "coordinates", + coord_size, + help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "bearings", + parameters.bearings, + "coordinates", + coord_size, + help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "radiuses", + parameters.radiuses, + "bearings", + bearings_size, + help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "radiuses", + parameters.radiuses, + "coordinates", + coord_size, + help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "timestamps", + parameters.timestamps, + "coordinates", + coord_size, + help); if (!param_size_mismatch && parameters.coordinates.size() < 2) { diff --git a/src/server/service/nearest_service.cpp b/src/server/service/nearest_service.cpp index 2f78d14af..94b75259d 100644 --- a/src/server/service/nearest_service.cpp +++ b/src/server/service/nearest_service.cpp @@ -19,14 +19,30 @@ std::string getWrongOptionHelp(const engine::api::NearestParameters ¶meters) constrainParamSize( PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, "coordinates", coord_size, help); - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "bearings", parameters.bearings, "coordinates", coord_size, help); - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "bearings", bearings_size, help); - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "coordinates", coord_size, help); - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "approaches", parameters.approaches, "coordinates", coord_size, help); + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "bearings", + parameters.bearings, + "coordinates", + coord_size, + help); + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "radiuses", + parameters.radiuses, + "bearings", + bearings_size, + help); + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "radiuses", + parameters.radiuses, + "coordinates", + coord_size, + help); + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "approaches", + parameters.approaches, + "coordinates", + coord_size, + help); return help; } diff --git a/src/server/service/route_service.cpp b/src/server/service/route_service.cpp index 41f146abf..625a0815f 100644 --- a/src/server/service/route_service.cpp +++ b/src/server/service/route_service.cpp @@ -17,17 +17,36 @@ std::string getWrongOptionHelp(const engine::api::RouteParameters ¶meters) const auto coord_size = parameters.coordinates.size(); const auto bearings_size = parameters.bearings.size(); - const bool param_size_mismatch = - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, "coordinates", coord_size, help) || - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "bearings", parameters.bearings, "coordinates", coord_size, help) || - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "bearings", bearings_size, help) || - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "coordinates", coord_size, help) || - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "approaches", parameters.approaches, "coordinates", coord_size, help); + const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "hints", + parameters.hints, + "coordinates", + coord_size, + help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "bearings", + parameters.bearings, + "coordinates", + coord_size, + help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "radiuses", + parameters.radiuses, + "bearings", + bearings_size, + help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "radiuses", + parameters.radiuses, + "coordinates", + coord_size, + help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "approaches", + parameters.approaches, + "coordinates", + coord_size, + help); if (!param_size_mismatch && parameters.coordinates.size() < 2) { diff --git a/src/server/service/table_service.cpp b/src/server/service/table_service.cpp index 88d0804d6..dee7429c0 100644 --- a/src/server/service/table_service.cpp +++ b/src/server/service/table_service.cpp @@ -17,17 +17,36 @@ std::string getWrongOptionHelp(const engine::api::TableParameters ¶meters) const auto coord_size = parameters.coordinates.size(); const auto bearings_size = parameters.bearings.size(); - const bool param_size_mismatch = - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, "coordinates", coord_size, help) || - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "bearings", parameters.bearings, "coordinates", coord_size, help) || - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "bearings", bearings_size, help) || - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "coordinates", coord_size, help) || - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "approaches", parameters.approaches, "coordinates", coord_size, help); + const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "hints", + parameters.hints, + "coordinates", + coord_size, + help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "bearings", + parameters.bearings, + "coordinates", + coord_size, + help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "radiuses", + parameters.radiuses, + "bearings", + bearings_size, + help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "radiuses", + parameters.radiuses, + "coordinates", + coord_size, + help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "approaches", + parameters.approaches, + "coordinates", + coord_size, + help); if (!param_size_mismatch && parameters.coordinates.size() < 2) { diff --git a/src/server/service/trip_service.cpp b/src/server/service/trip_service.cpp index 5fc35698a..4b6d31970 100644 --- a/src/server/service/trip_service.cpp +++ b/src/server/service/trip_service.cpp @@ -17,17 +17,36 @@ std::string getWrongOptionHelp(const engine::api::TripParameters ¶meters) const auto coord_size = parameters.coordinates.size(); const auto bearings_size = parameters.bearings.size(); - const bool param_size_mismatch = - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, "coordinates", coord_size, help) || - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "bearings", parameters.bearings, "coordinates", coord_size, help) || - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "bearings", bearings_size, help) || - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "coordinates", coord_size, help) || - constrainParamSize( - PARAMETER_SIZE_MISMATCH_MSG, "approaches", parameters.approaches, "coordinates", coord_size, help); + const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "hints", + parameters.hints, + "coordinates", + coord_size, + help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "bearings", + parameters.bearings, + "coordinates", + coord_size, + help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "radiuses", + parameters.radiuses, + "bearings", + bearings_size, + help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "radiuses", + parameters.radiuses, + "coordinates", + coord_size, + help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, + "approaches", + parameters.approaches, + "coordinates", + coord_size, + help); if (!param_size_mismatch && parameters.coordinates.size() < 2) {