diff options
Diffstat (limited to 'boost/geometry/algorithms/detail/point_on_border.hpp')
| -rw-r--r-- | boost/geometry/algorithms/detail/point_on_border.hpp | 53 |
1 files changed, 30 insertions, 23 deletions
diff --git a/boost/geometry/algorithms/detail/point_on_border.hpp b/boost/geometry/algorithms/detail/point_on_border.hpp index 3969939b4e..8b3a20a16f 100644 --- a/boost/geometry/algorithms/detail/point_on_border.hpp +++ b/boost/geometry/algorithms/detail/point_on_border.hpp @@ -4,8 +4,8 @@ // Copyright (c) 2008-2012 Bruno Lalande, Paris, France. // Copyright (c) 2009-2012 Mateusz Loskot, London, UK. -// This file was modified by Oracle on 2017-2020. -// Modifications copyright (c) 2017-2020 Oracle and/or its affiliates. +// This file was modified by Oracle on 2017-2022. +// Modifications copyright (c) 2017-2022 Oracle and/or its affiliates. // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library @@ -25,17 +25,15 @@ #include <boost/range/end.hpp> #include <boost/static_assert.hpp> +#include <boost/geometry/algorithms/assign.hpp> +#include <boost/geometry/algorithms/detail/convert_point_to_point.hpp> +#include <boost/geometry/algorithms/detail/equals/point_point.hpp> #include <boost/geometry/core/tags.hpp> #include <boost/geometry/core/point_type.hpp> #include <boost/geometry/core/ring_type.hpp> - #include <boost/geometry/geometries/concepts/check.hpp> - -#include <boost/geometry/algorithms/assign.hpp> -#include <boost/geometry/algorithms/detail/convert_point_to_point.hpp> -#include <boost/geometry/algorithms/detail/equals/point_point.hpp> - #include <boost/geometry/util/condition.hpp> +#include <boost/geometry/views/detail/indexed_point_view.hpp> namespace boost { namespace geometry @@ -49,10 +47,10 @@ namespace detail { namespace point_on_border struct get_point { - template <typename Point> - static inline bool apply(Point& destination, Point const& source) + template <typename Destination, typename Source> + static inline bool apply(Destination& destination, Source const& source) { - destination = source; + detail::conversion::convert_point_to_point(source, destination); return true; } }; @@ -69,7 +67,7 @@ struct point_on_range return false; } - geometry::detail::conversion::convert_point_to_point(*begin, point); + detail::conversion::convert_point_to_point(*begin, point); return true; } @@ -92,12 +90,13 @@ struct point_on_polygon }; -struct point_on_box +struct point_on_segment_or_box { - template<typename Point, typename Box> - static inline bool apply(Point& point, Box const& box) + template<typename Point, typename SegmentOrBox> + static inline bool apply(Point& point, SegmentOrBox const& segment_or_box) { - detail::assign::assign_box_2d_corner<min_corner, min_corner>(box, point); + detail::indexed_point_view<SegmentOrBox const, 0> view(segment_or_box); + detail::conversion::convert_point_to_point(view, point); return true; } }; @@ -111,12 +110,7 @@ struct point_on_multi { // Take a point on the first multi-geometry // (i.e. the first that is not empty) - for (typename boost::range_iterator - < - MultiGeometry const - >::type it = boost::begin(multi); - it != boost::end(multi); - ++it) + for (auto it = boost::begin(multi); it != boost::end(multi); ++it) { if (Policy::apply(point, *it)) { @@ -147,6 +141,11 @@ struct point_on_border<point_tag> {}; template <> +struct point_on_border<segment_tag> + : detail::point_on_border::point_on_segment_or_box +{}; + +template <> struct point_on_border<linestring_tag> : detail::point_on_border::point_on_range {}; @@ -163,11 +162,16 @@ struct point_on_border<polygon_tag> template <> struct point_on_border<box_tag> - : detail::point_on_border::point_on_box + : detail::point_on_border::point_on_segment_or_box {}; template <> +struct point_on_border<multi_point_tag> + : detail::point_on_border::point_on_range +{}; + +template <> struct point_on_border<multi_polygon_tag> : detail::point_on_border::point_on_multi < @@ -189,6 +193,9 @@ struct point_on_border<multi_linestring_tag> #endif // DOXYGEN_NO_DISPATCH +// TODO: We should probably rename this utility because it can return point +// which is in the interior of a geometry (for PointLike and LinearRings). + /*! \brief Take point on a border \ingroup overlay |