ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-04-06 18:46:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add .shp to the lists of filename suffixes; check for it as a format

Browse Source
This commit is contained in:
Eric Fischer 2018-08-10 17:20:04 -07:00
parent a508f4d11b
commit afe24dd4db
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.cpp
View File

@ -1270,6 +1270,7 @@ int read_input(std::vector<source> &sources, char *fname, int maxzoom, int minzo
".geobuf",
".mbtiles",
".csv",
".shp",
".gz",
};
@ -1424,7 +1425,7 @@ int read_input(std::vector<source> &sources, char *fname, int maxzoom, int minzo
continue;
}
if (sources[source].file.size() > 4 && sources[source].file.substr(sources[source].file.size() - 4) == std::string(".shp")) {
if (sources[source].format == "shp" || (sources[source].file.size() > 4 && sources[source].file.substr(sources[source].file.size() - 4) == std::string(".shp"))) {
std::atomic<long long> layer_seq[CPUS];
double dist_sums[CPUS];
size_t dist_counts[CPUS];
@ -1473,6 +1474,7 @@ int read_input(std::vector<source> &sources, char *fname, int maxzoom, int minzo
checkdisk(&readers);
continue;
}
if (sources[source].format == "csv" || (sources[source].file.size() > 4 && sources[source].file.substr(sources[source].file.size() - 4) == std::string(".csv"))) {
std::atomic<long long> layer_seq[CPUS];
double dist_sums[CPUS];