boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-11 13:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/fix_tangencies

Browse Source
This commit is contained in:
Barend Gehrels 2015-11-21 11:54:39 +01:00
commit 324bfac801
6 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/release_notes.qbk
View File

@ -28,6 +28,8 @@
* [@https://svn.boost.org/trac/boost/ticket/11522 11522] Namespace clash in buffer for traits::detail
* [@https://svn.boost.org/trac/boost/ticket/11533 11533] Assert failure in rtree caused by a bug in remove() if min elements number is 1
* [@https://svn.boost.org/trac/boost/ticket/11607 11607] Private geometry::exception::what()
* [@https://svn.boost.org/trac/boost/ticket/11709 11709] is_simple segfault
* [@https://svn.boost.org/trac/boost/ticket/11710 11710] is_simple - empty geometry logic
[*Bugfixes]

6
test/algorithms/overlay/multi_overlay_cases.hpp
View File

@ -538,6 +538,10 @@ static std::string bug_21155501[2] =
"MULTIPOLYGON(((4.9658203125 18.729501999072138,-3.4868710311820115 24.246968623627644,8.3589904332912 33.833614418115445,8.3056640625 32.99023555965106,9.8876953125 31.728167146023935,9.7119140625 25.48295117535531,11.8212890625 23.563987128451217,4.9658203125 18.729501999072138)),((-3.88714525609152 24.508246314579743,-8.3935546875 27.449790329784214,-8.9208984375 29.458731185355344,-0.5712890625 32.02670629333614,-1.8896484375 35.60371874069731,8.5693359375 37.16031654673677,8.362166569827938 33.883846345901595,-3.88714525609152 24.508246314579743)))",
};
static std::string mysql_21965285_b[2] =
{
"MULTIPOLYGON(((3 0, -19 -19, -7 3, -2 10, 15 0, 3 0)))",
"MULTIPOLYGON(((1 1, 3 0, 19 -8, -4 -3, 1 1)),((3 0, -2 7, -3 16, 1 19, 8 12, 3 0)))"
};
#endif // BOOST_GEOMETRY_TEST_MULTI_OVERLAY_CASES_HPP

6
test/algorithms/overlay/overlay_cases.hpp
View File

@ -934,5 +934,11 @@ static std::string mysql_21965285[2] =
"POLYGON((0 6, 0 8, -14 13, 0 6))",
};
static std::string mysql_21965285_b_inv[2] =
{
"POLYGON((3 0, -19 -19, -7 3, -2 10, 15 0, 3 0))",
"POLYGON((-20 -20,-20 20,20 20,20 -20,-20 -20),(1 1, -4 -3, 19 -8, 3 0, 1 1),(3 0, 8 12, 1 19, -3 16, -2 7, 3 0))"
};
#endif // BOOST_GEOMETRY_TEST_OVERLAY_CASES_HPP

10
test/algorithms/set_operations/difference/difference.cpp
View File

@ -466,16 +466,6 @@ void test_all()
1, -1, 92.0,
1, -1, 14.0,
1, -1, 92.0 + 14.0);
#ifdef BOOST_GEOMETRY_TEST_INCLUDE_FAILING_TESTS
typedef bg::model::multi_polygon<polygon> multi_polygon;
test_one<polygon, polygon, multi_polygon>("mysql_21965285_2",
"POLYGON((3 0, 15 0, -2 10, -7 3, -19 -19, 3 0))",
"MULTIPOLYGON(((1 1, -4 -3, 19 -8, 3 0, 1 1)),((3 0, 8 12, 1 19, -3 16, -2 7, 3 0)))",
2, -1, 183.71376870369406,
2, -1, 131.21376870369406,
4, -1, 183.71376870369406 + 131.21376870369406);
#endif
}

9
test/algorithms/set_operations/difference/difference_multi.cpp
View File

@ -171,6 +171,15 @@ void test_areal()
case_recursive_boxes_3[0], case_recursive_boxes_3[1],
1, 1, 1, 1, 1, 1);
*/
#ifdef BOOST_GEOMETRY_TEST_INCLUDE_FAILING_TESTS
test_one<Polygon, MultiPolygon, MultiPolygon>("mysql_21965285_b",
mysql_21965285_b[0],
mysql_21965285_b[1],
2, -1, 183.71376870369406,
2, -1, 131.21376870369406,
4, -1, 183.71376870369406 + 131.21376870369406);
#endif
}

7
test/algorithms/set_operations/intersection/intersection.cpp
View File

@ -345,6 +345,13 @@ void test_areal()
mysql_21964465[0], mysql_21964465[1],
0, -1, 0.0);
#ifdef BOOST_GEOMETRY_TEST_INCLUDE_FAILING_TESTS
test_one<Polygon, Polygon, Polygon>("mysql_21965285_b_inv",
mysql_21965285_b_inv[0],
mysql_21965285_b_inv[1],
2, -1, 183.71376870369406);
#endif
return;
test_one<Polygon, Polygon, Polygon>(