boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-12 14:01:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow start for self-turns for difference overlay operations and enable corresponding test case.

Browse Source
This commit is contained in:
Tinko Bartels 2022-05-29 23:13:29 +02:00 committed by Barend Gehrels
parent d31cd27488
commit 2ee0967344
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/geometry/algorithms/detail/overlay/handle_colocations.hpp
View File

@ -515,10 +515,10 @@ inline void gather_cluster_properties(Clusters& clusters, Turns& turns,
continue; continue;
} }
if (BOOST_GEOMETRY_CONDITION(OverlayType != overlay_difference) if (BOOST_GEOMETRY_CONDITION(OverlayType == overlay_difference)
&& is_self_turn<OverlayType>(turn)) && is_self_turn<OverlayType>(turn))
{ {
// Difference needs the self-turns, TODO: investigate // TODO: investigate
continue; continue;
} }

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

File diff suppressed because one or more lines are too long

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

@ -220,6 +220,8 @@ void test_areal()
TEST_DIFFERENCE_WITH(0, 1, issue_888_53, 117, 0.2973268, 17, 0.0525798, 134); TEST_DIFFERENCE_WITH(0, 1, issue_888_53, 117, 0.2973268, 17, 0.0525798, 134);
} }
TEST_DIFFERENCE(issue_900, 0, 0.0, 2, 35, 2);
// Areas and #clips correspond with POSTGIS (except sym case) // Areas and #clips correspond with POSTGIS (except sym case)
test_one<Polygon, MultiPolygon, MultiPolygon>("case_101_multi", test_one<Polygon, MultiPolygon, MultiPolygon>("case_101_multi",
case_101_multi[0], case_101_multi[1], case_101_multi[0], case_101_multi[1],
@ -357,11 +359,7 @@ void test_areal()
TEST_DIFFERENCE(case_recursive_boxes_59, 8, 6.5, 7, 7.0, 12); TEST_DIFFERENCE(case_recursive_boxes_59, 8, 6.5, 7, 7.0, 12);
TEST_DIFFERENCE(case_recursive_boxes_60, 6, 5.25, 7, 5.25, 11); TEST_DIFFERENCE(case_recursive_boxes_60, 6, 5.25, 7, 5.25, 11);
TEST_DIFFERENCE(case_recursive_boxes_61, 2, 1.5, 6, 2.0, 7); TEST_DIFFERENCE(case_recursive_boxes_61, 2, 1.5, 6, 2.0, 7);
#if defined(BOOST_GEOMETRY_TEST_FAILURES)
// Misses one triangle, should be fixed in traversal.
// It is not related to rescaling.
TEST_DIFFERENCE(case_recursive_boxes_62, 5, 5.0, 11, 5.75, 12); TEST_DIFFERENCE(case_recursive_boxes_62, 5, 5.0, 11, 5.75, 12);
#endif
TEST_DIFFERENCE(case_recursive_boxes_63, 9, 10.5, 5, 27.75, 4); TEST_DIFFERENCE(case_recursive_boxes_63, 9, 10.5, 5, 27.75, 4);
TEST_DIFFERENCE(case_recursive_boxes_64, 6, 2.75, 7, 4.5, 11); TEST_DIFFERENCE(case_recursive_boxes_64, 6, 2.75, 7, 4.5, 11);