Refactored point_list_t, linestring_t, ring_t

Author: joto

src/geom.cpp

@@ -23,4 +23,16 @@ bool operator!=(point_list_t const &a, point_list_t const &b) noexcept
     return !(a == b);
 }
 
+bool operator==(polygon_t const &a, polygon_t const &b) noexcept
+{
+    return (a.outer() == b.outer()) &&
+           std::equal(a.inners().cbegin(), a.inners().cend(),
+                      b.inners().cbegin(), b.inners().cend());
+}
+
+bool operator!=(polygon_t const &a, polygon_t const &b) noexcept
+{
+    return !(a == b);
+}
+
 } // namespace geom

src/geom.hpp

@@ -81,40 +81,41 @@ class point_t
 }; // class point_t
 
 /// This type is used as the basis for linestrings and rings.
-using point_list_t = std::vector<point_t>;
-
-bool operator==(point_list_t const &a, point_list_t const &b) noexcept;
-bool operator!=(point_list_t const &a, point_list_t const &b) noexcept;
-
-class linestring_t : public point_list_t
+class point_list_t : public std::vector<point_t>
 {
 public:
-    linestring_t() = default;
+    point_list_t() = default;
 
     template <typename Iterator>
-    linestring_t(Iterator begin, Iterator end) : point_list_t(begin, end)
+    point_list_t(Iterator begin, Iterator end)
+    : std::vector<point_t>(begin, end)
     {}
 
-    linestring_t(std::initializer_list<point_t> list)
-    : point_list_t(list.begin(), list.end())
+    point_list_t(std::initializer_list<point_t> list)
+    : std::vector<point_t>(list.begin(), list.end())
     {}
 
     static std::size_t num_geometries() noexcept { return 1; }
 
-}; // class linestring_t
+    friend bool operator==(point_list_t const &a,
+                           point_list_t const &b) noexcept;
 
-class ring_t : public point_list_t
+    friend bool operator!=(point_list_t const &a,
+                           point_list_t const &b) noexcept;
+
+}; // class point_list_t
+
+class linestring_t : public point_list_t
 {
 public:
-    ring_t() = default;
+    using point_list_t::point_list_t;
 
-    template <typename Iterator>
-    ring_t(Iterator begin, Iterator end) : point_list_t(begin, end)
-    {}
+}; // class linestring_t
 
-    ring_t(std::initializer_list<point_t> list)
-    : point_list_t(list.begin(), list.end())
-    {}
+class ring_t : public point_list_t
+{
+public:
+    using point_list_t::point_list_t;
 
 }; // class ring_t
 
@@ -137,17 +138,9 @@ class polygon_t
 
     void add_inner_ring(ring_t &&ring) { m_inners.push_back(std::move(ring)); }
 
-    friend bool operator==(polygon_t const &a, polygon_t const &b) noexcept
-    {
-        return (a.outer() == b.outer()) &&
-               std::equal(a.inners().cbegin(), a.inners().cend(),
-                          b.inners().cbegin(), b.inners().cend());
-    }
+    friend bool operator==(polygon_t const &a, polygon_t const &b) noexcept;
 
-    friend bool operator!=(polygon_t const &a, polygon_t const &b) noexcept
-    {
-        return !(a == b);
-    }
+    friend bool operator!=(polygon_t const &a, polygon_t const &b) noexcept;
 
 private:
     ring_t m_outer;