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

Add feature name to vector tiles (#2488)

Browse Source
This commit is contained in:
Vladimir Kurchatkin 2016-06-10 21:15:14 +03:00 committed by Daniel Patterson
parent cf2d2b6763
commit 6bdfe68897
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/engine/plugins/tile.cpp
View File

@ -184,6 +184,8 @@ Status TilePlugin::HandleRequest(const api::TileParameters &parameters, std::str
std::vector<int> used_weights;
std::unordered_map<int, std::size_t> weight_offsets;
uint8_t max_datasource_id = 0;
std::vector<std::string> names;
std::unordered_map<std::string, std::size_t> name_offsets;
// Loop over all edges once to tally up all the attributes we'll need.
// We need to do this so that we know the attribute offsets to use
@ -237,6 +239,14 @@ Status TilePlugin::HandleRequest(const api::TileParameters &parameters, std::str
// data to the layer attribute values
max_datasource_id = std::max(max_datasource_id, forward_datasource);
max_datasource_id = std::max(max_datasource_id, reverse_datasource);
std::string name = facade.GetNameForID(edge.name_id);
if (name_offsets.find(name) == name_offsets.end())
{
names.push_back(name);
name_offsets[name] = names.size() - 1;
}
}
// TODO: extract speed values for compressed and uncompressed geometries
@ -279,6 +289,8 @@ Status TilePlugin::HandleRequest(const api::TileParameters &parameters, std::str
uint8_t forward_datasource = 0;
uint8_t reverse_datasource = 0;
std::string name = facade.GetNameForID(edge.name_id);
if (edge.forward_packed_geometry_id != SPECIAL_EDGEID)
{
std::vector<EdgeWeight> forward_weight_vector;
@ -316,11 +328,12 @@ Status TilePlugin::HandleRequest(const api::TileParameters &parameters, std::str
max_datasource_id = std::max(max_datasource_id, forward_datasource);
max_datasource_id = std::max(max_datasource_id, reverse_datasource);
const auto encode_tile_line = [&layer_writer, &edge, &id, &max_datasource_id](
const auto encode_tile_line = [&layer_writer, &edge, &id, &max_datasource_id, &used_weights](
const detail::FixedLine &tile_line,
const std::uint32_t speed_kmh,
const std::size_t duration,
const std::uint8_t datasource,
const std::size_t name,
std::int32_t &start_x,
std::int32_t &start_y) {
// Here, we save the two attributes for our feature: the speed and the
@ -356,6 +369,10 @@ Status TilePlugin::HandleRequest(const api::TileParameters &parameters, std::str
field.add_element(3); // "duration" tag key offset
field.add_element(130 + max_datasource_id + 1 +
duration); // duration value offset
field.add_element(4); // "name" tag key offset
field.add_element(130 + max_datasource_id + 1 +
used_weights.size() + name); // name value offset
}
{
@ -383,6 +400,7 @@ Status TilePlugin::HandleRequest(const api::TileParameters &parameters, std::str
speed_kmh,
weight_offsets[forward_weight],
forward_datasource,
name_offsets[name],
start_x,
start_y);
}
@ -406,6 +424,7 @@ Status TilePlugin::HandleRequest(const api::TileParameters &parameters, std::str
speed_kmh,
weight_offsets[reverse_weight],
reverse_datasource,
name_offsets[name],
start_x,
start_y);
}
@ -420,6 +439,7 @@ Status TilePlugin::HandleRequest(const api::TileParameters &parameters, std::str
layer_writer.add_string(util::vector_tile::KEY_TAG, "is_small");
layer_writer.add_string(util::vector_tile::KEY_TAG, "datasource");
layer_writer.add_string(util::vector_tile::KEY_TAG, "duration");
layer_writer.add_string(util::vector_tile::KEY_TAG, "name");
// Now, we write out the possible speed value arrays and possible is_tiny
// values. Field type 4 is the "values" field. It's a variable type field,
@ -458,6 +478,14 @@ Status TilePlugin::HandleRequest(const api::TileParameters &parameters, std::str
// to seconds with a simple /10 for display
values_writer.add_double(util::vector_tile::VARIANT_TYPE_DOUBLE, weight / 10.);
}
for (const auto& name : names)
{
// Writing field type 4 == variant type
protozero::pbf_writer values_writer(layer_writer, util::vector_tile::VARIANT_TAG);
// Attribute value 1 == string type
values_writer.add_string(util::vector_tile::VARIANT_TYPE_STRING, name);
}
}
return Status::Ok;

7
unit_tests/library/tile.cpp
View File

@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE(test_tile)
BOOST_CHECK_EQUAL(feature_message.tag(), util::vector_tile::FEATURE_ATTRIBUTES_TAG);
// properties
std::tie(value_begin, value_end) = feature_message.get_packed_uint32();
BOOST_CHECK_EQUAL(std::distance(value_begin, value_end), 8);
BOOST_CHECK_EQUAL(std::distance(value_begin, value_end), 10);
auto iter = value_begin;
BOOST_CHECK_EQUAL(*iter++, 0); // speed key
BOOST_CHECK_LT(*iter++, 128); // speed value
@ -67,6 +67,9 @@ BOOST_AUTO_TEST_CASE(test_tile)
*iter++; // skip value check, can be valud uint32
BOOST_CHECK_EQUAL(*iter++, 3); // duration key
BOOST_CHECK_GT(*iter++, 130); // duration value
// name
BOOST_CHECK_EQUAL(*iter++, 4);
BOOST_CHECK_GT(*iter++, 130);
BOOST_CHECK(iter == value_end);
// geometry
feature_message.next();
@ -128,7 +131,7 @@ BOOST_AUTO_TEST_CASE(test_tile)
}
}
BOOST_CHECK_EQUAL(number_of_keys, 4);
BOOST_CHECK_EQUAL(number_of_keys, 5);
BOOST_CHECK_GT(number_of_values, 128); // speed value resolution
}