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

Merge branch 'clean-up-feature-dropping' into droprate

Browse Source
This commit is contained in:
Erica Fischer
2024-12-09 14:17:13 -08:00
parent a8bd7ac723 5194d29ae0
commit 6169c63236
59 changed files with 88111 additions and 65788 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.cpp
+6 -77
View File
@@ -67,6 +67,7 @@
#include "sort.hpp"
#include "attribute.hpp"
#include "thread.hpp"
#include "drop.hpp"
static int low_detail = 12;
static int full_detail = -1;
@@ -92,7 +93,6 @@ size_t limit_tile_feature_count = 0;
size_t limit_tile_feature_count_at_maxzoom = 0;
unsigned int drop_denser = 0;
std::map<std::string, serial_val> set_attributes;
unsigned long long preserve_point_density_threshold = 0;
unsigned long long preserve_multiplier_density_threshold = 0;
long long extend_zooms_max = 0;
int retain_points_multiplier = 1;
@@ -283,13 +283,6 @@ static void insert(struct mergelist *m, struct mergelist **head, unsigned char *
*head = m;
}
struct drop_state {
double gap;
unsigned long long previndex;
double interval;
double seq; // floating point because interval is
};
struct drop_densest {
unsigned long long gap;
size_t seq;
@@ -300,59 +293,6 @@ struct drop_densest {
}
};
int calc_feature_minzoom(struct index *ix, struct drop_state *ds, int maxzoom, double gamma) {
int feature_minzoom = 0;
if (gamma >= 0 && (ix->t == VT_POINT ||
(additional[A_LINE_DROP] && ix->t == VT_LINE) ||
(additional[A_POLYGON_DROP] && ix->t == VT_POLYGON))) {
for (ssize_t i = maxzoom; i >= 0; i--) {
ds[i].seq++;
}
for (ssize_t i = maxzoom; i >= 0; i--) {
if (ds[i].seq < 0) {
feature_minzoom = i + 1;
// The feature we are pushing out
// appears in zooms i + 1 through maxzoom,
// so track where that was so we can make sure
// not to cluster something else that is *too*
// far away into it.
for (ssize_t j = i + 1; j <= maxzoom; j++) {
ds[j].previndex = ix->ix;
}
break;
} else {
ds[i].seq -= ds[i].interval;
}
}
// If this feature has been chosen only for a high zoom level,
// check whether at a low zoom level it is nevertheless too far
// from the last feature chosen for that low zoom, in which case
// we will go ahead and push it out.
if (preserve_point_density_threshold > 0) {
for (ssize_t i = 0; i < feature_minzoom && i < maxzoom; i++) {
if (ix->ix - ds[i].previndex > ((1LL << (32 - i)) / preserve_point_density_threshold) * ((1LL << (32 - i)) / preserve_point_density_threshold)) {
feature_minzoom = i;
for (ssize_t j = i; j <= maxzoom; j++) {
ds[j].previndex = ix->ix;
}
break;
}
}
}
// XXX manage_gap
}
return feature_minzoom;
}
static void merge(struct mergelist *merges, size_t nmerges, unsigned char *map, FILE *indexfile, int bytes, char *geom_map, FILE *geom_out, std::atomic<long long> *geompos, long long *progress, long long *progress_max, long long *progress_reported, int maxzoom, double gamma, struct drop_state *ds) {
struct mergelist *head = NULL;
@@ -1054,21 +994,6 @@ void radix1(int *geomfds_in, int *indexfds_in, int inputs, int prefix, int split
}
}
void prep_drop_states(struct drop_state *ds, int maxzoom, int basezoom, double droprate) {
// Needs to be signed for interval calculation
for (ssize_t i = 0; i <= maxzoom; i++) {
ds[i].gap = 0;
ds[i].previndex = 0;
ds[i].interval = 0;
if (i < basezoom) {
ds[i].interval = std::exp(std::log(droprate) * (basezoom - i));
}
ds[i].seq = 0;
}
}
static size_t calc_memsize() {
size_t mem;
@@ -1140,7 +1065,11 @@ void radix(std::vector<struct reader> &readers, int nreaders, FILE *geomfile, FI
}
struct drop_state ds[maxzoom + 1];
prep_drop_states(ds, maxzoom, basezoom, droprate);
if (maxzoom < 0 || droprate <= 0) { // not guessed with -zg yet
prep_drop_states(ds, 0, 0, 1);
} else {
prep_drop_states(ds, maxzoom, basezoom, droprate);
}
long long progress = 0, progress_max = geom_total, progress_reported = -1;
long long availfiles_before = availfiles;