Skip to content

Simplify and fix code getting relation members #2365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Simplify and fix code getting relation members #2365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/middle-pgsql.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,9 +839,9 @@ middle_query_pgsql_t::rel_members_get(osmium::Relation const &rel,
for (auto const &member : rel.members()) {
if (member.type() == osmium::item_type::node &&
(types & osmium::osm_entity_bits::node)) {
osmium::builder::NodeBuilder builder{*buffer};
builder.set_id(member.ref());
++members_found;
if (node_get(member.ref(), buffer)) {
++members_found;
}
} else if (member.type() == osmium::item_type::way &&
(types & osmium::osm_entity_bits::way) && res) {
// Match the list of ways coming from postgres in a different order
Expand Down
27 changes: 4 additions & 23 deletions src/middle-ram.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,26 +334,14 @@ middle_ram_t::rel_members_get(osmium::Relation const &rel,
for (auto const &member : rel.members()) {
auto const member_entity_type =
osmium::osm_entity_bits::from_item_type(member.type());

if ((member_entity_type & types) == 0) {
continue;
}

switch (member.type()) {
case osmium::item_type::node:
if (m_store_options.nodes) {
auto const offset =
m_object_index.nodes().get(member.ref());
if (offset != ordered_index_t::not_found_value()) {
buffer->add_item(m_object_buffer.get<osmium::Node>(offset));
buffer->commit();
++count;
}
} else {
{
osmium::builder::NodeBuilder builder{*buffer};
builder.set_id(member.ref());
}
buffer->commit();
if (node_get(member.ref(), buffer)) {
++count;
}
break;
Expand All @@ -379,15 +367,8 @@ middle_ram_t::rel_members_get(osmium::Relation const &rel,
}
break;
default: // osmium::item_type::relation
if (m_store_options.relations) {
auto const offset =
m_object_index.relations().get(member.ref());
if (offset != ordered_index_t::not_found_value()) {
buffer->add_item(
m_object_buffer.get<osmium::Relation>(offset));
buffer->commit();
++count;
}
if (relation_get(member.ref(), buffer)) {
++count;
}
}
}
Expand Down
6 changes: 0 additions & 6 deletions src/output-flex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,12 +687,6 @@ bool output_flex_t::relation_cache_t::add_members(middle_query_t const &middle)
return false;
}

for (auto &node : m_members_buffer.select<osmium::Node>()) {
if (!node.location().valid()) {
node.set_location(middle.get_node_location(node.id()));
}
}

for (auto &way : m_members_buffer.select<osmium::Way>()) {
get_nodes(middle, &way);
}
Expand Down