From d3f8ea2f6b98c46e6029a6d1dfe8bd1c0a24c8c2 Mon Sep 17 00:00:00 2001
From: Adam Wulkiewicz <adam.wulkiewicz@gmail.com>
Date: Wed, 9 Apr 2014 01:33:37 +0200
Subject: [PATCH] [crosses] add bg::crosses() algorithm

---
 doc/doxy/doxygen_input/groups/groups.hpp                   | 1 +
 doc/quickbook/quickref.xml                                 | 1 +
 doc/quickref.xml                                           | 3 ++-
 doc/reference.qbk                                          | 2 ++
 include/boost/geometry/algorithms/detail/relate/result.hpp | 4 ++--
 include/boost/geometry/geometry.hpp                        | 1 +
 test/algorithms/Jamfile.v2                                 | 1 +
 7 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/doc/doxy/doxygen_input/groups/groups.hpp b/doc/doxy/doxygen_input/groups/groups.hpp
index 6128a44e8..cb6cc3337 100644
--- a/doc/doxy/doxygen_input/groups/groups.hpp
+++ b/doc/doxy/doxygen_input/groups/groups.hpp
@@ -24,6 +24,7 @@
 \defgroup core core: meta-functions for geometry types
 \defgroup correct correct: correct geometries
 \defgroup covered_by covered_by: detect if a geometry is inside or on the border of another geometry, a.o. point-in-polygon (border included)
+\defgroup crosses crosses: detect if two geometries crosses each other
 \defgroup cs coordinate systems
 \defgroup difference difference: difference of two geometries
 \defgroup disjoint disjoint: detect if geometries are not spatially related
diff --git a/doc/quickbook/quickref.xml b/doc/quickbook/quickref.xml
index 03f494cef..8179d7a87 100644
--- a/doc/quickbook/quickref.xml
+++ b/doc/quickbook/quickref.xml
@@ -299,6 +299,7 @@
     </simplelist>
     <bridgehead renderas="sect3">Predicates</bridgehead>
     <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.crosses">boost::geometry::crosses</link></member>
      <member><link linkend="boost_geometry.reference.disjoint">boost::geometry::disjoint</link></member>
      <member><link linkend="boost_geometry.reference.equals">boost::geometry::equals</link></member>
      <member><link linkend="boost_geometry.reference.intersects">boost::geometry::intersects</link></member>
diff --git a/doc/quickref.xml b/doc/quickref.xml
index 987cad233..fff476c40 100644
--- a/doc/quickref.xml
+++ b/doc/quickref.xml
@@ -318,6 +318,7 @@
     </simplelist>
     <bridgehead renderas="sect3">Predicates</bridgehead>
     <simplelist type="vert" columns="1">
+     <member><link linkend="geometry.reference.algorithms.crosses">crosses</link></member>
      <member><link linkend="geometry.reference.algorithms.covered_by">covered_by</link></member>
      <member><link linkend="geometry.reference.algorithms.disjoint">disjoint</link></member>
      <member><link linkend="geometry.reference.algorithms.equals">equals</link></member>
@@ -734,7 +735,7 @@
     <simplelist type="vert" columns="1">
      <member><link linkend="geometry.reference.spatial_indexes.group__predicates.contains_geometry_const___">contains(Geometry const &amp;)</link></member>
      <member><link linkend="geometry.reference.spatial_indexes.group__predicates.covered_by_geometry_const___">covered_by(Geometry const &amp;)</link></member>
-        <member><link linkend="geometry.reference.spatial_indexes.group__predicates.covers_geometry_const___">covers(Geometry const &amp;)</link></member>
+     <member><link linkend="geometry.reference.spatial_indexes.group__predicates.covers_geometry_const___">covers(Geometry const &amp;)</link></member>
 	 <member><link linkend="geometry.reference.spatial_indexes.group__predicates.disjoint_geometry_const___">disjoint(Geometry const &amp;)</link></member>
 	 <member><link linkend="geometry.reference.spatial_indexes.group__predicates.intersects_geometry_const___">intersects(Geometry const &amp;)</link></member>
 	 <member><link linkend="geometry.reference.spatial_indexes.group__predicates.overlaps_geometry_const___">overlaps(Geometry const &amp;)</link></member>
diff --git a/doc/reference.qbk b/doc/reference.qbk
index ce226af36..5878d6f92 100644
--- a/doc/reference.qbk
+++ b/doc/reference.qbk
@@ -89,6 +89,8 @@
 [include generated/covered_by.qbk]
 [endsect]
 
+[include generated/crosses.qbk]
+
 [include generated/difference.qbk]
 [include generated/disjoint.qbk]
 
diff --git a/include/boost/geometry/algorithms/detail/relate/result.hpp b/include/boost/geometry/algorithms/detail/relate/result.hpp
index ecb003268..957d25c23 100644
--- a/include/boost/geometry/algorithms/detail/relate/result.hpp
+++ b/include/boost/geometry/algorithms/detail/relate/result.hpp
@@ -1138,8 +1138,8 @@ struct static_mask_crosses_type<Geometry1, Geometry2, Dim, Dim, D1LessD2/*false*
                       typename geometry::tag<Geometry2>::type>
 {};
 // dim(G1) == 1 && dim(G2) == 1 - L/L
-template <typename Geometry1, typename Geometry2, bool D1LessD2>
-struct static_mask_crosses_type<Geometry1, Geometry2, 1, 1, D1LessD2>
+template <typename Geometry1, typename Geometry2>
+struct static_mask_crosses_type<Geometry1, Geometry2, 1, 1, false>
 {
     typedef static_mask<'0', '*', '*', '*', '*', '*', '*', '*', '*'> type;
 };
diff --git a/include/boost/geometry/geometry.hpp b/include/boost/geometry/geometry.hpp
index fcbec18d2..e17ace409 100644
--- a/include/boost/geometry/geometry.hpp
+++ b/include/boost/geometry/geometry.hpp
@@ -45,6 +45,7 @@
 #include <boost/geometry/algorithms/convex_hull.hpp>
 #include <boost/geometry/algorithms/correct.hpp>
 #include <boost/geometry/algorithms/covered_by.hpp>
+#include <boost/geometry/algorithms/crosses.hpp>
 #include <boost/geometry/algorithms/difference.hpp>
 #include <boost/geometry/algorithms/disjoint.hpp>
 #include <boost/geometry/algorithms/distance.hpp>
diff --git a/test/algorithms/Jamfile.v2 b/test/algorithms/Jamfile.v2
index 8227c3d50..91af4fb29 100644
--- a/test/algorithms/Jamfile.v2
+++ b/test/algorithms/Jamfile.v2
@@ -20,6 +20,7 @@ test-suite boost-geometry-algorithms
     [ run correct.cpp ]
     [ run convert.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run covered_by.cpp ]
+    [ run crosses.cpp ]
     [ run difference.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
     [ run disjoint.cpp ]
     [ run distance.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]