Merge pull request #2224 from joto/area-assembler

Refactor area assembler

Author: lonvia

src/CMakeLists.txt

@@ -25,6 +25,7 @@ target_sources(osm2pgsql_lib PRIVATE
     flex-table-column.cpp
     flex-table.cpp
     flex-write.cpp
+    geom-area-assembler.cpp
     geom-box.cpp
     geom-from-osm.cpp
     geom-functions.cpp

src/geom-area-assembler.cpp

@@ -0,0 +1,59 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include "geom-area-assembler.hpp"
+
+#include <osmium/builder/osm_object_builder.hpp>
+
+namespace geom {
+
+const osmium::area::AssemblerConfig area_config;
+
+area_assembler_t::area_assembler_t(osmium::memory::Buffer *buffer)
+: osmium::area::detail::BasicAssembler(area_config), m_buffer(buffer)
+{
+}
+
+bool area_assembler_t::make_area()
+{
+    if (!create_rings()) {
+        return false;
+    }
+
+    m_buffer->clear();
+    {
+        osmium::builder::AreaBuilder builder{*m_buffer};
+        add_rings_to_area(builder);
+    }
+    m_buffer->commit();
+
+    return true;
+}
+
+bool area_assembler_t::operator()(const osmium::Way &way)
+{
+    segment_list().extract_segments_from_way(nullptr, stats().duplicate_nodes,
+                                             way);
+    return make_area();
+}
+
+// Currently the relation is not needed for assembling the area, because
+// the roles on the members are ignored. In the future we might want to use
+// the roles, so we leave the function signature as it is.
+bool area_assembler_t::operator()(const osmium::Relation & /*relation*/,
+                                  const osmium::memory::Buffer &ways_buffer)
+{
+    for (const auto &way : ways_buffer.select<osmium::Way>()) {
+        segment_list().extract_segments_from_way(nullptr,
+                                                 stats().duplicate_nodes, way);
+    }
+    return make_area();
+}
+
+} // namespace geom

src/geom-area-assembler.hpp

@@ -0,0 +1,67 @@
+#ifndef OSM2PGSQL_GEOM_AREA_ASSEMBLER_HPP
+#define OSM2PGSQL_GEOM_AREA_ASSEMBLER_HPP
+
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2024 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+/**
+ * \file
+ *
+ * Code for assembling areas from ways or relations.
+ */
+
+#include <osmium/area/detail/basic_assembler.hpp>
+
+namespace geom {
+
+/**
+ * The area_assembler_t class is a light wrapper around the libosmium class
+ * for assembling areas.
+ */
+class area_assembler_t : public osmium::area::detail::BasicAssembler
+{
+public:
+    area_assembler_t(osmium::memory::Buffer *buffer);
+
+    /**
+     * Assemble an area from the given way.
+     *
+     * @returns false if there was some kind of error building the
+     *          area, true otherwise.
+     */
+    bool operator()(const osmium::Way &way);
+
+    /**
+     * Assemble an area from the given relation and its member ways
+     * which are in the ways_buffer.
+     *
+     * @returns false if there was some kind of error building the
+     *          area, true otherwise.
+     */
+    bool operator()(const osmium::Relation &relation,
+                    const osmium::memory::Buffer &ways_buffer);
+
+    /**
+     * Access the area that was built last.
+     */
+    osmium::Area const &get_area() const noexcept
+    {
+        return m_buffer->get<osmium::Area>(0);
+    }
+
+private:
+    bool make_area();
+
+    osmium::memory::Buffer* m_buffer;
+
+}; // class area_assembler_t
+
+} // namespace geom
+
+#endif // OSM2PGSQL_GEOM_AREA_ASSEMBLER_HPP

src/geom-from-osm.cpp

@@ -8,9 +8,10 @@
  */
 
 #include "geom-from-osm.hpp"
+
+#include "geom-area-assembler.hpp"
 #include "osmtypes.hpp"
 
-#include <osmium/area/geom_assembler.hpp>
 #include <osmium/osm/way.hpp>
 
 #include <cassert>
@@ -90,7 +91,8 @@ geometry_t create_linestring(osmium::Way const &way)
     return geom;
 }
 
-void create_polygon(geometry_t *geom, osmium::Way const &way)
+void create_polygon(geometry_t *geom, osmium::Way const &way,
+                    osmium::memory::Buffer *area_buffer)
 {
     auto &polygon = geom->set<polygon_t>();
 
@@ -100,26 +102,24 @@ void create_polygon(geometry_t *geom, osmium::Way const &way)
         return;
     }
 
-    osmium::area::AssemblerConfig area_config;
-    area_config.ignore_invalid_locations = true;
-    osmium::area::GeomAssembler assembler{area_config};
-    osmium::memory::Buffer area_buffer{1024};
+    geom::area_assembler_t assembler{area_buffer};
 
-    if (!assembler(way, area_buffer)) {
+    if (!assembler(way)) {
         geom->reset();
         return;
     }
 
-    auto const &area = area_buffer.get<osmium::Area>(0);
+    auto const &area = assembler.get_area();
     auto const &ring = *area.begin<osmium::OuterRing>();
 
     fill_point_list(&polygon.outer(), ring);
 }
 
-geometry_t create_polygon(osmium::Way const &way)
+geometry_t create_polygon(osmium::Way const &way,
+                          osmium::memory::Buffer *area_buffer)
 {
     geometry_t geom{};
-    create_polygon(&geom, way);
+    create_polygon(&geom, way, area_buffer);
     return geom;
 }
 
@@ -207,19 +207,17 @@ geometry_t create_multilinestring(osmium::memory::Buffer const &buffer,
 }
 
 void create_multipolygon(geometry_t *geom, osmium::Relation const &relation,
-                         osmium::memory::Buffer const &buffer)
+                         osmium::memory::Buffer const &buffer,
+                         osmium::memory::Buffer *area_buffer)
 {
-    osmium::area::AssemblerConfig area_config;
-    area_config.ignore_invalid_locations = true;
-    osmium::area::GeomAssembler assembler{area_config};
-    osmium::memory::Buffer area_buffer{1024};
+    geom::area_assembler_t assembler{area_buffer};
 
-    if (!assembler(relation, buffer, area_buffer)) {
+    if (!assembler(relation, buffer)) {
         geom->reset();
         return;
     }
 
-    auto const &area = area_buffer.get<osmium::Area>(0);
+    auto const &area = assembler.get_area();
 
     if (area.is_multipolygon()) {
         auto &multipolygon = geom->set<multipolygon_t>();
@@ -235,10 +233,11 @@ void create_multipolygon(geometry_t *geom, osmium::Relation const &relation,
 }
 
 geometry_t create_multipolygon(osmium::Relation const &relation,
-                               osmium::memory::Buffer const &buffer)
+                               osmium::memory::Buffer const &buffer,
+                               osmium::memory::Buffer *area_buffer)
 {
     geometry_t geom{};
-    create_multipolygon(&geom, relation, buffer);
+    create_multipolygon(&geom, relation, buffer, area_buffer);
     return geom;
 }
 

src/geom-from-osm.hpp

@@ -76,18 +76,22 @@ void create_linestring(geometry_t *geom, osmium::Way const &way);
  *
  * \param geom Pointer to an existing geometry which will be used as output.
  * \param way The input way.
+ * \param area_buffer Temporary buffer used to create area.
  */
-void create_polygon(geometry_t *geom, osmium::Way const &way);
+void create_polygon(geometry_t *geom, osmium::Way const &way,
+                    osmium::memory::Buffer *area_buffer);
 
 /**
  * Create a polygon geometry from a way.
  *
  * If the resulting polygon would be invalid, a null geometry is returned.
  *
  * \param way The input way.
+ * \param area_buffer Temporary buffer used to create area.
  * \returns The created geometry.
  */
-[[nodiscard]] geometry_t create_polygon(osmium::Way const &way);
+[[nodiscard]] geometry_t create_polygon(osmium::Way const &way,
+                                        osmium::memory::Buffer *area_buffer);
 
 /**
  * Create a multipoint geometry from a bunch of nodes (usually this would be
@@ -163,9 +167,11 @@ create_multilinestring(osmium::memory::Buffer const &buffer,
  * \param geom Pointer to an existing geometry which will be used as output.
  * \param relation The input relation.
  * \param buffer Buffer with OSM objects. Anything but ways are ignored.
+ * \param area_buffer Temporary buffer used to create area.
  */
 void create_multipolygon(geometry_t *geom, osmium::Relation const &relation,
-                         osmium::memory::Buffer const &buffer);
+                         osmium::memory::Buffer const &buffer,
+                         osmium::memory::Buffer *area_buffer);
 
 /**
  * Create a (multi)polygon geometry from a relation and member ways.
@@ -175,11 +181,13 @@ void create_multipolygon(geometry_t *geom, osmium::Relation const &relation,
  *
  * \param relation The input relation.
  * \param buffer Buffer with OSM objects. Anything but ways are ignored.
+ * \param area_buffer Temporary buffer used to create area.
  * \returns The created geometry.
  */
 [[nodiscard]] geometry_t
 create_multipolygon(osmium::Relation const &relation,
-                    osmium::memory::Buffer const &buffer);
+                    osmium::memory::Buffer const &buffer,
+                    osmium::memory::Buffer *area_buffer);
 
 /**
  * Create a geometry collection from nodes and ways, usually used for

src/output-flex.cpp

@@ -400,7 +400,7 @@ int output_flex_t::app_as_polygon()
     m_way_cache.add_nodes(middle());
 
     auto *geom = create_lua_geometry_object(lua_state());
-    geom::create_polygon(geom, m_way_cache.get());
+    geom::create_polygon(geom, m_way_cache.get(), &m_area_buffer);
 
     return 1;
 }
@@ -459,7 +459,7 @@ int output_flex_t::app_as_multipolygon()
         m_way_cache.add_nodes(middle());
 
         auto *geom = create_lua_geometry_object(lua_state());
-        geom::create_polygon(geom, m_way_cache.get());
+        geom::create_polygon(geom, m_way_cache.get(), &m_area_buffer);
 
         return 1;
     }
@@ -468,7 +468,8 @@ int output_flex_t::app_as_multipolygon()
 
     auto *geom = create_lua_geometry_object(lua_state());
     geom::create_multipolygon(geom, m_relation_cache.get(),
-                              m_relation_cache.members_buffer());
+                              m_relation_cache.members_buffer(),
+                              &m_area_buffer);
 
     return 1;
 }
@@ -1173,6 +1174,7 @@ output_flex_t::output_flex_t(output_flex_t const *other,
   m_db_connection(get_options()->connection_params, "out.flex.thread"),
   m_stage2_way_ids(other->m_stage2_way_ids),
   m_copy_thread(std::move(copy_thread)), m_lua_state(other->m_lua_state),
+  m_area_buffer(1024, osmium::memory::Buffer::auto_grow::yes),
   m_process_node(other->m_process_node), m_process_way(other->m_process_way),
   m_process_relation(other->m_process_relation),
   m_select_relation_members(other->m_select_relation_members),
@@ -1203,7 +1205,8 @@ output_flex_t::output_flex_t(std::shared_ptr<middle_query_t> const &mid,
                              properties_t const &properties)
 : output_t(mid, std::move(thread_pool), options),
   m_db_connection(get_options()->connection_params, "out.flex.main"),
-  m_copy_thread(std::make_shared<db_copy_thread_t>(options.connection_params))
+  m_copy_thread(std::make_shared<db_copy_thread_t>(options.connection_params)),
+  m_area_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
 {
     init_lua(options.style, properties);
 

src/output-flex.hpp

@@ -297,6 +297,8 @@ class output_flex_t : public output_t
     relation_cache_t m_relation_cache;
     osmium::Node const *m_context_node = nullptr;
 
+    osmium::memory::Buffer m_area_buffer;
+
     prepared_lua_function_t m_process_node{};
     prepared_lua_function_t m_process_way{};
     prepared_lua_function_t m_process_relation{};

src/output-pgsql.cpp

@@ -95,7 +95,7 @@ void output_pgsql_t::pgsql_out_way(osmium::Way const &way, taglist_t *tags,
                                    bool polygon, bool roads)
 {
     if (polygon && !way.nodes().empty() && way.is_closed()) {
-        auto const geom = geom::create_polygon(way);
+        auto const geom = geom::create_polygon(way, &m_area_buffer);
         auto const projected_geom = geom::transform(geom, *m_proj);
 
         auto const wkb = geom_to_ewkb(projected_geom);
@@ -297,9 +297,9 @@ void output_pgsql_t::pgsql_process_relation(osmium::Relation const &rel)
 
     // multipolygons and boundaries
     if (make_boundary || make_polygon) {
-        auto const geoms =
-            geom::split_multi(geom::create_multipolygon(rel, m_buffer),
-                              !get_options()->enable_multi);
+        auto const geoms = geom::split_multi(
+            geom::create_multipolygon(rel, m_buffer, &m_area_buffer),
+            !get_options()->enable_multi);
         for (auto const &sgeom : geoms) {
             auto const projected_geom = geom::transform(sgeom, *m_proj);
             m_expire.from_geometry_if_3857(projected_geom, m_expire_config);
@@ -439,7 +439,8 @@ output_pgsql_t::output_pgsql_t(std::shared_ptr<middle_query_t> const &mid,
 : output_t(mid, std::move(thread_pool), options), m_proj(options.projection),
   m_expire(options.expire_tiles_zoom, options.projection),
   m_buffer(32768, osmium::memory::Buffer::auto_grow::yes),
-  m_rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
+  m_rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes),
+  m_area_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
 {
     m_expire_config.full_area_limit = get_options()->expire_tiles_max_bbox;
     if (get_options()->expire_tiles_max_bbox > 0.0) {
@@ -505,7 +506,8 @@ output_pgsql_t::output_pgsql_t(
   m_proj(get_options()->projection), m_expire_config(other->m_expire_config),
   m_expire(get_options()->expire_tiles_zoom, get_options()->projection),
   m_buffer(1024, osmium::memory::Buffer::auto_grow::yes),
-  m_rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
+  m_rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes),
+  m_area_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
 {
     for (std::size_t i = 0; i < m_tables.size(); ++i) {
         //copy constructor will just connect to the already there table

src/output-pgsql.hpp

@@ -109,6 +109,7 @@ class output_pgsql_t : public output_t
 
     osmium::memory::Buffer m_buffer;
     osmium::memory::Buffer m_rels_buffer;
+    osmium::memory::Buffer m_area_buffer;
 };
 
 #endif // OSM2PGSQL_OUTPUT_PGSQL_HPP