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

Merge branch 'master' into topdown

Browse Source 
Conflicts:
	geojson.c
This commit is contained in:
Eric Fischer 2014-12-17 11:18:47 -08:00
commit 92bbf27f72
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
geojson.c
View File

@ -377,7 +377,7 @@ void read_json(FILE *f, const char *fname, const char *layername, int maxzoom, i
}
json_object *properties = json_hash_get(j, "properties");
if (properties == NULL || properties->type != JSON_HASH) {
if (properties == NULL || (properties->type != JSON_HASH && properties->type != JSON_NULL)) {
fprintf(stderr, "%s:%d: feature without properties hash\n", fname, jp->line);
json_free(j);
continue;
@ -405,14 +405,19 @@ void read_json(FILE *f, const char *fname, const char *layername, int maxzoom, i
{
unsigned bbox[] = { UINT_MAX, UINT_MAX, 0, 0 };
int nprop = 0;
if (properties->type == JSON_HASH) {
nprop = properties->length;
}
long long metastart = metapos;
char *metakey[properties->length];
char *metaval[properties->length];
int metatype[properties->length];
char *metakey[nprop];
char *metaval[nprop];
int metatype[nprop];
int m = 0;
int i;
for (i = 0; i < properties->length; i++) {
for (i = 0; i < nprop; i++) {
if (properties->keys[i]->type == JSON_STRING) {
if (exclude_all) {
if (!is_pooled(include, properties->keys[i]->string, VT_STRING)) {