diff options
Diffstat (limited to 'boost/geometry/algorithms/sym_difference.hpp')
| -rw-r--r-- | boost/geometry/algorithms/sym_difference.hpp | 307 |
1 files changed, 178 insertions, 129 deletions
diff --git a/boost/geometry/algorithms/sym_difference.hpp b/boost/geometry/algorithms/sym_difference.hpp index 854364ea33..894e88c7cc 100644 --- a/boost/geometry/algorithms/sym_difference.hpp +++ b/boost/geometry/algorithms/sym_difference.hpp @@ -2,9 +2,9 @@ // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands. -// This file was modified by Oracle on 2015-2021. -// Modifications copyright (c) 2015-2021 Oracle and/or its affiliates. - +// This file was modified by Oracle on 2015-2023. +// Modifications copyright (c) 2015-2023 Oracle and/or its affiliates. +// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle @@ -16,16 +16,11 @@ #define BOOST_GEOMETRY_ALGORITHMS_SYM_DIFFERENCE_HPP -#include <algorithm> #include <iterator> -#include <vector> - -#include <boost/variant/apply_visitor.hpp> -#include <boost/variant/static_visitor.hpp> -#include <boost/variant/variant_fwd.hpp> -#include <boost/geometry/algorithms/intersection.hpp> +#include <boost/geometry/algorithms/difference.hpp> #include <boost/geometry/algorithms/union.hpp> +#include <boost/geometry/geometries/adapted/boost_variant.hpp> #include <boost/geometry/geometries/multi_polygon.hpp> #include <boost/geometry/policies/robustness/get_rescale_policy.hpp> #include <boost/geometry/strategies/default_strategy.hpp> @@ -33,7 +28,6 @@ #include <boost/geometry/strategies/relate/cartesian.hpp> #include <boost/geometry/strategies/relate/geographic.hpp> #include <boost/geometry/strategies/relate/spherical.hpp> -#include <boost/geometry/util/range.hpp> namespace boost { namespace geometry @@ -512,20 +506,23 @@ inline OutputIterator sym_difference_insert(Geometry1 const& geometry1, #endif // DOXYGEN_NO_DETAIL -namespace resolve_strategy { +namespace resolve_collection +{ template < - typename Strategy, - bool IsUmbrella = strategies::detail::is_umbrella_strategy<Strategy>::value + typename Geometry1, typename Geometry2, typename Collection, + typename Tag1 = typename geometry::tag<Geometry1>::type, + typename Tag2 = typename geometry::tag<Geometry2>::type, + typename CollectionTag = typename geometry::tag<Collection>::type > struct sym_difference { - template <typename Geometry1, typename Geometry2, typename Collection> - static inline void apply(Geometry1 const& geometry1, - Geometry2 const& geometry2, - Collection & output_collection, - Strategy const& strategy) + template <typename Strategy> + static void apply(Geometry1 const& geometry1, + Geometry2 const& geometry2, + Collection & output_collection, + Strategy const& strategy) { typedef typename geometry::detail::output_geometry_value < @@ -539,6 +536,127 @@ struct sym_difference } }; + +template <typename Geometry1, typename Geometry2, typename Collection> +struct sym_difference + < + Geometry1, Geometry2, Collection, + geometry_collection_tag, geometry_collection_tag, geometry_collection_tag + > +{ + template <typename Strategy> + static void apply(Geometry1 const& geometry1, + Geometry2 const& geometry2, + Collection& output_collection, + Strategy const& strategy) + { + Collection temp1, temp2; + resolve_collection::difference + < + Geometry1, Geometry2, Collection + >::apply(geometry1, geometry2, temp1, strategy); + resolve_collection::difference + < + Geometry2, Geometry1, Collection + >::apply(geometry2, geometry1, temp2, strategy); + resolve_collection::union_ + < + Collection, Collection, Collection + >::apply(temp1, temp2, output_collection, strategy); + } +}; + +template <typename Geometry1, typename Geometry2, typename Collection, typename Tag1> +struct sym_difference + < + Geometry1, Geometry2, Collection, + Tag1, geometry_collection_tag, geometry_collection_tag + > +{ + template <typename Strategy> + static void apply(Geometry1 const& geometry1, + Geometry2 const& geometry2, + Collection & output_collection, + Strategy const& strategy) + { + using gc_view_t = geometry::detail::geometry_collection_view<Geometry1>; + sym_difference + < + gc_view_t, Geometry2, Collection + >::apply(gc_view_t(geometry1), geometry2, output_collection, strategy); + } +}; + +template <typename Geometry1, typename Geometry2, typename Collection, typename Tag2> +struct sym_difference + < + Geometry1, Geometry2, Collection, + geometry_collection_tag, Tag2, geometry_collection_tag + > +{ + template <typename Strategy> + static void apply(Geometry1 const& geometry1, + Geometry2 const& geometry2, + Collection & output_collection, + Strategy const& strategy) + { + using gc_view_t = geometry::detail::geometry_collection_view<Geometry2>; + sym_difference + < + Geometry1, gc_view_t, Collection + >::apply(geometry1, gc_view_t(geometry2), output_collection, strategy); + } +}; + +template <typename Geometry1, typename Geometry2, typename Collection, typename Tag1, typename Tag2> +struct sym_difference + < + Geometry1, Geometry2, Collection, + Tag1, Tag2, geometry_collection_tag + > +{ + template <typename Strategy> + static void apply(Geometry1 const& geometry1, + Geometry2 const& geometry2, + Collection & output_collection, + Strategy const& strategy) + { + using gc1_view_t = geometry::detail::geometry_collection_view<Geometry1>; + using gc2_view_t = geometry::detail::geometry_collection_view<Geometry2>; + sym_difference + < + gc1_view_t, gc2_view_t, Collection + >::apply(gc1_view_t(geometry1), gc2_view_t(geometry2), output_collection, strategy); + } +}; + + +} // namespace resolve_collection + + +namespace resolve_strategy +{ + +template +< + typename Strategy, + bool IsUmbrella = strategies::detail::is_umbrella_strategy<Strategy>::value +> +struct sym_difference +{ + template <typename Geometry1, typename Geometry2, typename Collection> + static inline void apply(Geometry1 const& geometry1, + Geometry2 const& geometry2, + Collection & output_collection, + Strategy const& strategy) + { + resolve_collection::sym_difference + < + Geometry1, Geometry2, Collection + >::apply(geometry1, geometry2, output_collection, strategy); + } +}; + template <typename Strategy> struct sym_difference<Strategy, false> { @@ -567,7 +685,7 @@ struct sym_difference<default_strategy, false> Collection & output_collection, default_strategy) { - typedef typename strategy::relate::services::default_strategy + typedef typename strategies::relate::services::default_strategy < Geometry1, Geometry2 >::type strategy_type; @@ -582,10 +700,15 @@ struct sym_difference<default_strategy, false> } // resolve_strategy -namespace resolve_variant +namespace resolve_dynamic { - -template <typename Geometry1, typename Geometry2> + +template +< + typename Geometry1, typename Geometry2, + typename Tag1 = typename geometry::tag<Geometry1>::type, + typename Tag2 = typename geometry::tag<Geometry2>::type +> struct sym_difference { template <typename Collection, typename Strategy> @@ -602,134 +725,60 @@ struct sym_difference }; -template <BOOST_VARIANT_ENUM_PARAMS(typename T), typename Geometry2> -struct sym_difference<variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometry2> +template <typename DynamicGeometry1, typename Geometry2, typename Tag2> +struct sym_difference<DynamicGeometry1, Geometry2, dynamic_geometry_tag, Tag2> { template <typename Collection, typename Strategy> - struct visitor: static_visitor<> + static void apply(DynamicGeometry1 const& geometry1, Geometry2 const& geometry2, + Collection& output_collection, Strategy const& strategy) { - Geometry2 const& m_geometry2; - Collection& m_output_collection; - Strategy const& m_strategy; - - visitor(Geometry2 const& geometry2, - Collection& output_collection, - Strategy const& strategy) - : m_geometry2(geometry2) - , m_output_collection(output_collection) - , m_strategy(strategy) - {} - - template <typename Geometry1> - void operator()(Geometry1 const& geometry1) const + traits::visit<DynamicGeometry1>::apply([&](auto const& g1) { - sym_difference + resolve_strategy::sym_difference < - Geometry1, - Geometry2 - >::apply(geometry1, m_geometry2, m_output_collection, m_strategy); - } - }; - - template <typename Collection, typename Strategy> - static inline void - apply(variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry1, - Geometry2 const& geometry2, - Collection& output_collection, - Strategy const& strategy) - { - boost::apply_visitor(visitor<Collection, Strategy>(geometry2, - output_collection, - strategy), - geometry1); + Strategy + >::apply(g1, geometry2, output_collection, strategy); + }, geometry1); } }; -template <typename Geometry1, BOOST_VARIANT_ENUM_PARAMS(typename T)> -struct sym_difference<Geometry1, variant<BOOST_VARIANT_ENUM_PARAMS(T)> > +template <typename Geometry1, typename DynamicGeometry2, typename Tag1> +struct sym_difference<Geometry1, DynamicGeometry2, Tag1, dynamic_geometry_tag> { template <typename Collection, typename Strategy> - struct visitor: static_visitor<> + static void apply(Geometry1 const& geometry1, DynamicGeometry2 const& geometry2, + Collection& output_collection, Strategy const& strategy) { - Geometry1 const& m_geometry1; - Collection& m_output_collection; - Strategy const& m_strategy; - - visitor(Geometry1 const& geometry1, - Collection& output_collection, - Strategy const& strategy) - : m_geometry1(geometry1) - , m_output_collection(output_collection) - , m_strategy(strategy) - {} - - template <typename Geometry2> - void operator()(Geometry2 const& geometry2) const + traits::visit<DynamicGeometry2>::apply([&](auto const& g2) { - sym_difference + resolve_strategy::sym_difference < - Geometry1, - Geometry2 - >::apply(m_geometry1, geometry2, m_output_collection, m_strategy); - } - }; - - template <typename Collection, typename Strategy> - static inline void - apply(Geometry1 const& geometry1, - variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry2, - Collection& output_collection, - Strategy const& strategy) - { - boost::apply_visitor(visitor<Collection, Strategy>(geometry1, - output_collection, - strategy), - geometry2); + Strategy + >::apply(geometry1, g2, output_collection, strategy); + }, geometry2); } }; -template <BOOST_VARIANT_ENUM_PARAMS(typename T1), BOOST_VARIANT_ENUM_PARAMS(typename T2)> -struct sym_difference<variant<BOOST_VARIANT_ENUM_PARAMS(T1)>, variant<BOOST_VARIANT_ENUM_PARAMS(T2)> > +template <typename DynamicGeometry1, typename DynamicGeometry2> +struct sym_difference<DynamicGeometry1, DynamicGeometry2, dynamic_geometry_tag, dynamic_geometry_tag> { template <typename Collection, typename Strategy> - struct visitor: static_visitor<> + static void apply(DynamicGeometry1 const& geometry1, DynamicGeometry2 const& geometry2, + Collection& output_collection, Strategy const& strategy) { - Collection& m_output_collection; - Strategy const& m_strategy; - - visitor(Collection& output_collection, Strategy const& strategy) - : m_output_collection(output_collection) - , m_strategy(strategy) - {} - - template <typename Geometry1, typename Geometry2> - void operator()(Geometry1 const& geometry1, - Geometry2 const& geometry2) const + traits::visit<DynamicGeometry1, DynamicGeometry2>::apply([&](auto const& g1, auto const& g2) { - sym_difference + resolve_strategy::sym_difference < - Geometry1, - Geometry2 - >::apply(geometry1, geometry2, m_output_collection, m_strategy); - } - }; - - template <typename Collection, typename Strategy> - static inline void - apply(variant<BOOST_VARIANT_ENUM_PARAMS(T1)> const& geometry1, - variant<BOOST_VARIANT_ENUM_PARAMS(T2)> const& geometry2, - Collection& output_collection, - Strategy const& strategy) - { - boost::apply_visitor(visitor<Collection, Strategy>(output_collection, - strategy), - geometry1, geometry2); + Strategy + >::apply(g1, g2, output_collection, strategy); + }, geometry1, geometry2); } }; - -} // namespace resolve_variant + +} // namespace resolve_dynamic /*! @@ -761,7 +810,7 @@ inline void sym_difference(Geometry1 const& geometry1, Collection& output_collection, Strategy const& strategy) { - resolve_variant::sym_difference + resolve_dynamic::sym_difference < Geometry1, Geometry2 @@ -793,11 +842,11 @@ inline void sym_difference(Geometry1 const& geometry1, Geometry2 const& geometry2, Collection& output_collection) { - resolve_variant::sym_difference + resolve_dynamic::sym_difference < Geometry1, Geometry2 - >::apply(geometry1, geometry2, output_collection, default_strategy()); + >::apply(geometry1, geometry2, output_collection, default_strategy()); } |