Skip to content

Commit b5b3283

Browse files
committed
Remove unnecessary intermediate *_delete functions
1 parent 77402d3 commit b5b3283

File tree

2 files changed

+3
-22
lines changed

2 files changed

+3
-22
lines changed

src/osmdata.cpp

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void osmdata_t::node(osmium::Node const &node)
5757
m_mid->node(node);
5858

5959
if (node.deleted()) {
60-
node_delete(node.id());
60+
m_output->node_delete(node.id());
6161
} else {
6262
if (m_append) {
6363
node_modify(node);
@@ -78,7 +78,7 @@ void osmdata_t::way(osmium::Way &way)
7878
m_mid->way(way);
7979

8080
if (way.deleted()) {
81-
way_delete(way.id());
81+
m_output->way_delete(way.id());
8282
} else {
8383
if (m_append) {
8484
way_modify(&way);
@@ -110,7 +110,7 @@ void osmdata_t::relation(osmium::Relation const &rel)
110110
m_mid->relation(rel);
111111

112112
if (rel.deleted()) {
113-
relation_delete(rel.id());
113+
m_output->relation_delete(rel.id());
114114
} else {
115115
if (m_append) {
116116
relation_modify(rel);
@@ -172,21 +172,6 @@ void osmdata_t::relation_modify(osmium::Relation const &rel) const
172172
}
173173
}
174174

175-
void osmdata_t::node_delete(osmid_t id) const
176-
{
177-
m_output->node_delete(id);
178-
}
179-
180-
void osmdata_t::way_delete(osmid_t id) const
181-
{
182-
m_output->way_delete(id);
183-
}
184-
185-
void osmdata_t::relation_delete(osmid_t id) const
186-
{
187-
m_output->relation_delete(id);
188-
}
189-
190175
void osmdata_t::start() const
191176
{
192177
m_output->start();

src/osmdata.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@ class osmdata_t : public osmium::handler::Handler
6969
void way_modify(osmium::Way *way) const;
7070
void relation_modify(osmium::Relation const &rel) const;
7171

72-
void node_delete(osmid_t id) const;
73-
void way_delete(osmid_t id) const;
74-
void relation_delete(osmid_t id) const;
75-
7672
/**
7773
* Run stage 1b and stage 1c processing: Process dependent objects in
7874
* append mode.

0 commit comments

Comments
 (0)