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

Avoid clipping if the input and output tiles are the same

Browse Source
This commit is contained in:
Erica Fischer
2024-01-25 09:58:42 -08:00
parent 0f026d5040
commit dc88da5e3e
1 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clip.cpp
+33 -25
View File
@@ -931,6 +931,7 @@ std::string overzoom(mvt_tile tile, int oz, int ox, int oy, int nz, int nx, int
long long tilesize = 1LL << (32 - oz); // source tile size in world coordinates long long tilesize = 1LL << (32 - oz); // source tile size in world coordinates
draw ring_closure(0, 0, 0); draw ring_closure(0, 0, 0);
bool sametile = (nz == ox && nx == ox && ny == oy);
for (auto const &g : feature.geometry) { for (auto const &g : feature.geometry) {
if (g.op == mvt_closepath) { if (g.op == mvt_closepath) {
@@ -956,43 +957,50 @@ std::string overzoom(mvt_tile tile, int oz, int ox, int oy, int nz, int nx, int
g.y -= ny * outtilesize; g.y -= ny * outtilesize;
} }
// Clip to output tile if (!sametile) {
// Clip to output tile
long long xmin = LLONG_MAX; long long xmin = LLONG_MAX;
long long ymin = LLONG_MAX; long long ymin = LLONG_MAX;
long long xmax = LLONG_MIN; long long xmax = LLONG_MIN;
long long ymax = LLONG_MIN; long long ymax = LLONG_MIN;
for (auto const &g : geom) { for (auto const &g : geom) {
xmin = std::min(xmin, g.x); xmin = std::min(xmin, g.x);
ymin = std::min(ymin, g.y); ymin = std::min(ymin, g.y);
xmax = std::max(xmax, g.x); xmax = std::max(xmax, g.x);
ymax = std::max(ymax, g.y); ymax = std::max(ymax, g.y);
} }
long long b = outtilesize * buffer / 256; long long b = outtilesize * buffer / 256;
if (xmax < -b || ymax < -b || xmin > outtilesize + b || ymin > outtilesize + b) { if (xmax < -b || ymax < -b || xmin > outtilesize + b || ymin > outtilesize + b) {
continue; continue;
} }
if (t == VT_LINE) { if (t == VT_LINE) {
geom = clip_lines(geom, nz, buffer); geom = clip_lines(geom, nz, buffer);
} else if (t == VT_POLYGON) { } else if (t == VT_POLYGON) {
drawvec dv; drawvec dv;
geom = simple_clip_poly(geom, nz, buffer, dv, false); geom = simple_clip_poly(geom, nz, buffer, dv, false);
} else if (t == VT_POINT) { } else if (t == VT_POINT) {
geom = clip_point(geom, nz, buffer); geom = clip_point(geom, nz, buffer);
}
} }
// Scale to output tile extent // Scale to output tile extent
to_tile_scale(geom, nz, det); to_tile_scale(geom, nz, det);
// Clean geometries if (!sametile) {
// Clean geometries
geom = remove_noop(geom, t, 0);
if (t == VT_POLYGON) {
geom = clean_or_clip_poly(geom, 0, 0, false, false);
}
}
geom = remove_noop(geom, t, 0);
if (t == VT_POLYGON) { if (t == VT_POLYGON) {
geom = clean_or_clip_poly(geom, 0, 0, false, false);
geom = close_poly(geom); geom = close_poly(geom);
} }