Improve the appearance of coalesce-densest-as-needed tiles (#247)

* Start to distinguish fixed cluster density setting from as-needed density

* Make consistent {drop,coalesce}-densest decisions between zooms

* Actually track the previous index instead of just intending to

* Clean up collinearities in coalesced features

* To determine densest, look at actual physical distance, not just index

* Don't actually need the previous index in serial_feature now

* Center of mass of one feature to most distant point of the next

* Add apologetic comment

* Wait, how did the tests pass before?

* Revert "Wait, how did the tests pass before?"

This reverts commit f73c8ee543.

* Add --maximum-string-attribute-length option

* Update version and changelog

* A little more testing to make sure
This commit is contained in:
Erica Fischer
2024-07-16 13:23:23 -07:00
committed by GitHub
parent 939579e5a2
commit 47e774adc4
21 changed files with 3801 additions and 4006 deletions
+35
View File
@@ -984,6 +984,41 @@ draw centerOfMass(const drawvec &dv, size_t start, size_t end, draw centre) {
}
}
draw center_of_mass_mp(const drawvec &dv) {
double ringx = 0, ringy = 0;
size_t ringcount = 0;
for (size_t i = 0; i < dv.size(); i++) {
if (dv[i].op == VT_MOVETO) {
double xsum = dv[i].x, ysum = dv[i].y;
ssize_t count = 1;
size_t j;
for (j = i + 1; j < dv.size(); j++) {
if (dv[j].op != VT_LINETO) {
break;
} else {
xsum += dv[j].x;
ysum += dv[j].y;
count++;
}
}
double area = get_area(dv, i, j);
draw centroid(VT_MOVETO, std::llround(xsum / count), std::llround(ysum / count));
draw center = centerOfMass(dv, i, j, centroid);
ringx += center.x * area;
ringy += center.y * area;
ringcount += area;
i = j - 1;
}
}
draw center(VT_MOVETO, ringx / ringcount, ringy / ringcount);
return center;
}
double label_goodness(const drawvec &dv, long long x, long long y) {
int nesting = 0;