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

Fix bit shifting errors at z0

Browse Source
This commit is contained in:
Eric Fischer
2014-09-22 18:08:37 -07:00
parent 6851e914a9
commit d7cdbec980
2 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geojson.c
+30 -11
View File
@@ -286,26 +286,38 @@ void check(struct index *ix, long long n, char *metabase, unsigned *file_bbox) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
int z; int z;
for (z = 14; z >= 14; z--) { for (z = 14; z >= 0; z--) {
struct index *i, *j = NULL; struct index *i, *j = NULL;
for (i = ix; i < ix + n && i != NULL; i = j) { for (i = ix; i < ix + n && i != NULL; i = j) {
unsigned wx, wy; unsigned wx, wy;
decode(i->index, &wx, &wy); decode(i->index, &wx, &wy);
unsigned tx = 0, ty = 0;
if (z != 0) {
tx = wx >> (32 - z);
ty = wy >> (32 - z);
}
// printf("%lld in %lld\n", (long long)(i - ix), (long long)n); // printf("%lld in %lld\n", (long long)(i - ix), (long long)n);
for (j = i + 1; j < ix + n; j++) { for (j = i + 1; j < ix + n; j++) {
unsigned wx2, wy2; unsigned wx2, wy2;
decode(j->index, &wx2, &wy2); decode(j->index, &wx2, &wy2);
if (wx2 >> (32 - z) != wx >> (32 - z) || wy2 >> (32 - z) != wy >> (32 - z)) { unsigned tx2 = 0, ty2 = 0;
if (z != 0) {
tx2 = wx2 >> (32 - z);
ty2 = wy2 >> (32 - z);
}
if (tx2 != tx || ty2 != ty) {
break; break;
} }
} }
printf("%d/%u/%u %x %x %lld to %lld\n", z, wx >> (32 - z), wy >> (32 - z), wx, wy, (long long)(i - ix), (long long)(j - ix)); printf("%d/%u/%u %x %x %lld to %lld\n", z, tx, ty, wx, wy, (long long)(i - ix), (long long)(j - ix));
write_tile(i, j, metabase, file_bbox, z, wx >> (32 - z), wy >> (32 - z)); write_tile(i, j, metabase, file_bbox, z, tx, ty);
} }
} }
} }
@@ -428,13 +440,20 @@ void read_json(FILE *f) {
int z = 14; int z = 14;
/* XXX do proper overlap instead of whole bounding box */ /* XXX do proper overlap instead of whole bounding box */
unsigned x, y; if (z == 0) {
for (x = bbox[0] >> (32 - z); x <= bbox[2] >> (32 - z); x++) { struct index ix;
for (y = bbox[1] >> (32 - z); y <= bbox[3] >> (32 - z); y++) { ix.index = encode(0, 0);
struct index ix; ix.fpos = start;
ix.index = encode(x << (32 - z), y << (32 - z)); fwrite_check(&ix, sizeof(struct index), 1, indexfile);
ix.fpos = start; } else {
fwrite_check(&ix, sizeof(struct index), 1, indexfile); unsigned x, y;
for (x = bbox[0] >> (32 - z); x <= bbox[2] >> (32 - z); x++) {
for (y = bbox[1] >> (32 - z); y <= bbox[3] >> (32 - z); y++) {
struct index ix;
ix.index = encode(x << (32 - z), y << (32 - z));
ix.fpos = start;
fwrite_check(&ix, sizeof(struct index), 1, indexfile);
}
} }
} }
tile.cc
+4 -2
View File
@@ -117,8 +117,10 @@ void write_tile(struct index *start, struct index *end, char *metabase, unsigned
long long wwx = (unsigned) wx; long long wwx = (unsigned) wx;
long long wwy = (unsigned) wy; long long wwy = (unsigned) wy;
wwx -= tx << (32 - z); if (z != 0) {
wwy -= ty << (32 - z); wwx -= tx << (32 - z);
wwy -= ty << (32 - z);
}
wwx >>= (32 - 12 - z); wwx >>= (32 - 12 - z);
wwy >>= (32 - 12 - z); wwy >>= (32 - 12 - z);