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

[is_valid] Fix overlapping interiors condition (replace 2x point_on_border with relate).

Browse Source
This commit is contained in:
Adam Wulkiewicz 2018-10-12 19:39:28 +02:00
parent 5847581734
commit fbe8f51cd1
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/geometry/algorithms/detail/is_valid/multipolygon.hpp
View File

@ -128,7 +128,7 @@ private:
= strategy.get_envelope_strategy();
// call partition to check if polygons are disjoint from each other
typename base::template item_visitor_type<within_strategy_type> item_visitor(within_strategy);
typename base::template item_visitor_type<Strategy> item_visitor(strategy);
geometry::partition
<

26
include/boost/geometry/algorithms/detail/is_valid/polygon.hpp
View File

@ -217,25 +217,19 @@ protected:
, m_strategy(strategy)
{}
template <typename Item>
inline bool is_within(Item const& first, Item const& second)
{
typename point_type<Polygon>::type point;
// TODO: this should check for a point on the interior, instead
// of on border. Or it should check using the overlap function.
return geometry::point_on_border(point, first)
&& geometry::within(point, second, m_strategy);
}
template <typename Iterator, typename Box>
inline bool apply(partition_item<Iterator, Box> const& item1,
partition_item<Iterator, Box> const& item2)
{
if (! items_overlap
&& (is_within(*item1.get(), *item2.get())
|| is_within(*item2.get(), *item1.get())))
typedef boost::mpl::vector
<
geometry::de9im::static_mask<'T'>,
geometry::de9im::static_mask<'*', 'T'>,
geometry::de9im::static_mask<'*', '*', '*', 'T'>
> relate_mask_t;
if ( ! items_overlap
&& geometry::relate(*item1.get(), *item2.get(), relate_mask_t(), m_strategy) )
{
items_overlap = true;
return false; // interrupt
@ -337,7 +331,7 @@ protected:
// call partition to check if interior rings are disjoint from
// each other
item_visitor_type<in_interior_strategy_type> item_visitor(in_interior_strategy);
item_visitor_type<Strategy> item_visitor(strategy);
geometry::partition
<