From 801c5d65742007e7dd6b0f2235cfc4081bc13ac1 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Tue, 17 Jan 2017 10:38:40 -0800 Subject: [PATCH 1/2] Add instructions for upgrading g++ on Linux --- README.md | 11 +++++++++++ man/tippecanoe.1 | 15 ++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c3222df..0c5197e 100644 --- a/README.md +++ b/README.md @@ -279,6 +279,17 @@ and perhaps make install +Tippecanoe now requires features from the 2014 C++ standard. If your compiler is older than +that, you will need to install a newer one. On MacOS, updating to the lastest XCode should +get you a new enough version of `clang++`. On Linux, you should be able to upgrade `g++` with + +``` +sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test +sudo apt-get update -y +sudo apt-get install -y g++-5 +export CXX=g++-5 +``` + Examples ------ diff --git a/man/tippecanoe.1 b/man/tippecanoe.1 index bfbda4e..774617f 100644 --- a/man/tippecanoe.1 +++ b/man/tippecanoe.1 @@ -315,7 +315,7 @@ Linux: .PP .RS .nf -sudo apt\-get install libsqlite3\-dev zlib1g\-dev +sudo apt\-get install build\-essential libsqlite3\-dev zlib1g\-dev .fi .RE .PP @@ -334,6 +334,19 @@ and perhaps make install .fi .RE +.PP +Tippecanoe now requires features from the 2014 C++ standard. If your compiler is older than +that, you will need to install a newer one. On MacOS, updating to the lastest XCode should +get you a new enough version of \fB\fCclang++\fR\&. On Linux, you should be able to upgrade \fB\fCg++\fR with +.PP +.RS +.nf +sudo add\-apt\-repository \-y ppa:ubuntu\-toolchain\-r/test +sudo apt\-get update \-y +sudo apt\-get install \-y g++\-5 +export CXX=g++\-5 +.fi +.RE .SH Examples .PP Check out some examples of maps made with tippecanoe \[la]MADE_WITH.md\[ra] From 5a8f9f11c08f4c41d68fca44dc24b655fd94bceb Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Wed, 18 Jan 2017 14:26:17 -0800 Subject: [PATCH 2/2] Only warn once about non-numeric/non-integer/negative feature IDs --- geojson.cpp | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/geojson.cpp b/geojson.cpp index 79c1887..b81797f 100644 --- a/geojson.cpp +++ b/geojson.cpp @@ -241,17 +241,32 @@ int serialize_geometry(json_object *geometry, json_object *properties, json_obje id_value = strtoull(id->string, &err, 10); if (err != NULL && *err != '\0') { - fprintf(stderr, "Warning: Can't represent non-integer feature ID %s\n", id->string); + static bool warned_frac = false; + + if (!warned_frac) { + fprintf(stderr, "Warning: Can't represent non-integer feature ID %s\n", id->string); + warned_frac = true; + } } else { has_id = true; } } else { - fprintf(stderr, "Warning: Can't represent negative feature ID %s\n", id->string); + static bool warned_neg = false; + + if (!warned_neg) { + fprintf(stderr, "Warning: Can't represent negative feature ID %s\n", id->string); + warned_neg = true; + } } } else { - char *s = json_stringify(id); - fprintf(stderr, "Warning: Can't represent non-numeric feature ID %s\n", s); - free(s); // stringify + static bool warned_nan = false; + + if (!warned_nan) { + char *s = json_stringify(id); + fprintf(stderr, "Warning: Can't represent non-numeric feature ID %s\n", s); + free(s); // stringify + warned_nan = true; + } } }