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

Merge branch 'main' into order-feature-dropping

Browse Source
This commit is contained in:
Erica Fischer
2023-02-24 16:33:18 -08:00
parent e1bbc843be 329dd86bfd
commit b3c3078480
14 changed files with 6658 additions and 4098 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tile.cpp
+20 -4
View File
@@ -2235,7 +2235,7 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
// representative of the other features in the tile.
const size_t MAX_INDICES = 100000;
if (additional[A_CLUSTER_DENSEST_AS_NEEDED] || cluster_distance != 0) {
if (z <= cluster_maxzoom && (additional[A_CLUSTER_DENSEST_AS_NEEDED] || cluster_distance != 0)) {
if (indices.size() < MAX_INDICES) {
indices.push_back(sf.index);
}
@@ -2423,7 +2423,9 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
if (p.clustered > 0) {
std::string layername = (*layer_unmaps)[p.segment][p.layer];
serial_val sv, sv2, sv3;
serial_val sv, sv2, sv3, sv4;
long long point_count = p.clustered + 1;
char abbrev[17]; // to_string(LLONG_MAX).length() / 1000 + 1;
p.full_keys.push_back("clustered");
sv.type = mvt_bool;
@@ -2434,17 +2436,31 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
p.full_keys.push_back("point_count");
sv2.type = mvt_double;
sv2.s = std::to_string(p.clustered + 1);
sv2.s = std::to_string(point_count);
p.full_values.push_back(sv2);
add_tilestats(layername, z, layermaps, tiling_seg, layer_unmaps, "point_count", sv2);
p.full_keys.push_back("sqrt_point_count");
sv3.type = mvt_double;
sv3.s = std::to_string(round(100 * sqrt(p.clustered + 1)) / 100.0);
sv3.s = std::to_string(round(100 * sqrt(point_count)) / 100.0);
p.full_values.push_back(sv3);
add_tilestats(layername, z, layermaps, tiling_seg, layer_unmaps, "sqrt_point_count", sv3);
p.full_keys.push_back("point_count_abbreviated");
sv4.type = mvt_string;
if (point_count >= 10000) {
sprintf(abbrev, "%.0fk", point_count / 1000.0);
} else if (point_count >= 1000) {
sprintf(abbrev, "%.1fk", point_count / 1000.0);
} else {
sprintf(abbrev, "%lld", point_count);
}
sv4.s = abbrev;
p.full_values.push_back(sv4);
add_tilestats(layername, z, layermaps, tiling_seg, layer_unmaps, "point_count_abbreviated", sv4);
}
if (p.need_tilestats.size() > 0) {