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

Count drawing operations, not ops and coordinates equally

Browse Source
This commit is contained in:
Eric Fischer 2014-09-23 18:19:06 -07:00
parent e8c3177725
commit a8907362bd
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tile.cc
View File

@ -43,7 +43,13 @@ static inline int compress(std::string const& input, std::string& output) {
return 0;
}
int decode_feature(char **meta, long long *out, int z, unsigned tx, unsigned ty, int detail) {
struct draw {
int op;
long long x;
long long y;
};
int decode_feature(char **meta, struct draw *out, int z, unsigned tx, unsigned ty, int detail) {
int len = 0;
while (1) {
@ -55,11 +61,9 @@ int decode_feature(char **meta, long long *out, int z, unsigned tx, unsigned ty,
}
if (out != NULL) {
out[len] = op;
out[len].op = op;
}
len++;
if (op == VT_MOVETO || op == VT_LINETO) {
int wx, wy;
deserialize_int(meta, &wx);
@ -77,18 +81,18 @@ int decode_feature(char **meta, long long *out, int z, unsigned tx, unsigned ty,
wwy >>= (32 - detail - z);
if (out != NULL) {
out[len] = wwx;
out[len + 1] = wwy;
out[len].x = wwx;
out[len].y = wwy;
}
len += 2;
}
len++;
}
return len;
}
int draw(long long *geom, int n, mapnik::vector::tile_feature *feature) {
int draw(struct draw *geom, int n, mapnik::vector::tile_feature *feature) {
int px = 0, py = 0;
int cmd_idx = -1;
int cmd = -1;
@ -97,7 +101,7 @@ int draw(long long *geom, int n, mapnik::vector::tile_feature *feature) {
int i = 0;
while (i < n) {
int op = geom[i++];
int op = geom[i++].op;
if (op != cmd) {
if (cmd_idx >= 0) {
@ -116,8 +120,8 @@ int draw(long long *geom, int n, mapnik::vector::tile_feature *feature) {
}
if (op == VT_MOVETO || op == VT_LINETO) {
long long wwx = geom[i++];
long long wwy = geom[i++];
long long wwx = geom[i - 1].x;
long long wwy = geom[i - 1].y;
int dx = wwx - px;
int dy = wwy - py;
@ -205,7 +209,7 @@ void write_tile(struct index *start, struct index *end, char *metabase, unsigned
}
int len = decode_feature(&meta, NULL, z, tx, ty, detail);
long long geom[len];
struct draw geom[len];
meta = metabase + i->fpos;
deserialize_int(&meta, &t);