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

handle SEG_CLOSE in visvalingam_whyatt and douglas_peucker

Browse source
This commit is contained in:
artemp 2015-03-29 19:11:07 +02:00
parent 3593f3c52c
commit 6a6af26566
1 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
include/mapnik/simplify_converter.hpp
View file

@ -192,8 +192,15 @@ private:
return SEG_END;
previous_vertex_ = vertices_[pos_];
*x = previous_vertex_.x;
*y = previous_vertex_.y;
if (previous_vertex_.cmd == SEG_CLOSE)
{
*x = *y = 0.0; // restore SEG_CLOSE command
}
else
{
*x = previous_vertex_.x;
*y = previous_vertex_.y;
}
pos_++;
return previous_vertex_.cmd;
}
@ -403,10 +410,20 @@ private:
vertex2d vtx(vertex2d::no_init);
while ((vtx.cmd = geom_.vertex(&vtx.x, &vtx.y)) != SEG_END)
{
if (vtx.cmd == SEG_MOVETO)
{
start_vertex_ = vtx;
}
else if (vtx.cmd == SEG_CLOSE)
{
vtx.x = start_vertex_.x;
vtx.y = start_vertex_.y;
}
v_list.push_back(new weighted_vertex(vtx));
}
if (v_list.empty()) {
if (v_list.empty())
{
return status_ = process;
}
@ -553,6 +570,15 @@ private:
vertex2d vtx(vertex2d::no_init);
while ((vtx.cmd = geom_.vertex(&vtx.x, &vtx.y)) != SEG_END)
{
if (vtx.cmd == SEG_MOVETO)
{
start_vertex_ = vtx;
}
else if (vtx.cmd == SEG_CLOSE)
{
vtx.x = start_vertex_.x;
vtx.y = start_vertex_.y;
}
vertices.push_back(vtx);
}