1 files changed, 63 insertions, 30 deletions

diff --git a/boost/geometry/algorithms/detail/relation/interface.hpp b/boost/geometry/algorithms/detail/relation/interface.hpp
index e9a9474551..83d27ed72f 100644
--- a/boost/geometry/algorithms/detail/relation/interface.hpp
+++ b/boost/geometry/algorithms/detail/relation/interface.hpp
@@ -2,8 +2,8 @@
 
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2013, 2014, 2015.
-// Modifications copyright (c) 2013-2015 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2013, 2014, 2015, 2017.
+// Modifications copyright (c) 2013-2017 Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -35,16 +35,16 @@ struct result_handler_type<Geometry1, Geometry2, geometry::de9im::matrix, false>
 }} // namespace detail::relate
 #endif // DOXYGEN_NO_DETAIL
 
-
 namespace resolve_variant
 {
 
 template <typename Geometry1, typename Geometry2>
 struct relation
 {
-    template <typename Matrix>
+    template <typename Matrix, typename Strategy>
     static inline Matrix apply(Geometry1 const& geometry1,
-                               Geometry2 const& geometry2)
+                               Geometry2 const& geometry2,
+                               Strategy const& strategy)
     {
         concepts::check<Geometry1 const>();
         concepts::check<Geometry2 const>();
@@ -57,11 +57,7 @@ struct relation
                 Matrix
             >::type handler;
 
-        dispatch::relate
-            <
-                Geometry1,
-                Geometry2
-            >::apply(geometry1, geometry2, handler);
+        resolve_strategy::relate::apply(geometry1, geometry2, handler, strategy);
 
         return handler.result();
     }
@@ -70,56 +66,60 @@ struct relation
 template <BOOST_VARIANT_ENUM_PARAMS(typename T), typename Geometry2>
 struct relation<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometry2>
 {
-    template <typename Matrix>
+    template <typename Matrix, typename Strategy>
     struct visitor : boost::static_visitor<Matrix>
     {
         Geometry2 const& m_geometry2;
+        Strategy const& m_strategy;
 
-        visitor(Geometry2 const& geometry2)
-            : m_geometry2(geometry2) {}
+        visitor(Geometry2 const& geometry2, Strategy const& strategy)
+            : m_geometry2(geometry2), m_strategy(strategy) {}
 
         template <typename Geometry1>
         Matrix operator()(Geometry1 const& geometry1) const
         {
             return relation<Geometry1, Geometry2>
-                   ::template apply<Matrix>(geometry1, m_geometry2);
+                   ::template apply<Matrix>(geometry1, m_geometry2, m_strategy);
         }
     };
 
-    template <typename Matrix>
+    template <typename Matrix, typename Strategy>
     static inline Matrix
     apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry1,
-          Geometry2 const& geometry2)
+          Geometry2 const& geometry2,
+          Strategy const& strategy)
     {
-        return boost::apply_visitor(visitor<Matrix>(geometry2), geometry1);
+        return boost::apply_visitor(visitor<Matrix, Strategy>(geometry2, strategy), geometry1);
     }
 };
 
 template <typename Geometry1, BOOST_VARIANT_ENUM_PARAMS(typename T)>
 struct relation<Geometry1, boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
 {
-    template <typename Matrix>
+    template <typename Matrix, typename Strategy>
     struct visitor : boost::static_visitor<Matrix>
     {
         Geometry1 const& m_geometry1;
+        Strategy const& m_strategy;
 
-        visitor(Geometry1 const& geometry1)
-            : m_geometry1(geometry1) {}
+        visitor(Geometry1 const& geometry1, Strategy const& strategy)
+            : m_geometry1(geometry1), m_strategy(strategy) {}
 
         template <typename Geometry2>
         Matrix operator()(Geometry2 const& geometry2) const
         {
             return relation<Geometry1, Geometry2>
-                   ::template apply<Matrix>(m_geometry1, geometry2);
+                   ::template apply<Matrix>(m_geometry1, geometry2, m_strategy);
         }
     };
 
-    template <typename Matrix>
+    template <typename Matrix, typename Strategy>
     static inline Matrix
     apply(Geometry1 const& geometry1,
-          boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry2)
+          boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry2,
+          Strategy const& strategy)
     {
-        return boost::apply_visitor(visitor<Matrix>(geometry1), geometry2);
+        return boost::apply_visitor(visitor<Matrix, Strategy>(geometry1, strategy), geometry2);
     }
 };
 
@@ -134,24 +134,30 @@ struct relation
         boost::variant<BOOST_VARIANT_ENUM_PARAMS(T2)>
     >
 {
-    template <typename Matrix>
+    template <typename Matrix, typename Strategy>
     struct visitor : boost::static_visitor<Matrix>
     {
+        Strategy const& m_strategy;
+
+        visitor(Strategy const& strategy)
+            : m_strategy(strategy) {}
+
         template <typename Geometry1, typename Geometry2>
         Matrix operator()(Geometry1 const& geometry1,
                           Geometry2 const& geometry2) const
         {
             return relation<Geometry1, Geometry2>
-                   ::template apply<Matrix>(geometry1, geometry2);
+                   ::template apply<Matrix>(geometry1, geometry2, m_strategy);
         }
     };
 
-    template <typename Matrix>
+    template <typename Matrix, typename Strategy>
     static inline Matrix
     apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T1)> const& geometry1,
-          boost::variant<BOOST_VARIANT_ENUM_PARAMS(T2)> const& geometry2)
+          boost::variant<BOOST_VARIANT_ENUM_PARAMS(T2)> const& geometry2,
+          Strategy const& strategy)
     {
-        return boost::apply_visitor(visitor<Matrix>(), geometry1, geometry2);
+        return boost::apply_visitor(visitor<Matrix, Strategy>(strategy), geometry1, geometry2);
     }
 };
 
@@ -163,6 +169,33 @@ struct relation
 \ingroup relation
 \tparam Geometry1 \tparam_geometry
 \tparam Geometry2 \tparam_geometry
+\tparam Strategy \tparam_strategy{Relation}
+\param geometry1 \param_geometry
+\param geometry2 \param_geometry
+\param strategy \param_strategy{relation}
+\return The DE-9IM matrix expressing the relation between geometries.
+
+\qbk{distinguish,with strategy}
+\qbk{[include reference/algorithms/relation.qbk]}
+ */
+template <typename Geometry1, typename Geometry2, typename Strategy>
+inline de9im::matrix relation(Geometry1 const& geometry1,
+                              Geometry2 const& geometry2,
+                              Strategy const& strategy)
+{
+    return resolve_variant::relation
+        <
+            Geometry1,
+            Geometry2
+        >::template apply<de9im::matrix>(geometry1, geometry2, strategy);
+}
+
+
+/*!
+\brief Calculates the relation between a pair of geometries as defined in DE-9IM.
+\ingroup relation
+\tparam Geometry1 \tparam_geometry
+\tparam Geometry2 \tparam_geometry
 \param geometry1 \param_geometry
 \param geometry2 \param_geometry
 \return The DE-9IM matrix expressing the relation between geometries.
@@ -177,7 +210,7 @@ inline de9im::matrix relation(Geometry1 const& geometry1,
         <
             Geometry1,
             Geometry2
-        >::template apply<de9im::matrix>(geometry1, geometry2);
+        >::template apply<de9im::matrix>(geometry1, geometry2, default_strategy());
 }