Skip to content

Commit 0a31043

Browse files
committed
Simplify osmdata_t class
Remove some functions and inline code.
1 parent acb840a commit 0a31043

File tree

2 files changed

+9
-24
lines changed

2 files changed

+9
-24
lines changed

src/osmdata.cpp

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -432,10 +432,16 @@ void osmdata_t::process_dependents()
432432
proc.process_relations_stage1c(std::move(rels_pending_tracker));
433433
}
434434

435-
void osmdata_t::reprocess_marked() const { m_output->reprocess_marked(); }
436-
437-
void osmdata_t::postprocess_database() const
435+
void osmdata_t::stop()
438436
{
437+
if (m_append) {
438+
process_dependents();
439+
}
440+
441+
// Run stage 2 processing: Reprocess objects marked in stage 1 (if any).
442+
m_output->reprocess_marked();
443+
444+
// Run postprocessing on database: Clustering and index creation.
439445
m_output->free_middle_references();
440446

441447
if (m_droptemp) {
@@ -458,14 +464,3 @@ void osmdata_t::postprocess_database() const
458464
m_mid->wait();
459465
m_output->wait();
460466
}
461-
462-
void osmdata_t::stop()
463-
{
464-
if (m_append) {
465-
process_dependents();
466-
}
467-
468-
reprocess_marked();
469-
470-
postprocess_database();
471-
}

src/osmdata.hpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,6 @@ class osmdata_t : public osmium::handler::Handler
7676
*/
7777
void process_dependents();
7878

79-
/**
80-
* Run stage 2 processing: Reprocess objects marked in stage 1 (if any).
81-
*/
82-
void reprocess_marked() const;
83-
84-
/**
85-
* Run postprocessing on database: Clustering and index creation.
86-
*/
87-
void postprocess_database() const;
88-
8979
/**
9080
* In append mode all new and changed nodes will be added to this. After
9181
* all nodes are read this is used to figure out which parent ways and

0 commit comments

Comments
 (0)