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

Rename for consistency

Browse Source
This commit is contained in:
Erica Fischer
2024-11-26 15:33:52 -08:00
parent ae0c14be83
commit e5e277a76d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clip.cpp
+6 -6
View File
@@ -387,7 +387,7 @@ drawvec clean_or_clip_poly(drawvec &geom, int z, int buffer, bool clip, bool try
return ret; return ret;
} }
drawvec clip_poly(drawvec &geom, drawvec const &bounds) { drawvec clip_poly_poly(drawvec &geom, drawvec const &bounds) {
geom = remove_noop(geom, VT_POLYGON, 0); geom = remove_noop(geom, VT_POLYGON, 0);
mapbox::geometry::multi_polygon<long long> result; mapbox::geometry::multi_polygon<long long> result;
@@ -488,7 +488,7 @@ static void clipper_to_geom(Clipper2Lib::Paths64 const &geom, drawvec &out) {
} }
} }
drawvec clip_lines(drawvec const &geom, drawvec const &region) { drawvec clip_lines_poly(drawvec const &geom, drawvec const &region) {
Clipper2Lib::Paths64 subject = geom_to_clipper(geom); Clipper2Lib::Paths64 subject = geom_to_clipper(geom);
Clipper2Lib::Paths64 clip = geom_to_clipper(region); Clipper2Lib::Paths64 clip = geom_to_clipper(region);
@@ -1553,12 +1553,12 @@ static bool feature_out(std::vector<tile_feature> const &features, mvt_layer &ou
if (t == VT_POLYGON) { if (t == VT_POLYGON) {
geom = simple_clip_poly(geom, c.minx, c.miny, c.maxx, c.maxy, false); geom = simple_clip_poly(geom, c.minx, c.miny, c.maxx, c.maxy, false);
if (c.dv.size() > 0 && geom.size() > 0) { if (c.dv.size() > 0 && geom.size() > 0) {
geom = clip_poly(geom, c.dv); geom = clip_poly_poly(geom, c.dv);
} }
} else if (t == VT_LINE) { } else if (t == VT_LINE) {
geom = clip_lines(geom, c.minx, c.miny, c.maxx, c.maxy); geom = clip_lines(geom, c.minx, c.miny, c.maxx, c.maxy);
if (c.dv.size() > 0 && geom.size() > 0) { if (c.dv.size() > 0 && geom.size() > 0) {
geom = clip_lines(geom, c.dv); geom = clip_lines_poly(geom, c.dv);
} }
} else if (t == VT_POINT) { } else if (t == VT_POINT) {
geom = clip_point(geom, c.minx, c.miny, c.maxx, c.maxy); geom = clip_point(geom, c.minx, c.miny, c.maxx, c.maxy);
@@ -2081,12 +2081,12 @@ std::string overzoom(std::vector<source_tile> const &tiles, int nz, int nx, int
if (t == VT_POLYGON) { if (t == VT_POLYGON) {
geom = simple_clip_poly(geom, c.minx, c.miny, c.maxx, c.maxy, false); geom = simple_clip_poly(geom, c.minx, c.miny, c.maxx, c.maxy, false);
if (c.dv.size() > 0 && geom.size() > 0) { if (c.dv.size() > 0 && geom.size() > 0) {
geom = clip_poly(geom, c.dv); geom = clip_poly_poly(geom, c.dv);
} }
} else if (t == VT_LINE) { } else if (t == VT_LINE) {
geom = clip_lines(geom, c.minx, c.miny, c.maxx, c.maxy); geom = clip_lines(geom, c.minx, c.miny, c.maxx, c.maxy);
if (c.dv.size() > 0 && geom.size() > 0) { if (c.dv.size() > 0 && geom.size() > 0) {
geom = clip_lines(geom, c.dv); geom = clip_lines_poly(geom, c.dv);
} }
} else if (t == VT_POINT) { } else if (t == VT_POINT) {
geom = clip_point(geom, c.minx, c.miny, c.maxx, c.maxy); geom = clip_point(geom, c.minx, c.miny, c.maxx, c.maxy);