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

Optimize out line movetos that don't actually move

Browse Source
This commit is contained in:
Eric Fischer
2014-09-24 15:43:24 -07:00
parent e65eb0b310
commit 509171b470
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tile.cc
+19 -2
View File
@@ -149,7 +149,7 @@ int draw(struct draw *geom, int n, mapnik::vector::tile_feature *feature) {
return drew; return drew;
} }
int remove_noop(struct draw *geom, int n) { int remove_noop(struct draw *geom, int n, int type) {
// first pass: remove empty linetos // first pass: remove empty linetos
long long x = 0, y = 0; long long x = 0, y = 0;
@@ -194,6 +194,23 @@ int remove_noop(struct draw *geom, int n) {
geom[out++] = geom[i]; geom[out++] = geom[i];
} }
// second pass: remove empty movetos
if (type == VT_LINE) {
n = out;
out = 0;
for (i = 0; i < n; i++) {
if (geom[i].op == VT_MOVETO) {
if (i - 1 >= 0 && geom[i - 1].op == VT_LINETO && geom[i - 1].x == geom[i].x && geom[i - 1].y == geom[i].y) {
continue;
}
}
geom[out++] = geom[i];
}
}
return out; return out;
} }
@@ -307,7 +324,7 @@ long long write_tile(struct index *start, struct index *end, char *metabase, uns
to_tile_scale(geom, len, z, detail); to_tile_scale(geom, len, z, detail);
if (t == VT_LINE || t == VT_POLYGON) { if (t == VT_LINE || t == VT_POLYGON) {
len = remove_noop(geom, len); len = remove_noop(geom, len, t);
} }
if (t == VT_POINT || draw(geom, len, NULL)) { if (t == VT_POINT || draw(geom, len, NULL)) {