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

Merge branch 'master' into earcut-polygon

Browse Source 
Conflicts:
	geometry.cc
This commit is contained in:
Eric Fischer
2016-03-28 15:45:16 -07:00
parent a92bdce12e 72b7dc977a
commit c6051d876f
12 changed files with 381 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geometry.cc
+43 -52
View File
@@ -77,9 +77,7 @@ drawvec decode_geometry(char **meta, int z, unsigned tx, unsigned ty, int detail
}
void to_tile_scale(drawvec &geom, int z, int detail) {
unsigned i;
for (i = 0; i < geom.size(); i++) {
for (size_t i = 0; i < geom.size(); i++) {
geom[i].x >>= (32 - detail - z);
geom[i].y >>= (32 - detail - z);
}
@@ -90,9 +88,8 @@ drawvec remove_noop(drawvec geom, int type, int shift) {
long long x = 0, y = 0;
drawvec out;
unsigned i;
for (i = 0; i < geom.size(); i++) {
for (size_t i = 0; i < geom.size(); i++) {
if (geom[i].op == VT_LINETO && (geom[i].x >> shift) == x && (geom[i].y >> shift) == y) {
continue;
}
@@ -112,7 +109,7 @@ drawvec remove_noop(drawvec geom, int type, int shift) {
geom = out;
out.resize(0);
for (i = 0; i < geom.size(); i++) {
for (size_t i = 0; i < geom.size(); i++) {
if (geom[i].op == VT_MOVETO) {
if (i + 1 >= geom.size()) {
continue;
@@ -139,7 +136,7 @@ drawvec remove_noop(drawvec geom, int type, int shift) {
geom = out;
out.resize(0);
for (i = 0; i < geom.size(); i++) {
for (size_t i = 0; i < geom.size(); i++) {
if (geom[i].op == VT_MOVETO) {
if (i > 0 && geom[i - 1].op == VT_LINETO && (geom[i - 1].x >> shift) == (geom[i].x >> shift) && (geom[i - 1].y >> shift) == (geom[i].y >> shift)) {
continue;
@@ -159,10 +156,9 @@ drawvec shrink_lines(drawvec &geom, int z, int detail, int basezoom, long long *
long long res = 200LL << (32 - 8 - z);
long long portion = res / exp(log(sqrt(droprate)) * (basezoom - z));
unsigned i;
drawvec out;
for (i = 0; i < geom.size(); i++) {
for (size_t i = 0; i < geom.size(); i++) {
if (i > 0 && (geom[i - 1].op == VT_MOVETO || geom[i - 1].op == VT_LINETO) && geom[i].op == VT_LINETO) {
double dx = (geom[i].x - geom[i - 1].x);
double dy = (geom[i].y - geom[i - 1].y);
@@ -241,8 +237,8 @@ static void decode_clipped(ClipperLib::PolyNode *t, drawvec &out) {
// to do any outer-ring children of those children as a new top level.
ClipperLib::Path p = t->Contour;
unsigned before = out.size();
for (unsigned i = 0; i < p.size(); i++) {
size_t before = out.size();
for (size_t i = 0; i < p.size(); i++) {
out.push_back(draw((i == 0) ? VT_MOVETO : VT_LINETO, p[i].X, p[i].Y));
}
if (p.size() > 0) {
@@ -254,7 +250,7 @@ static void decode_clipped(ClipperLib::PolyNode *t, drawvec &out) {
for (int n = 0; n < t->ChildCount(); n++) {
ClipperLib::Path p = t->Childs[n]->Contour;
for (unsigned i = 0; i < p.size(); i++) {
for (size_t i = 0; i < p.size(); i++) {
out.push_back(draw((i == 0) ? VT_MOVETO : VT_LINETO, p[i].X, p[i].Y));
}
if (p.size() > 0) {
@@ -278,9 +274,9 @@ drawvec clean_or_clip_poly(drawvec &geom, int z, int detail, int buffer, bool cl
bool has_area = false;
for (unsigned i = 0; i < geom.size(); i++) {
for (size_t i = 0; i < geom.size(); i++) {
if (geom[i].op == VT_MOVETO) {
unsigned j;
size_t j;
for (j = i + 1; j < geom.size(); j++) {
if (geom[j].op != VT_LINETO) {
break;
@@ -288,7 +284,7 @@ drawvec clean_or_clip_poly(drawvec &geom, int z, int detail, int buffer, bool cl
}
double area = 0;
for (unsigned k = i; k < j; k++) {
for (size_t k = i; k < j; k++) {
area += (long double) geom[k].x * (long double) geom[i + ((k - i + 1) % (j - i))].y;
area -= (long double) geom[k].y * (long double) geom[i + ((k - i + 1) % (j - i))].x;
}
@@ -300,14 +296,14 @@ drawvec clean_or_clip_poly(drawvec &geom, int z, int detail, int buffer, bool cl
ClipperLib::Path path;
drawvec tmp;
for (unsigned k = i; k < j; k++) {
for (size_t k = i; k < j; k++) {
path.push_back(ClipperLib::IntPoint(geom[k].x, geom[k].y));
}
if (!clipper.AddPath(path, ClipperLib::ptSubject, true)) {
#if 0
fprintf(stderr, "Couldn't add polygon for clipping:");
for (unsigned k = i; k < j; k++) {
for (size_t k = i; k < j; k++) {
fprintf(stderr, " %lld,%lld", geom[k].x, geom[k].y);
}
fprintf(stderr, "\n");
@@ -392,9 +388,9 @@ void check_polygon(drawvec &geom) {
drawvec close_poly(drawvec &geom) {
drawvec out;
for (unsigned i = 0; i < geom.size(); i++) {
for (size_t i = 0; i < geom.size(); i++) {
if (geom[i].op == VT_MOVETO) {
unsigned j;
size_t j;
for (j = i + 1; j < geom.size(); j++) {
if (geom[j].op != VT_LINETO) {
break;
@@ -407,7 +403,7 @@ drawvec close_poly(drawvec &geom) {
}
}
for (unsigned n = i; n < j - 1; n++) {
for (size_t n = i; n < j - 1; n++) {
out.push_back(geom[n]);
}
out.push_back(draw(VT_CLOSEPATH, 0, 0));
@@ -486,7 +482,7 @@ static drawvec clip_poly1(drawvec &geom, long long minx, long long miny, long lo
draw S = in[in.size() - 1];
for (unsigned e = 0; e < in.size(); e++) {
for (size_t e = 0; e < in.size(); e++) {
draw E = in[e];
if (inside(E, edge, minx, miny, maxx, maxy)) {
@@ -520,7 +516,7 @@ static drawvec clip_poly1(drawvec &geom, long long minx, long long miny, long lo
}
out[0].op = VT_MOVETO;
for (unsigned i = 1; i < out.size(); i++) {
for (size_t i = 1; i < out.size(); i++) {
out[i].op = VT_LINETO;
}
}
@@ -531,9 +527,9 @@ static drawvec clip_poly1(drawvec &geom, long long minx, long long miny, long lo
drawvec simple_clip_poly(drawvec &geom, long long minx, long long miny, long long maxx, long long maxy) {
drawvec out;
for (unsigned i = 0; i < geom.size(); i++) {
for (size_t i = 0; i < geom.size(); i++) {
if (geom[i].op == VT_MOVETO) {
unsigned j;
size_t j;
for (j = i + 1; j < geom.size(); j++) {
if (geom[j].op != VT_LINETO) {
break;
@@ -541,7 +537,7 @@ drawvec simple_clip_poly(drawvec &geom, long long minx, long long miny, long lon
}
drawvec tmp;
for (unsigned k = i; k < j; k++) {
for (size_t k = i; k < j; k++) {
tmp.push_back(geom[k]);
}
tmp = clip_poly1(tmp, minx, miny, maxx, maxy);
@@ -551,7 +547,7 @@ drawvec simple_clip_poly(drawvec &geom, long long minx, long long miny, long lon
exit(EXIT_FAILURE);
}
}
for (unsigned k = 0; k < tmp.size(); k++) {
for (size_t k = 0; k < tmp.size(); k++) {
out.push_back(tmp[k]);
}
@@ -583,9 +579,9 @@ drawvec reduce_tiny_poly(drawvec &geom, int z, int detail, bool *reduced, double
*reduced = true;
bool included_last_outer = false;
for (unsigned i = 0; i < geom.size(); i++) {
for (size_t i = 0; i < geom.size(); i++) {
if (geom[i].op == VT_MOVETO) {
unsigned j;
size_t j;
for (j = i + 1; j < geom.size(); j++) {
if (geom[j].op != VT_LINETO) {
break;
@@ -593,7 +589,7 @@ drawvec reduce_tiny_poly(drawvec &geom, int z, int detail, bool *reduced, double
}
double area = 0;
for (unsigned k = i; k < j; k++) {
for (size_t k = i; k < j; k++) {
area += (long double) geom[k].x * (long double) geom[i + ((k - i + 1) % (j - i))].y;
area -= (long double) geom[k].y * (long double) geom[i + ((k - i + 1) % (j - i))].x;
}
@@ -632,7 +628,7 @@ drawvec reduce_tiny_poly(drawvec &geom, int z, int detail, bool *reduced, double
} else {
// printf("area is %f so keeping instead of %lld\n", area, pixel * pixel);
for (unsigned k = i; k <= j && k < geom.size(); k++) {
for (size_t k = i; k <= j && k < geom.size(); k++) {
out.push_back(geom[k]);
}
@@ -648,7 +644,7 @@ drawvec reduce_tiny_poly(drawvec &geom, int z, int detail, bool *reduced, double
} else {
fprintf(stderr, "how did we get here with %d in %d?\n", geom[i].op, (int) geom.size());
for (unsigned n = 0; n < geom.size(); n++) {
for (size_t n = 0; n < geom.size(); n++) {
fprintf(stderr, "%d/%lld/%lld ", geom[n].op, geom[n].x, geom[n].y);
}
fprintf(stderr, "\n");
@@ -662,7 +658,6 @@ drawvec reduce_tiny_poly(drawvec &geom, int z, int detail, bool *reduced, double
drawvec clip_point(drawvec &geom, int z, int detail, long long buffer) {
drawvec out;
unsigned i;
long long min = 0;
long long area = 0xFFFFFFFF;
@@ -673,7 +668,7 @@ drawvec clip_point(drawvec &geom, int z, int detail, long long buffer) {
area += buffer * area / 256;
}
for (i = 0; i < geom.size(); i++) {
for (size_t i = 0; i < geom.size(); i++) {
if (geom[i].x >= min && geom[i].y >= min && geom[i].x <= area && geom[i].y <= area) {
out.push_back(geom[i]);
}
@@ -711,7 +706,6 @@ int quick_check(long long *bbox, int z, int detail, long long buffer) {
drawvec clip_lines(drawvec &geom, int z, int detail, long long buffer) {
drawvec out;
unsigned i;
long long min = 0;
long long area = 0xFFFFFFFF;
@@ -722,7 +716,7 @@ drawvec clip_lines(drawvec &geom, int z, int detail, long long buffer) {
area += buffer * area / 256;
}
for (i = 0; i < geom.size(); i++) {
for (size_t i = 0; i < geom.size(); i++) {
if (i > 0 && (geom[i - 1].op == VT_MOVETO || geom[i - 1].op == VT_LINETO) && geom[i].op == VT_LINETO) {
double x1 = geom[i - 1].x;
double y1 = geom[i - 1].y;
@@ -834,7 +828,7 @@ static void douglas_peucker(drawvec &geom, int start, int n, double e) {
drawvec impose_tile_boundaries(drawvec &geom, long long extent) {
drawvec out;
for (unsigned i = 0; i < geom.size(); i++) {
for (size_t i = 0; i < geom.size(); i++) {
if (i > 0 && geom[i].op == VT_LINETO && (geom[i - 1].op == VT_MOVETO || geom[i - 1].op == VT_LINETO)) {
double x1 = geom[i - 1].x;
double y1 = geom[i - 1].y;
@@ -869,8 +863,7 @@ drawvec simplify_lines(drawvec &geom, int z, int detail) {
area = 1LL << (32 - z);
}
unsigned i;
for (i = 0; i < geom.size(); i++) {
for (size_t i = 0; i < geom.size(); i++) {
if (geom[i].op == VT_MOVETO) {
geom[i].necessary = 1;
} else if (geom[i].op == VT_LINETO) {
@@ -882,9 +875,9 @@ drawvec simplify_lines(drawvec &geom, int z, int detail) {
geom = impose_tile_boundaries(geom, area);
for (i = 0; i < geom.size(); i++) {
for (size_t i = 0; i < geom.size(); i++) {
if (geom[i].op == VT_MOVETO) {
unsigned j;
size_t j;
for (j = i + 1; j < geom.size(); j++) {
if (geom[j].op != VT_LINETO) {
break;
@@ -900,7 +893,7 @@ drawvec simplify_lines(drawvec &geom, int z, int detail) {
}
drawvec out;
for (i = 0; i < geom.size(); i++) {
for (size_t i = 0; i < geom.size(); i++) {
if (geom[i].necessary) {
out.push_back(geom[i]);
}
@@ -916,8 +909,7 @@ drawvec reorder_lines(drawvec &geom) {
return geom;
}
unsigned i;
for (i = 0; i < geom.size(); i++) {
for (size_t i = 0; i < geom.size(); i++) {
if (geom[i].op == VT_MOVETO) {
if (i != 0) {
return geom;
@@ -940,7 +932,7 @@ drawvec reorder_lines(drawvec &geom) {
if (l1 > l2) {
drawvec out;
for (i = 0; i < geom.size(); i++) {
for (size_t i = 0; i < geom.size(); i++) {
out.push_back(geom[geom.size() - 1 - i]);
}
out[0].op = VT_MOVETO;
@@ -955,14 +947,13 @@ drawvec fix_polygon(drawvec &geom) {
int outer = 1;
drawvec out;
unsigned i;
for (i = 0; i < geom.size(); i++) {
for (size_t i = 0; i < geom.size(); i++) {
if (geom[i].op == VT_CLOSEPATH) {
outer = 1;
} else if (geom[i].op == VT_MOVETO) {
// Find the end of the ring
unsigned j;
size_t j;
for (j = i + 1; j < geom.size(); j++) {
if (geom[j].op != VT_LINETO) {
break;
@@ -973,7 +964,7 @@ drawvec fix_polygon(drawvec &geom) {
// Close it if it isn't closed.
drawvec ring;
for (unsigned a = i; a < j; a++) {
for (size_t a = i; a < j; a++) {
ring.push_back(geom[a]);
}
if (j - i != 0 && (ring[0].x != ring[j - i - 1].x || ring[0].y != ring[j - i - 1].y)) {
@@ -984,7 +975,7 @@ drawvec fix_polygon(drawvec &geom) {
// inner/outer expectation
double area = 0;
for (unsigned k = 0; k < ring.size(); k++) {
for (size_t k = 0; k < ring.size(); k++) {
area += (long double) ring[k].x * (long double) ring[(k + 1) % ring.size()].y;
area -= (long double) ring[k].y * (long double) ring[(k + 1) % ring.size()].x;
}
@@ -1000,7 +991,7 @@ drawvec fix_polygon(drawvec &geom) {
// Copy ring into output, fixing the moveto/lineto ops if necessary because of
// reversal or closing
for (unsigned a = 0; a < ring.size(); a++) {
for (size_t a = 0; a < ring.size(); a++) {
if (a == 0) {
out.push_back(draw(VT_MOVETO, ring[a].x, ring[a].y));
} else {
@@ -1027,7 +1018,7 @@ std::vector<drawvec> chop_polygon(std::vector<drawvec> &geoms) {
bool again = false;
std::vector<drawvec> out;
for (unsigned i = 0; i < geoms.size(); i++) {
for (size_t i = 0; i < geoms.size(); i++) {
if (geoms[i].size() > 700) {
static bool warned = false;
if (!warned) {
@@ -1038,7 +1029,7 @@ std::vector<drawvec> chop_polygon(std::vector<drawvec> &geoms) {
long long midx = 0, midy = 0, count = 0;
long long maxx = LLONG_MIN, maxy = LLONG_MIN, minx = LLONG_MAX, miny = LLONG_MAX;
for (unsigned j = 0; j < geoms[i].size(); j++) {
for (size_t j = 0; j < geoms[i].size(); j++) {
if (geoms[i][j].op == VT_MOVETO || geoms[i][j].op == VT_LINETO) {
midx += geoms[i][j].x;
midy += geoms[i][j].y;