diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-05 09:55:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Be more cautious about use of a null feature for bare geometries

Browse Source
This commit is contained in:
Eric Fischer
2018-08-08 14:17:08 -07:00
parent 98cf4d94aa
commit 19c132e79c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geojson-loop.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ void parse_json(json_feature_action *jfa, json_pull *jp) {
} }
found_geometries++; found_geometries++;
jfa->add_feature(j, false, NULL, NULL, NULL, NULL); jfa->add_feature(j, false, NULL, NULL, NULL, j);
json_free(j); json_free(j);
continue; continue;
} }
jsontool.cpp
+1 -1
View File
@@ -365,7 +365,7 @@ void join_csv(json_object *j) {
struct json_join_action : json_feature_action { struct json_join_action : json_feature_action {
int add_feature(json_object *geometry, bool, json_object *, json_object *, json_object *, json_object *feature) { int add_feature(json_object *geometry, bool, json_object *, json_object *, json_object *, json_object *feature) {
if (feature != NULL) { if (feature != geometry) { // a real feature, not a bare geometry
if (csvfile != NULL) { if (csvfile != NULL) {
join_csv(feature); join_csv(feature);
} }