From da5e753d628c21284c20c5158f97d4e0465fa110 Mon Sep 17 00:00:00 2001
From: Barend Gehrels <barend@xs4all.nl>
Date: Fri, 30 Apr 2010 14:58:07 +0000
Subject: [PATCH] Updated paths Added ccw test for area

[SVN r61707]
---
 .../algorithms/buffer/traversing_buffer.hpp          |  6 +++---
 .../boost/geometry/extensions/algorithms/offset.hpp  |  2 +-
 test/algorithms/area.cpp                             | 12 +++++++++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/include/boost/geometry/extensions/algorithms/buffer/traversing_buffer.hpp b/include/boost/geometry/extensions/algorithms/buffer/traversing_buffer.hpp
index fe08b32c3..24224746e 100644
--- a/include/boost/geometry/extensions/algorithms/buffer/traversing_buffer.hpp
+++ b/include/boost/geometry/extensions/algorithms/buffer/traversing_buffer.hpp
@@ -19,9 +19,9 @@
 #include <boost/geometry/core/point_type.hpp>
 
 #include <boost/geometry/strategies/buffer_side.hpp>
-#include <boost/geometry/algorithms/detail/buffer/intersecting_inserter.hpp>
-#include <boost/geometry/algorithms/detail/buffer/linestring_buffer.hpp>
-#include <boost/geometry/algorithms/detail/buffer/line_line_intersection.hpp>
+#include <boost/geometry/extensions/algorithms/buffer/intersecting_inserter.hpp>
+#include <boost/geometry/extensions/algorithms/buffer/linestring_buffer.hpp>
+#include <boost/geometry/extensions/algorithms/buffer/line_line_intersection.hpp>
 
 #include <boost/geometry/algorithms/detail/sections/get_section.hpp>
 #include <boost/geometry/algorithms/detail/sections/sectionalize.hpp>
diff --git a/include/boost/geometry/extensions/algorithms/offset.hpp b/include/boost/geometry/extensions/algorithms/offset.hpp
index 2c6ef82ca..56c37ea31 100644
--- a/include/boost/geometry/extensions/algorithms/offset.hpp
+++ b/include/boost/geometry/extensions/algorithms/offset.hpp
@@ -13,7 +13,7 @@
 #include <boost/range/metafunctions.hpp>
 
 #include <boost/geometry/core/point_type.hpp>
-#include <boost/geometry/algorithms/detail/buffer/line_line_intersection.hpp>
+#include <boost/geometry/extensions/algorithms/buffer/line_line_intersection.hpp>
 #include <boost/geometry/algorithms/detail/disjoint.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
 
diff --git a/test/algorithms/area.cpp b/test/algorithms/area.cpp
index 737939cb2..fe90a1427 100644
--- a/test/algorithms/area.cpp
+++ b/test/algorithms/area.cpp
@@ -22,7 +22,6 @@
 template <typename P>
 void test_all()
 {
-    //test_area_circle<P, double>();
     test_geometry<boost::geometry::box<P> >("POLYGON((0 0,2 2))", 4.0);
     test_geometry<boost::geometry::box<P> >("POLYGON((2 2,0 0))", 4.0);
 
@@ -66,6 +65,15 @@ void test_spherical()
     BOOST_CHECK_CLOSE(area, 2.0 * 2.0 * expected, 0.0001);
 }
 
+template <typename P>
+void test_ccw()
+{
+    typedef boost::geometry::polygon<P, std::vector, std::vector, false> ccw_polygon;
+    // counterclockwise rings (second is wrongly ordered)
+    test_geometry<ccw_polygon>("POLYGON((0 0,0 7,4 2,2 0,0 0))", -16.0);
+    test_geometry<ccw_polygon>("POLYGON((0 0,2 0,4 2,0 7,0 0))", 16.0);
+}
+
 
 int test_main(int, char* [])
 {
@@ -75,6 +83,8 @@ int test_main(int, char* [])
 
     test_spherical<boost::geometry::point<double, 2, boost::geometry::cs::spherical<boost::geometry::degree> > >();
 
+    test_ccw<boost::geometry::point<double, 2, boost::geometry::cs::cartesian> >();
+
 #if defined(HAVE_CLN)
     test_all<boost::geometry::point_xy<boost::numeric_adaptor::cln_value_type> >();
 #endif