ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-04-05 10:09:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix tile-join crash when no CSV is specified. Accept multiple input files.

Browse Source
This commit is contained in:
Eric Fischer 2015-10-30 17:59:15 -07:00
parent fd5ced6902
commit 4df95df637
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tile-join.cc
View File

@ -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<std::string, std::vector<std::string> >::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);
}