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

[traverse] fix case #case_141_multi which is isolated with multiple

Browse Source 
connections
This commit is contained in:
Barend Gehrels 2018-01-01 16:28:32 +01:00
parent 1a724ed696
commit 26a50a2bbd
2 changed files with 81 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
include/boost/geometry/algorithms/detail/overlay/traversal_switch_detector.hpp
View File

@ -204,6 +204,79 @@ struct traversal_switch_detector
return true;
}
bool ii_turn_connects_two_regions(region_properties const& region,
region_properties const& connected_region,
signed_size_type turn_index) const
{
turn_type const& turn = m_turns[turn_index];
if (! turn.both(operation_intersection))
{
return false;
}
signed_size_type const id0 = turn.operations[0].enriched.region_id;
signed_size_type const id1 = turn.operations[1].enriched.region_id;
return (id0 == region.region_id && id1 == connected_region.region_id)
|| (id1 == region.region_id && id0 == connected_region.region_id);
}
bool isolated_multiple_connection(region_properties const& region,
region_properties const& connected_region) const
{
if (connected_region.isolated != isolation_multiple)
{
return false;
}
// First step: compare turns of regions with turns of connected region
set_type turn_ids = region.unique_turn_ids;
for (set_iterator sit = connected_region.unique_turn_ids.begin();
sit != connected_region.unique_turn_ids.end(); ++sit)
{
turn_ids.erase(*sit);
}
// There should be one connection (turn or cluster) left
if (turn_ids.size() != 1)
{
return false;
}
for (set_iterator sit = connected_region.unique_turn_ids.begin();
sit != connected_region.unique_turn_ids.end(); ++sit)
{
signed_size_type const id_or_index = *sit;
if (id_or_index >= 0)
{
if (! ii_turn_connects_two_regions(region, connected_region, id_or_index))
{
return false;
}
}
else
{
signed_size_type const cluster_id = -id_or_index;
typename Clusters::const_iterator it = m_clusters.find(cluster_id);
if (it != m_clusters.end())
{
cluster_info const& cinfo = it->second;
for (set_iterator cit = cinfo.turn_indices.begin();
cit != cinfo.turn_indices.end(); ++cit)
{
if (! ii_turn_connects_two_regions(region, connected_region, *cit))
{
return false;
}
}
}
}
}
return true;
}
bool has_only_isolated_children(region_properties const& region) const
{
bool first_with_turn = true;
@ -226,10 +299,15 @@ struct traversal_switch_detector
if (cprop.count != 1)
{
return false;
// If there are more connections, check their isolation
if (! isolated_multiple_connection(region, connected_region))
{
return false;
}
}
if (connected_region.isolated != isolation_yes)
if (connected_region.isolated != isolation_yes
&& connected_region.isolated != isolation_multiple)
{
signed_size_type const unique_turn_id = *cprop.unique_turn_ids.begin();
if (first_with_turn)

5
test/algorithms/set_operations/intersection/intersection_multi.cpp
View File

@ -165,10 +165,7 @@ void test_areal()
TEST_INTERSECTION(case_138_multi, 2, 23, 40.4);
TEST_INTERSECTION(case_139_multi, 2, 23, 40.546875);
TEST_INTERSECTION(case_140_multi, 2, 23, 40.546875);
// TODO: isolated region with multiple connection should be handled
// differently
TEST_INTERSECTION_IGNORE(case_141_multi, 3, -1, 74.5);
TEST_INTERSECTION(case_141_multi, 3, -1, 74.5);
#ifndef BOOST_GEOMETRY_NO_SELF_TURNS
TEST_INTERSECTION(case_recursive_boxes_1, 10, 97, 47.0);