Skip to content

Commit 672c97b

Browse files
committed
Remove unused bbox parameter
1 parent 4995705 commit 672c97b

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

src/osm2pgsql.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
119119
// populating some of the tables.
120120
util::timer_t timer_parse;
121121

122-
auto const progress = osmdata.process_files(files, options.bbox);
122+
auto const progress = osmdata.process_files(files);
123123

124124
progress.print_status(std::time(nullptr));
125125
fmt::print(stderr, " parse time: {}\n",

src/osmdata.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -598,8 +598,7 @@ class multithreaded_processor
598598

599599
} // anonymous namespace
600600

601-
progress_display_t osmdata_t::process_file(osmium::io::File const &file,
602-
osmium::Box const &bbox)
601+
progress_display_t osmdata_t::process_file(osmium::io::File const &file)
603602
{
604603
osmium::io::Reader reader{file};
605604
type_id_version last{osmium::item_type::node, 0, 0};
@@ -618,11 +617,10 @@ progress_display_t osmdata_t::process_file(osmium::io::File const &file,
618617
}
619618

620619
progress_display_t
621-
osmdata_t::process_files(std::vector<osmium::io::File> const &files,
622-
osmium::Box const &bbox)
620+
osmdata_t::process_files(std::vector<osmium::io::File> const &files)
623621
{
624622
if (files.size() == 1) {
625-
return process_file(files.front(), bbox);
623+
return process_file(files.front());
626624
}
627625

628626
std::vector<data_source_t> data_sources;

src/osmdata.hpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ class osmdata_t : public osmium::handler::Handler
6464
/**
6565
* Process the specified OSM files (stage 1a).
6666
*/
67-
progress_display_t process_files(std::vector<osmium::io::File> const &files,
68-
osmium::Box const &bbox);
67+
progress_display_t
68+
process_files(std::vector<osmium::io::File> const &files);
6969

7070
/**
7171
* Rest of the processing (stages 1b, 1c, 2, and database postprocessing).
@@ -90,8 +90,7 @@ class osmdata_t : public osmium::handler::Handler
9090
void flush() const;
9191

9292
/// Process a single OSM file (stage 1a).
93-
progress_display_t process_file(osmium::io::File const &file,
94-
osmium::Box const &bbox);
93+
progress_display_t process_file(osmium::io::File const &file);
9594

9695
/**
9796
* Run stage 1b and stage 1c processing: Process dependent objects in

tests/common-import.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ inline void parse_file(options_t const &options,
4444
filepath += options.input_files[0];
4545
}
4646
osmium::io::File file{filepath};
47-
osmdata.process_files({file}, options.bbox);
47+
osmdata.process_files({file});
4848

4949
if (do_stop) {
5050
osmdata.stop();
@@ -155,7 +155,7 @@ class import_t
155155
for (auto const &data : input_data) {
156156
files.emplace_back(data.data(), data.size(), format);
157157
}
158-
osmdata.process_files(files, options.bbox);
158+
osmdata.process_files(files);
159159

160160
osmdata.stop();
161161
}

0 commit comments

Comments
 (0)