Merge pull request #1477 from joto/output-pgsql-member-names

Fix member names of pgsql output

Author: lonvia

src/output-pgsql.cpp

@@ -50,7 +50,7 @@ void output_pgsql_t::pgsql_out_way(osmium::Way const &way, taglist_t *tags,
     if (polygon && way.is_closed()) {
         auto wkb = m_builder.get_wkb_polygon(way);
         if (!wkb.empty()) {
-            expire.from_wkb(wkb, way.id());
+            m_expire.from_wkb(wkb, way.id());
             if (m_enable_way_area) {
                 auto const area =
                     m_options.reproject_area
@@ -67,7 +67,7 @@ void output_pgsql_t::pgsql_out_way(osmium::Way const &way, taglist_t *tags,
         double const split_at =
             m_options.projection->target_latlon() ? 1 : 100 * 1000;
         for (auto const &wkb : m_builder.get_wkb_line(way.nodes(), split_at)) {
-            expire.from_wkb(wkb, way.id());
+            m_expire.from_wkb(wkb, way.id());
             m_tables[t_line]->write_row(way.id(), *tags, wkb);
             if (roads) {
                 m_tables[t_roads]->write_row(way.id(), *tags, wkb);
@@ -79,14 +79,14 @@ void output_pgsql_t::pgsql_out_way(osmium::Way const &way, taglist_t *tags,
 void output_pgsql_t::pending_way(osmid_t id)
 {
     // Try to fetch the way from the DB
-    buffer.clear();
-    if (m_mid->way_get(id, &buffer)) {
+    m_buffer.clear();
+    if (m_mid->way_get(id, &m_buffer)) {
         pgsql_delete_way_from_output(id);
 
         taglist_t outtags;
         bool polygon = false;
         bool roads = false;
-        auto &way = buffer.get<osmium::Way>(0);
+        auto &way = m_buffer.get<osmium::Way>(0);
         if (!m_tagtransform->filter_tags(way, &polygon, &roads, outtags)) {
             auto nnodes = m_mid->nodes_get_list(&(way.nodes()));
             if (nnodes > 1) {
@@ -103,11 +103,11 @@ void output_pgsql_t::pending_relation(osmid_t id)
     // Note that we cannot use the global buffer here because
     // we cannot keep a reference to the relation and an autogrow buffer
     // might be relocated when more data is added.
-    rels_buffer.clear();
-    if (m_mid->relation_get(id, &rels_buffer)) {
+    m_rels_buffer.clear();
+    if (m_mid->relation_get(id, &m_rels_buffer)) {
         pgsql_delete_relation_from_output(id);
 
-        auto const &rel = rels_buffer.get<osmium::Relation>(0);
+        auto const &rel = m_rels_buffer.get<osmium::Relation>(0);
         pgsql_process_relation(rel);
     }
 }
@@ -130,8 +130,8 @@ void output_pgsql_t::stop(thread_pool_t *pool)
     }
 
     if (m_options.expire_tiles_zoom_min > 0) {
-        expire.output_and_destroy(m_options.expire_tiles_filename.c_str(),
-                                  m_options.expire_tiles_zoom_min);
+        m_expire.output_and_destroy(m_options.expire_tiles_filename.c_str(),
+                                    m_options.expire_tiles_zoom_min);
     }
 }
 
@@ -143,7 +143,7 @@ void output_pgsql_t::node_add(osmium::Node const &node)
     }
 
     auto wkb = m_builder.get_wkb_node(node.location());
-    expire.from_wkb(wkb, node.id());
+    m_expire.from_wkb(wkb, node.id());
     m_tables[t_point]->write_row(node.id(), outtags, wkb);
 }
 
@@ -202,9 +202,9 @@ void output_pgsql_t::pgsql_process_relation(osmium::Relation const &rel)
         return;
     }
 
-    buffer.clear();
+    m_buffer.clear();
     auto const num_ways =
-        m_mid->rel_members_get(rel, &buffer, osmium::osm_entity_bits::way);
+        m_mid->rel_members_get(rel, &m_buffer, osmium::osm_entity_bits::way);
 
     if (num_ways == 0) {
         return;
@@ -217,18 +217,18 @@ void output_pgsql_t::pgsql_process_relation(osmium::Relation const &rel)
 
     rolelist_t xrole;
     if (!m_options.tag_transform_script.empty()) {
-        xrole = get_rolelist(rel, buffer);
+        xrole = get_rolelist(rel, m_buffer);
     }
 
     // If it's a route relation make_boundary and make_polygon will be false
     // otherwise one or the other will be true.
-    if (m_tagtransform->filter_rel_member_tags(prefiltered_tags, buffer, xrole,
-                                               &make_boundary, &make_polygon,
-                                               &roads, outtags)) {
+    if (m_tagtransform->filter_rel_member_tags(
+            prefiltered_tags, m_buffer, xrole, &make_boundary, &make_polygon,
+            &roads, outtags)) {
         return;
     }
 
-    for (auto &w : buffer.select<osmium::Way>()) {
+    for (auto &w : m_buffer.select<osmium::Way>()) {
         m_mid->nodes_get_list(&(w.nodes()));
     }
 
@@ -238,9 +238,9 @@ void output_pgsql_t::pgsql_process_relation(osmium::Relation const &rel)
     if (!make_polygon) {
         double const split_at =
             m_options.projection->target_latlon() ? 1 : 100 * 1000;
-        auto wkbs = m_builder.get_wkb_multiline(buffer, split_at);
+        auto wkbs = m_builder.get_wkb_multiline(m_buffer, split_at);
         for (auto const &wkb : wkbs) {
-            expire.from_wkb(wkb, -rel.id());
+            m_expire.from_wkb(wkb, -rel.id());
             m_tables[t_line]->write_row(-rel.id(), outtags, wkb);
             if (roads) {
                 m_tables[t_roads]->write_row(-rel.id(), outtags, wkb);
@@ -250,10 +250,11 @@ void output_pgsql_t::pgsql_process_relation(osmium::Relation const &rel)
 
     // multipolygons and boundaries
     if (make_boundary || make_polygon) {
-        auto wkbs = m_builder.get_wkb_multipolygon(rel, buffer, m_options.enable_multi);
+        auto wkbs = m_builder.get_wkb_multipolygon(rel, m_buffer,
+                                                   m_options.enable_multi);
 
         for (auto const &wkb : wkbs) {
-            expire.from_wkb(wkb, -rel.id());
+            m_expire.from_wkb(wkb, -rel.id());
             if (m_enable_way_area) {
                 auto const area =
                     m_options.reproject_area
@@ -293,7 +294,7 @@ void output_pgsql_t::relation_add(osmium::Relation const &rel)
  * contain the change for that also. */
 void output_pgsql_t::node_delete(osmid_t osm_id)
 {
-    if (expire.from_db(m_tables[t_point].get(), osm_id) != 0) {
+    if (m_expire.from_db(m_tables[t_point].get(), osm_id) != 0) {
         m_tables[t_point]->delete_row(osm_id);
     }
 }
@@ -311,10 +312,10 @@ void output_pgsql_t::pgsql_delete_way_from_output(osmid_t osm_id)
     }
 
     m_tables[t_roads]->delete_row(osm_id);
-    if (expire.from_db(m_tables[t_line].get(), osm_id) != 0) {
+    if (m_expire.from_db(m_tables[t_line].get(), osm_id) != 0) {
         m_tables[t_line]->delete_row(osm_id);
     }
-    if (expire.from_db(m_tables[t_poly].get(), osm_id) != 0) {
+    if (m_expire.from_db(m_tables[t_poly].get(), osm_id) != 0) {
         m_tables[t_poly]->delete_row(osm_id);
     }
 }
@@ -328,10 +329,10 @@ void output_pgsql_t::way_delete(osmid_t osm_id)
 void output_pgsql_t::pgsql_delete_relation_from_output(osmid_t osm_id)
 {
     m_tables[t_roads]->delete_row(-osm_id);
-    if (expire.from_db(m_tables[t_line].get(), -osm_id) != 0) {
+    if (m_expire.from_db(m_tables[t_line].get(), -osm_id) != 0) {
         m_tables[t_line]->delete_row(-osm_id);
     }
-    if (expire.from_db(m_tables[t_poly].get(), -osm_id) != 0) {
+    if (m_expire.from_db(m_tables[t_poly].get(), -osm_id) != 0) {
         m_tables[t_poly]->delete_row(-osm_id);
     }
 }
@@ -383,9 +384,9 @@ output_pgsql_t::output_pgsql_t(
     std::shared_ptr<middle_query_t> const &mid, options_t const &o,
     std::shared_ptr<db_copy_thread_t> const &copy_thread)
 : output_t(mid, o), m_builder(o.projection),
-  expire(o.expire_tiles_zoom, o.expire_tiles_max_bbox, o.projection),
-  buffer(32768, osmium::memory::Buffer::auto_grow::yes),
-  rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
+  m_expire(o.expire_tiles_zoom, o.expire_tiles_max_bbox, o.projection),
+  m_buffer(32768, osmium::memory::Buffer::auto_grow::yes),
+  m_rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
 {
     log_debug("Using projection SRS {} ({})", o.projection->target_srs(),
               o.projection->target_desc());
@@ -441,12 +442,11 @@ output_pgsql_t::output_pgsql_t(
     std::shared_ptr<db_copy_thread_t> const &copy_thread)
 : output_t(mid, other->m_options),
   m_tagtransform(other->m_tagtransform->clone()),
-  m_enable_way_area(other->m_enable_way_area),
-  m_builder(m_options.projection),
-  expire(m_options.expire_tiles_zoom, m_options.expire_tiles_max_bbox,
-         m_options.projection),
-  buffer(1024, osmium::memory::Buffer::auto_grow::yes),
-  rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
+  m_enable_way_area(other->m_enable_way_area), m_builder(m_options.projection),
+  m_expire(m_options.expire_tiles_zoom, m_options.expire_tiles_max_bbox,
+           m_options.projection),
+  m_buffer(1024, osmium::memory::Buffer::auto_grow::yes),
+  m_rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
 {
     for (size_t i = 0; i < t_MAX; ++i) {
         //copy constructor will just connect to the already there table
@@ -461,6 +461,6 @@ void output_pgsql_t::merge_expire_trees(output_t *other)
 {
     auto *const opgsql = dynamic_cast<output_pgsql_t *>(other);
     if (opgsql) {
-        expire.merge_and_destroy(opgsql->expire);
+        m_expire.merge_and_destroy(opgsql->m_expire);
     }
 }

src/output-pgsql.hpp

@@ -87,10 +87,10 @@ class output_pgsql_t : public output_t
     std::array<std::unique_ptr<table_t>, t_MAX> m_tables;
 
     geom::osmium_builder_t m_builder;
-    expire_tiles expire;
+    expire_tiles m_expire;
 
-    osmium::memory::Buffer buffer;
-    osmium::memory::Buffer rels_buffer;
+    osmium::memory::Buffer m_buffer;
+    osmium::memory::Buffer m_rels_buffer;
 };
 
 #endif // OSM2PGSQL_OUTPUT_PGSQL_HPP