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
dirtiles.cpp
+11 -4
View File
@@ -59,19 +59,26 @@ bool pbfname(const char *s) {
return strcmp(s, ".pbf") == 0;
}
void check_dir(const char *dir, bool rm) {
void check_dir(const char *dir, bool force, bool forcetable) {
struct stat st;
std::string meta = std::string(dir) + "/" + "metadata.json";
if (rm) {
if (force) {
unlink(meta.c_str()); // error OK since it may not exist;
} else {
if (stat(meta.c_str(), &st) == 0) {
fprintf(stderr, "%s: file exists\n", meta.c_str());
exit(EXIT_FAILURE);
if (!forcetable) {
exit(EXIT_FAILURE);
}
}
}
if (forcetable) {
// Don't clear existing tiles
return;
}
DIR *d1 = opendir(dir);
if (d1 != NULL) {
struct dirent *dp;
@@ -101,7 +108,7 @@ void check_dir(const char *dir, bool rm) {
if (pbfname(dp3->d_name)) {
std::string y = x + "/" + dp3->d_name;
if (rm) {
if (force) {
if (unlink(y.c_str()) != 0) {
perror(y.c_str());
exit(EXIT_FAILURE);