ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-03-23 20:35:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stabilize edge list order by also comparing ring IDs

Browse Source
This commit is contained in:
Eric Fischer 2016-10-14 12:27:24 -07:00
parent 9160e6add5
commit feb9b4481a
2 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/border/out/-z1_--detect-shared-borders.json
View File

File diff suppressed because one or more lines are too long

21
tile.cpp
View File

@ -611,6 +611,25 @@ struct edge {
}
};
struct edgecmp_ring {
bool operator()(const edge &a, const edge &b) {
long long cmp = (long long) a.y1 - b.y1;
if (cmp == 0) {
cmp = (long long) a.x1 - b.x1;
}
if (cmp == 0) {
cmp = (long long) a.y2 - b.y2;
}
if (cmp == 0) {
cmp = (long long) a.x2 - b.x2;
}
if (cmp == 0) {
cmp = (long long) a.ring - b.ring;
}
return cmp < 0;
}
} edgecmp_ring;
bool edges_same(std::pair<std::vector<edge>::iterator, std::vector<edge>::iterator> e1, std::pair<std::vector<edge>::iterator, std::vector<edge>::iterator> e2) {
if ((e2.second - e2.first) != (e1.second - e1.first)) {
return false;
@ -701,7 +720,7 @@ void find_common_edges(std::vector<partial> &partials, int z, int line_detail, d
}
}
std::sort(edges.begin(), edges.end());
std::sort(edges.begin(), edges.end(), edgecmp_ring);
printf("edges:\n");
for (auto ei = edges.begin(); ei != edges.end(); ++ei) {