Merge pull request #2047 from joto/clang-tidy-cleanup

Clang tidy cleanup

Author: lonvia

src/gen/osm2pgsql-gen.cpp

@@ -595,6 +595,7 @@ void genproc_t::run()
     }
 }
 
+// NOLINTNEXTLINE(bugprone-exception-escape)
 int main(int argc, char *argv[])
 {
     try {

src/osm2pgsql.cpp

@@ -348,6 +348,7 @@ static void check_and_set_style(options_t *options)
     }
 }
 
+// NOLINTNEXTLINE(bugprone-exception-escape)
 int main(int argc, char *argv[])
 {
     try {
@@ -404,6 +405,9 @@ int main(int argc, char *argv[])
     } catch (std::exception const &e) {
         log_error("{}", e.what());
         return 1;
+    } catch (...) {
+        log_error("Unknown exception.");
+        return 1;
     }
 
     return 0;

src/tagtransform-lua.cpp

@@ -110,8 +110,8 @@ bool lua_tagtransform_t::filter_tags(osmium::OSMObject const &o, bool *polygon,
             lua_pushstring(lua_state(), t.key.c_str());
             lua_pushstring(lua_state(), t.value.c_str());
             lua_rawset(lua_state(), -3);
+            ++sz;
         }
-        sz += tags.size();
     }
 
     lua_pushinteger(lua_state(), sz);

tests/test-expire-from-geometry.cpp

@@ -390,13 +390,6 @@ TEST_CASE("expire multilinestring geometry", "[NoDB]")
         et.from_geometry(geom, expire_config);
     }
 
-    SECTION("geom with check")
-    {
-        geom::geometry_t geom{std::move(ml)};
-        geom.set_srid(3857);
-        et.from_geometry_if_3857(geom, expire_config);
-    }
-
     auto const tiles = et.get_tiles();
     REQUIRE(tiles.size() == 3);
     CHECK(tile_t::from_quadkey(tiles[0], zoom) == tile_t{zoom, 2049, 2046});
@@ -440,13 +433,6 @@ TEST_CASE("expire multipolygon geometry", "[NoDB]")
         et.from_geometry(geom, expire_config);
     }
 
-    SECTION("geom with check")
-    {
-        geom::geometry_t geom{std::move(mp)};
-        geom.set_srid(3857);
-        et.from_geometry_if_3857(geom, expire_config);
-    }
-
     auto const tiles = et.get_tiles();
     REQUIRE(tiles.size() == 17);
 
@@ -476,18 +462,8 @@ TEST_CASE("expire geometry collection", "[NoDB]")
     collection.add_geometry(geom::geometry_t{
         geom::linestring_t{{15000.0, 15000.0}, {25000.0, 15000.0}}});
 
-    SECTION("geom")
-    {
-        geom::geometry_t const geom{std::move(collection)};
-        et.from_geometry(geom, expire_config);
-    }
-
-    SECTION("geom with check")
-    {
-        geom::geometry_t geom{std::move(collection)};
-        geom.set_srid(3857);
-        et.from_geometry_if_3857(geom, expire_config);
-    }
+    geom::geometry_t const geom{std::move(collection)};
+    et.from_geometry(geom, expire_config);
 
     auto const tiles = et.get_tiles();
     REQUIRE(tiles.size() == 6);
@@ -499,6 +475,19 @@ TEST_CASE("expire geometry collection", "[NoDB]")
     CHECK(tile_t::from_quadkey(tiles[5], zoom) == tile_t{zoom, 2048, 2048});
 }
 
+TEST_CASE("expire works if in 3857", "[NoDB]")
+{
+    expire_config_t const expire_config;
+    expire_tiles et{zoom, defproj};
+
+    geom::geometry_t geom{geom::point_t{0.0, 0.0}};
+    geom.set_srid(3857);
+    et.from_geometry_if_3857(geom, expire_config);
+
+    auto const tiles = et.get_tiles();
+    REQUIRE(tiles.size() == 4);
+}
+
 TEST_CASE("expire doesn't do anything if not in 3857", "[NoDB]")
 {
     expire_config_t const expire_config;