mirror of
https://github.com/felt/tippecanoe.git
synced 2026-10-05 01:45:41 +02:00
Factor out the JSON token reading loop
Conflicts: geojson.c
This commit is contained in:
@@ -864,14 +864,7 @@ int read_json(int argc, char **argv, char *fname, const char *layername, int max
|
|||||||
|
|
||||||
jp = json_begin_file(fp);
|
jp = json_begin_file(fp);
|
||||||
|
|
||||||
int layer;
|
parse_json(jp, reading, &seq, &metapos, &geompos, &indexpos, exclude, include, exclude_all, metafile, geomfile, indexfile, poolfile, treefile, fname, maxzoom, basezoom, source, droprate, file_bbox);
|
||||||
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);
|
|
||||||
|
|
||||||
json_end(jp);
|
json_end(jp);
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
|||||||
Reference in New Issue
Block a user