From 4df95df637d09d2b4c61da06ae23c879435e25e8 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Fri, 30 Oct 2015 17:59:15 -0700 Subject: [PATCH] Fix tile-join crash when no CSV is specified. Accept multiple input files. --- tile-join.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tile-join.cc b/tile-join.cc index 8acce36..71a09f5 100644 --- a/tile-join.cc +++ b/tile-join.cc @@ -216,7 +216,7 @@ void handle(std::string message, int z, unsigned x, unsigned y, struct pool **fi feature_tags.push_back(v->n); } - if (strcmp(key, header[0].c_str()) == 0) { + if (header.size() > 0 && strcmp(key, header[0].c_str()) == 0) { std::map >::iterator ii = mapping.find(std::string(value)); if (ii != mapping.end()) { @@ -387,7 +387,7 @@ void decode(char *fname, char *map, struct pool **file_keys, char ***layernames, } void usage(char **argv) { - fprintf(stderr, "Usage: %s [-f] [-i] [-c joins.csv] [-x exclude ...] -o new.mbtiles source.mbtiles\n", argv[0]); + fprintf(stderr, "Usage: %s [-f] [-i] [-c joins.csv] [-x exclude ...] -o new.mbtiles source.mbtiles ...\n", argv[0]); exit(EXIT_FAILURE); } @@ -515,7 +515,7 @@ int main(int argc, char **argv) { } } - if (argc - optind != 1 || outfile == NULL) { + if (argc - optind < 1 || outfile == NULL) { usage(argv); }