Accept 0 as a feature ID in --use-attribute-for-id

strip_zeroes() removed every leading zero, so "0" became "" and never
matched std::to_string(0). The ID was rejected as too large and the
feature was left without an ID. Keep the final digit.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0172RxhnHkNgRZ3NBrsRJZYK

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 2.82.1
+
+* Fix `--use-attribute-for-id` rejecting an attribute value of 0 as a
+  "too-large" feature ID. The leading-zero stripping used to check that the ID
+  round-tripped stripped "0" down to an empty string, so the feature was left
+  with no ID and kept the attribute instead.
+
 # 2.82.0
 
 * Fix corruption of a JSON array when a non-final element was removed from it.

serial.cpp

@@ -382,7 +382,8 @@ static std::string strip_zeroes(std::string s) {
 	// Doesn't do anything special with '-' followed by leading zeros
 	// since integer IDs must be positive
 
-	while (s.size() > 0 && s[0] == '0') {
+	// Keep the final digit so that an ID of 0 compares equal to "0"
+	while (s.size() > 1 && s[0] == '0') {
 		s.erase(s.begin());
 	}
 

tests/stringid/in.json

@@ -10,3 +10,5 @@
 { "type": "Feature", "id": 1234, "properties": { "yes": "no", "special": 98237489273489274389728497289472839478297489274892734892, "something": false }, "geometry": { "type": "Point", "coordinates": [ 10, 1 ] } }
 { "type": "Feature", "properties": { "yes": "no", "special": 27, "something": false }, "geometry": { "type": "Point", "coordinates": [ 11, 1 ] } }
 { "type": "Feature", "properties": { "yes": "no", "special": "01005", "something": false }, "geometry": { "type": "Point", "coordinates": [ 12, 1 ] } }
+{ "type": "Feature", "properties": { "yes": "no", "special": 0, "something": false }, "geometry": { "type": "Point", "coordinates": [ 13, 1 ] } }
+{ "type": "Feature", "properties": { "yes": "no", "special": "0", "something": false }, "geometry": { "type": "Point", "coordinates": [ 14, 1 ] } }

tests/stringid/out/-z0.json

@@ -1,11 +1,11 @@
 { "type": "FeatureCollection", "properties": {
-"antimeridian_adjusted_bounds": "1.000000,1.000000,12.000000,1.000000",
+"antimeridian_adjusted_bounds": "1.000000,1.000000,14.000000,1.000000",
-"bounds": "1.000000,1.000000,12.000000,1.000000",
+"bounds": "1.000000,1.000000,14.000000,1.000000",
 "center": "1.000000,1.000000,0",
 "description": "tests/stringid/out/-z0.json.check.mbtiles",
 "format": "pbf",
 "generator_options": "./tippecanoe -q -a@ -f -o tests/stringid/out/-z0.json.check.mbtiles -z0 tests/stringid/in.json",
-"json": "{\"vector_layers\":[{\"id\":\"in\",\"description\":\"\",\"minzoom\":0,\"maxzoom\":0,\"fields\":{\"something\":\"Boolean\",\"special\":\"Mixed\",\"yes\":\"String\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"in\",\"count\":12,\"geometry\":\"Point\",\"attributeCount\":3,\"attributes\":[{\"attribute\":\"something\",\"count\":1,\"type\":\"boolean\",\"values\":[false]},{\"attribute\":\"special\",\"count\":5,\"type\":\"mixed\",\"values\":[\"01005\",\"27\",27,27.5,9.823748927348929e+55],\"min\":27,\"max\":9.823748927348929e+55},{\"attribute\":\"yes\",\"count\":1,\"type\":\"string\",\"values\":[\"no\"]}]}]}}",
+"json": "{\"vector_layers\":[{\"id\":\"in\",\"description\":\"\",\"minzoom\":0,\"maxzoom\":0,\"fields\":{\"something\":\"Boolean\",\"special\":\"Mixed\",\"yes\":\"String\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"in\",\"count\":14,\"geometry\":\"Point\",\"attributeCount\":3,\"attributes\":[{\"attribute\":\"something\",\"count\":1,\"type\":\"boolean\",\"values\":[false]},{\"attribute\":\"special\",\"count\":7,\"type\":\"mixed\",\"values\":[\"0\",0,\"01005\",\"27\",27,27.5,9.823748927348929e+55],\"min\":0,\"max\":9.823748927348929e+55},{\"attribute\":\"yes\",\"count\":1,\"type\":\"string\",\"values\":[\"no\"]}]}]}}",
 "maxzoom": "0",
 "minzoom": "0",
 "name": "tests/stringid/out/-z0.json.check.mbtiles",
@@ -37,6 +37,10 @@
 { "type": "Feature", "properties": { "yes": "no", "special": 27, "something": false }, "geometry": { "type": "Point", "coordinates": [ 10.986328, 0.966751 ] } }
 ,
 { "type": "Feature", "properties": { "yes": "no", "special": "01005", "something": false }, "geometry": { "type": "Point", "coordinates": [ 12.041016, 0.966751 ] } }
+,
+{ "type": "Feature", "properties": { "yes": "no", "special": 0, "something": false }, "geometry": { "type": "Point", "coordinates": [ 13.007812, 0.966751 ] } }
+,
+{ "type": "Feature", "properties": { "yes": "no", "special": "0", "something": false }, "geometry": { "type": "Point", "coordinates": [ 13.974609, 0.966751 ] } }
 ] }
 ] }
 ] }

tests/stringid/out/-z0_--use-attribute-for-id_special.json

@@ -1,11 +1,11 @@
 { "type": "FeatureCollection", "properties": {
-"antimeridian_adjusted_bounds": "1.000000,1.000000,12.000000,1.000000",
+"antimeridian_adjusted_bounds": "1.000000,1.000000,14.000000,1.000000",
-"bounds": "1.000000,1.000000,12.000000,1.000000",
+"bounds": "1.000000,1.000000,14.000000,1.000000",
 "center": "1.000000,1.000000,0",
 "description": "tests/stringid/out/-z0_--use-attribute-for-id_special.json.check.mbtiles",
 "format": "pbf",
 "generator_options": "./tippecanoe -q -a@ -f -o tests/stringid/out/-z0_--use-attribute-for-id_special.json.check.mbtiles -z0 --use-attribute-for-id special tests/stringid/in.json",
-"json": "{\"vector_layers\":[{\"id\":\"in\",\"description\":\"\",\"minzoom\":0,\"maxzoom\":0,\"fields\":{\"something\":\"Boolean\",\"special\":\"Mixed\",\"yes\":\"String\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"in\",\"count\":12,\"geometry\":\"Point\",\"attributeCount\":3,\"attributes\":[{\"attribute\":\"something\",\"count\":1,\"type\":\"boolean\",\"values\":[false]},{\"attribute\":\"special\",\"count\":4,\"type\":\"mixed\",\"values\":[\"01005\",\"27\",27.5,9.823748927348929e+55],\"min\":27.5,\"max\":9.823748927348929e+55},{\"attribute\":\"yes\",\"count\":1,\"type\":\"string\",\"values\":[\"no\"]}]}]}}",
+"json": "{\"vector_layers\":[{\"id\":\"in\",\"description\":\"\",\"minzoom\":0,\"maxzoom\":0,\"fields\":{\"something\":\"Boolean\",\"special\":\"Mixed\",\"yes\":\"String\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"in\",\"count\":14,\"geometry\":\"Point\",\"attributeCount\":3,\"attributes\":[{\"attribute\":\"something\",\"count\":1,\"type\":\"boolean\",\"values\":[false]},{\"attribute\":\"special\",\"count\":5,\"type\":\"mixed\",\"values\":[\"0\",\"01005\",\"27\",27.5,9.823748927348929e+55],\"min\":27.5,\"max\":9.823748927348929e+55},{\"attribute\":\"yes\",\"count\":1,\"type\":\"string\",\"values\":[\"no\"]}]}]}}",
 "maxzoom": "0",
 "minzoom": "0",
 "name": "tests/stringid/out/-z0_--use-attribute-for-id_special.json.check.mbtiles",
@@ -37,6 +37,10 @@
 { "type": "Feature", "id": 27, "properties": { "yes": "no", "something": false }, "geometry": { "type": "Point", "coordinates": [ 10.986328, 0.966751 ] } }
 ,
 { "type": "Feature", "properties": { "yes": "no", "special": "01005", "something": false }, "geometry": { "type": "Point", "coordinates": [ 12.041016, 0.966751 ] } }
+,
+{ "type": "Feature", "id": 0, "properties": { "yes": "no", "something": false }, "geometry": { "type": "Point", "coordinates": [ 13.007812, 0.966751 ] } }
+,
+{ "type": "Feature", "properties": { "yes": "no", "special": "0", "something": false }, "geometry": { "type": "Point", "coordinates": [ 13.974609, 0.966751 ] } }
 ] }
 ] }
 ] }

tests/stringid/out/-z0_--use-attribute-for-id_special_-X.json

@@ -1,11 +1,11 @@
 { "type": "FeatureCollection", "properties": {
-"antimeridian_adjusted_bounds": "1.000000,1.000000,12.000000,1.000000",
+"antimeridian_adjusted_bounds": "1.000000,1.000000,14.000000,1.000000",
-"bounds": "1.000000,1.000000,12.000000,1.000000",
+"bounds": "1.000000,1.000000,14.000000,1.000000",
 "center": "1.000000,1.000000,0",
 "description": "tests/stringid/out/-z0_--use-attribute-for-id_special_-X.json.check.mbtiles",
 "format": "pbf",
 "generator_options": "./tippecanoe -q -a@ -f -o tests/stringid/out/-z0_--use-attribute-for-id_special_-X.json.check.mbtiles -z0 --use-attribute-for-id special -X tests/stringid/in.json",
-"json": "{\"vector_layers\":[{\"id\":\"in\",\"description\":\"\",\"minzoom\":0,\"maxzoom\":0,\"fields\":{}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"in\",\"count\":12,\"geometry\":\"Point\",\"attributeCount\":0,\"attributes\":[]}]}}",
+"json": "{\"vector_layers\":[{\"id\":\"in\",\"description\":\"\",\"minzoom\":0,\"maxzoom\":0,\"fields\":{}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"in\",\"count\":14,\"geometry\":\"Point\",\"attributeCount\":0,\"attributes\":[]}]}}",
 "maxzoom": "0",
 "minzoom": "0",
 "name": "tests/stringid/out/-z0_--use-attribute-for-id_special_-X.json.check.mbtiles",
@@ -37,6 +37,10 @@
 { "type": "Feature", "id": 27, "properties": {  }, "geometry": { "type": "Point", "coordinates": [ 10.986328, 0.966751 ] } }
 ,
 { "type": "Feature", "properties": {  }, "geometry": { "type": "Point", "coordinates": [ 12.041016, 0.966751 ] } }
+,
+{ "type": "Feature", "id": 0, "properties": {  }, "geometry": { "type": "Point", "coordinates": [ 13.007812, 0.966751 ] } }
+,
+{ "type": "Feature", "properties": {  }, "geometry": { "type": "Point", "coordinates": [ 13.974609, 0.966751 ] } }
 ] }
 ] }
 ] }

tests/stringid/out/-z0_--use-attribute-for-id_special_-xspecial.json

@@ -1,11 +1,11 @@
 { "type": "FeatureCollection", "properties": {
-"antimeridian_adjusted_bounds": "1.000000,1.000000,12.000000,1.000000",
+"antimeridian_adjusted_bounds": "1.000000,1.000000,14.000000,1.000000",
-"bounds": "1.000000,1.000000,12.000000,1.000000",
+"bounds": "1.000000,1.000000,14.000000,1.000000",
 "center": "1.000000,1.000000,0",
 "description": "tests/stringid/out/-z0_--use-attribute-for-id_special_-xspecial.json.check.mbtiles",
 "format": "pbf",
 "generator_options": "./tippecanoe -q -a@ -f -o tests/stringid/out/-z0_--use-attribute-for-id_special_-xspecial.json.check.mbtiles -z0 --use-attribute-for-id special -xspecial tests/stringid/in.json",
-"json": "{\"vector_layers\":[{\"id\":\"in\",\"description\":\"\",\"minzoom\":0,\"maxzoom\":0,\"fields\":{\"something\":\"Boolean\",\"yes\":\"String\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"in\",\"count\":12,\"geometry\":\"Point\",\"attributeCount\":2,\"attributes\":[{\"attribute\":\"something\",\"count\":1,\"type\":\"boolean\",\"values\":[false]},{\"attribute\":\"yes\",\"count\":1,\"type\":\"string\",\"values\":[\"no\"]}]}]}}",
+"json": "{\"vector_layers\":[{\"id\":\"in\",\"description\":\"\",\"minzoom\":0,\"maxzoom\":0,\"fields\":{\"something\":\"Boolean\",\"yes\":\"String\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"in\",\"count\":14,\"geometry\":\"Point\",\"attributeCount\":2,\"attributes\":[{\"attribute\":\"something\",\"count\":1,\"type\":\"boolean\",\"values\":[false]},{\"attribute\":\"yes\",\"count\":1,\"type\":\"string\",\"values\":[\"no\"]}]}]}}",
 "maxzoom": "0",
 "minzoom": "0",
 "name": "tests/stringid/out/-z0_--use-attribute-for-id_special_-xspecial.json.check.mbtiles",
@@ -37,6 +37,10 @@
 { "type": "Feature", "id": 27, "properties": { "yes": "no", "something": false }, "geometry": { "type": "Point", "coordinates": [ 10.986328, 0.966751 ] } }
 ,
 { "type": "Feature", "properties": { "yes": "no", "something": false }, "geometry": { "type": "Point", "coordinates": [ 12.041016, 0.966751 ] } }
+,
+{ "type": "Feature", "id": 0, "properties": { "yes": "no", "something": false }, "geometry": { "type": "Point", "coordinates": [ 13.007812, 0.966751 ] } }
+,
+{ "type": "Feature", "properties": { "yes": "no", "something": false }, "geometry": { "type": "Point", "coordinates": [ 13.974609, 0.966751 ] } }
 ] }
 ] }
 ] }

tests/stringid/out/-z0_--use-attribute-for-id_special_-yother.json

@@ -1,11 +1,11 @@
 { "type": "FeatureCollection", "properties": {
-"antimeridian_adjusted_bounds": "1.000000,1.000000,12.000000,1.000000",
+"antimeridian_adjusted_bounds": "1.000000,1.000000,14.000000,1.000000",
-"bounds": "1.000000,1.000000,12.000000,1.000000",
+"bounds": "1.000000,1.000000,14.000000,1.000000",
 "center": "1.000000,1.000000,0",
 "description": "tests/stringid/out/-z0_--use-attribute-for-id_special_-yother.json.check.mbtiles",
 "format": "pbf",
 "generator_options": "./tippecanoe -q -a@ -f -o tests/stringid/out/-z0_--use-attribute-for-id_special_-yother.json.check.mbtiles -z0 --use-attribute-for-id special -yother tests/stringid/in.json",
-"json": "{\"vector_layers\":[{\"id\":\"in\",\"description\":\"\",\"minzoom\":0,\"maxzoom\":0,\"fields\":{}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"in\",\"count\":12,\"geometry\":\"Point\",\"attributeCount\":0,\"attributes\":[]}]}}",
+"json": "{\"vector_layers\":[{\"id\":\"in\",\"description\":\"\",\"minzoom\":0,\"maxzoom\":0,\"fields\":{}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"in\",\"count\":14,\"geometry\":\"Point\",\"attributeCount\":0,\"attributes\":[]}]}}",
 "maxzoom": "0",
 "minzoom": "0",
 "name": "tests/stringid/out/-z0_--use-attribute-for-id_special_-yother.json.check.mbtiles",
@@ -37,6 +37,10 @@
 { "type": "Feature", "id": 27, "properties": {  }, "geometry": { "type": "Point", "coordinates": [ 10.986328, 0.966751 ] } }
 ,
 { "type": "Feature", "properties": {  }, "geometry": { "type": "Point", "coordinates": [ 12.041016, 0.966751 ] } }
+,
+{ "type": "Feature", "id": 0, "properties": {  }, "geometry": { "type": "Point", "coordinates": [ 13.007812, 0.966751 ] } }
+,
+{ "type": "Feature", "properties": {  }, "geometry": { "type": "Point", "coordinates": [ 13.974609, 0.966751 ] } }
 ] }
 ] }
 ] }

tests/stringid/out/-z0_-aI.json

@@ -1,11 +1,11 @@
 { "type": "FeatureCollection", "properties": {
-"antimeridian_adjusted_bounds": "1.000000,1.000000,12.000000,1.000000",
+"antimeridian_adjusted_bounds": "1.000000,1.000000,14.000000,1.000000",
-"bounds": "1.000000,1.000000,12.000000,1.000000",
+"bounds": "1.000000,1.000000,14.000000,1.000000",
 "center": "1.000000,1.000000,0",
 "description": "tests/stringid/out/-z0_-aI.json.check.mbtiles",
 "format": "pbf",
 "generator_options": "./tippecanoe -q -a@ -f -o tests/stringid/out/-z0_-aI.json.check.mbtiles -z0 -aI tests/stringid/in.json",
-"json": "{\"vector_layers\":[{\"id\":\"in\",\"description\":\"\",\"minzoom\":0,\"maxzoom\":0,\"fields\":{\"something\":\"Boolean\",\"special\":\"Mixed\",\"yes\":\"String\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"in\",\"count\":12,\"geometry\":\"Point\",\"attributeCount\":3,\"attributes\":[{\"attribute\":\"something\",\"count\":1,\"type\":\"boolean\",\"values\":[false]},{\"attribute\":\"special\",\"count\":5,\"type\":\"mixed\",\"values\":[\"01005\",\"27\",27,27.5,9.823748927348929e+55],\"min\":27,\"max\":9.823748927348929e+55},{\"attribute\":\"yes\",\"count\":1,\"type\":\"string\",\"values\":[\"no\"]}]}]}}",
+"json": "{\"vector_layers\":[{\"id\":\"in\",\"description\":\"\",\"minzoom\":0,\"maxzoom\":0,\"fields\":{\"something\":\"Boolean\",\"special\":\"Mixed\",\"yes\":\"String\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"in\",\"count\":14,\"geometry\":\"Point\",\"attributeCount\":3,\"attributes\":[{\"attribute\":\"something\",\"count\":1,\"type\":\"boolean\",\"values\":[false]},{\"attribute\":\"special\",\"count\":7,\"type\":\"mixed\",\"values\":[\"0\",0,\"01005\",\"27\",27,27.5,9.823748927348929e+55],\"min\":0,\"max\":9.823748927348929e+55},{\"attribute\":\"yes\",\"count\":1,\"type\":\"string\",\"values\":[\"no\"]}]}]}}",
 "maxzoom": "0",
 "minzoom": "0",
 "name": "tests/stringid/out/-z0_-aI.json.check.mbtiles",
@@ -37,6 +37,10 @@
 { "type": "Feature", "properties": { "yes": "no", "special": 27, "something": false }, "geometry": { "type": "Point", "coordinates": [ 10.986328, 0.966751 ] } }
 ,
 { "type": "Feature", "properties": { "yes": "no", "special": "01005", "something": false }, "geometry": { "type": "Point", "coordinates": [ 12.041016, 0.966751 ] } }
+,
+{ "type": "Feature", "properties": { "yes": "no", "special": 0, "something": false }, "geometry": { "type": "Point", "coordinates": [ 13.007812, 0.966751 ] } }
+,
+{ "type": "Feature", "properties": { "yes": "no", "special": "0", "something": false }, "geometry": { "type": "Point", "coordinates": [ 13.974609, 0.966751 ] } }
 ] }
 ] }
 ] }

tests/stringid/out/-z0_-aI_--use-attribute-for-id_special.json

@@ -1,11 +1,11 @@
 { "type": "FeatureCollection", "properties": {
-"antimeridian_adjusted_bounds": "1.000000,1.000000,12.000000,1.000000",
+"antimeridian_adjusted_bounds": "1.000000,1.000000,14.000000,1.000000",
-"bounds": "1.000000,1.000000,12.000000,1.000000",
+"bounds": "1.000000,1.000000,14.000000,1.000000",
 "center": "1.000000,1.000000,0",
 "description": "tests/stringid/out/-z0_-aI_--use-attribute-for-id_special.json.check.mbtiles",
 "format": "pbf",
 "generator_options": "./tippecanoe -q -a@ -f -o tests/stringid/out/-z0_-aI_--use-attribute-for-id_special.json.check.mbtiles -z0 -aI --use-attribute-for-id special tests/stringid/in.json",
-"json": "{\"vector_layers\":[{\"id\":\"in\",\"description\":\"\",\"minzoom\":0,\"maxzoom\":0,\"fields\":{\"something\":\"Boolean\",\"special\":\"Number\",\"yes\":\"String\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"in\",\"count\":12,\"geometry\":\"Point\",\"attributeCount\":3,\"attributes\":[{\"attribute\":\"something\",\"count\":1,\"type\":\"boolean\",\"values\":[false]},{\"attribute\":\"special\",\"count\":2,\"type\":\"number\",\"values\":[27.5,9.823748927348929e+55],\"min\":27.5,\"max\":9.823748927348929e+55},{\"attribute\":\"yes\",\"count\":1,\"type\":\"string\",\"values\":[\"no\"]}]}]}}",
+"json": "{\"vector_layers\":[{\"id\":\"in\",\"description\":\"\",\"minzoom\":0,\"maxzoom\":0,\"fields\":{\"something\":\"Boolean\",\"special\":\"Number\",\"yes\":\"String\"}}],\"tilestats\":{\"layerCount\":1,\"layers\":[{\"layer\":\"in\",\"count\":14,\"geometry\":\"Point\",\"attributeCount\":3,\"attributes\":[{\"attribute\":\"something\",\"count\":1,\"type\":\"boolean\",\"values\":[false]},{\"attribute\":\"special\",\"count\":2,\"type\":\"number\",\"values\":[27.5,9.823748927348929e+55],\"min\":27.5,\"max\":9.823748927348929e+55},{\"attribute\":\"yes\",\"count\":1,\"type\":\"string\",\"values\":[\"no\"]}]}]}}",
 "maxzoom": "0",
 "minzoom": "0",
 "name": "tests/stringid/out/-z0_-aI_--use-attribute-for-id_special.json.check.mbtiles",
@@ -37,6 +37,10 @@
 { "type": "Feature", "id": 27, "properties": { "yes": "no", "something": false }, "geometry": { "type": "Point", "coordinates": [ 10.986328, 0.966751 ] } }
 ,
 { "type": "Feature", "id": 1005, "properties": { "yes": "no", "something": false }, "geometry": { "type": "Point", "coordinates": [ 12.041016, 0.966751 ] } }
+,
+{ "type": "Feature", "id": 0, "properties": { "yes": "no", "something": false }, "geometry": { "type": "Point", "coordinates": [ 13.007812, 0.966751 ] } }
+,
+{ "type": "Feature", "id": 0, "properties": { "yes": "no", "something": false }, "geometry": { "type": "Point", "coordinates": [ 13.974609, 0.966751 ] } }
 ] }
 ] }
 ] }

version.hpp

@@ -1,6 +1,6 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
 
-#define VERSION "v2.82.0"
+#define VERSION "v2.82.1"
 
 #endif