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

Make duplicate trimming less bad: only trim features indexed >1 time

Browse Source
This commit is contained in:
Eric Fischer
2014-11-06 11:27:10 -08:00
parent 7f6a5dc005
commit ea292def47
3 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geojson.c
+42 -29
View File
@@ -448,39 +448,52 @@ void read_json(FILE *f, char *fname, char *layername, int maxzoom, int minzoom,
ix.maxzoom = z; ix.maxzoom = z;
fwrite_check(&ix, sizeof(struct index), 1, indexfile, fname, jp); fwrite_check(&ix, sizeof(struct index), 1, indexfile, fname, jp);
} else { } else {
for (z = maxzoom; z >= 1; z--) { int pass;
unsigned x, y; int instances = 0;
for (x = (bbox[0] - (buffer << (32 - z - 8))) >> (32 - z); x <= (bbox[2] + (buffer << (32 - z - 8))) >> (32 - z); x++) {
for (y = (bbox[1] - (buffer << (32 - z - 8))) >> (32 - z); y <= (bbox[3] + (buffer << (32 - z - 8))) >> (32 - z); y++) {
if (z != maxzoom) {
// There must be a clearer way to write this, but the intent is
// not to add an additional index for a low-zoom tile
// if one of its children was already part of the
// buffered bounding box for the child's zoom.
// So we are comparing this tile's x and y to the edges of the for (pass = 0; pass < 2; pass++) {
// bounding box at the next zoom down, but divided by two for (z = maxzoom; z >= 1; z--) {
// to get it back into this zoom's tile coordinate scheme unsigned x, y;
for (x = (bbox[0] - (buffer << (32 - z - 8))) >> (32 - z); x <= (bbox[2] + (buffer << (32 - z - 8))) >> (32 - z); x++) {
for (y = (bbox[1] - (buffer << (32 - z - 8))) >> (32 - z); y <= (bbox[3] + (buffer << (32 - z - 8))) >> (32 - z); y++) {
if (z != maxzoom) {
// There must be a clearer way to write this, but the intent is
// not to add an additional index for a low-zoom tile
// if one of its children was already part of the
// buffered bounding box for the child's zoom.
if ((x >= ((bbox[0] - (buffer << (32 - (z + 1) - 8))) >> (32 - (z + 1)) >> 1)) && // So we are comparing this tile's x and y to the edges of the
(x <= ((bbox[2] + (buffer << (32 - (z + 1) - 8))) >> (32 - (z + 1)) >> 1)) && // bounding box at the next zoom down, but divided by two
(y >= ((bbox[1] - (buffer << (32 - (z + 1) - 8))) >> (32 - (z + 1)) >> 1)) && // to get it back into this zoom's tile coordinate scheme
(y <= ((bbox[3] + (buffer << (32 - (z + 1) - 8))) >> (32 - (z + 1)) >> 1))) {
continue; if ((x >= ((bbox[0] - (buffer << (32 - (z + 1) - 8))) >> (32 - (z + 1)) >> 1)) &&
(x <= ((bbox[2] + (buffer << (32 - (z + 1) - 8))) >> (32 - (z + 1)) >> 1)) &&
(y >= ((bbox[1] - (buffer << (32 - (z + 1) - 8))) >> (32 - (z + 1)) >> 1)) &&
(y <= ((bbox[3] + (buffer << (32 - (z + 1) - 8))) >> (32 - (z + 1)) >> 1))) {
continue;
}
}
if (pass == 0) {
instances++;
if (instances > 1) {
break;
}
} else {
struct index ix;
if (x == cx >> (32 - z) && y == cy >> (32 - z)) {
ix.index = encode(cx, cy);
} else {
ix.index = encode(x << (32 - z), y << (32 - z));
}
ix.fpos = start;
ix.type = mb_geometry[t];
ix.maxzoom = z;
ix.candup = (instances > 1);
fwrite_check(&ix, sizeof(struct index), 1, indexfile, fname, jp);
} }
} }
struct index ix;
if (x == cx >> (32 - z) && y == cy >> (32 - z)) {
ix.index = encode(cx, cy);
} else {
ix.index = encode(x << (32 - z), y << (32 - z));
}
ix.fpos = start;
ix.type = mb_geometry[t];
ix.maxzoom = z;
fwrite_check(&ix, sizeof(struct index), 1, indexfile, fname, jp);
} }
} }
} }
tile.cc
+5 -3
View File
@@ -371,10 +371,12 @@ long long write_tile(struct index *start, struct index *end, char *metabase, uns
continue; continue;
} }
if (dup.count(i->fpos) != 0) { if (i->candup) {
continue; if (dup.count(i->fpos) != 0) {
continue;
}
dup.insert(std::pair<long long, int>(i->fpos, 1));
} }
dup.insert(std::pair<long long, int>(i->fpos, 1));
int t = i->type; int t = i->type;
if (t == VT_POINT) { if (t == VT_POINT) {
tile.h
+2 -1
View File
@@ -22,7 +22,8 @@ struct index {
unsigned long long index; unsigned long long index;
long long fpos : 48; long long fpos : 48;
int maxzoom : 8; int maxzoom : 8;
int type : 8; int type : 7;
int candup : 1;
}; };
long long write_tile(struct index *start, struct index *end, char *metabase, unsigned *file_bbox, int z, unsigned x, unsigned y, int detail, int basezoom, struct pool *file_keys, char *layername, sqlite3 *outdb, double droprate, int buffer); long long write_tile(struct index *start, struct index *end, char *metabase, unsigned *file_bbox, int z, unsigned x, unsigned y, int detail, int basezoom, struct pool *file_keys, char *layername, sqlite3 *outdb, double droprate, int buffer);