kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Fix area features generation in case of self-intersection polygons.

Browse source
This commit is contained in:
vng 2011-04-24 17:12:49 +03:00 • committed by Alex Zolotarev
parent 69c15b4fb0
commit 439b048117
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
generator/feature_sorter.cpp
View file

@ -272,12 +272,21 @@ namespace feature
size_t const count = points.size();
if (!m_trgInner || count > 15 + 2)
{
// too many points for strip
m_trgInner = false;
return false;
}
if (m2::robust::CheckPolygonSelfIntersections(points.begin(), points.end()))
{
// polygon has self-intersectios
m_trgInner = false;
return false;
}
CHECK ( m_buffer.m_innerTrg.empty(), () );
// make CCW orientation for polygon
if (!IsPolygonCCW(points.begin(), points.end()))
{
reverse(points.begin(), points.end());
@ -289,6 +298,7 @@ namespace feature
if (index == count)
{
// can't find strip
m_trgInner = false;
return false;
}

3
geometry/geometry_tests/polygon_test.cpp
View file

@ -159,6 +159,8 @@ UNIT_TEST(IsPolygonCCW_DataSet)
TestPolygonOrReverseCCW(arr, arr + ARRAY_SIZE(arr));
}
// This polygon has self-intersections.
/*
UNIT_TEST(IsPolygonCCW_DataSet2)
{
P arr[] = { P(0.747119766424532, 61.4800033732131), P(0.747098308752385, 61.4800496413187),
@ -171,3 +173,4 @@ UNIT_TEST(IsPolygonCCW_DataSet2)
TestPolygonOrReverseCCW(arr, arr + ARRAY_SIZE(arr));
}
*/