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

Makes table plugin adhere to v5 spec for limit violations, fixes #2100

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-03-17 13:52:45 +01:00 committed by Patrick Niklaus
parent 9dbd437233
commit cb212a7315
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,17 +44,18 @@ Status TablePlugin::HandleRequest(const api::TableParameters &params, util::json
result); result);
} }
// Empty sources or destinations means the user wants all of them included, respectively
// The ManyToMany routing algorithm we dispatch to below already handles this perfectly.
const auto num_sources =
params.sources.empty() ? params.coordinates.size() : params.sources.size();
const auto num_destinations =
params.destinations.empty() ? params.coordinates.size() : params.destinations.size();
if (max_locations_distance_table > 0 && if (max_locations_distance_table > 0 &&
(params.sources.size() * params.destinations.size() > ((num_sources * num_destinations) >
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("TooBig", "Too many table coordinates", result);
"InvalidOptions",
"Number of entries " +
std::to_string(params.sources.size() * params.destinations.size()) +
" is higher than current maximum (" +
std::to_string(max_locations_distance_table * max_locations_distance_table) + ")",
result);
} }
auto snapped_phantoms = SnapPhantomNodes(GetPhantomNodes(params)); auto snapped_phantoms = SnapPhantomNodes(GetPhantomNodes(params));