diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-02 08:25:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make --allow-existing work on dirs; trim .geojson from layer names

Browse Source
This commit is contained in:
Eric Fischer
2017-11-29 16:24:48 -08:00
parent ca028dd1cc
commit ba1c343204
31 changed files with 3942 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.cpp
+7 -6
View File
@@ -1142,11 +1142,15 @@ int read_input(std::vector<source> &sources, char *fname, int maxzoom, int minzo
// Trim .json or .mbtiles from the name
ssize_t cp;
cp = trunc.find(".json");
if (cp >= 0) {
if (cp >= 0 && (size_t) cp + 5 == trunc.size()) {
trunc = trunc.substr(0, cp);
}
cp = trunc.find(".geojson");
if (cp >= 0 && (size_t) cp + 8 == trunc.size()) {
trunc = trunc.substr(0, cp);
}
cp = trunc.find(".mbtiles");
if (cp >= 0) {
if (cp >= 0 && (size_t) cp + 8 == trunc.size()) {
trunc = trunc.substr(0, cp);
}
@@ -2664,10 +2668,7 @@ int main(int argc, char **argv) {
outdb = mbtiles_open(out_mbtiles, argv, forcetable);
}
if (out_dir != NULL) {
if (force) {
check_dir(out_dir, true);
}
check_dir(out_dir, false);
check_dir(out_dir, force, forcetable);
}
int ret = EXIT_SUCCESS;