From fc810d41563a5d3dbe28dfc129051d3f829cb8b0 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Fri, 30 Aug 2019 15:34:24 -0700 Subject: [PATCH] Fix line numbers in GeoJSON feature parsing error messages --- CHANGELOG.md | 4 ++++ geojson.cpp | 1 + version.hpp | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15cb196..a4f6651 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.34.5 + +* Fix line numbers in GeoJSON feature parsing error messages + ## 1.34.4 * Be careful to avoid undefined behavior from shifting negative numbers diff --git a/geojson.cpp b/geojson.cpp index 67fe653..0eae17c 100644 --- a/geojson.cpp +++ b/geojson.cpp @@ -269,6 +269,7 @@ struct json_serialize_action : json_feature_action { std::string layername; int add_feature(json_object *geometry, bool geometrycollection, json_object *properties, json_object *id, json_object *tippecanoe, json_object *feature) { + sst->line = geometry->parser->line; if (geometrycollection) { int ret = 1; for (size_t g = 0; g < geometry->length; g++) { diff --git a/version.hpp b/version.hpp index 10a8e40..7adab3e 100644 --- a/version.hpp +++ b/version.hpp @@ -1,6 +1,6 @@ #ifndef VERSION_HPP #define VERSION_HPP -#define VERSION "v1.34.4" +#define VERSION "v1.34.5" #endif