Make multigeometry_t not derive from std::vector

Cleans up the API of that class.

Author: joto

src/geom-functions.cpp

@@ -237,7 +237,7 @@ static void split_linestring(linestring_t const &line, double split_at,
     }
 
     if (out->size() <= 1) {
-        output->resize(output->num_geometries() - 1);
+        output->remove_last();
     }
 }
 

src/geom.hpp

@@ -168,32 +168,59 @@ class polygon_t
 }; // class polygon_t
 
 template <typename GEOM>
-class multigeometry_t : public std::vector<GEOM>
+class multigeometry_t
 {
 public:
     using const_iterator = typename std::vector<GEOM>::const_iterator;
+    using iterator = typename std::vector<GEOM>::const_iterator;
+    using value_type = GEOM;
 
     [[nodiscard]] std::size_t num_geometries() const noexcept
     {
-        return this->size();
+        return m_geometry.size();
     }
 
-    void add_geometry(GEOM &&geom) { this->push_back(std::move(geom)); }
+    GEOM &add_geometry(GEOM &&geom)
+    {
+        m_geometry.push_back(std::move(geom));
+        return m_geometry.back();
+    }
 
-    [[nodiscard]] GEOM &add_geometry() { return this->emplace_back(); }
+    [[nodiscard]] GEOM &add_geometry() { return m_geometry.emplace_back(); }
 
     [[nodiscard]] friend bool operator==(multigeometry_t const &a,
                                          multigeometry_t const &b) noexcept
     {
-        return std::equal(a.cbegin(), a.cend(), b.cbegin(), b.cend());
+        return a.m_geometry == b.m_geometry;
     }
 
     [[nodiscard]] friend bool operator!=(multigeometry_t const &a,
                                          multigeometry_t const &b) noexcept
     {
-        return !(a == b);
+        return a.m_geometry != b.m_geometry;
+    }
+
+    const_iterator begin() const noexcept { return m_geometry.cbegin(); }
+    const_iterator end() const noexcept { return m_geometry.cend(); }
+    const_iterator cbegin() const noexcept { return m_geometry.cbegin(); }
+    const_iterator cend() const noexcept { return m_geometry.cend(); }
+
+    GEOM const &operator[](std::size_t i) const noexcept
+    {
+        return m_geometry[i];
     }
 
+    void remove_last()
+    {
+        assert(!m_geometry.empty());
+        m_geometry.pop_back();
+    }
+
+    void reserve(std::size_t size) { m_geometry.reserve(size); }
+
+private:
+    std::vector<GEOM> m_geometry;
+
 }; // class multigeometry_t
 
 using multipoint_t = multigeometry_t<point_t>;

src/wkb.cpp

@@ -476,7 +476,7 @@ class ewkb_parser_t
 
         multipoint.reserve(num_geoms);
         for (uint32_t i = 0; i < num_geoms; ++i) {
-            auto &point = multipoint.emplace_back();
+            auto &point = multipoint.add_geometry();
             uint32_t const type = parse_header();
             if (type != geometry_type::wkb_point) {
                 throw std::runtime_error{
@@ -498,7 +498,7 @@ class ewkb_parser_t
 
         multilinestring.reserve(num_geoms);
         for (uint32_t i = 0; i < num_geoms; ++i) {
-            auto &linestring = multilinestring.emplace_back();
+            auto &linestring = multilinestring.add_geometry();
             uint32_t const type = parse_header();
             if (type != geometry_type::wkb_line) {
                 throw std::runtime_error{
@@ -520,7 +520,7 @@ class ewkb_parser_t
 
         multipolygon.reserve(num_geoms);
         for (uint32_t i = 0; i < num_geoms; ++i) {
-            auto &polygon = multipolygon.emplace_back();
+            auto &polygon = multipolygon.add_geometry();
             uint32_t const type = parse_header();
             if (type != geometry_type::wkb_polygon) {
                 throw std::runtime_error{

tests/test-wkb.cpp

@@ -92,8 +92,8 @@ TEST_CASE("wkb: multipoint", "[NoDB]")
     geom::geometry_t geom{geom::multipoint_t{}, 46};
 
     auto &mp = geom.get<geom::multipoint_t>();
-    mp.emplace_back(geom::point_t{{1.2, 2.3}});
-    mp.emplace_back(geom::point_t{{7.0, 7.0}});
+    mp.add_geometry(geom::point_t{{1.2, 2.3}});
+    mp.add_geometry(geom::point_t{{7.0, 7.0}});
 
     auto const result = ewkb_to_geom(geom_to_ewkb(geom));
     REQUIRE(result.is_multipoint());
@@ -120,8 +120,8 @@ TEST_CASE("wkb: multilinestring", "[NoDB]")
     geom::geometry_t geom{geom::multilinestring_t{}, 46};
 
     auto &ml = geom.get<geom::multilinestring_t>();
-    ml.emplace_back(geom::linestring_t{{1.2, 2.3}, {3.4, 4.5}, {5.6, 6.7}});
-    ml.emplace_back(geom::linestring_t{{7.0, 7.0}, {8.0, 7.0}, {8.0, 8.0}});
+    ml.add_geometry(geom::linestring_t{{1.2, 2.3}, {3.4, 4.5}, {5.6, 6.7}});
+    ml.add_geometry(geom::linestring_t{{7.0, 7.0}, {8.0, 7.0}, {8.0, 8.0}});
 
     auto const result = ewkb_to_geom(geom_to_ewkb(geom));
     REQUIRE(result.is_multilinestring());
@@ -151,14 +151,14 @@ TEST_CASE("wkb: multipolygon", "[NoDB]")
 
     auto &mp = geom.get<geom::multipolygon_t>();
     {
-        auto &p0 = mp.emplace_back(geom::ring_t{
-            {0.0, 0.0}, {3.0, 0.0}, {3.0, 3.0}, {0.0, 3.0}, {0.0, 0.0}});
+        auto &p0 = mp.add_geometry(geom::polygon_t{geom::ring_t{
+            {0.0, 0.0}, {3.0, 0.0}, {3.0, 3.0}, {0.0, 3.0}, {0.0, 0.0}}});
         p0.add_inner_ring(geom::ring_t{
             {1.0, 1.0}, {2.0, 1.0}, {2.0, 2.0}, {1.0, 2.0}, {1.0, 1.0}});
     }
 
-    mp.emplace_back(geom::ring_t{
-        {4.0, 4.0}, {5.0, 4.0}, {5.0, 5.0}, {4.0, 5.0}, {4.0, 4.0}});
+    mp.add_geometry(geom::polygon_t{geom::ring_t{
+        {4.0, 4.0}, {5.0, 4.0}, {5.0, 5.0}, {4.0, 5.0}, {4.0, 4.0}}});
 
     auto const result = ewkb_to_geom(geom_to_ewkb(geom));
     REQUIRE(result.is_multipolygon());
@@ -172,8 +172,8 @@ TEST_CASE("wkb: geometrycollection", "[NoDB]")
     geom::geometry_t geom2{geom::linestring_t{{1.2, 2.3}, {3.4, 4.5}}};
     geom::geometry_t geom3{geom::multipolygon_t{}};
 
-    geom3.get<geom::multipolygon_t>().emplace_back(geom::ring_t{
-        {4.0, 4.0}, {5.0, 4.0}, {5.0, 5.0}, {4.0, 5.0}, {4.0, 4.0}});
+    geom3.get<geom::multipolygon_t>().add_geometry(geom::polygon_t{geom::ring_t{
+        {4.0, 4.0}, {5.0, 4.0}, {5.0, 5.0}, {4.0, 5.0}, {4.0, 4.0}}});
 
     geom::geometry_t geom{geom::collection_t{}, 49};
     auto &c = geom.get<geom::collection_t>();