34cc00dc3c
Removes the breaking libosrm API change by replacing the use of variant response type with method overloading. This has the added benefit of being explicit about the supported response types for each libosrm API method.
86 lines
2.7 KiB
C++
86 lines
2.7 KiB
C++
#include "server/service/match_service.hpp"
|
|
|
|
#include "server/api/parameters_parser.hpp"
|
|
#include "server/service/utils.hpp"
|
|
#include "engine/api/match_parameters.hpp"
|
|
|
|
#include "util/json_container.hpp"
|
|
|
|
#include <boost/format.hpp>
|
|
|
|
namespace osrm
|
|
{
|
|
namespace server
|
|
{
|
|
namespace service
|
|
{
|
|
namespace
|
|
{
|
|
std::string getWrongOptionHelp(const engine::api::MatchParameters ¶meters)
|
|
{
|
|
std::string help;
|
|
|
|
const auto coord_size = parameters.coordinates.size();
|
|
|
|
const bool param_size_mismatch =
|
|
constrainParamSize(
|
|
PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, 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) ||
|
|
constrainParamSize(
|
|
PARAMETER_SIZE_MISMATCH_MSG, "timestamps", parameters.timestamps, coord_size, help);
|
|
|
|
if (!param_size_mismatch && parameters.coordinates.size() < 2)
|
|
{
|
|
help = "Number of coordinates needs to be at least two.";
|
|
}
|
|
|
|
return help;
|
|
}
|
|
} // anon. ns
|
|
|
|
engine::Status MatchService::RunQuery(std::size_t prefix_length,
|
|
std::string &query,
|
|
osrm::engine::api::ResultT &result)
|
|
{
|
|
result = util::json::Object();
|
|
auto &json_result = result.get<util::json::Object>();
|
|
|
|
auto query_iterator = query.begin();
|
|
auto parameters =
|
|
api::parseParameters<engine::api::MatchParameters>(query_iterator, query.end());
|
|
if (!parameters || query_iterator != query.end())
|
|
{
|
|
const auto position = std::distance(query.begin(), query_iterator);
|
|
json_result.values["code"] = "InvalidQuery";
|
|
json_result.values["message"] =
|
|
"Query string malformed close to position " + std::to_string(prefix_length + position);
|
|
return engine::Status::Error;
|
|
}
|
|
|
|
BOOST_ASSERT(parameters);
|
|
if (!parameters->IsValid())
|
|
{
|
|
json_result.values["code"] = "InvalidOptions";
|
|
json_result.values["message"] = getWrongOptionHelp(*parameters);
|
|
return engine::Status::Error;
|
|
}
|
|
BOOST_ASSERT(parameters->IsValid());
|
|
|
|
if (parameters->format)
|
|
{
|
|
if (parameters->format == engine::api::BaseParameters::OutputFormatType::FLATBUFFERS)
|
|
{
|
|
result = flatbuffers::FlatBufferBuilder();
|
|
auto &fb_result = result.get<flatbuffers::FlatBufferBuilder>();
|
|
return BaseService::routing_machine.Match(*parameters, fb_result);
|
|
}
|
|
}
|
|
return BaseService::routing_machine.Match(*parameters, json_result);
|
|
}
|
|
}
|
|
}
|
|
}
|