Remove osm_id param from expire_tiles::from_geometry/result

The osm_id is only used for debug logging which isn't that useful. And
we'll need to extend the code that does expiry by geometry in the future
to allow more options, so its better to make the code simpler now.

Author: joto

src/expire-tiles.cpp

@@ -78,7 +78,7 @@ void expire_tiles::from_point_list(geom::point_list_t const &list)
     });
 }
 
-void expire_tiles::from_geometry(geom::geometry_t const &geom, osmid_t osm_id)
+void expire_tiles::from_geometry(geom::geometry_t const &geom)
 {
     if (geom.srid() != 3857) {
         return;
@@ -96,10 +96,6 @@ void expire_tiles::from_geometry(geom::geometry_t const &geom, osmid_t osm_id)
     } else if (geom.is_polygon() || geom.is_multipolygon()) {
         auto const box = geom::envelope(geom);
         if (from_bbox(box)) {
-            /* Bounding box too big - just expire tiles on the line */
-            log_debug("Large polygon ({:.0f} x {:.0f} metres, OSM ID {})"
-                      " - only expiring perimeter",
-                      box.max_x() - box.min_x(), box.max_y() - box.min_y(), osm_id);
             if (geom.is_polygon()) {
                 from_point_list(geom.get<geom::polygon_t>().outer());
                 for (auto const &inner : geom.get<geom::polygon_t>().inners()) {
@@ -234,7 +230,7 @@ int expire_tiles::from_bbox(geom::box_t const &box)
     return 0;
 }
 
-int expire_tiles::from_result(pg_result_t const &result, osmid_t osm_id)
+int expire_tiles::from_result(pg_result_t const &result)
 {
     if (!enabled()) {
         return -1;
@@ -243,7 +239,7 @@ int expire_tiles::from_result(pg_result_t const &result, osmid_t osm_id)
     auto const num_tuples = result.num_tuples();
     for (int i = 0; i < num_tuples; ++i) {
         char const *const wkb = result.get_value(i, 0);
-        from_geometry(ewkb_to_geom(decode_hex(wkb)), osm_id);
+        from_geometry(ewkb_to_geom(decode_hex(wkb)));
     }
 
     return num_tuples;

src/expire-tiles.hpp

@@ -32,7 +32,7 @@ class expire_tiles
 
     bool enabled() const noexcept { return m_maxzoom != 0; }
 
-    void from_geometry(geom::geometry_t const &geom, osmid_t osm_id);
+    void from_geometry(geom::geometry_t const &geom);
 
     int from_bbox(geom::box_t const &box);
 
@@ -42,11 +42,9 @@ class expire_tiles
      * \param result Result of a database query into some table returning the
      *               geometries. (This is usually done using the "get_wkb"
      *               prepared statement.)
-     * \param osm_id The OSM id to look for.
-     * \return The number of elements that refer to the osm_id or -1 if
-     *         expire is disabled.
+     * \return The number of tuples in the result or -1 if expire is disabled.
      */
-    int from_result(pg_result_t const &result, osmid_t osm_id);
+    int from_result(pg_result_t const &result);
 
     /**
      * Get tiles as a vector of quadkeys and remove them from the expire_tiles

src/output-flex.cpp

@@ -711,17 +711,13 @@ void output_flex_t::write_column(
                      type == table_column_type::multilinestring ||
                      type == table_column_type::multipolygon);
                 if (geom->srid() == column.srid()) {
-                    // OSM id not available here, so use dummy 0, it is used
-                    // for debug messages only anyway.
-                    m_expire.from_geometry(*geom, 0);
+                    m_expire.from_geometry(*geom);
                     copy_mgr->add_hex_geom(geom_to_ewkb(*geom, wrap_multi));
                 } else {
                     auto const proj =
                         reprojection::create_projection(column.srid());
                     auto const tgeom = geom::transform(*geom, *proj);
-                    // OSM id not available here, so use dummy 0, it is used
-                    // for debug messages only anyway.
-                    m_expire.from_geometry(tgeom, 0);
+                    m_expire.from_geometry(tgeom);
                     copy_mgr->add_hex_geom(geom_to_ewkb(tgeom, wrap_multi));
                 }
             } else {
@@ -1685,7 +1681,7 @@ void output_flex_t::add_row(table_connection_t *table_connection,
 
     auto const geoms = geom::split_multi(std::move(geom), split_multi);
     for (auto const &sgeom : geoms) {
-        m_expire.from_geometry(sgeom, id);
+        m_expire.from_geometry(sgeom);
         write_row(table_connection, object.type(), id, sgeom,
                   table.geom_column().srid());
     }
@@ -1919,7 +1915,7 @@ void output_flex_t::delete_from_table(table_connection_t *table_connection,
             return;
         }
 
-        m_expire.from_result(result, id);
+        m_expire.from_result(result);
     }
 
     table_connection->delete_rows_with(type, id);

src/output-pgsql.cpp

@@ -67,7 +67,7 @@ void output_pgsql_t::pgsql_out_way(osmium::Way const &way, taglist_t *tags,
 
         auto const wkb = geom_to_ewkb(projected_geom);
         if (!wkb.empty()) {
-            m_expire.from_geometry(projected_geom, way.id());
+            m_expire.from_geometry(projected_geom);
             if (m_enable_way_area) {
                 double const area = calculate_area(
                     get_options()->reproject_area, geom, projected_geom);
@@ -82,7 +82,7 @@ void output_pgsql_t::pgsql_out_way(osmium::Way const &way, taglist_t *tags,
         auto const geoms = geom::split_multi(geom::segmentize(
             geom::transform(geom::create_linestring(way), *m_proj), split_at));
         for (auto const &sgeom : geoms) {
-            m_expire.from_geometry(sgeom, way.id());
+            m_expire.from_geometry(sgeom);
             auto const wkb = geom_to_ewkb(sgeom);
             m_tables[t_line]->write_row(way.id(), *tags, wkb);
             if (roads) {
@@ -169,7 +169,7 @@ void output_pgsql_t::node_add(osmium::Node const &node)
     }
 
     auto const geom = geom::transform(geom::create_point(node), *m_proj);
-    m_expire.from_geometry(geom, node.id());
+    m_expire.from_geometry(geom);
     auto const wkb = geom_to_ewkb(geom);
     m_tables[t_point]->write_row(node.id(), outtags, wkb);
 }
@@ -272,7 +272,7 @@ void output_pgsql_t::pgsql_process_relation(osmium::Relation const &rel)
         }
         auto const geoms = geom::split_multi(std::move(projected_geom));
         for (auto const &sgeom : geoms) {
-            m_expire.from_geometry(sgeom, -rel.id());
+            m_expire.from_geometry(sgeom);
             auto const wkb = geom_to_ewkb(sgeom);
             m_tables[t_line]->write_row(-rel.id(), outtags, wkb);
             if (roads) {
@@ -288,7 +288,7 @@ void output_pgsql_t::pgsql_process_relation(osmium::Relation const &rel)
                               !get_options()->enable_multi);
         for (auto const &sgeom : geoms) {
             auto const projected_geom = geom::transform(sgeom, *m_proj);
-            m_expire.from_geometry(projected_geom, -rel.id());
+            m_expire.from_geometry(projected_geom);
             auto const wkb = geom_to_ewkb(projected_geom);
             if (m_enable_way_area) {
                 double const area = calculate_area(
@@ -325,7 +325,7 @@ void output_pgsql_t::relation_add(osmium::Relation const &rel)
  * contain the change for that also. */
 void output_pgsql_t::node_delete(osmid_t osm_id)
 {
-    if (m_expire.from_result(m_tables[t_point]->get_wkb(osm_id), osm_id) != 0) {
+    if (m_expire.from_result(m_tables[t_point]->get_wkb(osm_id)) != 0) {
         m_tables[t_point]->delete_row(osm_id);
     }
 }
@@ -343,10 +343,10 @@ void output_pgsql_t::pgsql_delete_way_from_output(osmid_t osm_id)
     }
 
     m_tables[t_roads]->delete_row(osm_id);
-    if (m_expire.from_result(m_tables[t_line]->get_wkb(osm_id), osm_id) != 0) {
+    if (m_expire.from_result(m_tables[t_line]->get_wkb(osm_id)) != 0) {
         m_tables[t_line]->delete_row(osm_id);
     }
-    if (m_expire.from_result(m_tables[t_poly]->get_wkb(osm_id), osm_id) != 0) {
+    if (m_expire.from_result(m_tables[t_poly]->get_wkb(osm_id)) != 0) {
         m_tables[t_poly]->delete_row(osm_id);
     }
 }
@@ -360,12 +360,10 @@ void output_pgsql_t::way_delete(osmid_t osm_id)
 void output_pgsql_t::pgsql_delete_relation_from_output(osmid_t osm_id)
 {
     m_tables[t_roads]->delete_row(-osm_id);
-    if (m_expire.from_result(m_tables[t_line]->get_wkb(-osm_id), -osm_id) !=
-        0) {
+    if (m_expire.from_result(m_tables[t_line]->get_wkb(-osm_id)) != 0) {
         m_tables[t_line]->delete_row(-osm_id);
     }
-    if (m_expire.from_result(m_tables[t_poly]->get_wkb(-osm_id), -osm_id) !=
-        0) {
+    if (m_expire.from_result(m_tables[t_poly]->get_wkb(-osm_id)) != 0) {
         m_tables[t_poly]->delete_row(-osm_id);
     }
 }