From 7f90ba5e1b16878b2c3ff37b07e76d148eb65823 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Thu, 7 Jun 2018 21:37:25 -0700 Subject: [PATCH] Include version number in tile-join output too --- main.cpp | 4 ++-- mbtiles.cpp | 5 +++-- mbtiles.hpp | 2 +- tile-join.cpp | 2 +- version.hpp | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/main.cpp b/main.cpp index 1666f13..7149638 100644 --- a/main.cpp +++ b/main.cpp @@ -2311,7 +2311,7 @@ int read_input(std::vector &sources, char *fname, int maxzoom, int minzo ai->second.maxzoom = maxzoom; } - mbtiles_write_metadata(outdb, outdir, fname, minzoom, maxzoom, minlat, minlon, maxlat, maxlon, midlat, midlon, forcetable, attribution, merged_lm, true, description, !prevent[P_TILE_STATS], attribute_descriptions); + mbtiles_write_metadata(outdb, outdir, fname, minzoom, maxzoom, minlat, minlon, maxlat, maxlon, midlat, midlon, forcetable, attribution, merged_lm, true, description, !prevent[P_TILE_STATS], attribute_descriptions, "tippecanoe"); return ret; } @@ -2882,7 +2882,7 @@ int main(int argc, char **argv) { } case 'v': - fprintf(stderr, "%s\n", VERSION); + fprintf(stderr, "tippecanoe %s\n", VERSION); exit(EXIT_FAILURE); case 'P': diff --git a/mbtiles.cpp b/mbtiles.cpp index 9b4edc4..12a89c6 100644 --- a/mbtiles.cpp +++ b/mbtiles.cpp @@ -265,7 +265,7 @@ void tilestats(std::map const &layermap1, size_t el state.json_end_hash(); } -void mbtiles_write_metadata(sqlite3 *outdb, const char *outdir, const char *fname, int minzoom, int maxzoom, double minlat, double minlon, double maxlat, double maxlon, double midlat, double midlon, int forcetable, const char *attribution, std::map const &layermap, bool vector, const char *description, bool do_tilestats, std::map const &attribute_descriptions) { +void mbtiles_write_metadata(sqlite3 *outdb, const char *outdir, const char *fname, int minzoom, int maxzoom, double minlat, double minlon, double maxlat, double maxlon, double midlat, double midlon, int forcetable, const char *attribution, std::map const &layermap, bool vector, const char *description, bool do_tilestats, std::map const &attribute_descriptions, std::string const &program) { char *sql, *err; sqlite3 *db = outdb; @@ -372,7 +372,8 @@ void mbtiles_write_metadata(sqlite3 *outdb, const char *outdir, const char *fnam } sqlite3_free(sql); - sql = sqlite3_mprintf("INSERT INTO metadata (name, value) VALUES ('generator', %Q);", VERSION); + std::string version = program + " " + VERSION; + sql = sqlite3_mprintf("INSERT INTO metadata (name, value) VALUES ('generator', %Q);", version.c_str()); if (sqlite3_exec(db, sql, NULL, NULL, &err) != SQLITE_OK) { fprintf(stderr, "set type: %s\n", err); if (!forcetable) { diff --git a/mbtiles.hpp b/mbtiles.hpp index 95ec651..f915e90 100644 --- a/mbtiles.hpp +++ b/mbtiles.hpp @@ -41,7 +41,7 @@ sqlite3 *mbtiles_open(char *dbname, char **argv, int forcetable); void mbtiles_write_tile(sqlite3 *outdb, int z, int tx, int ty, const char *data, int size); -void mbtiles_write_metadata(sqlite3 *outdb, const char *outdir, const char *fname, int minzoom, int maxzoom, double minlat, double minlon, double maxlat, double maxlon, double midlat, double midlon, int forcetable, const char *attribution, std::map const &layermap, bool vector, const char *description, bool do_tilestats, std::map const &attribute_descriptions); +void mbtiles_write_metadata(sqlite3 *outdb, const char *outdir, const char *fname, int minzoom, int maxzoom, double minlat, double minlon, double maxlat, double maxlon, double midlat, double midlon, int forcetable, const char *attribution, std::map const &layermap, bool vector, const char *description, bool do_tilestats, std::map const &attribute_descriptions, std::string const &program); void mbtiles_close(sqlite3 *outdb, const char *pgm); diff --git a/tile-join.cpp b/tile-join.cpp index ee9269c..b17ef15 100644 --- a/tile-join.cpp +++ b/tile-join.cpp @@ -1064,7 +1064,7 @@ int main(int argc, char **argv) { name = set_name; } - 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); + 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) { mbtiles_close(outdb, argv[0]); diff --git a/version.hpp b/version.hpp index 6cd41e9..9a1fe62 100644 --- a/version.hpp +++ b/version.hpp @@ -1,6 +1,6 @@ #ifndef VERSION_HPP #define VERSION_HPP -#define VERSION "tippecanoe v1.29.3" +#define VERSION "v1.29.3" #endif