Remember to remove the closepath after clipping away a polygon

This commit is contained in:
Eric Fischer 2014-12-04 14:54:11 -08:00
parent 028fef470e
commit 380550ce85
2 changed files with 10 additions and 4 deletions

View File

@ -308,7 +308,9 @@ drawvec clip_poly(drawvec &geom, int z, int detail, int buffer) {
}
if (j >= geom.size() || geom[j].op == VT_CLOSEPATH) {
out.push_back(draw(VT_CLOSEPATH, 0, 0));
if (out.size() > 0 && out[out.size() - 1].op != VT_CLOSEPATH) {
out.push_back(draw(VT_CLOSEPATH, 0, 0));
}
i = j;
} else {
i = j - 1;
@ -374,7 +376,13 @@ drawvec reduce_tiny_poly(drawvec &geom, int z, int detail, bool *reduced, double
i = j;
} else {
fprintf(stderr, "how did we get here with %d?\n", geom[i].op);
fprintf(stderr, "how did we get here with %d in %d?\n", geom[i].op, (int) geom.size());
for (unsigned n = 0; n < geom.size(); n++) {
fprintf(stderr, "%d/%lld/%lld ", geom[n].op, geom[n].x, geom[n].y);
}
fprintf(stderr, "\n");
out.push_back(geom[i]);
}
}

View File

@ -412,7 +412,6 @@ long long write_tile(char **geoms, char *metabase, unsigned *file_bbox, int z, u
if (line_detail == detail) { /* only write out the next zoom once, even if we retry */
if (geom.size() > 0) {
if (!within) {
printf("writing %d/%u/%u\n", z, tx, ty);
serialize_int(geomfile, z, &geompos, fname, jp);
serialize_uint(geomfile, tx, &geompos, fname, jp);
serialize_uint(geomfile, ty, &geompos, fname, jp);
@ -554,7 +553,6 @@ long long write_tile(char **geoms, char *metabase, unsigned *file_bbox, int z, u
evaluate(features, metabase, file_keys, layername, line_detail, compressed.size());
}
} else {
printf("output %d/%u/%u\n", z, tx, ty);
mbtiles_write_tile(outdb, z, tx, ty, compressed.data(), compressed.size());
return count;
}