Merge pull request #897 from lonvia/cleanup-osmdata

osmdata: remove unused projection member

Author: lonvia

.travis.yml

@@ -74,7 +74,7 @@ matrix:
       env: T="osx_clang_NoDB" LUAJIT_OPTION="OFF" TEST_NODB=1
            CXXFLAGS="-pedantic -Werror"
       before_install:
-        - brew install lua;
+        - brew install lua; brew install lua
       before_script:
         - xml2-config --version
         - proj | head -n1

osm2pgsql.cpp

@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
         }
 
         //let osmdata orchestrate between the middle and the outs
-        osmdata_t osmdata(middle, outputs, options.projection);
+        osmdata_t osmdata(middle, outputs);
 
         fprintf(stderr, "Using projection SRS %d (%s)\n",
                 options.projection->target_srs(),

osmdata.cpp

@@ -14,18 +14,16 @@
 #include "output.hpp"
 
 osmdata_t::osmdata_t(std::shared_ptr<middle_t> mid_,
-                     std::shared_ptr<output_t> const &out_,
-                     std::shared_ptr<reprojection> proj)
-: mid(mid_), projection(proj)
+                     std::shared_ptr<output_t> const &out_)
+: mid(mid_)
 {
     outs.push_back(out_);
     with_extra = outs[0]->get_options()->extra_attributes;
 }
 
 osmdata_t::osmdata_t(std::shared_ptr<middle_t> mid_,
-                     std::vector<std::shared_ptr<output_t> > const &outs_,
-                     std::shared_ptr<reprojection> proj)
-: mid(mid_), outs(outs_), projection(proj)
+                     std::vector<std::shared_ptr<output_t>> const &outs_)
+: mid(mid_), outs(outs_)
 {
     if (outs.empty()) {
         throw std::runtime_error("Must have at least one output, but none have "
@@ -35,10 +33,6 @@ osmdata_t::osmdata_t(std::shared_ptr<middle_t> mid_,
     with_extra = outs[0]->get_options()->extra_attributes;
 }
 
-osmdata_t::~osmdata_t()
-{
-}
-
 int osmdata_t::node_add(osmium::Node const &node)
 {
     mid->nodes_set(node);
@@ -425,12 +419,12 @@ void osmdata_t::stop() {
     }
 
     // should be the same for all outputs
-    const bool append = outs[0]->get_options()->append;
+    auto *opts = outs[0]->get_options();
 
     {
         //threaded pending processing
-        pending_threaded_processor ptp(
-            mid, outs, outs[0]->get_options()->num_procs, append);
+        pending_threaded_processor ptp(mid, outs, opts->num_procs,
+                                       opts->append);
 
         if (!outs.empty()) {
             //This stage takes ways which were processed earlier, but might be
@@ -449,7 +443,6 @@ void osmdata_t::stop() {
     // Clustering, index creation, and cleanup.
     // All the intensive parts of this are long-running PostgreSQL commands
     {
-        auto *opts = outs[0]->get_options();
         osmium::thread::Pool pool(opts->parallel_indexing ? opts->num_procs : 1,
                                   512);
 

osmdata.hpp

@@ -18,12 +18,9 @@ class osmdata_t
 {
 public:
     osmdata_t(std::shared_ptr<middle_t> mid_,
-              std::shared_ptr<output_t> const &out_,
-              std::shared_ptr<reprojection> proj);
+              std::shared_ptr<output_t> const &out_);
     osmdata_t(std::shared_ptr<middle_t> mid_,
-              std::vector<std::shared_ptr<output_t> > const &outs_,
-              std::shared_ptr<reprojection> proj);
-    ~osmdata_t();
+              std::vector<std::shared_ptr<output_t>> const &outs_);
 
     void start();
     void type_changed(osmium::item_type new_type);
@@ -44,7 +41,6 @@ class osmdata_t
 private:
     std::shared_ptr<middle_t> mid;
     std::vector<std::shared_ptr<output_t> > outs;
-    std::shared_ptr<reprojection> projection;
     bool with_extra;
 };
 

tests/fixture-tablespace-cleanup

@@ -6,6 +6,6 @@ BASEDIR=`pwd`
 
 TBLDIR=${BASEDIR}/osm2pgsql-test-tablespace
 
-if find $TBLDIR -maxdepth 1 -mindepth 1 -type d -name 'PG*'; then
-  rm -r $TBLDIR/PG*
+if [ -d "$TBLDIR" ]; then
+    find $TBLDIR -maxdepth 1 -mindepth 1 -type d -name 'PG*' -delete
 fi

tests/test-hstore-match-only.cpp

@@ -55,7 +55,7 @@ int main(int argc, char *argv[]) {
 
         auto out_test = std::make_shared<output_pgsql_t>(mid_pgsql.get(), options);
 
-        osmdata_t osmdata(mid_pgsql, out_test, options.projection);
+        osmdata_t osmdata(mid_pgsql, out_test);
 
         testing::parse("tests/hstore-match-only.osm", "xml",
                        options, &osmdata);

tests/test-options-projection.cpp

@@ -45,7 +45,7 @@ static void check_tables(pg::tempdb *db, options_t &options,
     options.database_options = db->database_options;
     auto mid_ram = std::make_shared<middle_ram_t>();
     auto out_test = std::make_shared<output_pgsql_t>(mid_ram.get(), options);
-    osmdata_t osmdata(mid_ram, out_test, options.projection);
+    osmdata_t osmdata(mid_ram, out_test);
 
     testing::parse("tests/liechtenstein-2013-08-03.osm.pbf", "pbf",
                    options, &osmdata);

tests/test-output-multi-line-storage.cpp

@@ -51,7 +51,7 @@ int main(int argc, char *argv[]) {
         std::vector<std::shared_ptr<output_t> > outputs = output_t::create_outputs(middle.get(), options);
 
         //let osmdata orchestrate between the middle and the outs
-        osmdata_t osmdata(middle, outputs, options.projection);
+        osmdata_t osmdata(middle, outputs);
 
         testing::parse("tests/test_output_multi_line_storage.osm", "xml",
                        options, &osmdata);

tests/test-output-multi-line.cpp

@@ -49,7 +49,7 @@ int main(int argc, char *argv[]) {
         // This actually uses the multi-backend with C transforms, not Lua transforms. This is unusual and doesn't reflect real practice
         auto out_test = std::make_shared<output_multi_t>("foobar_highways", processor, columns, mid_pgsql.get(), options);
 
-        osmdata_t osmdata(mid_pgsql, out_test, options.projection);
+        osmdata_t osmdata(mid_pgsql, out_test);
 
         testing::parse("tests/liechtenstein-2013-08-03.osm.pbf", "pbf",
                        options, &osmdata);

tests/test-output-multi-point-multi-table.cpp

@@ -58,7 +58,7 @@ int main(int argc, char *argv[]) {
             outputs.push_back(out_test);
         }
 
-        osmdata_t osmdata(mid_pgsql, outputs, options.projection);
+        osmdata_t osmdata(mid_pgsql, outputs);
 
         testing::parse("tests/liechtenstein-2013-08-03.osm.pbf", "pbf",
                        options, &osmdata);