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

Fix test flakiness for filtered tile-join, and some other warnings.

Browse Source
This commit is contained in:
Eric Fischer 2017-08-09 11:30:16 -07:00
parent 915b1481ad
commit e453e32321
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
decode.cpp
View File

@ -24,7 +24,6 @@ int maxzoom = 32;
bool force = false;
void handle(std::string message, int z, unsigned x, unsigned y, int describe, std::set<std::string> const &to_decode, bool pipeline) {
int within = 0;
mvt_tile tile;
bool was_compressed;
@ -80,7 +79,6 @@ void handle(std::string message, int z, unsigned x, unsigned y, int describe, st
printf(", \"features\": [\n");
first_layer = false;
within = 0;
}
}

2
tests/join-population/joined-i.mbtiles.json
View File

File diff suppressed because one or more lines are too long

13
tile-join.cpp
View File

@ -92,12 +92,6 @@ void handle(std::string message, int z, unsigned x, unsigned y, std::map<std::st
}
}
if (layermap.count(layer.name) == 0) {
layermap.insert(std::pair<std::string, layermap_entry>(layer.name, layermap_entry(layermap.size())));
auto file_keys = layermap.find(layer.name);
file_keys->second.minzoom = z;
file_keys->second.maxzoom = z;
}
auto file_keys = layermap.find(layer.name);
for (size_t f = 0; f < layer.features.size(); f++) {
@ -207,6 +201,13 @@ void handle(std::string message, int z, unsigned x, unsigned y, std::map<std::st
}
if (matched || !ifmatched) {
if (file_keys == layermap.end()) {
layermap.insert(std::pair<std::string, layermap_entry>(layer.name, layermap_entry(layermap.size())));
file_keys = layermap.find(layer.name);
file_keys->second.minzoom = z;
file_keys->second.maxzoom = z;
}
// To keep attributes in their original order instead of alphabetical
for (auto k : key_order) {
auto fa = attributes.find(k);

4
tile.cpp
View File

@ -1468,8 +1468,8 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s
FILE *prefilter_fp = NULL;
pthread_t prefilter_writer;
run_prefilter_args rpa; // here so it stays in scope until joined
FILE *prefilter_read_fp;
json_pull *prefilter_jp;
FILE *prefilter_read_fp = NULL;
json_pull *prefilter_jp = NULL;
if (prefilter != NULL) {
setup_filter(prefilter, &prefilter_write, &prefilter_read, &prefilter_pid, z, tx, ty);