From dfcdd03b19630bba244a97e30a69a2d791785d4a Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Fri, 23 Oct 2015 11:59:57 -0700 Subject: [PATCH] Factor out the JSON token reading loop Conflicts: geojson.c --- geojson.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/geojson.c b/geojson.c index 6248b570..68aaf461 100644 --- a/geojson.c +++ b/geojson.c @@ -864,14 +864,7 @@ int read_json(int argc, char **argv, char *fname, const char *layername, int max jp = json_begin_file(fp); - int layer; - if (nlayers == 1) { - layer = 0; - } else { - layer = source; - } - - parse_json(jp, reading, &seq, &metapos, &geompos, &indexpos, exclude, include, exclude_all, metafile, geomfile, indexfile, poolfile, treefile, fname, maxzoom, basezoom, layer, droprate, file_bbox); + parse_json(jp, reading, &seq, &metapos, &geompos, &indexpos, exclude, include, exclude_all, metafile, geomfile, indexfile, poolfile, treefile, fname, maxzoom, basezoom, source, droprate, file_bbox); json_end(jp); fclose(fp);