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

Fix "whole" multi centroid computation (#1606)

Browse source 
Still lacks a testcase
This commit is contained in:
Sandro Santilli 2012-11-29 11:41:24 +01:00
parent 9728f346f4
commit 9cccf2ba77
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/mapnik/geom_util.hpp
View file

@ -340,12 +340,10 @@ bool centroid_geoms(Iter start, Iter end, double & x, double & y)
double start_x = x0; double start_x = x0;
double start_y = y0; double start_y = y0;
bool empty = true;
double atmp = 0.0; double atmp = 0.0;
double xtmp = 0.0; double xtmp = 0.0;
double ytmp = 0.0; double ytmp = 0.0;
unsigned count = 1; unsigned count = 0;
while (start!=end) while (start!=end)
{ {
@ -353,7 +351,11 @@ bool centroid_geoms(Iter start, Iter end, double & x, double & y)
path.rewind(0); path.rewind(0);
unsigned command = path.vertex(&x0, &y0); unsigned command = path.vertex(&x0, &y0);
if (command == SEG_END) continue; if (command == SEG_END) continue;
empty = false;
if ( ! count++ ) {
start_x = x0;
start_y = y0;
}
while (SEG_END != (command = path.vertex(&x1, &y1))) while (SEG_END != (command = path.vertex(&x1, &y1)))
{ {
@ -369,9 +371,10 @@ bool centroid_geoms(Iter start, Iter end, double & x, double & y)
y0 = y1; y0 = y1;
++count; ++count;
} }
} }
if ( empty ) return false; if (count == 0) return false;
if (count <= 2) { if (count <= 2) {
x = (start_x + x0) * 0.5; x = (start_x + x0) * 0.5;