Use new accessor functions for osmium::nwr_array

They are available in the new libosmium version.

Author: joto

src/middle-pgsql.cpp

@@ -323,7 +323,7 @@ void middle_pgsql_t::node_set(osmium::Node const &node)
     if (!m_options->flat_node_file.empty()) {
         m_persistent_cache->set(node.id(), node.location());
     } else {
-        m_db_copy.new_line(m_tables(osmium::item_type::node).copy_target());
+        m_db_copy.new_line(m_tables.nodes().copy_target());
 
         m_db_copy.add_columns(node.id(), node.location().y(),
                               node.location().x());
@@ -364,7 +364,7 @@ void middle_pgsql_t::node_delete(osmid_t osm_id)
     if (!m_options->flat_node_file.empty()) {
         m_persistent_cache->set(osm_id, osmium::Location{});
     } else {
-        m_db_copy.new_line(m_tables(osmium::item_type::node).copy_target());
+        m_db_copy.new_line(m_tables.nodes().copy_target());
         m_db_copy.delete_object(osm_id);
     }
 }
@@ -386,7 +386,7 @@ idlist_t middle_pgsql_t::get_rels_by_way(osmid_t osm_id)
 
 void middle_pgsql_t::way_set(osmium::Way const &way)
 {
-    m_db_copy.new_line(m_tables(osmium::item_type::way).copy_target());
+    m_db_copy.new_line(m_tables.ways().copy_target());
 
     m_db_copy.add_column(way.id());
 
@@ -485,7 +485,7 @@ middle_query_pgsql_t::rel_members_get(osmium::Relation const &rel,
 void middle_pgsql_t::way_delete(osmid_t osm_id)
 {
     assert(m_options->append);
-    m_db_copy.new_line(m_tables(osmium::item_type::way).copy_target());
+    m_db_copy.new_line(m_tables.ways().copy_target());
     m_db_copy.delete_object(osm_id);
 }
 
@@ -498,7 +498,7 @@ void middle_pgsql_t::relation_set(osmium::Relation const &rel)
         parts[osmium::item_type_to_nwr_index(m.type())].push_back(m.ref());
     }
 
-    m_db_copy.new_line(m_tables(osmium::item_type::relation).copy_target());
+    m_db_copy.new_line(m_tables.relations().copy_target());
 
     // id, way offset, relation offset
     m_db_copy.add_columns(rel.id(), parts[0].size(),
@@ -561,30 +561,30 @@ void middle_pgsql_t::relation_delete(osmid_t osm_id)
 {
     assert(m_options->append);
 
-    m_db_copy.new_line(m_tables(osmium::item_type::relation).copy_target());
+    m_db_copy.new_line(m_tables.relations().copy_target());
     m_db_copy.delete_object(osm_id);
 }
 
 void middle_pgsql_t::after_nodes()
 {
     m_db_copy.sync();
     if (m_options->flat_node_file.empty()) {
-        auto const &table = m_tables(osmium::item_type::node);
+        auto const &table = m_tables.nodes();
         analyze_table(m_db_connection, table.schema(), table.name());
     }
 }
 
 void middle_pgsql_t::after_ways()
 {
     m_db_copy.sync();
-    auto const &table = m_tables(osmium::item_type::way);
+    auto const &table = m_tables.ways();
     analyze_table(m_db_connection, table.schema(), table.name());
 }
 
 void middle_pgsql_t::after_relations()
 {
     m_db_copy.sync();
-    auto const &table = m_tables(osmium::item_type::relation);
+    auto const &table = m_tables.relations();
     analyze_table(m_db_connection, table.schema(), table.name());
 
     // release the copy thread and its database connection
@@ -800,13 +800,12 @@ middle_pgsql_t::middle_pgsql_t(options_t const *options)
         log_debug("You don't have a bucket index. See manual for details.");
     }
 
-    m_tables(osmium::item_type::node) =
+    m_tables.nodes() =
         table_desc{*options, sql_for_nodes(options->flat_node_file.empty())};
-    m_tables(osmium::item_type::way) =
+    m_tables.ways() =
         table_desc{*options, sql_for_ways(has_bucket_index,
                                           options->way_node_index_id_shift)};
-    m_tables(osmium::item_type::relation) =
-        table_desc{*options, sql_for_relations()};
+    m_tables.relations() = table_desc{*options, sql_for_relations()};
 }
 
 std::shared_ptr<middle_query_t>

src/middle-ram.cpp

@@ -254,7 +254,7 @@ middle_ram_t::rel_members_get(osmium::Relation const &rel,
         case osmium::item_type::node:
             if (m_store_options.nodes) {
                 auto const offset =
-                    m_object_index(osmium::item_type::node).get(member.ref());
+                    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();
@@ -265,7 +265,7 @@ middle_ram_t::rel_members_get(osmium::Relation const &rel,
         case osmium::item_type::way:
             if (m_store_options.ways) {
                 auto const offset =
-                    m_object_index(osmium::item_type::way).get(member.ref());
+                    m_object_index.ways().get(member.ref());
                 if (offset != ordered_index_t::not_found_value()) {
                     buffer->add_item(m_object_buffer.get<osmium::Way>(offset));
                     buffer->commit();
@@ -285,8 +285,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(osmium::item_type::relation)
-                                        .get(member.ref());
+                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));