From fb74bfbe268a413e72f47bad932680c161d1f2ef Mon Sep 17 00:00:00 2001 From: Barend Gehrels Date: Tue, 3 Sep 2013 18:45:18 +0000 Subject: [PATCH] [geometry] Fixed ticket 9047 (recursive inclusion) and unit test for ticket 8652 [SVN r85552] --- doc/release_notes.qbk | 4 +++- include/boost/geometry/strategies/intersection.hpp | 1 - test/algorithms/intersection.cpp | 3 +++ test/algorithms/overlay/overlay_cases.hpp | 6 ++++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/doc/release_notes.qbk b/doc/release_notes.qbk index fd462877e..4746c6061 100644 --- a/doc/release_notes.qbk +++ b/doc/release_notes.qbk @@ -27,11 +27,13 @@ [*Solved tickets] -* [@https://svn.boost.org/trac/boost/ticket/6958 6958] Intersection generates self-intersection. Caused by spikes, fixed +* [@https://svn.boost.org/trac/boost/ticket/6958 6958] Intersection generates self-intersection. Caused by spike, fixed * [@https://svn.boost.org/trac/boost/ticket/8364 8364] Invalid input exception, caused by spikes in previous steps, fixed * [@https://svn.boost.org/trac/boost/ticket/8365 8365] Invalid input exception, caused by spikes in previous steps, fixed * [@https://svn.boost.org/trac/boost/ticket/8969 8969] boost::geometry::model::point single argument constructor should be explicit * [@https://svn.boost.org/trac/boost/ticket/8825 8825] Patch adding member variable documentation to doxygen_xml2qbk +* [@https://svn.boost.org/trac/boost/ticket/8652 8652] Intersection fails for triangle-triangle intersection. Caused by spike, fixed +* [@https://svn.boost.org/trac/boost/ticket/9047 9047] Boost files that include themselves (strategies/intersection.hpp), fixed [*Internal changes] diff --git a/include/boost/geometry/strategies/intersection.hpp b/include/boost/geometry/strategies/intersection.hpp index fc628c063..243f5b561 100644 --- a/include/boost/geometry/strategies/intersection.hpp +++ b/include/boost/geometry/strategies/intersection.hpp @@ -17,7 +17,6 @@ #include #include -#include #include #include diff --git a/test/algorithms/intersection.cpp b/test/algorithms/intersection.cpp index 2d293dd3b..e176e2356 100644 --- a/test/algorithms/intersection.cpp +++ b/test/algorithms/intersection.cpp @@ -220,6 +220,9 @@ void test_areal() test_one("ticket_6958", ticket_6958[0], ticket_6958[1], 1, 4, 4.34355e-05, 0.01); + test_one("ticket_8652", ticket_8652[0], ticket_8652[1], + 1, 4, 0.0003, 0.00001); + test_one("buffer_mp1", buffer_mp1[0], buffer_mp1[1], 1, 31, 2.271707796); diff --git a/test/algorithms/overlay/overlay_cases.hpp b/test/algorithms/overlay/overlay_cases.hpp index 3c0374905..33d09c215 100644 --- a/test/algorithms/overlay/overlay_cases.hpp +++ b/test/algorithms/overlay/overlay_cases.hpp @@ -579,6 +579,12 @@ static std::string ticket_8254[2] = "POLYGON((-0.27224111308522286334 0.57751061210314269534,-0.27201435369399112885 0.57735026899999997152,-0.27224111308522280783 0.57718992589685735872,-0.27224111308522286334 0.57751061210314269534))" }; +static std::string ticket_8652[2] = + { + "POLYGON((0 0, 0.05 0.04, 0.05 0, 0 0))", + "POLYGON((0.02 -2.77556e-17, 0.05 0.02, 0.05 -2.77556e-17, 0.02 -2.77556e-17))" + }; + static std::string ggl_list_20120229_volker[3] = { "POLYGON((1716 1554,2076 2250,2436 2352,2796 1248,3156 2484,3516 2688,3516 2688,3156 2484,2796 1248,2436 2352,2076 2250, 1716 1554))",