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

Elevation in geometry is a warning, not an error.

Browse Source 
Only complain about the first null geometry, not ever one.
This commit is contained in:
Eric Fischer
2014-12-09 15:23:22 -08:00
parent 40ecfc0668
commit b068635acf
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geojson.c
+23 -3
View File
@@ -138,12 +138,21 @@ void parse_geometry(int t, json_object *j, unsigned *bbox, long long *fpos, FILE
parse_geometry(within, j->array[i], bbox, fpos, out, op, fname, source); parse_geometry(within, j->array[i], bbox, fpos, out, op, fname, source);
} }
} else { } else {
if (j->length == 2 && j->array[0]->type == JSON_NUMBER && j->array[1]->type == JSON_NUMBER) { if (j->length >= 2 && j->array[0]->type == JSON_NUMBER && j->array[1]->type == JSON_NUMBER) {
unsigned x, y; unsigned x, y;
double lon = j->array[0]->number; double lon = j->array[0]->number;
double lat = j->array[1]->number; double lat = j->array[1]->number;
latlon2tile(lat, lon, 32, &x, &y); latlon2tile(lat, lon, 32, &x, &y);
if (j->length > 2) {
static int warned = 0;
if (!warned) {
fprintf(stderr, "%s:%d: ignoring dimensions beyond two\n", fname, source->line);
warned = 1;
}
}
if (bbox != NULL) { if (bbox != NULL) {
if (x < bbox[0]) { if (x < bbox[0]) {
bbox[0] = x; bbox[0] = x;
@@ -360,8 +369,19 @@ void read_json(FILE *f, const char *fname, const char *layername, int maxzoom, i
} }
json_object *geometry_type = json_hash_get(geometry, "type"); json_object *geometry_type = json_hash_get(geometry, "type");
if (geometry_type == NULL || geometry_type->type != JSON_STRING) { if (geometry_type == NULL) {
fprintf(stderr, "%s:%d: geometry without type string\n", fname, jp->line); static int warned = 0;
if (!warned) {
fprintf(stderr, "%s:%d: null geometry (additional not reported)\n", fname, jp->line);
warned = 1;
}
json_free(j);
continue;
}
if (geometry_type->type != JSON_STRING) {
fprintf(stderr, "%s:%d: geometry without type\n", fname, jp->line);
json_free(j); json_free(j);
continue; continue;
} }