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

hit_test - cache x,y for MOVE_TO and use on CLOSE_PATH command

Browse source
This commit is contained in:
artemp 2015-04-22 15:30:59 +02:00
parent 86cc903835
commit 3366e804c9
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/mapnik/geom_util.hpp
View file

@ -455,6 +455,8 @@ bool hit_test(PathType & path, double x, double y, double tol)
double y0 = 0;
double x1 = 0;
double y1 = 0;
double start_x = 0;
double start_y = 0;
path.rewind(0);
unsigned command = path.vertex(&x0, &y0);
if (command == SEG_END)
@ -465,17 +467,20 @@ bool hit_test(PathType & path, double x, double y, double tol)
mapnik::geometry::geometry_types geom_type = static_cast<mapnik::geometry::geometry_types>(path.type());
while (SEG_END != (command = path.vertex(&x1, &y1)))
{
if (command == SEG_CLOSE)
{
continue;
}
++count;
if (command == SEG_MOVETO)
{
x0 = x1;
y0 = y1;
start_x = x0;
start_y = y0;
continue;
}
else if (command == SEG_CLOSE)
{
x1 = start_x;
y1 = start_y;
}
switch(geom_type)
{
case mapnik::geometry::geometry_types::Polygon: