ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-04-10 04:19:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Serialize geometry before tags

Browse Source 
To make it easier to skip the tags if the geometry is optimized away
This commit is contained in:
Eric Fischer 2014-09-22 16:17:46 -07:00
parent baf364dd53
commit 74bdbfc76a
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
geojson.c
View File

@ -301,19 +301,6 @@ void check_range(struct index *start, struct index *end, char *metabase, unsigne
char *meta = metabase + i->fpos;
int m;
deserialize_int(&meta, &m);
int i;
for (i = 0; i < m; i++) {
int t;
deserialize_int(&meta, &t);
struct pool_val *key = deserialize_string(&meta, &keys, VT_STRING);
struct pool_val *value = deserialize_string(&meta, &keys, t);
printf("%s (%d) = %s (%d)\n", key->s, key->n, value->s, value->n);
}
int t;
deserialize_int(&meta, &t);
printf("(%d) ", t);
@ -338,6 +325,19 @@ void check_range(struct index *start, struct index *end, char *metabase, unsigne
}
}
int m;
deserialize_int(&meta, &m);
int i;
for (i = 0; i < m; i++) {
int t;
deserialize_int(&meta, &t);
struct pool_val *key = deserialize_string(&meta, &keys, VT_STRING);
struct pool_val *value = deserialize_string(&meta, &keys, t);
printf("%s (%d) = %s (%d)\n", key->s, key->n, value->s, value->n);
}
printf("\n");
}
@ -446,6 +446,12 @@ void read_json(FILE *f) {
{
long long start = fpos;
unsigned bbox[] = { UINT_MAX, UINT_MAX, 0, 0 };
serialize_int(metafile, t, &fpos);
parse_geometry(t, coordinates, bbox, &fpos, metafile, VT_MOVETO);
serialize_int(metafile, VT_END, &fpos);
char *metakey[properties->length];
char *metaval[properties->length];
int metatype[properties->length];
@ -482,12 +488,6 @@ void read_json(FILE *f) {
serialize_string(metafile, metaval[i], &fpos);
}
unsigned bbox[] = { UINT_MAX, UINT_MAX, 0, 0 };
serialize_int(metafile, t, &fpos);
parse_geometry(t, coordinates, bbox, &fpos, metafile, VT_MOVETO);
serialize_int(metafile, VT_END, &fpos);
int z = 14;
/* XXX do proper overlap instead of whole bounding box */