sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

correctly populate close_points when skipping duplicate (coincident vertices)

Browse source
This commit is contained in:
artemp 2015-07-07 18:38:25 +02:00
parent 0a484bf784
commit 73cae70a41
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
include/mapnik/offset_converter.hpp
View file

@ -306,41 +306,44 @@ private:
bool is_polygon = false; bool is_polygon = false;
std::size_t cpt = 0; std::size_t cpt = 0;
v0.cmd = geom_.vertex(&v0.x, &v0.y); v0.cmd = geom_.vertex(&v0.x, &v0.y);
v1.x = v0.x; v1 = v0;
v1.y = v0.y;
v1.cmd = v0.cmd;
// PUSH INITIAL // PUSH INITIAL
points.push_back(vertex2d(v0.x, v0.y, v0.cmd)); points.push_back(v0);
if (v0.cmd == SEG_END) // not enough vertices in source if (v0.cmd == SEG_END) // not enough vertices in source
{ {
return status_ = process; return status_ = process;
} }
start = v0;
while ((v0.cmd = geom_.vertex(&v0.x, &v0.y)) != SEG_END) while ((v0.cmd = geom_.vertex(&v0.x, &v0.y)) != SEG_END)
{ {
if (v0.cmd == SEG_CLOSE) if (v0.cmd == SEG_CLOSE)
{ {
is_polygon = true; is_polygon = true;
close_points.push_back(vertex2d(v1.x, v1.y, v1.cmd));
auto & prev = points.back(); auto & prev = points.back();
if (prev.x == start.x && prev.y == start.y) if (prev.x == start.x && prev.y == start.y)
{ {
prev.x = v0.x; // hack
prev.y = v0.y;
prev.cmd = SEG_CLOSE; // account for dupes (line_to(move_to) + close_path) in agg poly clipper prev.cmd = SEG_CLOSE; // account for dupes (line_to(move_to) + close_path) in agg poly clipper
std::size_t size = points.size();
if (size > 1) close_points.push_back(points[size - 2]);
else close_points.push_back(prev);
continue; continue;
} }
else
{
close_points.push_back(v1);
}
} }
else if (v0.cmd == SEG_MOVETO) else if (v0.cmd == SEG_MOVETO)
{ {
start = v0; start = v0;
} }
v1.x = v0.x; v1 = v0;
v1.y = v0.y; points.push_back(v0);
v1.cmd = v0.cmd;
points.push_back(vertex2d(v0.x, v0.y, v0.cmd));
} }
// Push SEG_END // Push SEG_END
points.push_back(vertex2d(v0.x, v0.y, v0.cmd)); points.push_back(vertex2d(v0.x,v0.y,SEG_END));
std::size_t i = 0; std::size_t i = 0;
v1 = points[i++]; v1 = points[i++];
v2 = points[i++]; v2 = points[i++];