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

Fix formatting issues

Browse Source
This commit is contained in:
Whytro 2023-03-12 18:22:43 +09:00
parent 85b0d22723
commit f883555a42
7 changed files with 147 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/server/service/utils.hpp
View File

@ -16,7 +16,8 @@ bool constrainParamSize(const char *msg_template,
{ {
if (param.size() > 0 && param.size() != target_size) 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 true;
} }
return false; return false;

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

@ -42,7 +42,7 @@ Status TablePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
return Error( return Error(
"InvalidOptions", "Number of bearings does not match number of coordinates", result); "InvalidOptions", "Number of bearings does not match number of coordinates", result);
} }
if (!params.bearings.empty() && params.radiuses.size() != params.bearings.size()) if (!params.bearings.empty() && params.radiuses.size() != params.bearings.size())
{ {
return Error( return Error(

41
src/server/service/match_service.cpp
View File

@ -17,17 +17,36 @@ std::string getWrongOptionHelp(const engine::api::MatchParameters &parameters)
const auto coord_size = parameters.coordinates.size(); const auto coord_size = parameters.coordinates.size();
const auto bearings_size = parameters.bearings.size(); const auto bearings_size = parameters.bearings.size();
const bool param_size_mismatch = const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
constrainParamSize( "hints",
PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, "coordinates", coord_size, help) || parameters.hints,
constrainParamSize( "coordinates",
PARAMETER_SIZE_MISMATCH_MSG, "bearings", parameters.bearings, "coordinates", coord_size, help) || coord_size,
constrainParamSize( help) ||
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "bearings", bearings_size, help) || constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
constrainParamSize( "bearings",
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "coordinates", coord_size, help) || parameters.bearings,
constrainParamSize( "coordinates",
PARAMETER_SIZE_MISMATCH_MSG, "timestamps", parameters.timestamps, "coordinates", coord_size, help); 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) if (!param_size_mismatch && parameters.coordinates.size() < 2)
{ {

32
src/server/service/nearest_service.cpp
View File

@ -19,14 +19,30 @@ std::string getWrongOptionHelp(const engine::api::NearestParameters &parameters)
constrainParamSize( constrainParamSize(
PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, "coordinates", coord_size, help); PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, "coordinates", coord_size, help);
constrainParamSize( constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
PARAMETER_SIZE_MISMATCH_MSG, "bearings", parameters.bearings, "coordinates", coord_size, help); "bearings",
constrainParamSize( parameters.bearings,
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "bearings", bearings_size, help); "coordinates",
constrainParamSize( coord_size,
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "coordinates", coord_size, help); help);
constrainParamSize( constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
PARAMETER_SIZE_MISMATCH_MSG, "approaches", parameters.approaches, "coordinates", coord_size, help); "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; return help;
} }

41
src/server/service/route_service.cpp
View File

@ -17,17 +17,36 @@ std::string getWrongOptionHelp(const engine::api::RouteParameters &parameters)
const auto coord_size = parameters.coordinates.size(); const auto coord_size = parameters.coordinates.size();
const auto bearings_size = parameters.bearings.size(); const auto bearings_size = parameters.bearings.size();
const bool param_size_mismatch = const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
constrainParamSize( "hints",
PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, "coordinates", coord_size, help) || parameters.hints,
constrainParamSize( "coordinates",
PARAMETER_SIZE_MISMATCH_MSG, "bearings", parameters.bearings, "coordinates", coord_size, help) || coord_size,
constrainParamSize( help) ||
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "bearings", bearings_size, help) || constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
constrainParamSize( "bearings",
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "coordinates", coord_size, help) || parameters.bearings,
constrainParamSize( "coordinates",
PARAMETER_SIZE_MISMATCH_MSG, "approaches", parameters.approaches, "coordinates", coord_size, help); 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) if (!param_size_mismatch && parameters.coordinates.size() < 2)
{ {

41
src/server/service/table_service.cpp
View File

@ -17,17 +17,36 @@ std::string getWrongOptionHelp(const engine::api::TableParameters &parameters)
const auto coord_size = parameters.coordinates.size(); const auto coord_size = parameters.coordinates.size();
const auto bearings_size = parameters.bearings.size(); const auto bearings_size = parameters.bearings.size();
const bool param_size_mismatch = const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
constrainParamSize( "hints",
PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, "coordinates", coord_size, help) || parameters.hints,
constrainParamSize( "coordinates",
PARAMETER_SIZE_MISMATCH_MSG, "bearings", parameters.bearings, "coordinates", coord_size, help) || coord_size,
constrainParamSize( help) ||
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "bearings", bearings_size, help) || constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
constrainParamSize( "bearings",
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "coordinates", coord_size, help) || parameters.bearings,
constrainParamSize( "coordinates",
PARAMETER_SIZE_MISMATCH_MSG, "approaches", parameters.approaches, "coordinates", coord_size, help); 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) if (!param_size_mismatch && parameters.coordinates.size() < 2)
{ {

41
src/server/service/trip_service.cpp
View File

@ -17,17 +17,36 @@ std::string getWrongOptionHelp(const engine::api::TripParameters &parameters)
const auto coord_size = parameters.coordinates.size(); const auto coord_size = parameters.coordinates.size();
const auto bearings_size = parameters.bearings.size(); const auto bearings_size = parameters.bearings.size();
const bool param_size_mismatch = const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
constrainParamSize( "hints",
PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, "coordinates", coord_size, help) || parameters.hints,
constrainParamSize( "coordinates",
PARAMETER_SIZE_MISMATCH_MSG, "bearings", parameters.bearings, "coordinates", coord_size, help) || coord_size,
constrainParamSize( help) ||
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "bearings", bearings_size, help) || constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
constrainParamSize( "bearings",
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "coordinates", coord_size, help) || parameters.bearings,
constrainParamSize( "coordinates",
PARAMETER_SIZE_MISMATCH_MSG, "approaches", parameters.approaches, "coordinates", coord_size, help); 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) if (!param_size_mismatch && parameters.coordinates.size() < 2)
{ {