From 6da2090960ab0f972558fd3a7b3d8e10b4c807a4 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@pobox.com>
Date: Wed, 16 Jan 2019 11:55:57 -0800
Subject: [PATCH] Fix a bug that disallowed a per-feature minzoom of 0

---
 CHANGELOG.md               |  4 ++++
 tests/minzoom/in.json      |  1 +
 tests/minzoom/out/-z6.json | 10 ++++++++--
 text.cpp                   |  2 +-
 version.hpp                |  2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ded0166..a7d3b39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.32.10
+
+* Fix a bug that disallowed a per-feature minzoom of 0
+
 ## 1.32.9
 
 * Limit tile detail to 30 and buffer size to 127 to prevent coordinate
diff --git a/tests/minzoom/in.json b/tests/minzoom/in.json
index d03f380..cc1daf8 100644
--- a/tests/minzoom/in.json
+++ b/tests/minzoom/in.json
@@ -1,3 +1,4 @@
+{ "type": "Feature", "properties": {}, "geometry": { "type": "Point", "coordinates": [ 0, 0 ] }, "tippecanoe": { "minzoom": 0, "maxzoom": 0 } }
 { "type": "Feature", "properties": {}, "geometry": { "type": "Point", "coordinates": [ 1, 1 ] }, "tippecanoe": { "minzoom": 1, "maxzoom": 1 } }
 { "type": "Feature", "properties": {}, "geometry": { "type": "Point", "coordinates": [ 2, 2 ] }, "tippecanoe": { "minzoom": 2, "maxzoom": 2 } }
 { "type": "Feature", "properties": {}, "geometry": { "type": "Point", "coordinates": [ 3, 3 ] }, "tippecanoe": { "minzoom": 3, "maxzoom": 3 } }
diff --git a/tests/minzoom/out/-z6.json b/tests/minzoom/out/-z6.json
index 140f02f..7854f3b 100644
--- a/tests/minzoom/out/-z6.json
+++ b/tests/minzoom/out/-z6.json
@@ -1,15 +1,21 @@
 { "type": "FeatureCollection", "properties": {
-"bounds": "1.000000,1.000000,6.000000,6.000000",
+"bounds": "0.000000,0.000000,6.000000,6.000000",
 "center": "6.000000,6.000000,6",
 "description": "tests/minzoom/out/-z6.json.check.mbtiles",
 "format": "pbf",
-"json": "{\"vector_layers\": [ { \"id\": \"in\", \"description\": \"\", \"minzoom\": 0, \"maxzoom\": 6, \"fields\": {} } ],\"tilestats\": {\"layerCount\": 1,\"layers\": [{\"layer\": \"in\",\"count\": 6,\"geometry\": \"Point\",\"attributeCount\": 0,\"attributes\": []}]}}",
+"json": "{\"vector_layers\": [ { \"id\": \"in\", \"description\": \"\", \"minzoom\": 0, \"maxzoom\": 6, \"fields\": {} } ],\"tilestats\": {\"layerCount\": 1,\"layers\": [{\"layer\": \"in\",\"count\": 7,\"geometry\": \"Point\",\"attributeCount\": 0,\"attributes\": []}]}}",
 "maxzoom": "6",
 "minzoom": "0",
 "name": "tests/minzoom/out/-z6.json.check.mbtiles",
 "type": "overlay",
 "version": "2"
 }, "features": [
+{ "type": "FeatureCollection", "properties": { "zoom": 0, "x": 0, "y": 0 }, "features": [
+{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
+{ "type": "Feature", "properties": {  }, "geometry": { "type": "Point", "coordinates": [ 0.000000, 0.000000 ] } }
+] }
+] }
+,
 { "type": "FeatureCollection", "properties": { "zoom": 1, "x": 0, "y": 1 }, "features": [
 { "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
 { "type": "Feature", "properties": {  }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 1.010690 ] } }
diff --git a/text.cpp b/text.cpp
index d7473fe..45a562b 100644
--- a/text.cpp
+++ b/text.cpp
@@ -127,7 +127,7 @@ std::string truncate16(std::string const &s, size_t runes) {
 
 int integer_zoom(std::string where, std::string text) {
 	double d = atof(text.c_str());
-	if (!isnormal(d) || d != floor(d) || d < 0 || d > 32) {
+	if (!isfinite(d) || d != floor(d) || d < 0 || d > 32) {
 		fprintf(stderr, "%s: Expected integer zoom level in \"tippecanoe\" GeoJSON extension, not %s\n", where.c_str(), text.c_str());
 		exit(EXIT_FAILURE);
 	}
diff --git a/version.hpp b/version.hpp
index 2154349..22b8618 100644
--- a/version.hpp
+++ b/version.hpp
@@ -1,6 +1,6 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
 
-#define VERSION "v1.32.9"
+#define VERSION "v1.32.10"
 
 #endif