Skip to content

Commit f883555

Browse files
whytrowhytro
committed
Fix formatting issues
1 parent 85b0d22 commit f883555

File tree

7 files changed

+147
-54
lines changed

7 files changed

+147
-54
lines changed

‎include/server/service/utils.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ bool constrainParamSize(const char *msg_template,
1616
{
1717
if (param.size() > 0 && param.size() != target_size)
1818
{
19-
help = (boost::format(msg_template) % param_name % param.size() % target_name % target_size).str();
19+
help = (boost::format(msg_template) % param_name % param.size() % target_name % target_size)
20+
.str();
2021
return true;
2122
}
2223
return false;

‎src/engine/plugins/table.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Status TablePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
4242
return Error(
4343
"InvalidOptions", "Number of bearings does not match number of coordinates", result);
4444
}
45-
45+
4646
if (!params.bearings.empty() && params.radiuses.size() != params.bearings.size())
4747
{
4848
return Error(

‎src/server/service/match_service.cpp

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,36 @@ std::string getWrongOptionHelp(const engine::api::MatchParameters &parameters)
1717
const auto coord_size = parameters.coordinates.size();
1818
const auto bearings_size = parameters.bearings.size();
1919

20-
const bool param_size_mismatch =
21-
constrainParamSize(
22-
PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, "coordinates", coord_size, help) ||
23-
constrainParamSize(
24-
PARAMETER_SIZE_MISMATCH_MSG, "bearings", parameters.bearings, "coordinates", coord_size, help) ||
25-
constrainParamSize(
26-
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "bearings", bearings_size, help) ||
27-
constrainParamSize(
28-
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "coordinates", coord_size, help) ||
29-
constrainParamSize(
30-
PARAMETER_SIZE_MISMATCH_MSG, "timestamps", parameters.timestamps, "coordinates", coord_size, help);
20+
const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
21+
"hints",
22+
parameters.hints,
23+
"coordinates",
24+
coord_size,
25+
help) ||
26+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
27+
"bearings",
28+
parameters.bearings,
29+
"coordinates",
30+
coord_size,
31+
help) ||
32+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
33+
"radiuses",
34+
parameters.radiuses,
35+
"bearings",
36+
bearings_size,
37+
help) ||
38+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
39+
"radiuses",
40+
parameters.radiuses,
41+
"coordinates",
42+
coord_size,
43+
help) ||
44+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
45+
"timestamps",
46+
parameters.timestamps,
47+
"coordinates",
48+
coord_size,
49+
help);
3150

3251
if (!param_size_mismatch && parameters.coordinates.size() < 2)
3352
{

‎src/server/service/nearest_service.cpp

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,30 @@ std::string getWrongOptionHelp(const engine::api::NearestParameters &parameters)
1919

2020
constrainParamSize(
2121
PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, "coordinates", coord_size, help);
22-
constrainParamSize(
23-
PARAMETER_SIZE_MISMATCH_MSG, "bearings", parameters.bearings, "coordinates", coord_size, help);
24-
constrainParamSize(
25-
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "bearings", bearings_size, help);
26-
constrainParamSize(
27-
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "coordinates", coord_size, help);
28-
constrainParamSize(
29-
PARAMETER_SIZE_MISMATCH_MSG, "approaches", parameters.approaches, "coordinates", coord_size, help);
22+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
23+
"bearings",
24+
parameters.bearings,
25+
"coordinates",
26+
coord_size,
27+
help);
28+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
29+
"radiuses",
30+
parameters.radiuses,
31+
"bearings",
32+
bearings_size,
33+
help);
34+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
35+
"radiuses",
36+
parameters.radiuses,
37+
"coordinates",
38+
coord_size,
39+
help);
40+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
41+
"approaches",
42+
parameters.approaches,
43+
"coordinates",
44+
coord_size,
45+
help);
3046

3147
return help;
3248
}

‎src/server/service/route_service.cpp

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,36 @@ std::string getWrongOptionHelp(const engine::api::RouteParameters &parameters)
1717
const auto coord_size = parameters.coordinates.size();
1818
const auto bearings_size = parameters.bearings.size();
1919

20-
const bool param_size_mismatch =
21-
constrainParamSize(
22-
PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, "coordinates", coord_size, help) ||
23-
constrainParamSize(
24-
PARAMETER_SIZE_MISMATCH_MSG, "bearings", parameters.bearings, "coordinates", coord_size, help) ||
25-
constrainParamSize(
26-
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "bearings", bearings_size, help) ||
27-
constrainParamSize(
28-
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "coordinates", coord_size, help) ||
29-
constrainParamSize(
30-
PARAMETER_SIZE_MISMATCH_MSG, "approaches", parameters.approaches, "coordinates", coord_size, help);
20+
const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
21+
"hints",
22+
parameters.hints,
23+
"coordinates",
24+
coord_size,
25+
help) ||
26+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
27+
"bearings",
28+
parameters.bearings,
29+
"coordinates",
30+
coord_size,
31+
help) ||
32+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
33+
"radiuses",
34+
parameters.radiuses,
35+
"bearings",
36+
bearings_size,
37+
help) ||
38+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
39+
"radiuses",
40+
parameters.radiuses,
41+
"coordinates",
42+
coord_size,
43+
help) ||
44+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
45+
"approaches",
46+
parameters.approaches,
47+
"coordinates",
48+
coord_size,
49+
help);
3150

3251
if (!param_size_mismatch && parameters.coordinates.size() < 2)
3352
{

‎src/server/service/table_service.cpp

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,36 @@ std::string getWrongOptionHelp(const engine::api::TableParameters &parameters)
1717
const auto coord_size = parameters.coordinates.size();
1818
const auto bearings_size = parameters.bearings.size();
1919

20-
const bool param_size_mismatch =
21-
constrainParamSize(
22-
PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, "coordinates", coord_size, help) ||
23-
constrainParamSize(
24-
PARAMETER_SIZE_MISMATCH_MSG, "bearings", parameters.bearings, "coordinates", coord_size, help) ||
25-
constrainParamSize(
26-
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "bearings", bearings_size, help) ||
27-
constrainParamSize(
28-
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "coordinates", coord_size, help) ||
29-
constrainParamSize(
30-
PARAMETER_SIZE_MISMATCH_MSG, "approaches", parameters.approaches, "coordinates", coord_size, help);
20+
const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
21+
"hints",
22+
parameters.hints,
23+
"coordinates",
24+
coord_size,
25+
help) ||
26+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
27+
"bearings",
28+
parameters.bearings,
29+
"coordinates",
30+
coord_size,
31+
help) ||
32+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
33+
"radiuses",
34+
parameters.radiuses,
35+
"bearings",
36+
bearings_size,
37+
help) ||
38+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
39+
"radiuses",
40+
parameters.radiuses,
41+
"coordinates",
42+
coord_size,
43+
help) ||
44+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
45+
"approaches",
46+
parameters.approaches,
47+
"coordinates",
48+
coord_size,
49+
help);
3150

3251
if (!param_size_mismatch && parameters.coordinates.size() < 2)
3352
{

‎src/server/service/trip_service.cpp

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,36 @@ std::string getWrongOptionHelp(const engine::api::TripParameters &parameters)
1717
const auto coord_size = parameters.coordinates.size();
1818
const auto bearings_size = parameters.bearings.size();
1919

20-
const bool param_size_mismatch =
21-
constrainParamSize(
22-
PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, "coordinates", coord_size, help) ||
23-
constrainParamSize(
24-
PARAMETER_SIZE_MISMATCH_MSG, "bearings", parameters.bearings, "coordinates", coord_size, help) ||
25-
constrainParamSize(
26-
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "bearings", bearings_size, help) ||
27-
constrainParamSize(
28-
PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, "coordinates", coord_size, help) ||
29-
constrainParamSize(
30-
PARAMETER_SIZE_MISMATCH_MSG, "approaches", parameters.approaches, "coordinates", coord_size, help);
20+
const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
21+
"hints",
22+
parameters.hints,
23+
"coordinates",
24+
coord_size,
25+
help) ||
26+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
27+
"bearings",
28+
parameters.bearings,
29+
"coordinates",
30+
coord_size,
31+
help) ||
32+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
33+
"radiuses",
34+
parameters.radiuses,
35+
"bearings",
36+
bearings_size,
37+
help) ||
38+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
39+
"radiuses",
40+
parameters.radiuses,
41+
"coordinates",
42+
coord_size,
43+
help) ||
44+
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG,
45+
"approaches",
46+
parameters.approaches,
47+
"coordinates",
48+
coord_size,
49+
help);
3150

3251
if (!param_size_mismatch && parameters.coordinates.size() < 2)
3352
{

0 commit comments

Comments
 (0)