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

topojson bounding_box - fix multi_point logic (remove bogus if (num_arcs_ > 0) condition)

Browse source
This commit is contained in:
artemp 2016-03-17 14:19:29 +01:00
parent 47e43a1faa
commit 0c2558c154
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
include/mapnik/json/topojson_utils.hpp
View file

@ -50,27 +50,25 @@ struct bounding_box_visitor
box2d<double> operator() (mapnik::topojson::multi_point const& multi_pt) const
{
box2d<double> bbox;
if (num_arcs_ > 0)
bool first = true;
double px = 0, py = 0;
for (auto const& pt : multi_pt.points)
{
bool first = true;
for (auto const& pt : multi_pt.points)
double x = pt.x;
double y = pt.y;
if (topo_.tr)
{
double x = pt.x;
double y = pt.y;
if (topo_.tr)
{
x = x * (*topo_.tr).scale_x + (*topo_.tr).translate_x;
y = y * (*topo_.tr).scale_y + (*topo_.tr).translate_y; // TODO : delta encoded ?
}
if (first)
{
first = false;
bbox.init(x,y,x,y);
}
else
{
bbox.expand_to_include(x,y);
}
x = (px += x) * (*topo_.tr).scale_x + (*topo_.tr).translate_x;
y = (py += y) * (*topo_.tr).scale_y + (*topo_.tr).translate_y;
}
if (first)
{
first = false;
bbox.init(x,y,x,y);
}
else
{
bbox.expand_to_include(x,y);
}
}
return bbox;