Added full flatbuffers support to the Table service
This commit is contained in:
Denis Chaplygin
@@ -45,6 +45,75 @@ class TableAPI final : public BaseAPI
|
||||
{
|
||||
}
|
||||
|
||||
virtual void
|
||||
MakeResponse(const std::pair<std::vector<EdgeDuration>, std::vector<EdgeDistance>> &tables,
|
||||
const std::vector<PhantomNode> &phantoms,
|
||||
const std::vector<TableCellRef> &fallback_speed_cells,
|
||||
osrm::engine::api::ResultT &response) const
|
||||
{
|
||||
if(response.is<flatbuffers::FlatBufferBuilder>()) {
|
||||
auto& fb_result = response.get<flatbuffers::FlatBufferBuilder>();
|
||||
MakeResponse(tables, phantoms, fallback_speed_cells, fb_result);
|
||||
} else {
|
||||
auto& json_result = response.get<util::json::Object>();
|
||||
MakeResponse(tables, phantoms, fallback_speed_cells, json_result);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
virtual void
|
||||
MakeResponse(const std::pair<std::vector<EdgeDuration>, std::vector<EdgeDistance>> &tables,
|
||||
const std::vector<PhantomNode> &phantoms,
|
||||
const std::vector<TableCellRef> &fallback_speed_cells,
|
||||
flatbuffers::FlatBufferBuilder &fb_result) const {
|
||||
auto number_of_sources = parameters.sources.size();
|
||||
auto number_of_destinations = parameters.destinations.size();
|
||||
|
||||
fbresult::FBResultBuilder response(fb_result);
|
||||
response.add_code(fb_result.CreateString("Ok"));
|
||||
response.add_response_type(osrm::engine::api::fbresult::ServiceResponse::ServiceResponse_table);
|
||||
|
||||
fbresult::TableBuilder table(fb_result);
|
||||
|
||||
// symmetric case
|
||||
if (parameters.sources.empty())
|
||||
{
|
||||
table.add_sources(MakeWaypoints(fb_result, phantoms));
|
||||
number_of_sources = phantoms.size();
|
||||
}
|
||||
else
|
||||
{
|
||||
table.add_sources(MakeWaypoints(fb_result, phantoms, parameters.sources));
|
||||
}
|
||||
|
||||
if (parameters.destinations.empty())
|
||||
{
|
||||
table.add_destinations(MakeWaypoints(fb_result, phantoms));
|
||||
number_of_destinations = phantoms.size();
|
||||
}
|
||||
else
|
||||
{
|
||||
table.add_destinations(MakeWaypoints(fb_result, phantoms, parameters.destinations));
|
||||
}
|
||||
|
||||
if (parameters.annotations & TableParameters::AnnotationsType::Duration)
|
||||
{
|
||||
table.add_durations(MakeDurationTable(fb_result, tables.first, number_of_sources, number_of_destinations));
|
||||
}
|
||||
|
||||
if (parameters.annotations & TableParameters::AnnotationsType::Distance)
|
||||
{
|
||||
table.add_distances(MakeDistanceTable(fb_result, tables.second, number_of_sources, number_of_destinations));
|
||||
}
|
||||
|
||||
if (parameters.fallback_speed != INVALID_FALLBACK_SPEED && parameters.fallback_speed > 0)
|
||||
{
|
||||
table.add_fallback_speed_cells(MakeEstimatesTable(fb_result, fallback_speed_cells));
|
||||
}
|
||||
|
||||
fb_result.Finish(response.Finish());
|
||||
}
|
||||
|
||||
virtual void
|
||||
MakeResponse(const std::pair<std::vector<EdgeDuration>, std::vector<EdgeDistance>> &tables,
|
||||
const std::vector<PhantomNode> &phantoms,
|
||||
@@ -96,6 +165,109 @@ class TableAPI final : public BaseAPI
|
||||
}
|
||||
|
||||
protected:
|
||||
virtual flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<fbresult::Waypoint>>>
|
||||
MakeWaypoints(flatbuffers::FlatBufferBuilder& builder, const std::vector<PhantomNode> &phantoms) const
|
||||
{
|
||||
std::vector<flatbuffers::Offset<fbresult::Waypoint>> waypoints;
|
||||
waypoints.reserve(phantoms.size());
|
||||
BOOST_ASSERT(phantoms.size() == parameters.coordinates.size());
|
||||
|
||||
boost::range::transform(
|
||||
phantoms,
|
||||
std::back_inserter(waypoints),
|
||||
[this, &builder](const PhantomNode &phantom) { return BaseAPI::MakeWaypoint(builder, phantom); });
|
||||
return builder.CreateVector(waypoints);
|
||||
}
|
||||
|
||||
virtual flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<fbresult::Waypoint>>>
|
||||
MakeWaypoints(flatbuffers::FlatBufferBuilder& builder,
|
||||
const std::vector<PhantomNode> &phantoms,
|
||||
const std::vector<std::size_t> &indices) const
|
||||
{
|
||||
std::vector<flatbuffers::Offset<fbresult::Waypoint>> waypoints;
|
||||
waypoints.reserve(indices.size());
|
||||
boost::range::transform(indices,
|
||||
std::back_inserter(waypoints),
|
||||
[this, &builder, phantoms](const std::size_t idx) {
|
||||
BOOST_ASSERT(idx < phantoms.size());
|
||||
return BaseAPI::MakeWaypoint(builder, phantoms[idx]);
|
||||
});
|
||||
return builder.CreateVector(waypoints);
|
||||
}
|
||||
|
||||
virtual flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<fbresult::VectorDouble>>>
|
||||
MakeDurationTable(flatbuffers::FlatBufferBuilder& builder,
|
||||
const std::vector<EdgeWeight> &values,
|
||||
std::size_t number_of_rows,
|
||||
std::size_t number_of_columns) const
|
||||
{
|
||||
std::vector<flatbuffers::Offset<fbresult::VectorDouble>> fb_table;
|
||||
for (const auto row : util::irange<std::size_t>(0UL, number_of_rows))
|
||||
{
|
||||
std::vector<double> fb_row;
|
||||
auto row_begin_iterator = values.begin() + (row * number_of_columns);
|
||||
auto row_end_iterator = values.begin() + ((row + 1) * number_of_columns);
|
||||
fb_row.resize(number_of_columns);
|
||||
std::transform(row_begin_iterator,
|
||||
row_end_iterator,
|
||||
fb_row.begin(),
|
||||
[](const EdgeWeight duration) -> double {
|
||||
if (duration == MAXIMAL_EDGE_DURATION)
|
||||
{
|
||||
return MAXIMAL_EDGE_DURATION;
|
||||
}
|
||||
// division by 10 because the duration is in deciseconds (10s)
|
||||
return duration / 10.;
|
||||
});
|
||||
fb_table.push_back(fbresult::CreateVectorDoubleDirect(builder, &fb_row));
|
||||
}
|
||||
return builder.CreateVector(fb_table);
|
||||
}
|
||||
|
||||
virtual flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<fbresult::VectorDouble>>>
|
||||
MakeDistanceTable(flatbuffers::FlatBufferBuilder& builder,
|
||||
const std::vector<EdgeDistance> &values,
|
||||
std::size_t number_of_rows,
|
||||
std::size_t number_of_columns) const
|
||||
{
|
||||
std::vector<flatbuffers::Offset<fbresult::VectorDouble>> fb_table;
|
||||
for (const auto row : util::irange<std::size_t>(0UL, number_of_rows))
|
||||
{
|
||||
std::vector<double> fb_row;
|
||||
auto row_begin_iterator = values.begin() + (row * number_of_columns);
|
||||
auto row_end_iterator = values.begin() + ((row + 1) * number_of_columns);
|
||||
fb_row.resize(number_of_columns);
|
||||
std::transform(row_begin_iterator,
|
||||
row_end_iterator,
|
||||
fb_row.begin(),
|
||||
[](const EdgeDistance distance) -> double {
|
||||
if (distance == INVALID_EDGE_DISTANCE) {
|
||||
return INVALID_EDGE_DISTANCE;
|
||||
}
|
||||
// round to single decimal place
|
||||
return std::round(distance * 10) / 10.;
|
||||
});
|
||||
fb_table.push_back(fbresult::CreateVectorDoubleDirect(builder, &fb_row));
|
||||
}
|
||||
return builder.CreateVector(fb_table);
|
||||
}
|
||||
|
||||
virtual flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<fbresult::VectorDouble>>>
|
||||
MakeEstimatesTable(flatbuffers::FlatBufferBuilder& builder, const std::vector<TableCellRef> &fallback_speed_cells) const
|
||||
{
|
||||
std::vector<flatbuffers::Offset<fbresult::VectorDouble>> fb_table;
|
||||
fb_table.reserve(fallback_speed_cells.size());
|
||||
std::for_each(
|
||||
fallback_speed_cells.begin(), fallback_speed_cells.end(), [&](const auto &cell) {
|
||||
std::vector<double> fb_row;
|
||||
fb_row.push_back(cell.row);
|
||||
fb_row.push_back(cell.column);
|
||||
fb_table.push_back(fbresult::CreateVectorDoubleDirect(builder, &fb_row));
|
||||
});
|
||||
return builder.CreateVector(fb_table);
|
||||
}
|
||||
|
||||
|
||||
virtual util::json::Array MakeWaypoints(const std::vector<PhantomNode> &phantoms) const
|
||||
{
|
||||
util::json::Array json_waypoints;
|
||||
|
||||
Reference in New Issue
Block a user