diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-02 16:35:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Keep tippecanoe's own errors from being reported as protobuf errors

Browse Source 
A tile that fails to decode is reported with EXIT_MVT, while a tile that
protozero throws on is reported with EXIT_PROTOBUF. Now that decoding
failures are raised as a tippecanoe_error rather than exiting on the
spot, the catch that was written for protozero's exceptions catches
tippecanoe's own as well, since tippecanoe_error is a std::exception:
mvt_tile::decode() throwing "Tile decompression failed" came back out as
EXIT_PROTOBUF and "PBF decoding error in tile z/x/y".

Catch tippecanoe_error first at the four places that wrap a decode in a
try. In overzoom() and in tippecanoe-decode it can be rethrown for
main() to report. In tile-join it can't: append_tile() runs on a worker
thread, where an escaping exception would call std::terminate() instead
of exiting, so report it and exit with its own status there.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DuCSVGssWNUCpVEE8Yp5HT
This commit is contained in:
Claude
2026-08-07 18:50:53 +00:00
parent 85547150c2
commit 701389bbc9
4 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clip.cpp
+4
View File
@@ -1230,6 +1230,10 @@ std::string overzoom(std::vector<input_tile> const &tiles, int nz, int nx, int n
if (!tile.decode(t.tile, was_compressed)) {
throw_tippecanoe_error(EXIT_MVT, "Couldn't parse tile %d/%u/%u", t.z, t.x, t.y);
}
} catch (tippecanoe_error &e) {
// a tippecanoe_error is a std::exception, so it would
// otherwise be caught below and reattributed to protobuf
throw;
} catch (std::exception const &e) {
throw_tippecanoe_error(EXIT_PROTOBUF, "PBF decoding error in tile %d/%u/%u", t.z, t.x, t.y);
}