diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-04 17:35:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix the layer number for layers being merged together

Browse Source
This commit is contained in:
Eric Fischer
2016-01-08 13:26:56 -08:00
parent 581728f157
commit 43c9bb705d
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+4
View File
@@ -1,3 +1,7 @@
## 1.6.4
* Fix crashing bug when layers are being merged with -l
## 1.6.3 ## 1.6.3
* Add an option to do line simplification only at zooms below maxzoom * Add an option to do line simplification only at zooms below maxzoom
geojson.c
+2 -2
View File
@@ -1090,7 +1090,7 @@ int read_json(int argc, char **argv, char *fname, const char *layername, int max
pja[i].fname = fname; pja[i].fname = fname;
pja[i].maxzoom = maxzoom; pja[i].maxzoom = maxzoom;
pja[i].basezoom = basezoom; pja[i].basezoom = basezoom;
pja[i].layer = source; pja[i].layer = source < nlayers ? source : 0;
pja[i].droprate = droprate; pja[i].droprate = droprate;
pja[i].file_bbox = reader[i].file_bbox; pja[i].file_bbox = reader[i].file_bbox;
pja[i].segment = i; pja[i].segment = i;
@@ -1124,7 +1124,7 @@ int read_json(int argc, char **argv, char *fname, const char *layername, int max
long long layer_seq = 0; long long layer_seq = 0;
json_pull *jp = json_begin_file(fp); json_pull *jp = json_begin_file(fp);
parse_json(jp, reading, &layer_seq, &progress_seq, &reader[0].metapos, &reader[0].geompos, &reader[0].indexpos, exclude, include, exclude_all, reader[0].metafile, reader[0].geomfile, reader[0].indexfile, reader[0].poolfile, reader[0].treefile, fname, maxzoom, basezoom, source, droprate, reader[0].file_bbox, 0, &initialized[0], &initial_x[0], &initial_y[0]); parse_json(jp, reading, &layer_seq, &progress_seq, &reader[0].metapos, &reader[0].geompos, &reader[0].indexpos, exclude, include, exclude_all, reader[0].metafile, reader[0].geomfile, reader[0].indexfile, reader[0].poolfile, reader[0].treefile, fname, maxzoom, basezoom, source < nlayers ? source : 0, droprate, reader[0].file_bbox, 0, &initialized[0], &initial_x[0], &initial_y[0]);
json_end(jp); json_end(jp);
fclose(fp); fclose(fp);
} }
version.h
+1 -1
View File
@@ -1 +1 @@
#define VERSION "tippecanoe v1.6.3\n" #define VERSION "tippecanoe v1.6.4\n"