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

Fix match plugin status codes

Browse Source
This commit is contained in:
Patrick Niklaus 2015-11-18 22:21:17 +01:00
parent d843521839
commit 61f015eef6
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
descriptors/json_descriptor.hpp
View File

@ -105,7 +105,6 @@ template <class DataFacadeT> class JSONDescriptor final : public BaseDescriptor<
// We do not need to do much, if there is no route ;-) // We do not need to do much, if there is no route ;-)
json_result.values["status"] = 207; json_result.values["status"] = 207;
json_result.values["status_message"] = "Cannot find route between points"; json_result.values["status_message"] = "Cannot find route between points";
// osrm::json::render(reply.content, json_result);
return; return;
} }

35
plugins/match.hpp
View File

@ -273,7 +273,8 @@ template <class DataFacadeT> class MapMatchingPlugin : public BasePlugin
// check number of parameters // check number of parameters
if (!check_all_coordinates(route_parameters.coordinates)) if (!check_all_coordinates(route_parameters.coordinates))
{ {
json_result.values["status"] = "Invalid coordinates."; json_result.values["status"] = 400;
json_result.values["status_message"] = "Invalid coordinates.";
return 400; return 400;
} }
@ -284,13 +285,15 @@ template <class DataFacadeT> class MapMatchingPlugin : public BasePlugin
const auto &input_bearings = route_parameters.bearings; const auto &input_bearings = route_parameters.bearings;
if (input_timestamps.size() > 0 && input_coords.size() != input_timestamps.size()) if (input_timestamps.size() > 0 && input_coords.size() != input_timestamps.size())
{ {
json_result.values["status"] = "Number of timestamps does not match number of coordinates ."; json_result.values["status"] = 400;
json_result.values["status_message"] = "Number of timestamps does not match number of coordinates.";
return 400; return 400;
} }
if (input_bearings.size() > 0 && input_coords.size() != input_bearings.size()) if (input_bearings.size() > 0 && input_coords.size() != input_bearings.size())
{ {
json_result.values["status"] = "Number of bearings does not match number of coordinates ."; json_result.values["status"] = 400;
json_result.values["status_message"] = "Number of bearings does not match number of coordinates.";
return 400; return 400;
} }
@ -298,14 +301,16 @@ template <class DataFacadeT> class MapMatchingPlugin : public BasePlugin
if (max_locations_map_matching > 0 && if (max_locations_map_matching > 0 &&
static_cast<int>(input_coords.size()) < max_locations_map_matching) static_cast<int>(input_coords.size()) < max_locations_map_matching)
{ {
json_result.values["status"] = "Too many coodindates."; json_result.values["status"] = 400;
json_result.values["status_message"] = "Too many coodindates.";
return 400; return 400;
} }
// enforce maximum number of locations for performance reasons // enforce maximum number of locations for performance reasons
if (static_cast<int>(input_coords.size()) < 2) if (static_cast<int>(input_coords.size()) < 2)
{ {
json_result.values["status"] = "At least two coordinates needed."; json_result.values["status"] = 400;
json_result.values["status_message"] = "At least two coordinates needed.";
return 400; return 400;
} }
@ -313,7 +318,8 @@ template <class DataFacadeT> class MapMatchingPlugin : public BasePlugin
getCandidates(input_coords, input_bearings, route_parameters.gps_precision, sub_trace_lengths, candidates_lists); getCandidates(input_coords, input_bearings, route_parameters.gps_precision, sub_trace_lengths, candidates_lists);
if (!found_candidates) if (!found_candidates)
{ {
json_result.values["status"] = "No suitable matching candidates found."; json_result.values["status"] = 400;
json_result.values["status_message"] = "No suitable matching candidates found.";
return 400; return 400;
} }
@ -327,12 +333,6 @@ template <class DataFacadeT> class MapMatchingPlugin : public BasePlugin
route_parameters.matching_beta, route_parameters.matching_beta,
route_parameters.gps_precision, sub_matchings); route_parameters.gps_precision, sub_matchings);
if (sub_matchings.empty())
{
json_result.values["status"] = "No matchings found.";
return 400;
}
osrm::json::Array matchings; osrm::json::Array matchings;
for (auto &sub : sub_matchings) for (auto &sub : sub_matchings)
{ {
@ -379,6 +379,17 @@ template <class DataFacadeT> class MapMatchingPlugin : public BasePlugin
osrm::json::Logger::get()->render("matching", json_result); osrm::json::Logger::get()->render("matching", json_result);
json_result.values["matchings"] = matchings; json_result.values["matchings"] = matchings;
if (sub_matchings.empty())
{
json_result.values["status"] = 0;
json_result.values["status_message"] = "Found matchings.";
}
else
{
json_result.values["status"] = 207;
json_result.values["status_message"] = "Cannot find matchings.";
}
return 200; return 200;
} }