ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-04-06 18:46:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't generate intermediate points for crossings right on the edge

Browse Source
This commit is contained in:
Eric Fischer 2018-06-15 17:17:29 -07:00
parent d8f7ee846f
commit 8db6a73ec7
1 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
vt3.cpp
View File

@ -260,21 +260,24 @@ void split_feature(mvt_layer const &layer, mvt_feature const &feature, std::vect
long first = floor((double) ogeom[i - 1].x / nextent) * nextent;
long second = floor((double) ogeom[i].x / nextent) * nextent;
if (second >= first) {
for (long x = first + nextent; x <= second; x += nextent) {
long y = round(ogeom[i - 1].y + (ogeom[i].y - ogeom[i - 1].y) * (double) (x - ogeom[i - 1].x) / (ogeom[i].x - ogeom[i - 1].x));
mvt_geometry p(ogeom[i].op, x, y);
p.id = ++pointid;
p.phantom = true;
ngeom.push_back(p);
}
} else {
for (long x = first; x >= second + nextent; x -= nextent) {
long y = round(ogeom[i - 1].y + (ogeom[i].y - ogeom[i - 1].y) * (double) (x - ogeom[i - 1].x) / (ogeom[i].x - ogeom[i - 1].x));
mvt_geometry p(ogeom[i].op, x, y);
p.id = ++pointid;
p.phantom = true;
ngeom.push_back(p);
// If <= 2, one endpoint or the other is on the edge, not crossing it
if (llabs(ogeom[i].x - ogeom[i - 1].x) > 2) {
if (second >= first) {
for (long x = first + nextent; x <= second; x += nextent) {
long y = round(ogeom[i - 1].y + (ogeom[i].y - ogeom[i - 1].y) * (double) (x - ogeom[i - 1].x) / (ogeom[i].x - ogeom[i - 1].x));
mvt_geometry p(ogeom[i].op, x, y);
p.id = ++pointid;
p.phantom = true;
ngeom.push_back(p);
}
} else {
for (long x = first; x >= second + nextent; x -= nextent) {
long y = round(ogeom[i - 1].y + (ogeom[i].y - ogeom[i - 1].y) * (double) (x - ogeom[i - 1].x) / (ogeom[i].x - ogeom[i - 1].x));
mvt_geometry p(ogeom[i].op, x, y);
p.id = ++pointid;
p.phantom = true;
ngeom.push_back(p);
}
}
}
}
@ -292,21 +295,24 @@ void split_feature(mvt_layer const &layer, mvt_feature const &feature, std::vect
long first = floor((double) ogeom[i - 1].y / nextent) * nextent;
long second = floor((double) ogeom[i].y / nextent) * nextent;
if (second >= first) {
for (long y = first + nextent; y <= second; y += nextent) {
long x = round(ogeom[i - 1].x + (ogeom[i].x - ogeom[i - 1].x) * (double) (y - ogeom[i - 1].y) / (ogeom[i].y - ogeom[i - 1].y));
mvt_geometry p(ogeom[i].op, x, y);
p.id = ++pointid;
p.phantom = true;
ngeom.push_back(p);
}
} else {
for (long y = first; y >= second + nextent; y -= nextent) {
long x = round(ogeom[i - 1].x + (ogeom[i].x - ogeom[i - 1].x) * (double) (y - ogeom[i - 1].y) / (ogeom[i].y - ogeom[i - 1].y));
mvt_geometry p(ogeom[i].op, x, y);
p.id = ++pointid;
p.phantom = true;
ngeom.push_back(p);
// If <= 2, one endpoint or the other is on the edge, not crossing it
if (llabs(ogeom[i].y - ogeom[i - 1].y) > 2) {
if (second >= first) {
for (long y = first + nextent; y <= second; y += nextent) {
long x = round(ogeom[i - 1].x + (ogeom[i].x - ogeom[i - 1].x) * (double) (y - ogeom[i - 1].y) / (ogeom[i].y - ogeom[i - 1].y));
mvt_geometry p(ogeom[i].op, x, y);
p.id = ++pointid;
p.phantom = true;
ngeom.push_back(p);
}
} else {
for (long y = first; y >= second + nextent; y -= nextent) {
long x = round(ogeom[i - 1].x + (ogeom[i].x - ogeom[i - 1].x) * (double) (y - ogeom[i - 1].y) / (ogeom[i].y - ogeom[i - 1].y));
mvt_geometry p(ogeom[i].op, x, y);
p.id = ++pointid;
p.phantom = true;
ngeom.push_back(p);
}
}
}
}