Remove unnecessary intermediate *_modify functions

Author: joto

src/osmdata.cpp

@@ -61,9 +61,15 @@ void osmdata_t::node(osmium::Node const &node)
         return;
     }
 
+    bool const has_tags_or_attrs = m_with_extra_attrs || !node.tags().empty();
     if (m_append) {
-        node_modify(node);
-    } else if (m_with_extra_attrs || !node.tags().empty()) {
+        if (has_tags_or_attrs) {
+            m_output->node_modify(node);
+        } else {
+            m_output->node_delete(node.id());
+        }
+        m_dependency_manager->node_changed(node.id());
+    } else if (has_tags_or_attrs) {
         m_output->node_add(node);
     }
 }
@@ -83,9 +89,15 @@ void osmdata_t::way(osmium::Way &way)
         return;
     }
 
+    bool const has_tags_or_attrs = m_with_extra_attrs || !way.tags().empty();
     if (m_append) {
-        way_modify(&way);
-    } else if (m_with_extra_attrs || !way.tags().empty()) {
+        if (has_tags_or_attrs) {
+            m_output->way_modify(&way);
+        } else {
+            m_output->way_delete(way.id());
+        }
+        m_dependency_manager->way_changed(way.id());
+    } else if (has_tags_or_attrs) {
         m_output->way_add(&way);
     }
 }
@@ -115,44 +127,21 @@ void osmdata_t::relation(osmium::Relation const &rel)
         m_output->relation_delete(rel.id());
         return;
     }
+
+    bool const has_tags_or_attrs = m_with_extra_attrs || !rel.tags().empty();
     if (m_append) {
-        relation_modify(rel);
-    } else if (m_with_extra_attrs || !rel.tags().empty()) {
+        if (has_tags_or_attrs) {
+            m_output->relation_modify(rel);
+        } else {
+            m_output->relation_delete(rel.id());
+        }
+    } else if (has_tags_or_attrs) {
         m_output->relation_add(rel);
     }
 }
 
 void osmdata_t::after_relations() { m_mid->after_relations(); }
 
-void osmdata_t::node_modify(osmium::Node const &node) const
-{
-    if (m_with_extra_attrs || !node.tags().empty()) {
-        m_output->node_modify(node);
-    } else {
-        m_output->node_delete(node.id());
-    }
-    m_dependency_manager->node_changed(node.id());
-}
-
-void osmdata_t::way_modify(osmium::Way *way) const
-{
-    if (m_with_extra_attrs || !way->tags().empty()) {
-        m_output->way_modify(way);
-    } else {
-        m_output->way_delete(way->id());
-    }
-    m_dependency_manager->way_changed(way->id());
-}
-
-void osmdata_t::relation_modify(osmium::Relation const &rel) const
-{
-    if (m_with_extra_attrs || !rel.tags().empty()) {
-        m_output->relation_modify(rel);
-    } else {
-        m_output->relation_delete(rel.id());
-    }
-}
-
 void osmdata_t::start() const
 {
     m_output->start();

src/osmdata.hpp

@@ -61,10 +61,6 @@ class osmdata_t : public osmium::handler::Handler
     void stop() const;
 
 private:
-    void node_modify(osmium::Node const &node) const;
-    void way_modify(osmium::Way *way) const;
-    void relation_modify(osmium::Relation const &rel) const;
-
     /**
      * Run stage 1b and stage 1c processing: Process dependent objects in
      * append mode.