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

Fix bug in area polygons filtration.

Browse source
This commit is contained in:
vng 2011-09-15 22:16:38 +03:00 • committed by Alex Zolotarev
parent fbb72ed991
commit b0a746895d
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
generator/feature_sorter.cpp
View file

@ -469,16 +469,21 @@ namespace feature
if (isLine)
holder.AddPoints(points, i);
if (isArea && IsGoodArea(points, level) && holder.NeedProcessTriangles())
if (isArea && holder.NeedProcessTriangles())
{
// simplify and serialize triangles
bool const good = IsGoodArea(points, level);
polygons_t const & polys = fb.GetPolygons();
if (polys.size() == 1 && holder.TryToMakeStrip(points))
if (polys.size() == 1 && good && holder.TryToMakeStrip(points))
continue;
polygons_t simplified;
simplified.push_back(points);
if (good)
{
simplified.push_back(points_t());
simplified.back().swap(points);
}
polygons_t::const_iterator iH = polys.begin();
for (++iH; iH != polys.end(); ++iH)
@ -491,7 +496,8 @@ namespace feature
simplified.pop_back();
}
holder.AddTriangles(simplified, i);
if (!simplified.empty())
holder.AddTriangles(simplified, i);
}
}
}