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

Also trim .geobuf from layer names

Browse Source
This commit is contained in:
Eric Fischer
2017-11-29 16:44:55 -08:00
parent ba1c343204
commit 1b1be9f872
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.cpp
+11
View File
@@ -1140,18 +1140,29 @@ int read_input(std::vector<source> &sources, char *fname, int maxzoom, int minzo
std::string trunc = std::string(use); std::string trunc = std::string(use);
// Trim .json or .mbtiles from the name // Trim .json or .mbtiles from the name
while (true) {
ssize_t cp; ssize_t cp;
cp = trunc.find(".json"); cp = trunc.find(".json");
if (cp >= 0 && (size_t) cp + 5 == trunc.size()) { if (cp >= 0 && (size_t) cp + 5 == trunc.size()) {
trunc = trunc.substr(0, cp); trunc = trunc.substr(0, cp);
continue;
} }
cp = trunc.find(".geojson"); cp = trunc.find(".geojson");
if (cp >= 0 && (size_t) cp + 8 == trunc.size()) { if (cp >= 0 && (size_t) cp + 8 == trunc.size()) {
trunc = trunc.substr(0, cp); trunc = trunc.substr(0, cp);
continue;
}
cp = trunc.find(".geobuf");
if (cp >= 0 && (size_t) cp + 7 == trunc.size()) {
trunc = trunc.substr(0, cp);
continue;
} }
cp = trunc.find(".mbtiles"); cp = trunc.find(".mbtiles");
if (cp >= 0 && (size_t) cp + 8 == trunc.size()) { if (cp >= 0 && (size_t) cp + 8 == trunc.size()) {
trunc = trunc.substr(0, cp); trunc = trunc.substr(0, cp);
continue;
}
break;
} }
// Trim out characters that can't be part of selector // Trim out characters that can't be part of selector