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

Self-intersections in the same feature don't count

Browse Source
This commit is contained in:
Erica Fischer
2023-09-08 15:30:48 -07:00
parent af5035f9d3
commit e04b19916e
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tile.cpp
+20 -4
View File
@@ -1298,8 +1298,9 @@ struct joint {
draw p1; draw p1;
draw mid; draw mid;
draw p2; draw p2;
size_t ring;
joint(draw one, draw hinge, draw two) { joint(draw one, draw hinge, draw two, size_t r) {
if (one < two) { if (one < two) {
p1 = one; p1 = one;
p2 = two; p2 = two;
@@ -1309,6 +1310,7 @@ struct joint {
} }
mid = hinge; mid = hinge;
ring = r;
} }
bool operator<(const joint &o) const { bool operator<(const joint &o) const {
@@ -2284,10 +2286,20 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
// j - 1 because we don't want the duplicate last point // j - 1 because we don't want the duplicate last point
for (size_t k = i; k < j - 1; k++) { for (size_t k = i; k < j - 1; k++) {
if (sf.geometry[k] == sf.geometry[(k + 1 - i) % (j - 1 - i) + i]) {
abort();
}
if (sf.geometry[(k + 1 - i) % (j - 1 - i) + i] ==
sf.geometry[(k + 2 - i) % (j - 1 - i) + i]) {
abort();
}
shared_joints.emplace_back( shared_joints.emplace_back(
sf.geometry[k], sf.geometry[k],
sf.geometry[(k + 1 - i) % (j - 1 - i) + i], sf.geometry[(k + 1 - i) % (j - 1 - i) + i],
sf.geometry[(k + 2 - i) % (j - 1 - i) + i]); sf.geometry[(k + 2 - i) % (j - 1 - i) + i],
seq);
} }
printf("%lld,%lld ", sf.geometry[i].x, sf.geometry[i].y); printf("%lld,%lld ", sf.geometry[i].x, sf.geometry[i].y);
@@ -2441,9 +2453,13 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
for (size_t i = 0; i + 1 < shared_joints.size(); i++) { for (size_t i = 0; i + 1 < shared_joints.size(); i++) {
if (shared_joints[i].mid == shared_joints[i + 1].mid) { if (shared_joints[i].mid == shared_joints[i + 1].mid) {
// printf("%lld,%lld: ", shared_joints[i].mid.x, shared_joints[i].mid.y); // printf("%lld,%lld: ", shared_joints[i].mid.x, shared_joints[i].mid.y);
if (shared_joints[i].p1 != shared_joints[i + 1].p1 || if ((shared_joints[i].p1 != shared_joints[i + 1].p1 ||
shared_joints[i].p2 != shared_joints[i + 1].p2) { shared_joints[i].p2 != shared_joints[i + 1].p2) &&
(shared_joints[i].ring != shared_joints[i + 1].ring)) {
shared_nodes.push_back(shared_joints[i].mid); shared_nodes.push_back(shared_joints[i].mid);
double lon, lat;
tile2lonlat(shared_joints[i].mid.x, shared_joints[i].mid.y, 32, &lon, &lat);
printf("{\"type\":\"Feature\",\"properties\":{},\"geometry\":{\"type\":\"Point\",\"coordinates\":[%f,%f]}}\n", lon, lat);
// printf("different\n"); // printf("different\n");
} else { } else {
// printf("same %lld,%lld to %lld,%lld\n", shared_joints[i].p1.x, shared_joints[i].p1.y, shared_joints[i].p2.x, shared_joints[i].p2.y); // printf("same %lld,%lld to %lld,%lld\n", shared_joints[i].p1.x, shared_joints[i].p1.y, shared_joints[i].p2.x, shared_joints[i].p2.y);