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

adapt viaroute plugin to query NN search for vector of phantom nodes

Browse Source
This commit is contained in:
Dennis Luxen 2014-12-29 15:27:32 +01:00
parent 67f68b47db
commit 95d1e8a4f1
2 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data_structures/phantom_node.hpp
View File

@ -78,6 +78,8 @@ struct PhantomNode
using PhantomNodeArray = std::vector<std::vector<PhantomNode>>; using PhantomNodeArray = std::vector<std::vector<PhantomNode>>;
using phantom_node_pair = std::pair<PhantomNode, PhantomNode>;
struct PhantomNodeLists struct PhantomNodeLists
{ {
std::vector<PhantomNode> source_phantom_list; std::vector<PhantomNode> source_phantom_list;

47
plugins/viaroute.hpp
View File

@ -71,37 +71,68 @@ template <class DataFacadeT> class ViaRoutePlugin final : public BasePlugin
void HandleRequest(const RouteParameters &route_parameters, http::Reply &reply) final void HandleRequest(const RouteParameters &route_parameters, http::Reply &reply) final
{ {
SimpleLogger().Write() << "handling call";
if (!check_all_coordinates(route_parameters.coordinates)) if (!check_all_coordinates(route_parameters.coordinates))
{ {
SimpleLogger().Write() << "coordinates not ok";
reply = http::Reply::StockReply(http::Reply::badRequest); reply = http::Reply::StockReply(http::Reply::badRequest);
return; return;
} }
reply.status = http::Reply::ok; reply.status = http::Reply::ok;
SimpleLogger().Write() << "coordinates ok";
std::vector<PhantomNode> phantom_node_vector(route_parameters.coordinates.size()); std::vector<phantom_node_pair> phantom_node_pair_list(route_parameters.coordinates.size());
const bool checksum_OK = (route_parameters.check_sum == facade->GetCheckSum()); const bool checksum_OK = (route_parameters.check_sum == facade->GetCheckSum());
for (const auto i : osrm::irange<std::size_t>(0, route_parameters.coordinates.size())) for (const auto i : osrm::irange<std::size_t>(0, route_parameters.coordinates.size()))
{ {
SimpleLogger().Write() << "[" << i << "] checking coordinate";
SimpleLogger().Write() << "route_parameters.hints.size()" << route_parameters.hints.size();
if (checksum_OK && i < route_parameters.hints.size() && if (checksum_OK && i < route_parameters.hints.size() &&
!route_parameters.hints[i].empty()) !route_parameters.hints[i].empty())
{ {
ObjectEncoder::DecodeFromBase64(route_parameters.hints[i], phantom_node_vector[i]); SimpleLogger().Write() << "decoding hint " << i;
if (phantom_node_vector[i].is_valid(facade->GetNumberOfNodes()))
ObjectEncoder::DecodeFromBase64(route_parameters.hints[i], phantom_node_pair_list[i]);
if (phantom_node_pair_list[i].first.is_valid(facade->GetNumberOfNodes()))
{ {
SimpleLogger().Write() << "decoded PhantomNode";
continue; continue;
} }
} }
facade->IncrementalFindPhantomNodeForCoordinate(route_parameters.coordinates[i], std::vector<PhantomNode> phantom_node_vector;
phantom_node_vector[i]); SimpleLogger().Write() << "finding coordinate";
if (facade->IncrementalFindPhantomNodeForCoordinate(route_parameters.coordinates[i],
phantom_node_vector,
1))
{
SimpleLogger().Write() << "found first PhantomNode";
BOOST_ASSERT(!phantom_node_vector.empty());
phantom_node_pair_list[i].first = phantom_node_vector.front();
if (phantom_node_vector.size() > 1)
{
SimpleLogger().Write() << "found second PhantomNode";
phantom_node_pair_list[i].second = phantom_node_vector.back();
}
} else {
SimpleLogger().Write() << "found no PhantomNode";
}
} }
//TODO: - if all PhantomNodes are from same tiny cc then take those
// - otherwise take all from big component.
// - rotate results into phantom_node_pair.first
RawRouteData raw_route; RawRouteData raw_route;
auto build_phantom_pairs = [&raw_route] (const PhantomNode &first, const PhantomNode &second) auto build_phantom_pairs = [&raw_route] (const phantom_node_pair &first_pair, const phantom_node_pair &second_pair)
{ {
raw_route.segment_end_coordinates.emplace_back(PhantomNodes{first, second}); raw_route.segment_end_coordinates.emplace_back(PhantomNodes{first_pair.first, first_pair.second});
}; };
osrm::for_each_pair(phantom_node_vector, build_phantom_pairs); osrm::for_each_pair(phantom_node_pair_list, build_phantom_pairs);
if (route_parameters.alternate_route && if (route_parameters.alternate_route &&
1 == raw_route.segment_end_coordinates.size()) 1 == raw_route.segment_end_coordinates.size())