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

Turn polygon revival back on; turn off some debug spew

Browse Source
This commit is contained in:
Erica Fischer
2023-11-12 23:17:26 -08:00
parent c0866b9cde
commit d06363e9f9
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polygon.cpp
+8 -4
View File
@@ -66,7 +66,7 @@ bool fix_opposites(std::vector<segment> &segs) {
double dx = std::round(segs[i].second.x) - std::round(segs[i].first.x); double dx = std::round(segs[i].second.x) - std::round(segs[i].first.x);
double dy = std::round(segs[i].second.y) - std::round(segs[i].first.y); double dy = std::round(segs[i].second.y) - std::round(segs[i].first.y);
double dsq = dx * dx + dy * dy; double dsq = dx * dx + dy * dy;
if (false && dsq >= 5 * 5) { if (dsq >= 5 * 5) {
// alter the segments instead to keep it from collapsing away // alter the segments instead to keep it from collapsing away
double ang = atan2(dy, dx) - M_PI / 2; double ang = atan2(dy, dx) - M_PI / 2;
@@ -428,7 +428,7 @@ struct ring_area {
long long x = (geom[i].x + geom[i + 1].x + geom[i + 2].x) / 3; long long x = (geom[i].x + geom[i + 1].x + geom[i + 2].x) / 3;
long long y = (geom[i].y + geom[i + 1].y + geom[i + 2].y) / 3; long long y = (geom[i].y + geom[i + 1].y + geom[i + 2].y) / 3;
if (pnpoly(geom, 0, geom.size(), x, y)) { if (get_area(geom, i, i + 3) != 0 && pnpoly(geom, 0, geom.size(), x, y)) {
ear_x = x; ear_x = x;
ear_y = y; ear_y = y;
return; return;
@@ -766,17 +766,21 @@ drawvec clean_polygon(drawvec const &geom, int z, int detail) {
signbit(rings[j].area) == signbit(rings[i].area) ? "!!!!" : ""); signbit(rings[j].area) == signbit(rings[i].area) ? "!!!!" : "");
#endif #endif
} else if (rings[i].area < 0 && rings[j].area < 0) { } else if (rings[i].area < 0 && rings[j].area < 0) {
#if 0
fprintf(stderr, "inner within inner: ring %zd (%f) encloses ring %zu (%f) %s\n", j, rings[j].area, i, rings[i].area, fprintf(stderr, "inner within inner: ring %zd (%f) encloses ring %zu (%f) %s\n", j, rings[j].area, i, rings[i].area,
signbit(rings[j].area) == signbit(rings[i].area) ? "!!!!" : ""); signbit(rings[j].area) == signbit(rings[i].area) ? "!!!!" : "");
#endif
rings[i].geom.clear(); rings[i].geom.clear();
} else if (rings[i].area > 0 && rings[j].area > 0) { } else if (rings[i].area > 0 && rings[j].area > 0) {
#if 0
fprintf(stderr, "outer within outer: ring %zd (%f) encloses ring %zu (%f) %s\n", j, rings[j].area, i, rings[i].area, fprintf(stderr, "outer within outer: ring %zd (%f) encloses ring %zu (%f) %s\n", j, rings[j].area, i, rings[i].area,
signbit(rings[j].area) == signbit(rings[i].area) ? "!!!!" : ""); signbit(rings[j].area) == signbit(rings[i].area) ? "!!!!" : "");
#endif
rings[i].geom.clear(); rings[i].geom.clear();
} else { } else {
// outer ring within an inner ring; // outer ring within an inner ring;
// this is OK, but it is treated as a new outer ring in the tile, // this is fine, but it is treated as a new outer ring in the tile,
// not output in a hierarchy // not output in a hierarchy with the enclosing rings
} }
break; break;