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

Gather the results from each thread *after* the thread finishes

Browse Source
This commit is contained in:
Erica Fischer
2024-12-20 09:42:09 -08:00
parent 7338c4b6b0
commit 4788b67a54
14 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/feature-filter/out/filtered.json.standard
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "0.000000,0.000000,0.000000,0.000000", "antimeridian_adjusted_bounds": "-180.000000,0.000000,0.966797,85.051129",
"bounds": "0.000000,0.000000,0.000000,0.000000", "bounds": "-180.000000,0.000000,0.966797,85.051129",
"center": "0.000000,0.000000,0", "center": "0.000000,0.000000,0",
"description": "tests/feature-filter/out/all.mbtiles", "description": "tests/feature-filter/out/all.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/concat.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "0.000000,0.000000,0.000000,0.000000", "antimeridian_adjusted_bounds": "-122.255859,37.718590,-122.080078,37.857507",
"bounds": "0.000000,0.000000,0.000000,0.000000", "bounds": "-122.255859,37.718590,-122.080078,37.857507",
"center": "-122.104097,37.695438,0", "center": "-122.104097,37.695438,0",
"description": "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", "description": "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
"format": "pbf", "format": "pbf",
tests/join-population/joined-no-tile-stats.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-135.000000,37.877021,-122.280579,40.979898", "antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898",
"bounds": "-135.000000,37.877021,-122.280579,40.979898", "bounds": "-135.000000,37.874853,-122.280579,40.979898",
"center": "-122.299805,37.892187,12", "center": "-122.299805,37.892187,12",
"description": "tests/join-population/tabblock_06001420.mbtiles", "description": "tests/join-population/tabblock_06001420.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/joined-null.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-135.000000,37.877021,-122.280579,40.979898", "antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898",
"bounds": "-135.000000,37.877021,-122.280579,40.979898", "bounds": "-135.000000,37.874853,-122.280579,40.979898",
"center": "-122.299805,37.892187,12", "center": "-122.299805,37.892187,12",
"description": "tests/join-population/tabblock_06001420.mbtiles", "description": "tests/join-population/tabblock_06001420.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/joined-tile-stats-attributes-limit.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-135.000000,37.877021,-122.280579,40.979898", "antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898",
"bounds": "-135.000000,37.877021,-122.280579,40.979898", "bounds": "-135.000000,37.874853,-122.280579,40.979898",
"center": "-122.299805,37.892187,12", "center": "-122.299805,37.892187,12",
"description": "tests/join-population/tabblock_06001420.mbtiles", "description": "tests/join-population/tabblock_06001420.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/joined-tile-stats-sample-values-limit.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-135.000000,37.877021,-122.280579,40.979898", "antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898",
"bounds": "-135.000000,37.877021,-122.280579,40.979898", "bounds": "-135.000000,37.874853,-122.280579,40.979898",
"center": "-122.299805,37.892187,12", "center": "-122.299805,37.892187,12",
"description": "tests/join-population/tabblock_06001420.mbtiles", "description": "tests/join-population/tabblock_06001420.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/joined-tile-stats-values-limit.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-135.000000,37.877021,-122.280579,40.979898", "antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898",
"bounds": "-135.000000,37.877021,-122.280579,40.979898", "bounds": "-135.000000,37.874853,-122.280579,40.979898",
"center": "-122.299805,37.892187,12", "center": "-122.299805,37.892187,12",
"description": "tests/join-population/tabblock_06001420.mbtiles", "description": "tests/join-population/tabblock_06001420.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/joined.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-135.000000,37.877021,-122.280579,40.979898", "antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898",
"bounds": "-135.000000,37.877021,-122.280579,40.979898", "bounds": "-135.000000,37.874853,-122.280579,40.979898",
"center": "-122.299805,37.892187,12", "center": "-122.299805,37.892187,12",
"description": "tests/join-population/tabblock_06001420.mbtiles", "description": "tests/join-population/tabblock_06001420.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/macarthur-6-9-exclude.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-122.294655,37.695231,-122.104111,37.833107", "antimeridian_adjusted_bounds": "-122.294655,37.695231,-122.103424,37.833107",
"bounds": "-122.294655,37.695231,-122.104111,37.833107", "bounds": "-122.294655,37.695231,-122.103424,37.833107",
"center": "-122.167969,37.833010,9", "center": "-122.167969,37.833010,9",
"description": "tests/join-population/macarthur.mbtiles", "description": "tests/join-population/macarthur.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/macarthur-6-9.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-122.294655,37.695231,-122.104111,37.833107", "antimeridian_adjusted_bounds": "-122.294655,37.695231,-122.103424,37.833107",
"bounds": "-122.294655,37.695231,-122.104111,37.833107", "bounds": "-122.294655,37.695231,-122.103424,37.833107",
"center": "-122.167969,37.833010,9", "center": "-122.167969,37.833010,9",
"description": "tests/join-population/macarthur.mbtiles", "description": "tests/join-population/macarthur.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/no-macarthur.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-135.000000,37.877021,-122.280579,40.979898", "antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898",
"bounds": "-135.000000,37.877021,-122.280579,40.979898", "bounds": "-135.000000,37.874853,-122.280579,40.979898",
"center": "-122.299805,37.892187,12", "center": "-122.299805,37.892187,12",
"description": "tests/join-population/tabblock_06001420.mbtiles", "description": "tests/join-population/tabblock_06001420.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/renamed.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-122.294655,37.695231,-122.103424,37.833107", "antimeridian_adjusted_bounds": "-122.294655,37.694688,-122.103424,37.833649",
"bounds": "-122.294655,37.695231,-122.103424,37.833107", "bounds": "-122.294655,37.694688,-122.103424,37.833649",
"center": "-122.167969,37.828608,10", "center": "-122.167969,37.828608,10",
"description": "tests/join-population/macarthur2.mbtiles", "description": "tests/join-population/macarthur2.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/windows.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-122.294655,37.695231,-122.103424,37.833107", "antimeridian_adjusted_bounds": "-122.294655,37.694688,-122.103424,37.833649",
"bounds": "-122.294655,37.695231,-122.103424,37.833107", "bounds": "-122.294655,37.694688,-122.103424,37.833649",
"center": "-122.167969,37.833010,10", "center": "-122.167969,37.833010,10",
"description": "tests/join-population/macarthur.mbtiles", "description": "tests/join-population/macarthur.mbtiles",
"format": "pbf", "format": "pbf",
tile-join.cpp
+4 -4
View File
@@ -1012,6 +1012,10 @@ void dispatch_tasks(std::map<zxy, std::vector<std::string>> &tasks, std::vector<
for (size_t i = 0; i < CPUS; i++) { for (size_t i = 0; i < CPUS; i++) {
void *retval; void *retval;
if (pthread_join(pthreads[i], &retval) != 0) {
perror("pthread_join");
}
*minlat = std::min(*minlat, args[i].minlat); *minlat = std::min(*minlat, args[i].minlat);
*minlon = std::min(*minlon, args[i].minlon); *minlon = std::min(*minlon, args[i].minlon);
*maxlat = std::max(*maxlat, args[i].maxlat); *maxlat = std::max(*maxlat, args[i].maxlat);
@@ -1019,10 +1023,6 @@ void dispatch_tasks(std::map<zxy, std::vector<std::string>> &tasks, std::vector<
*minlon2 = std::min(*minlon2, args[i].minlon2); *minlon2 = std::min(*minlon2, args[i].minlon2);
*maxlon2 = std::max(*maxlon2, args[i].maxlon2); *maxlon2 = std::max(*maxlon2, args[i].maxlon2);
if (pthread_join(pthreads[i], &retval) != 0) {
perror("pthread_join");
}
for (auto ai = args[i].outputs.begin(); ai != args[i].outputs.end(); ++ai) { for (auto ai = args[i].outputs.begin(); ai != args[i].outputs.end(); ++ai) {
if (outdb != NULL) { if (outdb != NULL) {
mbtiles_write_tile(outdb, ai->first.z, ai->first.x, ai->first.y, ai->second.data(), ai->second.size()); mbtiles_write_tile(outdb, ai->first.z, ai->first.x, ai->first.y, ai->second.data(), ai->second.size());