boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-11 21:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move std::array from base class to member of box_view and segment_view.

Browse Source
This commit is contained in:
Adam Wulkiewicz 2021-06-06 16:38:05 +02:00
parent 32aaa05bd0
commit a9e5f267c3
2 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
include/boost/geometry/views/box_view.hpp
View File

@ -30,6 +30,19 @@
namespace boost { namespace geometry namespace boost { namespace geometry
{ {
// NOTE: This is equivalent to the previous implementation with detail::points_view.
// Technically this should not be called a view because it owns the elements.
// It's also not a borrowed_range because of dangling iterators after the
// destruction.
// It's a container or more specifically a ring of some sort, e.g. static_ring.
// NOTE: It would be possible to implement a borrowed_range or a view.
// The iterators would have to store copies of points.
// Another possibility is to store the original Box or reference/pointer
// to Box and index. But then the reference would be the value type
// so technically they would be InputIterators not RandomAccessIterators.
// NOTE: This object can not represent a Box correctly in all coordinates systems.
// It's correct only in cartesian CS so maybe it should be removed entirely.
/*! /*!
\brief Makes a box behave like a ring or a range \brief Makes a box behave like a ring or a range
@ -49,35 +62,24 @@ namespace boost { namespace geometry
*/ */
template <typename Box, bool Clockwise = true> template <typename Box, bool Clockwise = true>
struct box_view struct box_view
// NOTE: This is equivalent to the previous implementation with detail::points_view
// Technically this should not be called a view because it owns the elements.
// It's also not a borrowed_range because of dangling iterators after the
// destruction.
// It's a container or more specifically a ring of some sort,
// e.g. static_ring.
// NOTE: It would be possible to implement a borrowed_range or a view.
// The iterators would have to store copies of points.
// Another possibility is to store the original Box or reference/pointer
// to Box and index. But then the reference would be the value type
// so technically they would be InputIterators not RandomAccessIterators.
// NOTE: This object can not represent a Box correctly in all coordinates systems.
// It's correct only in cartesian CS so maybe it should be removed entirely.
: private std::array<typename geometry::point_type<Box>::type, 5>
{ {
using base_t = std::array<typename geometry::point_type<Box>::type, 5>; using array_t = std::array<typename geometry::point_type<Box>::type, 5>;
using iterator = typename base_t::const_iterator; using iterator = typename array_t::const_iterator;
using const_iterator = typename base_t::const_iterator; using const_iterator = typename array_t::const_iterator;
/// Constructor accepting the box to adapt /// Constructor accepting the box to adapt
explicit box_view(Box const& box) explicit box_view(Box const& box)
{ {
detail::assign_box_corners_oriented<!Clockwise>(box, static_cast<base_t&>(*this)); detail::assign_box_corners_oriented<!Clockwise>(box, m_array);
(*this)[4] = (*this)[0]; m_array[4] = m_array[0];
} }
const_iterator begin() const noexcept { return base_t::begin(); } const_iterator begin() const noexcept { return m_array.begin(); }
const_iterator end() const noexcept { return base_t::end(); } const_iterator end() const noexcept { return m_array.end(); }
private:
array_t m_array;
}; };

40
include/boost/geometry/views/segment_view.hpp
View File

@ -29,6 +29,17 @@
namespace boost { namespace geometry namespace boost { namespace geometry
{ {
// NOTE: This is equivalent to the previous implementation with detail::points_view.
// Technically this should not be called a view because it owns the elements.
// It's also not a borrowed_range because of dangling iterators after the
// destruction.
// It's a container or more specifically a linestring of some sort, e.g. static_linestring.
// NOTE: It would be possible to implement a borrowed_range or a view.
// The iterators would have to store copies of points.
// Another possibility is to store the original Segment or reference/pointer
// to Segment and index. But then the reference would be the value type
// so technically they would be InputIterators not RandomAccessIterators.
/*! /*!
\brief Makes a segment behave like a linestring or a range \brief Makes a segment behave like a linestring or a range
@ -47,33 +58,24 @@ namespace boost { namespace geometry
*/ */
template <typename Segment> template <typename Segment>
struct segment_view struct segment_view
// NOTE: This is equivalent to the previous implementation with detail::points_view
// Technically this should not be called a view because it owns the elements.
// It's also not a borrowed_range because of dangling iterators after the
// destruction.
// It's a container or more specifically a linestring of some sort,
// e.g. static_linestring.
// NOTE: It would be possible to implement a borrowed_range or a view.
// The iterators would have to store copies of points.
// Another possibility is to store the original Segment or reference/pointer
// to Segment and index. But then the reference would be the value type
// so technically they would be InputIterators not RandomAccessIterators.
: private std::array<typename geometry::point_type<Segment>::type, 2>
{ {
using base_t = std::array<typename geometry::point_type<Segment>::type, 2>; using array_t = std::array<typename geometry::point_type<Segment>::type, 2>;
using iterator = typename base_t::const_iterator; using iterator = typename array_t::const_iterator;
using const_iterator = typename base_t::const_iterator; using const_iterator = typename array_t::const_iterator;
/// Constructor accepting the segment to adapt /// Constructor accepting the segment to adapt
explicit segment_view(Segment const& segment) explicit segment_view(Segment const& segment)
{ {
geometry::detail::assign_point_from_index<0>(segment, (*this)[0]); geometry::detail::assign_point_from_index<0>(segment, m_array[0]);
geometry::detail::assign_point_from_index<1>(segment, (*this)[1]); geometry::detail::assign_point_from_index<1>(segment, m_array[1]);
} }
const_iterator begin() const noexcept { return base_t::begin(); } const_iterator begin() const noexcept { return m_array.begin(); }
const_iterator end() const noexcept { return base_t::end(); } const_iterator end() const noexcept { return m_array.end(); }
private:
array_t m_array;
}; };