From fa7a52d032c6b89f95ee27f79902bb93e8e4e17a Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@pobox.com>
Date: Mon, 23 May 2016 17:44:41 -0700
Subject: [PATCH] Bump version number

---
 CHANGELOG.md | 5 +++++
 geojson.cpp  | 2 +-
 main.cpp     | 2 +-
 version.hpp  | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 899e5ce..bf004cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.11.7
+
+* Keep metadata together with geometry for features that don't span many tiles,
+  to avoid extra memory load from indexing into a separate metadata file
+
 ## 1.11.6
 
 * Reduce the size of critical data structures to reduce dynamic memory use
diff --git a/geojson.cpp b/geojson.cpp
index c98719d..a40217d 100644
--- a/geojson.cpp
+++ b/geojson.cpp
@@ -297,7 +297,7 @@ int serialize_geometry(json_object *geometry, json_object *properties, const cha
 	bool inline_meta = true;
 	// Don't inline metadata for features that will span several tiles at maxzoom
 	if (g > 0 && (bbox[2] < bbox[0] || bbox[3] < bbox[1])) {
-		fprintf(stderr, "Malformed bbox %llx,%llx,%llx,%llx\n", bbox[0], bbox[1], bbox[2], bbox[3]);
+		fprintf(stderr, "Internal error: impossible feature bounding box %llx,%llx,%llx,%llx\n", bbox[0], bbox[1], bbox[2], bbox[3]);
 	}
 	if (bbox[2] - bbox[0] > (2LL << (32 - maxzoom)) || bbox[3] - bbox[1] > (2LL << (32 - maxzoom))) {
 		inline_meta = false;
diff --git a/main.cpp b/main.cpp
index f3fdcce..15bbd2c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1393,7 +1393,7 @@ int read_input(std::vector<source> &sources, char *fname, const char *layername,
 	progress_seq = indexpos / sizeof(struct index);
 
 	if (!quiet) {
-		fprintf(stderr, "%lld features, %lld bytes of geometry, %lld bytes of metadata, %lld bytes of string pool\n", progress_seq, geompos, metapos, poolpos);
+		fprintf(stderr, "%lld features, %lld bytes of geometry, %lld bytes of separate metadata, %lld bytes of string pool\n", progress_seq, geompos, metapos, poolpos);
 	}
 
 	if (indexpos == 0) {
diff --git a/version.hpp b/version.hpp
index 8a29be8..bc26cbf 100644
--- a/version.hpp
+++ b/version.hpp
@@ -1 +1 @@
-#define VERSION "tippecanoe v1.11.6\n"
+#define VERSION "tippecanoe v1.11.7\n"