mirror of
https://github.com/felt/tippecanoe.git
synced 2026-10-02 08:25:40 +02:00
Revert "Add a flag to retain multiplier features by minimum distance"
This reverts commit 01f14a4255.
This commit is contained in:
@@ -1237,9 +1237,6 @@ static serial_feature next_feature(decompressor *geoms, std::atomic<long long> *
|
||||
} else if (z + extra_multiplier_zooms >= feature_minzoom && count->second + 1 < retain_points_multiplier) {
|
||||
count->second++;
|
||||
sf.dropped = count->second;
|
||||
} else if (preserve_multiplier_density_threshold > 0 &&
|
||||
sf.gap > ((1LL << (32 - z)) / preserve_multiplier_density_threshold) * ((1LL << (32 - z)) / preserve_multiplier_density_threshold)) {
|
||||
sf.dropped = FEATURE_NO_REALLY_KEEP_IT_AROUND;
|
||||
} else {
|
||||
sf.dropped = FEATURE_DROPPED;
|
||||
}
|
||||
@@ -1901,11 +1898,8 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
|
||||
} else {
|
||||
can_stop_early = false;
|
||||
|
||||
if (sf.dropped != FEATURE_DROPPED && sf.dropped != FEATURE_NO_REALLY_KEEP_IT_AROUND) {
|
||||
if (sf.dropped != FEATURE_DROPPED) {
|
||||
// Does the current multiplier cluster already have too many features?
|
||||
// (Because we are dropping dynamically, and we have already filled the
|
||||
// cluster with features that were dynamically dropped from being
|
||||
// primary features)
|
||||
// If so, we have to drop this one, even if it would potentially qualify
|
||||
// as a secondary feature to be exposed by filtering
|
||||
if (layer.multiplier_cluster_size >= (size_t) retain_points_multiplier) {
|
||||
@@ -2152,8 +2146,6 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
|
||||
if (sf.dropped == FEATURE_KEPT) {
|
||||
layer.multiplier_cluster_size = 1;
|
||||
lead_features_count++;
|
||||
} else if (sf.dropped == FEATURE_NO_REALLY_KEEP_IT_AROUND) {
|
||||
other_multiplier_cluster_features_count++;
|
||||
} else {
|
||||
layer.multiplier_cluster_size++;
|
||||
other_multiplier_cluster_features_count++;
|
||||
|
||||
Reference in New Issue
Block a user