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

Remove collinear points and clean polygons even at high resolution

Browse Source
This commit is contained in:
Erica Fischer
2025-05-27 21:43:03 -07:00
parent 90d6edbc38
commit 8193c716c7
2 changed files with 450 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/tl_2022_11_tract/out/-z17_-Z12_--coalesce-densest-as-needed_--generate-variable-depth-tile-pyramid_-M10000.json
+432 -432
View File
File diff suppressed because one or more lines are too long
tile.cpp
+18 -21
View File
@@ -541,7 +541,6 @@ struct simplification_worker_arg {
std::vector<std::shared_ptr<serial_feature>> *features = NULL; std::vector<std::shared_ptr<serial_feature>> *features = NULL;
int task = 0; int task = 0;
int tasks = 0; int tasks = 0;
bool trying_to_stop_early = false;
drawvec *shared_nodes; drawvec *shared_nodes;
node *shared_nodes_map; node *shared_nodes_map;
@@ -676,9 +675,7 @@ static void *simplification_worker(void *v) {
for (size_t i = a->task; i < (*features).size(); i += a->tasks) { for (size_t i = a->task; i < (*features).size(); i += a->tasks) {
double area = 0; double area = 0;
if (!a->trying_to_stop_early) { area = simplify_feature(&*((*features)[i]), *(a->shared_nodes), a->shared_nodes_map, a->nodepos, *(a->shared_nodes_bloom));
area = simplify_feature(&*((*features)[i]), *(a->shared_nodes), a->shared_nodes_map, a->nodepos, *(a->shared_nodes_bloom));
}
signed char t = (*features)[i]->t; signed char t = (*features)[i]->t;
int z = (*features)[i]->z; int z = (*features)[i]->z;
@@ -693,20 +690,18 @@ static void *simplification_worker(void *v) {
{ {
drawvec before = geom; drawvec before = geom;
if (!a->trying_to_stop_early) { // we can try scaling up because this is now tile scale
// we can try scaling up because this is now tile scale coalesce_polygon(geom, true);
coalesce_polygon(geom, true); if (additional[A_DEBUG_POLYGON]) {
if (additional[A_DEBUG_POLYGON]) { check_polygon(geom);
check_polygon(geom); }
}
if (geom.size() < 3) { if (geom.size() < 3) {
if (area > 0) { if (area > 0) {
// area is in world coordinates, calculated before scaling down // area is in world coordinates, calculated before scaling down
geom = revive_polygon(before, area, z, out_detail); geom = revive_polygon(before, area, z, out_detail);
} else { } else {
geom.clear(); geom.clear();
}
} }
} }
} }
@@ -2185,6 +2180,12 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
sf.clustered = 0; sf.clustered = 0;
sf.tile_stringpool = tile_stringpool; sf.tile_stringpool = tile_stringpool;
if (trying_to_stop_early && line_detail == first_detail) {
// only remove collinearities;
// leave all other vertices for extreme overzooming
sf.simplification = 0;
}
if (line_detail == detail && extra_detail >= 0 && z == maxzoom) { if (line_detail == detail && extra_detail >= 0 && z == maxzoom) {
sf.extra_detail = extra_detail; sf.extra_detail = extra_detail;
// maximum allowed coordinate delta in geometries is 2^31 - 1 // maximum allowed coordinate delta in geometries is 2^31 - 1
@@ -2381,8 +2382,6 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
tasks = 1; tasks = 1;
} }
printf("doing %d/%d/%d, detail %d, thresh %lld\n", z, tx, ty, line_detail, mingap);
{ {
pthread_t pthreads[tasks]; pthread_t pthreads[tasks];
std::vector<simplification_worker_arg> args; std::vector<simplification_worker_arg> args;
@@ -2395,7 +2394,6 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
args[i].shared_nodes_map = shared_nodes_map; args[i].shared_nodes_map = shared_nodes_map;
args[i].nodepos = nodepos; args[i].nodepos = nodepos;
args[i].shared_nodes_bloom = &shared_nodes_bloom; args[i].shared_nodes_bloom = &shared_nodes_bloom;
args[i].trying_to_stop_early = trying_to_stop_early && line_detail == first_detail;
if (tasks > 1) { if (tasks > 1) {
if (thread_create(&pthreads[i], NULL, simplification_worker, &args[i]) != 0) { if (thread_create(&pthreads[i], NULL, simplification_worker, &args[i]) != 0) {
@@ -2783,7 +2781,6 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
if (trying_to_stop_early && line_detail == first_detail) { if (trying_to_stop_early && line_detail == first_detail) {
// didn't work, try a lower detail // didn't work, try a lower detail
detail_reduced++;
continue; continue;
} }