From d490d8475eb67d1f201573edc128af168514cc0a Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Tue, 30 Aug 2016 14:17:28 -0700 Subject: [PATCH] Remove unused layer count and layer name list --- main.cpp | 2 +- mbtiles.cpp | 2 +- mbtiles.hpp | 2 +- tile-join.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main.cpp b/main.cpp index 6e08704..79ee22c 100644 --- a/main.cpp +++ b/main.cpp @@ -1729,7 +1729,7 @@ int read_input(std::vector &sources, char *fname, const char *layername, std::map merged_lm = merge_layermaps(layermaps); - mbtiles_write_metadata(outdb, fname, layernames, minzoom, maxzoom, minlat, minlon, maxlat, maxlon, midlat, midlon, nlayers, forcetable, attribution, merged_lm); + mbtiles_write_metadata(outdb, fname, minzoom, maxzoom, minlat, minlon, maxlat, maxlon, midlat, midlon, forcetable, attribution, merged_lm); return ret; } diff --git a/mbtiles.cpp b/mbtiles.cpp index 4fa0f51..bf167af 100644 --- a/mbtiles.cpp +++ b/mbtiles.cpp @@ -133,7 +133,7 @@ bool type_and_string::operator<(const type_and_string &o) const { return false; } -void mbtiles_write_metadata(sqlite3 *outdb, const char *fname, std::vector &layername, int minzoom, int maxzoom, double minlat, double minlon, double maxlat, double maxlon, double midlat, double midlon, int nlayers, int forcetable, const char *attribution, std::map const &layermap) { +void mbtiles_write_metadata(sqlite3 *outdb, 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) { char *sql, *err; sql = sqlite3_mprintf("INSERT INTO metadata (name, value) VALUES ('name', %Q);", fname); diff --git a/mbtiles.hpp b/mbtiles.hpp index c5e2e51..3a8894c 100644 --- a/mbtiles.hpp +++ b/mbtiles.hpp @@ -18,7 +18,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 *fname, std::vector &layername, int minzoom, int maxzoom, double minlat, double minlon, double maxlat, double maxlon, double midlat, double midlon, int nlayers, int forcetable, const char *attribution, std::map const &layermap); +void mbtiles_write_metadata(sqlite3 *outdb, 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); void mbtiles_close(sqlite3 *outdb, char **argv); diff --git a/tile-join.cpp b/tile-join.cpp index 8485e3b..5422482 100644 --- a/tile-join.cpp +++ b/tile-join.cpp @@ -429,7 +429,7 @@ int main(int argc, char **argv) { layermap.find(layernames[i])->second.file_keys = file_keys[i]; } - mbtiles_write_metadata(outdb, outfile, layernames, st.minzoom, st.maxzoom, st.minlat, st.minlon, st.maxlat, st.maxlon, st.midlat, st.midlon, nlayers, 0, attribution.size() != 0 ? attribution.c_str() : NULL, layermap); + mbtiles_write_metadata(outdb, outfile, 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); mbtiles_close(outdb, argv); return 0;