diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-05 18:05:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove closepath expectation in polygon thinning

Browse Source
This commit is contained in:
Eric Fischer
2015-10-07 17:11:58 -07:00
parent 5dc9f50345
commit 329f041bf2
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geometry.cc
+6 -8
View File
@@ -97,6 +97,7 @@ drawvec remove_noop(drawvec geom, int type, int shift) {
} }
if (geom[i].op == VT_CLOSEPATH) { if (geom[i].op == VT_CLOSEPATH) {
fprintf(stderr, "Shouldn't happen\n");
out.push_back(geom[i]); out.push_back(geom[i]);
} else { /* moveto or lineto */ } else { /* moveto or lineto */
out.push_back(geom[i]); out.push_back(geom[i]);
@@ -121,6 +122,7 @@ drawvec remove_noop(drawvec geom, int type, int shift) {
} }
if (geom[i + 1].op == VT_CLOSEPATH) { if (geom[i + 1].op == VT_CLOSEPATH) {
fprintf(stderr, "Shouldn't happen\n");
i++; // also remove unused closepath i++; // also remove unused closepath
continue; continue;
} }
@@ -371,15 +373,11 @@ drawvec reduce_tiny_poly(drawvec &geom, int z, int detail, bool *reduced, double
if (geom[i].op == VT_MOVETO) { if (geom[i].op == VT_MOVETO) {
unsigned j; unsigned j;
for (j = i + 1; j < geom.size(); j++) { for (j = i + 1; j < geom.size(); j++) {
if (geom[j].op == VT_CLOSEPATH) { if (geom[j].op != VT_LINETO) {
break; break;
} }
} }
if (j + 1 < geom.size() && geom[j + 1].op == VT_CLOSEPATH) {
fprintf(stderr, "double closepath\n");
}
double area = 0; double area = 0;
for (unsigned k = i; k < j; k++) { for (unsigned k = i; k < j; k++) {
area += geom[k].x * geom[i + ((k - i + 1) % (j - i))].y; area += geom[k].x * geom[i + ((k - i + 1) % (j - i))].y;
@@ -398,7 +396,7 @@ drawvec reduce_tiny_poly(drawvec &geom, int z, int detail, bool *reduced, double
out.push_back(draw(VT_LINETO, geom[i].x + pixel, geom[i].y)); out.push_back(draw(VT_LINETO, geom[i].x + pixel, geom[i].y));
out.push_back(draw(VT_LINETO, geom[i].x + pixel, geom[i].y + pixel)); out.push_back(draw(VT_LINETO, geom[i].x + pixel, geom[i].y + pixel));
out.push_back(draw(VT_LINETO, geom[i].x, geom[i].y + pixel)); out.push_back(draw(VT_LINETO, geom[i].x, geom[i].y + pixel));
out.push_back(draw(VT_CLOSEPATH, geom[i].x, geom[i].y)); out.push_back(draw(VT_LINETO, geom[i].x, geom[i].y));
*accum_area -= pixel * pixel; *accum_area -= pixel * pixel;
} }
@@ -412,7 +410,7 @@ drawvec reduce_tiny_poly(drawvec &geom, int z, int detail, bool *reduced, double
*reduced = false; *reduced = false;
} }
i = j; i = j - 1;
} else { } else {
fprintf(stderr, "how did we get here with %d in %d?\n", geom[i].op, (int) geom.size()); fprintf(stderr, "how did we get here with %d in %d?\n", geom[i].op, (int) geom.size());
@@ -614,7 +612,7 @@ drawvec simplify_lines(drawvec &geom, int z, int detail) {
if (geom[i].op == VT_MOVETO) { if (geom[i].op == VT_MOVETO) {
unsigned j; unsigned j;
for (j = i + 1; j < geom.size(); j++) { for (j = i + 1; j < geom.size(); j++) {
if (geom[j].op == VT_CLOSEPATH || geom[j].op == VT_MOVETO) { if (geom[j].op != VT_LINETO) {
break; break;
} }
} }