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

Fix missing capitalization of error codes

Browse Source
This commit is contained in:
Patrick Niklaus 2016-03-08 19:10:59 +01:00
parent b01c2bc8b8
commit 44c12afc3f
11 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,12 +36,12 @@ Status TablePlugin::HandleRequest(const api::TableParameters &params, util::json
if (!CheckAllCoordinates(params.coordinates)) if (!CheckAllCoordinates(params.coordinates))
{ {
return Error("invalid-options", "Coordinates are invalid", result); return Error("InvalidOptions", "Coordinates are invalid", result);
} }
if (params.bearings.size() > 0 && params.coordinates.size() != params.bearings.size()) if (params.bearings.size() > 0 && params.coordinates.size() != params.bearings.size())
{ {
return Error("invalid-options", "Number of bearings does not match number of coordinates", return Error("InvalidOptions", "Number of bearings does not match number of coordinates",
result); result);
} }
@ -50,7 +50,7 @@ Status TablePlugin::HandleRequest(const api::TableParameters &params, util::json
static_cast<std::size_t>(max_locations_distance_table * max_locations_distance_table))) static_cast<std::size_t>(max_locations_distance_table * max_locations_distance_table)))
{ {
return Error( return Error(
"invalid-options", "InvalidOptions",
"Number of entries " + "Number of entries " +
std::to_string(params.sources.size() * params.destinations.size()) + std::to_string(params.sources.size() * params.destinations.size()) +
" is higher than current maximum (" + " is higher than current maximum (" +
@ -63,7 +63,7 @@ Status TablePlugin::HandleRequest(const api::TableParameters &params, util::json
if (result_table.empty()) if (result_table.empty())
{ {
return Error("no-table", "No table found", result); return Error("NoTable", "No table found", result);
} }
api::TableAPI table_api{facade, params}; api::TableAPI table_api{facade, params};

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

@ -173,7 +173,7 @@ Status TripPlugin::HandleRequest(const api::TripParameters &parameters,
auto phantom_node_pairs = GetPhantomNodes(parameters); auto phantom_node_pairs = GetPhantomNodes(parameters);
if (phantom_node_pairs.size() != parameters.coordinates.size()) if (phantom_node_pairs.size() != parameters.coordinates.size())
{ {
return Error("no-segment", return Error("NoSegment",
std::string("Could not find a matching segment for coordinate ") + std::string("Could not find a matching segment for coordinate ") +
std::to_string(phantom_node_pairs.size()), std::to_string(phantom_node_pairs.size()),
json_result); json_result);

10
src/engine/plugins/viaroute.cpp
View File

@ -34,7 +34,7 @@ Status ViaRoutePlugin::HandleRequest(const api::RouteParameters &route_parameter
if (max_locations_viaroute > 0 && if (max_locations_viaroute > 0 &&
(static_cast<int>(route_parameters.coordinates.size()) > max_locations_viaroute)) (static_cast<int>(route_parameters.coordinates.size()) > max_locations_viaroute))
{ {
return Error("too-big", return Error("TooBig",
"Number of entries " + std::to_string(route_parameters.coordinates.size()) + "Number of entries " + std::to_string(route_parameters.coordinates.size()) +
" is higher than current maximum (" + " is higher than current maximum (" +
std::to_string(max_locations_viaroute) + ")", std::to_string(max_locations_viaroute) + ")",
@ -43,13 +43,13 @@ Status ViaRoutePlugin::HandleRequest(const api::RouteParameters &route_parameter
if (!CheckAllCoordinates(route_parameters.coordinates)) if (!CheckAllCoordinates(route_parameters.coordinates))
{ {
return Error("invalid-value", "Invalid coordinate value.", json_result); return Error("InvalidValue", "Invalid coordinate value.", json_result);
} }
auto phantom_node_pairs = GetPhantomNodes(route_parameters); auto phantom_node_pairs = GetPhantomNodes(route_parameters);
if (phantom_node_pairs.size() != route_parameters.coordinates.size()) if (phantom_node_pairs.size() != route_parameters.coordinates.size())
{ {
return Error("no-segment", return Error("NoSegment",
std::string("Could not find a matching segment for coordinate ") + std::string("Could not find a matching segment for coordinate ") +
std::to_string(phantom_node_pairs.size()), std::to_string(phantom_node_pairs.size()),
json_result); json_result);
@ -100,11 +100,11 @@ Status ViaRoutePlugin::HandleRequest(const api::RouteParameters &route_parameter
if (not_in_same_component) if (not_in_same_component)
{ {
return Error("no-route", "Impossible route between points", json_result); return Error("NoRoute", "Impossible route between points", json_result);
} }
else else
{ {
return Error("no-route", "No route found between points", json_result); return Error("NoRoute", "No route found between points", json_result);
} }
} }

2
src/server/request_handler.cpp
View File

@ -107,7 +107,7 @@ void RequestHandler::HandleRequest(const http::request &current_request, http::r
current_reply.status = http::reply::bad_request; current_reply.status = http::reply::bad_request;
result = util::json::Object(); result = util::json::Object();
auto &json_result = result.get<util::json::Object>(); auto &json_result = result.get<util::json::Object>();
json_result.values["code"] = "invalid-url"; json_result.values["code"] = "InvalidUrl";
json_result.values["message"] = "URL string malformed close to position " + json_result.values["message"] = "URL string malformed close to position " +
std::to_string(position) + ": \"" + context + "\""; std::to_string(position) + ": \"" + context + "\"";
} }

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

@ -51,7 +51,7 @@ engine::Status MatchService::RunQuery(std::string &query, ResultT &result)
if (!parameters || query_iterator != query.end()) if (!parameters || query_iterator != query.end())
{ {
const auto position = std::distance(query.begin(), query_iterator); const auto position = std::distance(query.begin(), query_iterator);
json_result.values["code"] = "invalid-query"; json_result.values["code"] = "InvalidQuery";
json_result.values["message"] = json_result.values["message"] =
"Query string malformed close to position " + std::to_string(position); "Query string malformed close to position " + std::to_string(position);
return engine::Status::Error; return engine::Status::Error;
@ -60,7 +60,7 @@ engine::Status MatchService::RunQuery(std::string &query, ResultT &result)
BOOST_ASSERT(parameters); BOOST_ASSERT(parameters);
if (!parameters->IsValid()) if (!parameters->IsValid())
{ {
json_result.values["code"] = "invalid-options"; json_result.values["code"] = "InvalidOptions";
json_result.values["message"] = getWrongOptionHelp(*parameters); json_result.values["message"] = getWrongOptionHelp(*parameters);
return engine::Status::Error; return engine::Status::Error;
} }

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

@ -50,7 +50,7 @@ engine::Status NearestService::RunQuery(std::string &query, ResultT &result)
if (!parameters || query_iterator != query.end()) if (!parameters || query_iterator != query.end())
{ {
const auto position = std::distance(query.begin(), query_iterator); const auto position = std::distance(query.begin(), query_iterator);
json_result.values["code"] = "invalid-query"; json_result.values["code"] = "InvalidQuery";
json_result.values["message"] = json_result.values["message"] =
"Query string malformed close to position " + std::to_string(position); "Query string malformed close to position " + std::to_string(position);
return engine::Status::Error; return engine::Status::Error;
@ -59,7 +59,7 @@ engine::Status NearestService::RunQuery(std::string &query, ResultT &result)
if (!parameters->IsValid()) if (!parameters->IsValid())
{ {
json_result.values["code"] = "invalid-options"; json_result.values["code"] = "InvalidOptions";
json_result.values["message"] = getWrongOptionHelp(*parameters); json_result.values["message"] = getWrongOptionHelp(*parameters);
return engine::Status::Error; return engine::Status::Error;
} }

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

@ -49,7 +49,7 @@ engine::Status RouteService::RunQuery(std::string &query, ResultT &result)
if (!parameters || query_iterator != query.end()) if (!parameters || query_iterator != query.end())
{ {
const auto position = std::distance(query.begin(), query_iterator); const auto position = std::distance(query.begin(), query_iterator);
json_result.values["code"] = "invalid-query"; json_result.values["code"] = "InvalidQuery";
json_result.values["message"] = json_result.values["message"] =
"Query string malformed close to position " + std::to_string(position); "Query string malformed close to position " + std::to_string(position);
return engine::Status::Error; return engine::Status::Error;
@ -58,7 +58,7 @@ engine::Status RouteService::RunQuery(std::string &query, ResultT &result)
if (!parameters->IsValid()) if (!parameters->IsValid())
{ {
json_result.values["code"] = "invalid-options"; json_result.values["code"] = "InvalidOptions";
json_result.values["message"] = getWrongOptionHelp(*parameters); json_result.values["message"] = getWrongOptionHelp(*parameters);
return engine::Status::Error; return engine::Status::Error;
} }

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

@ -68,7 +68,7 @@ engine::Status TableService::RunQuery(std::string &query, ResultT &result)
if (!parameters || query_iterator != query.end()) if (!parameters || query_iterator != query.end())
{ {
const auto position = std::distance(query.begin(), query_iterator); const auto position = std::distance(query.begin(), query_iterator);
json_result.values["code"] = "invalid-query"; json_result.values["code"] = "InvalidQuery";
json_result.values["message"] = json_result.values["message"] =
"Query string malformed close to position " + std::to_string(position); "Query string malformed close to position " + std::to_string(position);
return engine::Status::Error; return engine::Status::Error;
@ -77,7 +77,7 @@ engine::Status TableService::RunQuery(std::string &query, ResultT &result)
if (!parameters->IsValid()) if (!parameters->IsValid())
{ {
json_result.values["code"] = "invalid-options"; json_result.values["code"] = "InvalidOptions";
json_result.values["message"] = getWrongOptionHelp(*parameters); json_result.values["message"] = getWrongOptionHelp(*parameters);
return engine::Status::Error; return engine::Status::Error;
} }

4
src/server/service/tile_service.cpp
View File

@ -25,7 +25,7 @@ engine::Status TileService::RunQuery(std::string &query, ResultT &result)
const auto position = std::distance(query.begin(), query_iterator); const auto position = std::distance(query.begin(), query_iterator);
result = util::json::Object(); result = util::json::Object();
auto &json_result = result.get<util::json::Object>(); auto &json_result = result.get<util::json::Object>();
json_result.values["code"] = "invalid-query"; json_result.values["code"] = "InvalidQuery";
json_result.values["message"] = json_result.values["message"] =
"Query string malformed close to position " + std::to_string(position); "Query string malformed close to position " + std::to_string(position);
return engine::Status::Error; return engine::Status::Error;
@ -36,7 +36,7 @@ engine::Status TileService::RunQuery(std::string &query, ResultT &result)
{ {
result = util::json::Object(); result = util::json::Object();
auto &json_result = result.get<util::json::Object>(); auto &json_result = result.get<util::json::Object>();
json_result.values["code"] = "invalid-options"; json_result.values["code"] = "InvalidOptions";
json_result.values["message"] = "Invalid coodinates. Only zoomlevel 12+ is supported"; json_result.values["message"] = "Invalid coodinates. Only zoomlevel 12+ is supported";
return engine::Status::Error; return engine::Status::Error;
} }

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

@ -51,7 +51,7 @@ engine::Status TripService::RunQuery(std::string &query, ResultT &result)
const auto position = std::distance(query.begin(), query_iterator); const auto position = std::distance(query.begin(), query_iterator);
result = util::json::Object(); result = util::json::Object();
auto &json_result = result.get<util::json::Object>(); auto &json_result = result.get<util::json::Object>();
json_result.values["code"] = "invalid-query"; json_result.values["code"] = "InvalidQuery";
json_result.values["message"] = json_result.values["message"] =
"Query string malformed close to position " + std::to_string(position); "Query string malformed close to position " + std::to_string(position);
return engine::Status::Error; return engine::Status::Error;
@ -60,7 +60,7 @@ engine::Status TripService::RunQuery(std::string &query, ResultT &result)
if (!parameters->IsValid()) if (!parameters->IsValid())
{ {
json_result.values["code"] = "invalid-options"; json_result.values["code"] = "InvalidOptions";
json_result.values["message"] = getWrongOptionHelp(*parameters); json_result.values["message"] = getWrongOptionHelp(*parameters);
return engine::Status::Error; return engine::Status::Error;
} }

4
src/server/service_handler.cpp
View File

@ -33,7 +33,7 @@ engine::Status ServiceHandler::RunQuery(api::ParsedURL parsed_url,
{ {
result = util::json::Object(); result = util::json::Object();
auto &json_result = result.get<util::json::Object>(); auto &json_result = result.get<util::json::Object>();
json_result.values["code"] = "invalid-service"; json_result.values["code"] = "InvalidService";
json_result.values["message"] = "Service " + parsed_url.service + " not found!"; json_result.values["message"] = "Service " + parsed_url.service + " not found!";
return engine::Status::Error; return engine::Status::Error;
} }
@ -43,7 +43,7 @@ engine::Status ServiceHandler::RunQuery(api::ParsedURL parsed_url,
{ {
result = util::json::Object(); result = util::json::Object();
auto &json_result = result.get<util::json::Object>(); auto &json_result = result.get<util::json::Object>();
json_result.values["code"] = "invalid-version"; json_result.values["code"] = "InvalidVersion";
json_result.values["message"] = "Service " + parsed_url.service + " not found!"; json_result.values["message"] = "Service " + parsed_url.service + " not found!";
return engine::Status::Error; return engine::Status::Error;
} }