ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-01-22 12:28:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make the string pools within each tile

Browse Source
This commit is contained in:
Eric Fischer 2014-09-22 12:22:58 -07:00
parent 94ef6afc17
commit 41981ec8e9
1 changed files with 69 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
geojson.c
View File

@ -146,6 +146,53 @@ int indexcmp(const void *v1, const void *v2) {
} }
} }
struct pool_val {
char *s;
int type;
int n;
struct pool_val *next;
};
struct pool {
struct pool_val *vals;
int n;
};
struct pool_val *pool(struct pool *p, char *s, int type) {
struct pool_val **v = &(p->vals);
while (*v != NULL) {
int cmp = strcmp(s, (*v)->s);
if (cmp == 0) {
cmp = type - (*v)->type;
}
if (cmp == 0) {
return *v;
}
v = &((*v)->next);
}
*v = malloc(sizeof(struct pool_val));
(*v)->next = NULL;
(*v)->s = s;
(*v)->type = type;
(*v)->n = p->n++;
return *v;
}
void pool_free(struct pool *p) {
while (p->vals != NULL) {
struct pool_val *next = p->vals->next;
free(p->vals);
p->vals = next;
}
}
size_t fwrite_check(const void *ptr, size_t size, size_t nitems, FILE *stream) { size_t fwrite_check(const void *ptr, size_t size, size_t nitems, FILE *stream) {
size_t w = fwrite(ptr, size, nitems, stream); size_t w = fwrite(ptr, size, nitems, stream);
if (w != nitems) { if (w != nitems) {
@ -168,9 +215,10 @@ void serialize_uint(FILE *out, unsigned n, long long *fpos) {
void serialize_string(FILE *out, char *s, long long *fpos) { void serialize_string(FILE *out, char *s, long long *fpos) {
int len = strlen(s); int len = strlen(s);
serialize_int(out, len, fpos); serialize_int(out, len + 1, fpos);
fwrite_check(s, sizeof(char), len, out); fwrite_check(s, sizeof(char), len, out);
*fpos += len; fwrite_check("", sizeof(char), 1, out);
*fpos += len + 1;
} }
void parse_geometry(int t, json_object *j, unsigned *bbox, long long *fpos, FILE *out, int op) { void parse_geometry(int t, json_object *j, unsigned *bbox, long long *fpos, FILE *out, int op) {
@ -233,14 +281,15 @@ void deserialize_int(char **f, int *n) {
*f += sizeof(int); *f += sizeof(int);
} }
void deserialize_string(char **f) { struct pool_val *deserialize_string(char **f, struct pool *p, int type) {
struct pool_val *ret;
int len; int len;
deserialize_int(f, &len); deserialize_int(f, &len);
char s[len + 1]; ret = pool(p, *f, type);
memcpy(s, *f, len);
*f += len; *f += len;
s[len] = '\0';
printf("%s", s); return ret;
} }
void range_search(struct index *ix, long long n, unsigned long long start, unsigned long long end, struct index **pstart, struct index **pend) { void range_search(struct index *ix, long long n, unsigned long long start, unsigned long long end, struct index **pstart, struct index **pend) {
@ -266,8 +315,12 @@ void range_search(struct index *ix, long long n, unsigned long long start, unsig
} }
void check_range(struct index *start, struct index *end, char *metabase, unsigned *file_bbox) { void check_range(struct index *start, struct index *end, char *metabase, unsigned *file_bbox) {
struct index *i; struct pool keys, values;
keys.n = values.n = 0;
keys.vals = values.vals = NULL;
struct index *i;
printf("tile -----------------------------------------------\n");
for (i = start; i < end; i++) { for (i = start; i < end; i++) {
printf("%llx ", i->index); printf("%llx ", i->index);
@ -280,11 +333,10 @@ void check_range(struct index *start, struct index *end, char *metabase, unsigne
for (i = 0; i < m; i++) { for (i = 0; i < m; i++) {
int t; int t;
deserialize_int(&meta, &t); deserialize_int(&meta, &t);
printf("(%d) ", t); struct pool_val *key = deserialize_string(&meta, &keys, VT_STRING);
deserialize_string(&meta); struct pool_val *value = deserialize_string(&meta, &values, t);
printf("=");
deserialize_string(&meta); printf("%s (%d) = %s (%d)\n", key->s, key->n, value->s, value->n);
printf("; ");
} }
int t; int t;
@ -313,13 +365,16 @@ void check_range(struct index *start, struct index *end, char *metabase, unsigne
printf("\n"); printf("\n");
} }
pool_free(&keys);
pool_free(&values);
} }
void check(struct index *ix, long long n, char *metabase, unsigned *file_bbox) { 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 = 11; z >= 11; z--) { for (z = 14; z >= 14; 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;