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

Fix classes for service member function definitions

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-02-17 16:01:44 -08:00 committed by Patrick Niklaus
parent 0c64503218
commit 6aa5ab5904
5 changed files with 60 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,9 +14,9 @@ namespace server
namespace service namespace service
{ {
engine::Status RouteService::RunQuery(std::vector<util::FixedPointCoordinate> coordinates, engine::Status MatchService::RunQuery(std::vector<util::FixedPointCoordinate> coordinates,
std::string &options, std::string &options,
util::json::Object &json_result) util::json::Object &result)
{ {
// TODO(daniel-j-h) // TODO(daniel-j-h)
return Status::Error; return Status::Error;

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

@ -14,9 +14,9 @@ namespace server
namespace service namespace service
{ {
engine::Status RouteService::RunQuery(std::vector<util::FixedPointCoordinate> coordinates, engine::Status NearestService::RunQuery(std::vector<util::FixedPointCoordinate> coordinates,
std::string &options, std::string &options,
util::json::Object &json_result) util::json::Object &result)
{ {
// TODO(daniel-j-h) // TODO(daniel-j-h)
return Status::Error; return Status::Error;

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

@ -14,12 +14,18 @@ namespace server
namespace service namespace service
{ {
namespace { namespace
{
const constexpr char PARAMETER_SIZE_MISMATCH_MSG[] = "Number of elements in %1% size %2% does not match coordinate size %3%"; const constexpr char PARAMETER_SIZE_MISMATCH_MSG[] =
"Number of elements in %1% size %2% does not match coordinate size %3%";
template<typename ParamT> template <typename ParamT>
bool constrainParamSize(const char* msg_template, const char* name, const ParamT& param, const std::size_t target_size, std::string& help) bool constrainParamSize(const char *msg_template,
const char *name,
const ParamT &param,
const std::size_t target_size,
std::string &help)
{ {
if (param.size() > 0 && param.size() != target_size) if (param.size() > 0 && param.size() != target_size)
{ {
@ -29,16 +35,20 @@ bool constrainParamSize(const char* msg_template, const char* name, const ParamT
return false; return false;
} }
std::string getWrongOptionHelp(const engine::api::RouteParameters& parameters) std::string getWrongOptionHelp(const engine::api::RouteParameters &parameters)
{ {
std::string help; std::string help;
const auto coord_size = parameters.coordinates.size(); const auto coord_size = parameters.coordinates.size();
const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, coord_size, help) const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "hints",
|| constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "bearings", parameters.bearings, coord_size, help) parameters.hints, coord_size, help) ||
|| constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, coord_size, help) constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "bearings",
|| constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "uturns", parameters.uturns, coord_size, help); parameters.bearings, coord_size, help) ||
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "radiuses",
parameters.radiuses, coord_size, help) ||
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "uturns",
parameters.uturns, coord_size, help);
if (!param_size_mismatch && parameters.coordinates.size() < 2) if (!param_size_mismatch && parameters.coordinates.size() < 2)
{ {
@ -51,16 +61,17 @@ std::string getWrongOptionHelp(const engine::api::RouteParameters& parameters)
engine::Status RouteService::RunQuery(std::vector<util::FixedPointCoordinate> coordinates, engine::Status RouteService::RunQuery(std::vector<util::FixedPointCoordinate> coordinates,
std::string &options, std::string &options,
util::json::Object &json_result) util::json::Object &result)
{ {
auto options_iterator = options.begin(); auto options_iterator = options.begin();
auto parameters = api::parseParameters<engine::api::RouteParameters>(options_iterator, options.end()); auto parameters =
api::parseParameters<engine::api::RouteParameters>(options_iterator, options.end());
if (!parameters || options_iterator != options.end()) if (!parameters || options_iterator != options.end())
{ {
const auto position = std::distance(options.begin(), options_iterator); const auto position = std::distance(options.begin(), options_iterator);
json_result.values["code"] = "invalid-options"; result.values["code"] = "invalid-options";
json_result.values["message"] = result.values["message"] =
"Options string malformed close to position " + std::to_string(position); "Options string malformed close to position " + std::to_string(position);
return engine::Status::Error; return engine::Status::Error;
} }
@ -70,13 +81,13 @@ engine::Status RouteService::RunQuery(std::vector<util::FixedPointCoordinate> co
if (!parameters->IsValid()) if (!parameters->IsValid())
{ {
json_result.values["code"] = "invalid-options"; result.values["code"] = "invalid-options";
json_result.values["message"] = getWrongOptionHelp(*parameters); result.values["message"] = getWrongOptionHelp(*parameters);
return engine::Status::Error; return engine::Status::Error;
} }
BOOST_ASSERT(parameters->IsValid()); BOOST_ASSERT(parameters->IsValid());
return BaseService::routing_machine.Route(*parameters, json_result); return BaseService::routing_machine.Route(*parameters, result);
} }
} }
} }

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

@ -14,12 +14,18 @@ namespace server
namespace service namespace service
{ {
namespace { namespace
{
const constexpr char PARAMETER_SIZE_MISMATCH_MSG[] = "Number of elements in %1% size %2% does not match coordinate size %3%"; const constexpr char PARAMETER_SIZE_MISMATCH_MSG[] =
"Number of elements in %1% size %2% does not match coordinate size %3%";
template<typename ParamT> template <typename ParamT>
bool constrainParamSize(const char* msg_template, const char* name, const ParamT& param, const std::size_t target_size, std::string& help) bool constrainParamSize(const char *msg_template,
const char *name,
const ParamT &param,
const std::size_t target_size,
std::string &help)
{ {
if (param.size() > 0 && param.size() != target_size) if (param.size() > 0 && param.size() != target_size)
{ {
@ -29,15 +35,18 @@ bool constrainParamSize(const char* msg_template, const char* name, const ParamT
return false; return false;
} }
std::string getWrongOptionHelp(const engine::api::TableParameters& parameters) std::string getWrongOptionHelp(const engine::api::TableParameters &parameters)
{ {
std::string help; std::string help;
const auto coord_size = parameters.coordinates.size(); const auto coord_size = parameters.coordinates.size();
const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, coord_size, help) const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "hints",
|| constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "bearings", parameters.bearings, coord_size, help) parameters.hints, coord_size, help) ||
|| constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, coord_size, help); constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "bearings",
parameters.bearings, coord_size, help) ||
constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "radiuses",
parameters.radiuses, coord_size, help);
if (!param_size_mismatch && parameters.coordinates.size() < 2) if (!param_size_mismatch && parameters.coordinates.size() < 2)
{ {
@ -50,16 +59,17 @@ std::string getWrongOptionHelp(const engine::api::TableParameters& parameters)
engine::Status TableService::RunQuery(std::vector<util::FixedPointCoordinate> coordinates, engine::Status TableService::RunQuery(std::vector<util::FixedPointCoordinate> coordinates,
std::string &options, std::string &options,
util::json::Object &json_result) util::json::Object &result)
{ {
auto options_iterator = options.begin(); auto options_iterator = options.begin();
auto parameters = api::parseParameters<engine::api::TableParameters>(options_iterator, options.end()); auto parameters =
api::parseParameters<engine::api::TableParameters>(options_iterator, options.end());
if (!parameters || options_iterator != options.end()) if (!parameters || options_iterator != options.end())
{ {
const auto position = std::distance(options.begin(), options_iterator); const auto position = std::distance(options.begin(), options_iterator);
json_result.values["code"] = "invalid-options"; result.values["code"] = "invalid-options";
json_result.values["message"] = result.values["message"] =
"Options string malformed close to position " + std::to_string(position); "Options string malformed close to position " + std::to_string(position);
return engine::Status::Error; return engine::Status::Error;
} }
@ -69,13 +79,13 @@ engine::Status TableService::RunQuery(std::vector<util::FixedPointCoordinate> co
if (!parameters->IsValid()) if (!parameters->IsValid())
{ {
json_result.values["code"] = "invalid-options"; result.values["code"] = "invalid-options";
json_result.values["message"] = getWrongOptionHelp(*parameters); result.values["message"] = getWrongOptionHelp(*parameters);
return engine::Status::Error; return engine::Status::Error;
} }
BOOST_ASSERT(parameters->IsValid()); BOOST_ASSERT(parameters->IsValid());
return BaseService::routing_machine.Table(*parameters, json_result); return BaseService::routing_machine.Table(*parameters, result);
} }
} }
} }

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

@ -14,9 +14,9 @@ namespace server
namespace service namespace service
{ {
engine::Status RouteService::RunQuery(std::vector<util::FixedPointCoordinate> coordinates, engine::Status TripService::RunQuery(std::vector<util::FixedPointCoordinate> coordinates,
std::string &options, std::string &options,
util::json::Object &json_result) util::json::Object &result)
{ {
// TODO(daniel-j-h) // TODO(daniel-j-h)
return Status::Error; return Status::Error;