From 8df0455230e4e641d9c7e094b43c0d2b13eb1efe Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Wed, 20 Feb 2019 12:04:10 -0800 Subject: [PATCH] Make tile-join and tippecanoe-decode more flexible about directories: * Accept .mvt as well as .pbf in directories of tiles * Allow tippecanoe-decode and tile-join of directories with no metadata --- CHANGELOG.md | 5 +++++ dirtiles.cpp | 53 ++++++++++++++++++++++++++++++--------------------- dirtiles.hpp | 4 +++- tile-join.cpp | 9 +++++++++ version.hpp | 2 +- 5 files changed, 49 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7d3b39..74910a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.32.11 + +* Accept .mvt as well as .pbf in directories of tiles +* Allow tippecanoe-decode and tile-join of directories with no metadata + ## 1.32.10 * Fix a bug that disallowed a per-feature minzoom of 0 diff --git a/dirtiles.cpp b/dirtiles.cpp index 9cb0038..b946e07 100644 --- a/dirtiles.cpp +++ b/dirtiles.cpp @@ -59,7 +59,7 @@ static bool pbfname(const char *s) { s++; } - return strcmp(s, ".pbf") == 0; + return strcmp(s, ".pbf") == 0 || strcmp(s, ".mvt") == 0; } void check_dir(const char *dir, char **argv, bool force, bool forcetable) { @@ -134,7 +134,12 @@ std::vector enumerate_dirtiles(const char *fname) { while ((dp3 = readdir(d3)) != NULL) { if (pbfname(dp3->d_name)) { int ty = atoi(dp3->d_name); - tiles.push_back(zxy(tz, tx, ty)); + zxy tile(tz, tx, ty); + if (strstr(dp3->d_name, ".mvt") != NULL) { + tile.extension = ".mvt"; + } + + tiles.push_back(tile); } } @@ -172,30 +177,34 @@ sqlite3 *dirmeta2tmp(const char *fname) { FILE *f = fopen(name.c_str(), "r"); if (f == NULL) { perror(name.c_str()); - exit(EXIT_FAILURE); - } - - json_pull *jp = json_begin_file(f); - json_object *o = json_read_tree(jp); - - if (o->type != JSON_HASH) { - fprintf(stderr, "%s: bad metadata format\n", name.c_str()); - exit(EXIT_FAILURE); - } - - for (size_t i = 0; i < o->length; i++) { - if (o->keys[i]->type != JSON_STRING || o->values[i]->type != JSON_STRING) { - fprintf(stderr, "%s: non-string in metadata\n", name.c_str()); + } else { + json_pull *jp = json_begin_file(f); + json_object *o = json_read_tree(jp); + if (o == NULL) { + fprintf(stderr, "%s: metadata parsing error: %s\n", name.c_str(), jp->error); + exit(EXIT_FAILURE); } - char *sql = sqlite3_mprintf("INSERT INTO metadata (name, value) VALUES (%Q, %Q);", o->keys[i]->string, o->values[i]->string); - if (sqlite3_exec(db, sql, NULL, NULL, &err) != SQLITE_OK) { - fprintf(stderr, "set %s in metadata: %s\n", o->keys[i]->string, err); + if (o->type != JSON_HASH) { + fprintf(stderr, "%s: bad metadata format\n", name.c_str()); + exit(EXIT_FAILURE); } - sqlite3_free(sql); + + for (size_t i = 0; i < o->length; i++) { + if (o->keys[i]->type != JSON_STRING || o->values[i]->type != JSON_STRING) { + fprintf(stderr, "%s: non-string in metadata\n", name.c_str()); + } + + char *sql = sqlite3_mprintf("INSERT INTO metadata (name, value) VALUES (%Q, %Q);", o->keys[i]->string, o->values[i]->string); + if (sqlite3_exec(db, sql, NULL, NULL, &err) != SQLITE_OK) { + fprintf(stderr, "set %s in metadata: %s\n", o->keys[i]->string, err); + } + sqlite3_free(sql); + } + + json_end(jp); + fclose(f); } - json_end(jp); - fclose(f); return db; } diff --git a/dirtiles.hpp b/dirtiles.hpp index f6f9182..52b7f47 100644 --- a/dirtiles.hpp +++ b/dirtiles.hpp @@ -1,5 +1,6 @@ #include #include +#include #ifndef DIRTILES_HPP #define DIRTILES_HPP @@ -12,6 +13,7 @@ struct zxy { long long z; long long x; long long y; + std::string extension = ".pbf"; zxy(int _z, int _x, int _y) : z(_z), x(_x), y(_y) { @@ -36,7 +38,7 @@ struct zxy { } std::string path() { - return std::to_string(z) + "/" + std::to_string(x) + "/" + std::to_string(y) + ".pbf"; + return std::to_string(z) + "/" + std::to_string(x) + "/" + std::to_string(y) + extension; } }; diff --git a/tile-join.cpp b/tile-join.cpp index f713641..2a1c62f 100644 --- a/tile-join.cpp +++ b/tile-join.cpp @@ -1092,6 +1092,15 @@ int main(int argc, char **argv) { name = set_name; } + for (auto &l : layermap) { + if (l.second.minzoom < st.minzoom) { + st.minzoom = l.second.minzoom; + } + if (l.second.maxzoom > st.maxzoom) { + st.maxzoom = l.second.maxzoom; + } + } + mbtiles_write_metadata(outdb, out_dir, name.c_str(), st.minzoom, st.maxzoom, st.minlat, st.minlon, st.maxlat, st.maxlon, st.midlat, st.midlon, 0, attribution.size() != 0 ? attribution.c_str() : NULL, layermap, true, description.c_str(), !pg, attribute_descriptions, "tile-join"); if (outdb != NULL) { diff --git a/version.hpp b/version.hpp index 22b8618..46f7b53 100644 --- a/version.hpp +++ b/version.hpp @@ -1,6 +1,6 @@ #ifndef VERSION_HPP #define VERSION_HPP -#define VERSION "v1.32.10" +#define VERSION "v1.32.11" #endif