update boost
This commit is contained in:
@@ -2,9 +2,9 @@
|
||||
|
||||
// Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
|
||||
|
||||
// This file was modified by Oracle on 2015, 2017.
|
||||
// Modifications copyright (c) 2015-2017 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,20 +16,18 @@
|
||||
#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>
|
||||
#include <boost/geometry/util/range.hpp>
|
||||
#include <boost/geometry/strategies/detail.hpp>
|
||||
#include <boost/geometry/strategies/relate/cartesian.hpp>
|
||||
#include <boost/geometry/strategies/relate/geographic.hpp>
|
||||
#include <boost/geometry/strategies/relate/spherical.hpp>
|
||||
|
||||
|
||||
namespace boost { namespace geometry
|
||||
@@ -150,6 +148,124 @@ struct sym_difference_areal_areal
|
||||
};
|
||||
|
||||
|
||||
template
|
||||
<
|
||||
typename GeometryOut,
|
||||
typename SingleTag,
|
||||
template <typename, typename, typename> class Algorithm
|
||||
>
|
||||
struct sym_difference_same_inputs_tupled_output
|
||||
{
|
||||
template
|
||||
<
|
||||
typename Geometry1,
|
||||
typename Geometry2,
|
||||
typename RobustPolicy,
|
||||
typename OutputIterator,
|
||||
typename Strategy
|
||||
>
|
||||
static inline OutputIterator apply(Geometry1 const& geometry1,
|
||||
Geometry2 const& geometry2,
|
||||
RobustPolicy const& robust_policy,
|
||||
OutputIterator out,
|
||||
Strategy const& strategy)
|
||||
{
|
||||
typedef typename geometry::detail::output_geometry_access
|
||||
<
|
||||
GeometryOut, SingleTag, SingleTag
|
||||
> access;
|
||||
|
||||
access::get(out) = Algorithm
|
||||
<
|
||||
typename access::type, Geometry1, Geometry2
|
||||
>::apply(geometry1, geometry2, robust_policy, access::get(out), strategy);
|
||||
|
||||
return out;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
template
|
||||
<
|
||||
typename GeometryOut,
|
||||
typename SingleTag1,
|
||||
typename SingleTag2,
|
||||
bool Reverse = (geometry::core_dispatch::top_dim<SingleTag1>::value
|
||||
> geometry::core_dispatch::top_dim<SingleTag2>::value)
|
||||
>
|
||||
struct sym_difference_different_inputs_tupled_output
|
||||
{
|
||||
template
|
||||
<
|
||||
typename Geometry1,
|
||||
typename Geometry2,
|
||||
typename RobustPolicy,
|
||||
typename OutputIterator,
|
||||
typename Strategy
|
||||
>
|
||||
static inline OutputIterator apply(Geometry1 const& geometry1,
|
||||
Geometry2 const& geometry2,
|
||||
RobustPolicy const& robust_policy,
|
||||
OutputIterator out,
|
||||
Strategy const& strategy)
|
||||
{
|
||||
return sym_difference_different_inputs_tupled_output
|
||||
<
|
||||
GeometryOut, SingleTag2, SingleTag1
|
||||
>::apply(geometry2, geometry1, robust_policy, out, strategy);
|
||||
}
|
||||
};
|
||||
|
||||
template
|
||||
<
|
||||
typename GeometryOut,
|
||||
typename SingleTag1,
|
||||
typename SingleTag2
|
||||
>
|
||||
struct sym_difference_different_inputs_tupled_output
|
||||
<
|
||||
GeometryOut, SingleTag1, SingleTag2, false
|
||||
>
|
||||
{
|
||||
template
|
||||
<
|
||||
typename Geometry1,
|
||||
typename Geometry2,
|
||||
typename RobustPolicy,
|
||||
typename OutputIterator,
|
||||
typename Strategy
|
||||
>
|
||||
static inline OutputIterator apply(Geometry1 const& geometry1,
|
||||
Geometry2 const& geometry2,
|
||||
RobustPolicy const& robust_policy,
|
||||
OutputIterator out,
|
||||
Strategy const& strategy)
|
||||
{
|
||||
typedef typename geometry::detail::output_geometry_access
|
||||
<
|
||||
GeometryOut, SingleTag1, SingleTag1
|
||||
> access1;
|
||||
typedef typename geometry::detail::output_geometry_access
|
||||
<
|
||||
GeometryOut, SingleTag2, SingleTag2
|
||||
> access2;
|
||||
|
||||
access1::get(out) = compute_difference
|
||||
<
|
||||
typename access1::type
|
||||
>::apply(geometry1, geometry2, robust_policy, access1::get(out), strategy);
|
||||
|
||||
access2::get(out) = geometry::detail::convert_to_output
|
||||
<
|
||||
Geometry2,
|
||||
typename access2::type
|
||||
>::apply(geometry2, access2::get(out));
|
||||
|
||||
return out;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
}} // namespace detail::sym_difference
|
||||
#endif // DOXYGEN_NO_DETAIL
|
||||
|
||||
@@ -167,13 +283,13 @@ template
|
||||
typename GeometryOut,
|
||||
typename TagIn1 = typename geometry::tag_cast
|
||||
<
|
||||
typename tag<Geometry1>::type, areal_tag
|
||||
typename tag<Geometry1>::type, pointlike_tag, linear_tag, areal_tag
|
||||
>::type,
|
||||
typename TagIn2 = typename geometry::tag_cast
|
||||
<
|
||||
typename tag<Geometry2>::type, areal_tag
|
||||
typename tag<Geometry2>::type, pointlike_tag, linear_tag, areal_tag
|
||||
>::type,
|
||||
typename TagOut = typename geometry::tag<GeometryOut>::type
|
||||
typename TagOut = typename detail::setop_insert_output_tag<GeometryOut>::type
|
||||
>
|
||||
struct sym_difference_insert
|
||||
: detail::sym_difference::sym_difference_generic
|
||||
@@ -201,6 +317,95 @@ struct sym_difference_insert
|
||||
{};
|
||||
|
||||
|
||||
|
||||
template
|
||||
<
|
||||
typename PointLike1,
|
||||
typename PointLike2,
|
||||
typename GeometryOut
|
||||
>
|
||||
struct sym_difference_insert
|
||||
<
|
||||
PointLike1, PointLike2, GeometryOut,
|
||||
pointlike_tag, pointlike_tag, detail::tupled_output_tag
|
||||
>
|
||||
: detail::expect_output<PointLike1, PointLike2, GeometryOut, point_tag>
|
||||
, detail::sym_difference::sym_difference_same_inputs_tupled_output
|
||||
<
|
||||
GeometryOut,
|
||||
point_tag,
|
||||
detail::sym_difference::sym_difference_generic
|
||||
>
|
||||
{};
|
||||
|
||||
template
|
||||
<
|
||||
typename Linear1,
|
||||
typename Linear2,
|
||||
typename GeometryOut
|
||||
>
|
||||
struct sym_difference_insert
|
||||
<
|
||||
Linear1, Linear2, GeometryOut,
|
||||
linear_tag, linear_tag, detail::tupled_output_tag
|
||||
>
|
||||
: detail::expect_output<Linear1, Linear2, GeometryOut, linestring_tag>
|
||||
, detail::sym_difference::sym_difference_same_inputs_tupled_output
|
||||
<
|
||||
GeometryOut,
|
||||
linestring_tag,
|
||||
detail::sym_difference::sym_difference_generic
|
||||
>
|
||||
{};
|
||||
|
||||
template
|
||||
<
|
||||
typename Areal1,
|
||||
typename Areal2,
|
||||
typename GeometryOut
|
||||
>
|
||||
struct sym_difference_insert
|
||||
<
|
||||
Areal1, Areal2, GeometryOut,
|
||||
areal_tag, areal_tag, detail::tupled_output_tag
|
||||
>
|
||||
: detail::expect_output<Areal1, Areal2, GeometryOut, polygon_tag>
|
||||
, detail::sym_difference::sym_difference_same_inputs_tupled_output
|
||||
<
|
||||
GeometryOut,
|
||||
polygon_tag,
|
||||
detail::sym_difference::sym_difference_areal_areal
|
||||
>
|
||||
{};
|
||||
|
||||
template
|
||||
<
|
||||
typename Geometry1,
|
||||
typename Geometry2,
|
||||
typename GeometryOut,
|
||||
typename TagIn1,
|
||||
typename TagIn2
|
||||
>
|
||||
struct sym_difference_insert
|
||||
<
|
||||
Geometry1, Geometry2, GeometryOut,
|
||||
TagIn1, TagIn2, detail::tupled_output_tag
|
||||
>
|
||||
: detail::expect_output
|
||||
<
|
||||
Geometry1, Geometry2, GeometryOut,
|
||||
typename detail::single_tag_from_base_tag<TagIn1>::type,
|
||||
typename detail::single_tag_from_base_tag<TagIn2>::type
|
||||
>
|
||||
, detail::sym_difference::sym_difference_different_inputs_tupled_output
|
||||
<
|
||||
GeometryOut,
|
||||
typename detail::single_tag_from_base_tag<TagIn1>::type,
|
||||
typename detail::single_tag_from_base_tag<TagIn2>::type
|
||||
>
|
||||
{};
|
||||
|
||||
|
||||
} // namespace dispatch
|
||||
#endif // DOXYGEN_NO_DISPATCH
|
||||
|
||||
@@ -234,19 +439,29 @@ template
|
||||
typename GeometryOut,
|
||||
typename Geometry1,
|
||||
typename Geometry2,
|
||||
typename RobustPolicy,
|
||||
typename OutputIterator,
|
||||
typename Strategy
|
||||
>
|
||||
inline OutputIterator sym_difference_insert(Geometry1 const& geometry1,
|
||||
Geometry2 const& geometry2,
|
||||
RobustPolicy const& robust_policy,
|
||||
OutputIterator out,
|
||||
Strategy const& strategy)
|
||||
{
|
||||
concepts::check<Geometry1 const>();
|
||||
concepts::check<Geometry2 const>();
|
||||
concepts::check<GeometryOut>();
|
||||
//concepts::check<GeometryOut>();
|
||||
geometry::detail::output_geometry_concept_check<GeometryOut>::apply();
|
||||
|
||||
typedef typename geometry::rescale_overlay_policy_type
|
||||
<
|
||||
Geometry1,
|
||||
Geometry2,
|
||||
typename Strategy::cs_tag
|
||||
>::type rescale_policy_type;
|
||||
|
||||
rescale_policy_type robust_policy
|
||||
= geometry::get_rescale_policy<rescale_policy_type>(
|
||||
geometry1, geometry2, strategy);
|
||||
|
||||
return dispatch::sym_difference_insert
|
||||
<
|
||||
@@ -274,83 +489,226 @@ template
|
||||
typename GeometryOut,
|
||||
typename Geometry1,
|
||||
typename Geometry2,
|
||||
typename RobustPolicy,
|
||||
typename OutputIterator
|
||||
>
|
||||
inline OutputIterator sym_difference_insert(Geometry1 const& geometry1,
|
||||
Geometry2 const& geometry2,
|
||||
RobustPolicy const& robust_policy, OutputIterator out)
|
||||
Geometry2 const& geometry2, OutputIterator out)
|
||||
{
|
||||
concepts::check<Geometry1 const>();
|
||||
concepts::check<Geometry2 const>();
|
||||
concepts::check<GeometryOut>();
|
||||
|
||||
typedef typename strategy::intersection::services::default_strategy
|
||||
typedef typename strategies::relate::services::default_strategy
|
||||
<
|
||||
typename cs_tag<GeometryOut>::type
|
||||
Geometry1, Geometry2
|
||||
>::type strategy_type;
|
||||
|
||||
return sym_difference_insert<GeometryOut>(geometry1, geometry2, robust_policy, out, strategy_type());
|
||||
return sym_difference_insert<GeometryOut>(geometry1, geometry2, out, strategy_type());
|
||||
}
|
||||
|
||||
}} // namespace detail::sym_difference
|
||||
#endif // DOXYGEN_NO_DETAIL
|
||||
|
||||
|
||||
namespace resolve_strategy {
|
||||
namespace resolve_collection
|
||||
{
|
||||
|
||||
template
|
||||
<
|
||||
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
|
||||
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
|
||||
<
|
||||
Collection
|
||||
>::type single_out;
|
||||
|
||||
detail::sym_difference::sym_difference_insert<single_out>(
|
||||
geometry1, geometry2,
|
||||
geometry::detail::output_geometry_back_inserter(output_collection),
|
||||
strategy);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
template <typename Geometry1, typename Geometry2, typename Collection>
|
||||
struct sym_difference
|
||||
<
|
||||
typename Geometry1,
|
||||
typename Geometry2,
|
||||
typename RobustPolicy,
|
||||
typename Collection,
|
||||
typename Strategy
|
||||
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,
|
||||
RobustPolicy const& robust_policy,
|
||||
Collection & output_collection,
|
||||
Strategy const& strategy)
|
||||
{
|
||||
typedef typename boost::range_value<Collection>::type geometry_out;
|
||||
|
||||
detail::sym_difference::sym_difference_insert<geometry_out>(
|
||||
geometry1, geometry2, robust_policy,
|
||||
range::back_inserter(output_collection),
|
||||
strategy);
|
||||
resolve_collection::sym_difference
|
||||
<
|
||||
Geometry1, Geometry2, Collection
|
||||
>::apply(geometry1, geometry2, output_collection, strategy);
|
||||
}
|
||||
};
|
||||
|
||||
template
|
||||
<
|
||||
typename Geometry1,
|
||||
typename Geometry2,
|
||||
typename RobustPolicy,
|
||||
typename Collection
|
||||
>
|
||||
template <typename Strategy>
|
||||
struct sym_difference<Strategy, false>
|
||||
{
|
||||
template <typename Geometry1, typename Geometry2, typename Collection>
|
||||
static inline void apply(Geometry1 const& geometry1,
|
||||
Geometry2 const& geometry2,
|
||||
Collection & output_collection,
|
||||
Strategy const& strategy)
|
||||
{
|
||||
using strategies::relate::services::strategy_converter;
|
||||
|
||||
sym_difference
|
||||
<
|
||||
decltype(strategy_converter<Strategy>::get(strategy))
|
||||
>::apply(geometry1, geometry2, output_collection,
|
||||
strategy_converter<Strategy>::get(strategy));
|
||||
}
|
||||
};
|
||||
|
||||
template <>
|
||||
struct sym_difference<default_strategy, false>
|
||||
{
|
||||
template <typename Geometry1, typename Geometry2, typename Collection>
|
||||
static inline void apply(Geometry1 const& geometry1,
|
||||
Geometry2 const& geometry2,
|
||||
RobustPolicy const& robust_policy,
|
||||
Collection & output_collection,
|
||||
default_strategy)
|
||||
{
|
||||
typedef typename boost::range_value<Collection>::type geometry_out;
|
||||
|
||||
detail::sym_difference::sym_difference_insert<geometry_out>(
|
||||
geometry1, geometry2, robust_policy,
|
||||
range::back_inserter(output_collection));
|
||||
typedef typename strategies::relate::services::default_strategy
|
||||
<
|
||||
Geometry1, Geometry2
|
||||
>::type strategy_type;
|
||||
|
||||
sym_difference
|
||||
<
|
||||
strategy_type
|
||||
>::apply(geometry1, geometry2, output_collection, strategy_type());
|
||||
}
|
||||
};
|
||||
|
||||
} // 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>
|
||||
@@ -359,152 +717,68 @@ struct sym_difference
|
||||
Collection& output_collection,
|
||||
Strategy const& strategy)
|
||||
{
|
||||
typedef typename geometry::rescale_overlay_policy_type
|
||||
resolve_strategy::sym_difference
|
||||
<
|
||||
Geometry1,
|
||||
Geometry2
|
||||
>::type rescale_policy_type;
|
||||
|
||||
rescale_policy_type robust_policy
|
||||
= geometry::get_rescale_policy<rescale_policy_type>(geometry1,
|
||||
geometry2);
|
||||
|
||||
resolve_strategy::sym_difference::apply(geometry1, geometry2,
|
||||
robust_policy,
|
||||
output_collection,
|
||||
strategy);
|
||||
Strategy
|
||||
>::apply(geometry1, geometry2, output_collection, strategy);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
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
|
||||
|
||||
|
||||
/*!
|
||||
@@ -536,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
|
||||
@@ -568,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());
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user