Merge pull request #1512 from joto/misc-cleanups

Misc cleanups

Author: lonvia

src/db-check.cpp

@@ -18,7 +18,7 @@
  * Check whether the table with the specified name exists in the specified
  * schema in the database. Leave schema empty to check in the 'public' schema.
  */
-static bool has_table(pg_conn_t &db_connection, std::string const &schema,
+static bool has_table(pg_conn_t const &db_connection, std::string const &schema,
                       std::string const &table)
 {
     auto const sql = "SELECT count(*) FROM pg_tables"

src/db-copy-mgr.hpp

@@ -41,7 +41,7 @@ class db_copy_mgr_t
                 m_processor->add_buffer(std::move(m_current));
             }
 
-            m_current.reset(new db_cmd_copy_delete_t<DELETER>{table});
+            m_current = std::make_unique<db_cmd_copy_delete_t<DELETER>>(table);
         }
     }
 

src/db-copy.cpp

@@ -124,7 +124,7 @@ db_copy_thread_t::thread_t::thread_t(std::string conninfo, shared &shared)
 void db_copy_thread_t::thread_t::operator()()
 {
     try {
-        m_conn.reset(new pg_conn_t{m_conninfo});
+        m_conn = std::make_unique<pg_conn_t>(m_conninfo);
 
         // Let commits happen faster by delaying when they actually occur.
         m_conn->exec("SET synchronous_commit = off");

src/expire-tiles.cpp

@@ -116,7 +116,7 @@ void expire_tiles::expire_tile(uint32_t x, uint32_t y)
     }
 }
 
-uint32_t expire_tiles::normalise_tile_x_coord(int x)
+uint32_t expire_tiles::normalise_tile_x_coord(int x) const
 {
     x %= map_width;
     if (x < 0) {
@@ -141,10 +141,10 @@ void expire_tiles::coords_to_tile(double lon, double lat, double *tilex,
 void expire_tiles::from_line(double lon_a, double lat_a, double lon_b,
                              double lat_b)
 {
-    double tile_x_a;
-    double tile_y_a;
-    double tile_x_b;
-    double tile_y_b;
+    double tile_x_a = NAN;
+    double tile_y_a = NAN;
+    double tile_x_b = NAN;
+    double tile_y_b = NAN;
 
     coords_to_tile(lon_a, lat_a, &tile_x_a, &tile_y_a);
     coords_to_tile(lon_b, lat_b, &tile_x_b, &tile_y_b);
@@ -237,8 +237,8 @@ int expire_tiles::from_bbox(double min_lon, double min_lat, double max_lon,
     }
 
     /* Convert the box's Mercator coordinates into tile coordinates */
-    double tmp_x;
-    double tmp_y;
+    double tmp_x = NAN;
+    double tmp_y = NAN;
     coords_to_tile(min_lon, max_lat, &tmp_x, &tmp_y);
     int min_tile_x = tmp_x - TILE_EXPIRY_LEEWAY;
     int min_tile_y = tmp_y - TILE_EXPIRY_LEEWAY;

src/expire-tiles.hpp

@@ -20,9 +20,10 @@
 class reprojection;
 class table_t;
 class tile;
+
 namespace ewkb {
 class parser_t;
-}
+} // namespace ewkb
 
 /**
  * \brief Simple struct for the x and y index of a tile ID.
@@ -114,11 +115,10 @@ struct expire_tiles
          * (larger than largest possible quadkey). */
         uint64_t last_quadkey = 1ULL << (2 * maxzoom);
         std::size_t count = 0;
-        for (std::vector<uint64_t>::const_iterator it = tiles_maxzoom.cbegin();
-             it != tiles_maxzoom.cend(); ++it) {
+        for (auto const quadkey : tiles_maxzoom) {
             for (uint32_t dz = 0; dz <= maxzoom - minzoom; ++dz) {
                 // scale down to the current zoom level
-                uint64_t qt_current = *it >> (dz * 2);
+                uint64_t qt_current = quadkey >> (dz * 2);
                 /* If dz > 0, there are propably multiple elements whose quadkey
                  * is equal because they are all sub-tiles of the same tile at the current
                  * zoom level. We skip all of them after we have written the first sibling.
@@ -130,7 +130,7 @@ struct expire_tiles
                 output_writer.output_dirty_tile(xy.x, xy.y, maxzoom - dz);
                 ++count;
             }
-            last_quadkey = *it;
+            last_quadkey = quadkey;
         }
         log_info("Wrote {} entries to expired tiles list", count);
     }
@@ -178,7 +178,7 @@ struct expire_tiles
      * \param y y index of the tile to be expired.
      */
     void expire_tile(uint32_t x, uint32_t y);
-    uint32_t normalise_tile_x_coord(int x);
+    uint32_t normalise_tile_x_coord(int x) const;
     void from_line(double lon_a, double lat_a, double lon_b, double lat_b);
 
     void from_wkb_point(ewkb::parser_t *wkb);

src/flex-table.cpp

@@ -152,7 +152,7 @@ void table_connection_t::connect(std::string const &conninfo)
 {
     assert(!m_db_connection);
 
-    m_db_connection.reset(new pg_conn_t{conninfo});
+    m_db_connection = std::make_unique<pg_conn_t>(conninfo);
     m_db_connection->exec("SET synchronous_commit = off");
 }
 

src/gazetteer-style.cpp

@@ -21,15 +21,6 @@
 #include "pgsql.hpp"
 #include "wkb.hpp"
 
-namespace {
-
-enum : int
-{
-    MAX_ADMINLEVEL = 15
-};
-
-} // anonymous namespace
-
 namespace pt = boost::property_tree;
 
 void db_deleter_place_t::delete_rows(std::string const &table,

src/gazetteer-style.hpp

@@ -94,6 +94,11 @@ class gazetteer_copy_mgr_t : public db_copy_mgr_t<db_deleter_place_t>
     std::shared_ptr<db_target_descr_t> m_table;
 };
 
+enum : int
+{
+    MAX_ADMINLEVEL = 15
+};
+
 class gazetteer_style_t
 {
     using flag_t = uint16_t;
@@ -179,7 +184,7 @@ class gazetteer_style_t
     /// value of operator tag
     char const *m_operator = nullptr;
     /// admin level
-    int m_admin_level;
+    int m_admin_level = MAX_ADMINLEVEL;
 
     /// which metadata fields of the OSM objects should be written to the output
     osmium::metadata_options m_metadata_fields{"none"};

src/geom.cpp

@@ -95,9 +95,8 @@ void split_linestring(linestring_t const &line, double split_at,
                     dist = 0;
                     prev_pt = this_pt;
                     continue;
-                } else {
-                    dist = distance(this_pt, ipoint);
                 }
+                dist = distance(this_pt, ipoint);
             } else {
                 dist += delta;
             }

src/geom.hpp

@@ -69,7 +69,7 @@ class linestring_t
 
     void add_point(osmium::geom::Coordinates coordinates)
     {
-        m_coordinates.emplace_back(std::move(coordinates));
+        m_coordinates.emplace_back(coordinates);
     }
 
     iterator begin() noexcept { return m_coordinates.begin(); }