ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-02-24 02:41:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #642 from mapbox/maxzoom-minzoom

Browse Source 
Issue an error message in tile-join if minzoom is greater than maxzoom
This commit is contained in:
Eric Fischer 2018-09-07 12:07:47 -07:00 committed by GitHub
commit 03199a77a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 1.31.6
* Issue an error message in tile-join if minzoom is greater than maxzoom
## 1.31.5 ## 1.31.5
* Add options to change the tilestats limits * Add options to change the tilestats limits

2
main.cpp
View File

@ -3046,7 +3046,7 @@ int main(int argc, char **argv) {
} }
if (minzoom > maxzoom) { if (minzoom > maxzoom) {
fprintf(stderr, "minimum zoom -Z cannot be greater than maxzoom -z\n"); fprintf(stderr, "%s: Minimum zoom -Z%d cannot be greater than maxzoom -z%d\n", argv[0], minzoom, maxzoom);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }

5
tile-join.cpp
View File

@ -1030,6 +1030,11 @@ int main(int argc, char **argv) {
usage(argv); usage(argv);
} }
if (minzoom > maxzoom) {
fprintf(stderr, "%s: Minimum zoom -Z%d cannot be greater than maxzoom -z%d\n", argv[0], minzoom, maxzoom);
exit(EXIT_FAILURE);
}
if (out_mbtiles != NULL) { if (out_mbtiles != NULL) {
if (force) { if (force) {
unlink(out_mbtiles); unlink(out_mbtiles);

2
version.hpp
View File

@ -1,6 +1,6 @@
#ifndef VERSION_HPP #ifndef VERSION_HPP
#define VERSION_HPP #define VERSION_HPP
#define VERSION "v1.31.5" #define VERSION "v1.31.6"
#endif #endif