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

Also makes no difference...

Browse Source
This commit is contained in:
Erica Fischer
2023-09-07 16:32:26 -07:00
parent 9c3ed8e331
commit 10747c0dd1
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geometry.cpp
+14 -6
View File
@@ -110,11 +110,14 @@ drawvec from_tile_scale(drawvec const &geom, int z, int detail) {
drawvec remove_noop(drawvec geom, int type, int shift) { drawvec remove_noop(drawvec geom, int type, int shift) {
// first pass: remove empty linetos // first pass: remove empty linetos
long long x = 0, y = 0; long long ox = 0, oy = 0;
drawvec out; drawvec out;
for (size_t i = 0; i < geom.size(); i++) { for (size_t i = 0; i < geom.size(); i++) {
if (geom[i].op == VT_LINETO && (long long) std::round((double) geom[i].x / (1LL << shift)) == x && (long long) std::round((double) geom[i].y / (1LL << shift)) == y) { long long nx = std::round((double) geom[i].x / (1LL << shift));
long long ny = std::round((double) geom[i].y / (1LL << shift));
if (geom[i].op == VT_LINETO && nx == ox && ny == oy) {
continue; continue;
} }
@@ -122,8 +125,8 @@ drawvec remove_noop(drawvec geom, int type, int shift) {
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]);
x = std::round((double) geom[i].x / (1LL << shift)); ox = nx;
y = std::round((double) geom[i].y / (1LL << shift)); oy = ny;
} }
} }
@@ -136,14 +139,17 @@ drawvec remove_noop(drawvec geom, int type, int shift) {
for (size_t i = 0; i < geom.size(); i++) { for (size_t i = 0; i < geom.size(); i++) {
if (geom[i].op == VT_MOVETO) { if (geom[i].op == VT_MOVETO) {
if (i + 1 >= geom.size()) { if (i + 1 >= geom.size()) {
// followed by end-of-geometry: not needed
continue; continue;
} }
if (geom[i + 1].op == VT_MOVETO) { if (geom[i + 1].op == VT_MOVETO) {
// followed by another moveto: not needed
continue; continue;
} }
if (geom[i + 1].op == VT_CLOSEPATH) { if (geom[i + 1].op == VT_CLOSEPATH) {
// followed by closepath: not possible
fprintf(stderr, "Shouldn't happen\n"); fprintf(stderr, "Shouldn't happen\n");
i++; // also remove unused closepath i++; // also remove unused closepath
continue; continue;
@@ -161,8 +167,10 @@ drawvec remove_noop(drawvec geom, int type, int shift) {
out.resize(0); out.resize(0);
for (size_t i = 0; i < geom.size(); i++) { for (size_t i = 0; i < geom.size(); i++) {
if (geom[i].op == VT_MOVETO) { if (i > 1 && geom[i].op == VT_MOVETO) {
if (i > 0 && geom[i - 1].op == VT_LINETO && (long long) std::round((double) geom[i - 1].x / (1LL << shift)) == (long long) std::round((double) geom[i].x / (1LL << shift)) && (long long) std::round((double) geom[i - 1].y / (1LL << shift)) == (long long) std::round((double) geom[i].y / (1LL << shift))) { if (geom[i - 1].op == VT_LINETO &&
std::round((double) geom[i - 1].x / (1LL << shift)) == std::round((double) geom[i].x / (1LL << shift)) &&
std::round((double) geom[i - 1].y / (1LL << shift)) == std::round((double) geom[i].y / (1LL << shift))) {
continue; continue;
} }
} }