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

Add max values for viaroute and trip and reorganize return code handling

Browse Source 
"status" is now always:
 - 200 if the request was successful
 - 207 if the result is empty (no path found)
 - 400 if the request is invalid

 viaroute and trip now have a maximum of 500 and 100 locations
 respectively. Override with the --max-viaroute-size and --max-trip-size
 parameters.
This commit is contained in:
Patrick Niklaus
2015-12-17 04:14:06 +01:00
parent 7eb2af6cd3
commit 78ac3cffde
16 changed files with 283 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/distance_table.hpp
+26 -12
View File
@@ -98,11 +98,14 @@ template <class DataFacadeT> class DistanceTablePlugin final : public BasePlugin
return is_destination;
});
if (number_of_sources * number_of_destination >
max_locations_distance_table * max_locations_distance_table)
if (max_locations_distance_table > 0 &&
(number_of_sources * number_of_destination >
max_locations_distance_table * max_locations_distance_table))
{
json_result.values["status_message"] =
"Number of bearings does not match number of coordinates.";
"Number of entries " + std::to_string(number_of_sources * number_of_destination) +
" is higher than current maximum (" +
std::to_string(max_locations_distance_table * max_locations_distance_table) + ")";
return 400;
}
@@ -123,7 +126,8 @@ template <class DataFacadeT> class DistanceTablePlugin final : public BasePlugin
{
if (route_parameters.is_source[i])
{
*phantom_node_source_out_iter = std::make_pair(current_phantom_node, current_phantom_node);
*phantom_node_source_out_iter =
std::make_pair(current_phantom_node, current_phantom_node);
if (route_parameters.is_destination[i])
{
*phantom_node_target_out_iter = *phantom_node_source_out_iter;
@@ -133,8 +137,10 @@ template <class DataFacadeT> class DistanceTablePlugin final : public BasePlugin
}
else
{
BOOST_ASSERT(route_parameters.is_destination[i] && !route_parameters.is_source[i]);
*phantom_node_target_out_iter = std::make_pair(current_phantom_node, current_phantom_node);
BOOST_ASSERT(route_parameters.is_destination[i] &&
!route_parameters.is_source[i]);
*phantom_node_target_out_iter =
std::make_pair(current_phantom_node, current_phantom_node);
phantom_node_target_out_iter++;
}
continue;
@@ -146,11 +152,14 @@ template <class DataFacadeT> class DistanceTablePlugin final : public BasePlugin
: 180;
if (route_parameters.is_source[i])
{
*phantom_node_source_out_iter = facade->NearestPhantomNodeWithAlternativeFromBigComponent(route_parameters.coordinates[i], bearing, range);
*phantom_node_source_out_iter =
facade->NearestPhantomNodeWithAlternativeFromBigComponent(
route_parameters.coordinates[i], bearing, range);
// we didn't found a fitting node, return error
if (!phantom_node_source_out_iter->first.is_valid(facade->GetNumberOfNodes()))
{
json_result.values["status_message"] = std::string("Could not find matching road for via ") + std::to_string(i);
json_result.values["status_message"] =
std::string("Could not find matching road for via ") + std::to_string(i);
return 400;
}
@@ -165,11 +174,14 @@ template <class DataFacadeT> class DistanceTablePlugin final : public BasePlugin
{
BOOST_ASSERT(route_parameters.is_destination[i] && !route_parameters.is_source[i]);
*phantom_node_target_out_iter = facade->NearestPhantomNodeWithAlternativeFromBigComponent(route_parameters.coordinates[i], bearing, range);
*phantom_node_target_out_iter =
facade->NearestPhantomNodeWithAlternativeFromBigComponent(
route_parameters.coordinates[i], bearing, range);
// we didn't found a fitting node, return error
if (!phantom_node_target_out_iter->first.is_valid(facade->GetNumberOfNodes()))
{
json_result.values["status_message"] = std::string("Could not find matching road for via ") + std::to_string(i);
json_result.values["status_message"] =
std::string("Could not find matching road for via ") + std::to_string(i);
return 400;
}
phantom_node_target_out_iter++;
@@ -181,11 +193,13 @@ template <class DataFacadeT> class DistanceTablePlugin final : public BasePlugin
BOOST_ASSERT((phantom_node_target_out_iter - phantom_node_target_vector.begin()) ==
number_of_destination);
// FIXME we should clear phantom_node_source_vector and phantom_node_target_vector after this
// FIXME we should clear phantom_node_source_vector and phantom_node_target_vector after
// this
auto snapped_source_phantoms = snapPhantomNodes(phantom_node_source_vector);
auto snapped_target_phantoms = snapPhantomNodes(phantom_node_target_vector);
auto result_table = search_engine_ptr->distance_table(snapped_source_phantoms, snapped_target_phantoms);
auto result_table =
search_engine_ptr->distance_table(snapped_source_phantoms, snapped_target_phantoms);
if (!result_table)
{
plugins/match.hpp
+10 -20
View File
@@ -272,10 +272,17 @@ template <class DataFacadeT> class MapMatchingPlugin : public BasePlugin
int HandleRequest(const RouteParameters &route_parameters,
osrm::json::Object &json_result) final override
{
// enforce maximum number of locations for performance reasons
if (max_locations_map_matching > 0 &&
static_cast<int>(route_parameters.coordinates.size()) > max_locations_map_matching)
{
json_result.values["status_message"] = "Too many coodindates.";
return 400;
}
// check number of parameters
if (!check_all_coordinates(route_parameters.coordinates))
{
json_result.values["status"] = 400;
json_result.values["status_message"] = "Invalid coordinates.";
return 400;
}
@@ -287,31 +294,19 @@ template <class DataFacadeT> class MapMatchingPlugin : public BasePlugin
const auto &input_bearings = route_parameters.bearings;
if (input_timestamps.size() > 0 && input_coords.size() != input_timestamps.size())
{
json_result.values["status"] = 400;
json_result.values["status_message"] = "Number of timestamps does not match number of coordinates.";
return 400;
}
if (input_bearings.size() > 0 && input_coords.size() != input_bearings.size())
{
json_result.values["status"] = 400;
json_result.values["status_message"] = "Number of bearings does not match number of coordinates.";
return 400;
}
// enforce maximum number of locations for performance reasons
if (max_locations_map_matching > 0 &&
static_cast<int>(input_coords.size()) > max_locations_map_matching)
{
json_result.values["status"] = 400;
json_result.values["status_message"] = "Too many coodindates.";
return 400;
}
// enforce maximum number of locations for performance reasons
if (static_cast<int>(input_coords.size()) < 2)
{
json_result.values["status"] = 400;
json_result.values["status_message"] = "At least two coordinates needed.";
return 400;
}
@@ -320,7 +315,6 @@ template <class DataFacadeT> class MapMatchingPlugin : public BasePlugin
getCandidates(input_coords, input_bearings, route_parameters.gps_precision, sub_trace_lengths, candidates_lists);
if (!found_candidates)
{
json_result.values["status"] = 400;
json_result.values["status_message"] = "No suitable matching candidates found.";
return 400;
}
@@ -385,15 +379,11 @@ template <class DataFacadeT> class MapMatchingPlugin : public BasePlugin
if (sub_matchings.empty())
{
json_result.values["status"] = 207;
json_result.values["status_message"] = "Cannot find matchings.";
}
else
{
json_result.values["status"] = 0;
json_result.values["status_message"] = "Found matchings.";
return 207;
}
json_result.values["status_message"] = "Found matchings.";
return 200;
}
plugins/nearest.hpp
+4 -5
View File
@@ -62,7 +62,7 @@ template <class DataFacadeT> class NearestPlugin final : public BasePlugin
const auto &input_bearings = route_parameters.bearings;
if (input_bearings.size() > 0 && route_parameters.coordinates.size() != input_bearings.size())
{
json_result.values["status"] = "Number of bearings does not match number of coordinates .";
json_result.values["status_message"] = "Number of bearings does not match number of coordinates.";
return 400;
}
@@ -73,13 +73,12 @@ template <class DataFacadeT> class NearestPlugin final : public BasePlugin
if (phantom_node_vector.empty() || !phantom_node_vector.front().phantom_node.is_valid())
{
json_result.values["status"] = 207;
json_result.values["status_message"] = "No nearest edge found.";
return 207;
}
else
{
// reply.status = http::Reply::ok;
json_result.values["status"] = 0;
json_result.values["status_message"] = "Found nearest edge.";
if (number_of_results > 1)
{
osrm::json::Array results;
plugins/trip.hpp
+39 -13
View File
@@ -63,9 +63,11 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
std::string descriptor_string;
DataFacadeT *facade;
std::unique_ptr<SearchEngine<DataFacadeT>> search_engine_ptr;
int max_locations_trip;
public:
explicit RoundTripPlugin(DataFacadeT *facade) : descriptor_string("trip"), facade(facade)
explicit RoundTripPlugin(DataFacadeT *facade, int max_locations_trip)
: descriptor_string("trip"), facade(facade), max_locations_trip(max_locations_trip)
{
search_engine_ptr = osrm::make_unique<SearchEngine<DataFacadeT>>(facade);
}
@@ -96,8 +98,13 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
}
}
const int bearing = input_bearings.size() > 0 ? input_bearings[i].first : 0;
const int range = input_bearings.size() > 0 ? (input_bearings[i].second?*input_bearings[i].second:10) : 180;
phantom_node_list.push_back(facade->NearestPhantomNodes(route_parameters.coordinates[i], 1, bearing, range).front().phantom_node);
const int range = input_bearings.size() > 0
? (input_bearings[i].second ? *input_bearings[i].second : 10)
: 180;
phantom_node_list.push_back(
facade->NearestPhantomNodes(route_parameters.coordinates[i], 1, bearing, range)
.front()
.phantom_node);
BOOST_ASSERT(phantom_node_list.back().is_valid(facade->GetNumberOfNodes()));
}
@@ -125,8 +132,7 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
BOOST_ASSERT_MSG(component.size() >= range.size(),
"scc component and its ranges do not match");
BOOST_ASSERT_MSG(component.size() > 0, "there's no scc component");
BOOST_ASSERT_MSG(*std::max_element(range.begin(), range.end()) <=
component.size(),
BOOST_ASSERT_MSG(*std::max_element(range.begin(), range.end()) <= component.size(),
"scc component ranges are out of bound");
BOOST_ASSERT_MSG(*std::min_element(range.begin(), range.end()) >= 0,
"invalid scc component range");
@@ -221,16 +227,17 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
// if from_node is the last node, compute the route from the last to the first location
const auto to_node = std::next(it) != end ? *std::next(it) : *start;
viapoint =
PhantomNodes{phantom_node_list[from_node], phantom_node_list[to_node]};
viapoint = PhantomNodes{phantom_node_list[from_node], phantom_node_list[to_node]};
min_route.segment_end_coordinates.emplace_back(viapoint);
}
BOOST_ASSERT(min_route.segment_end_coordinates.size() == trip.size());
std::vector<bool> uturns(trip.size() + 1);
std::transform(trip.begin(), trip.end(), uturns.begin(), [&route_parameters](const NodeID idx) {
return route_parameters.uturns[idx];
});
std::transform(trip.begin(), trip.end(), uturns.begin(),
[&route_parameters](const NodeID idx)
{
return route_parameters.uturns[idx];
});
uturns.back() = route_parameters.uturns[trip.front()];
search_engine_ptr->shortest_path(min_route.segment_end_coordinates, uturns, min_route);
@@ -242,6 +249,15 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
int HandleRequest(const RouteParameters &route_parameters,
osrm::json::Object &json_result) override final
{
if (max_locations_trip > 0 &&
(static_cast<int>(route_parameters.coordinates.size()) > max_locations_trip))
{
json_result.values["status_message"] =
"Number of entries " + std::to_string(route_parameters.coordinates.size()) +
" is higher than current maximum (" + std::to_string(max_locations_trip) + ")";
return 400;
}
// check if all inputs are coordinates
if (!check_all_coordinates(route_parameters.coordinates))
{
@@ -250,9 +266,11 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
}
const auto &input_bearings = route_parameters.bearings;
if (input_bearings.size() > 0 && route_parameters.coordinates.size() != input_bearings.size())
if (input_bearings.size() > 0 &&
route_parameters.coordinates.size() != input_bearings.size())
{
json_result.values["status_message"] = "Number of bearings does not match number of coordinates.";
json_result.values["status_message"] =
"Number of bearings does not match number of coordinates.";
return 400;
}
@@ -262,7 +280,8 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
// compute the distance table of all phantom nodes
const auto result_table = DistTableWrapper<EdgeWeight>(
*search_engine_ptr->distance_table(phantom_node_list, phantom_node_list), number_of_locations);
*search_engine_ptr->distance_table(phantom_node_list, phantom_node_list),
number_of_locations);
if (result_table.size() == 0)
{
@@ -359,6 +378,13 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
json_result.values["trips"] = std::move(trip);
if (trip.values.empty())
{
json_result.values["status_message"] = "Cannot find trips.";
return 207;
}
json_result.values["status_message"] = "Found trips.";
return 200;
}
};
plugins/viaroute.hpp
+15 -2
View File
@@ -57,9 +57,12 @@ template <class DataFacadeT> class ViaRoutePlugin final : public BasePlugin
std::string descriptor_string;
std::unique_ptr<SearchEngine<DataFacadeT>> search_engine_ptr;
DataFacadeT *facade;
int max_locations_viaroute;
public:
explicit ViaRoutePlugin(DataFacadeT *facade) : descriptor_string("viaroute"), facade(facade)
explicit ViaRoutePlugin(DataFacadeT *facade, int max_locations_viaroute)
: descriptor_string("viaroute"), facade(facade),
max_locations_viaroute(max_locations_viaroute)
{
search_engine_ptr = osrm::make_unique<SearchEngine<DataFacadeT>>(facade);
@@ -75,6 +78,15 @@ template <class DataFacadeT> class ViaRoutePlugin final : public BasePlugin
int HandleRequest(const RouteParameters &route_parameters,
osrm::json::Object &json_result) override final
{
if (max_locations_viaroute > 0 &&
(static_cast<int>(route_parameters.coordinates.size()) > max_locations_viaroute))
{
json_result.values["status_message"] =
"Number of entries " + std::to_string(route_parameters.coordinates.size()) +
" is higher than current maximum (" + std::to_string(max_locations_viaroute) + ")";
return 400;
}
if (!check_all_coordinates(route_parameters.coordinates))
{
json_result.values["status_message"] = "Invalid coordinates.";
@@ -189,8 +201,9 @@ template <class DataFacadeT> class ViaRoutePlugin final : public BasePlugin
});
if (not_in_same_component)
{
SimpleLogger().Write(logDEBUG) << "Coordinates not in same component.";
json_result.values["status_message"] = "Impossible route between points.";
return 400;
return 207;
}
}