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

Write out geometry

Browse Source
This commit is contained in:
Eric Fischer 2014-09-22 17:12:38 -07:00
parent 78304d6385
commit 3df523a588
3 changed files with 51 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
geojson.c
View File

@ -305,7 +305,7 @@ void check(struct index *ix, long long n, char *metabase, unsigned *file_bbox) {
printf("%d/%u/%u %x %x %lld to %lld\n", z, wx >> (32 - z), wy >> (32 - z), wx, wy, (long long)(i - ix), (long long)(j - ix));
check_range(i, j, metabase, file_bbox);
write_tile(i, j, metabase, file_bbox, z, wx >> (32 - z), wy >> (32 - z));
}
}
}

57
tile.cc
View File

@ -11,6 +11,8 @@ extern "C" {
#define XMAX 4096
#define YMAX 4096
#define CMD_BITS 3
// https://github.com/mapbox/mapnik-vector-tile/blob/master/src/vector_tile_compression.hpp
static inline int compress(std::string const& input, std::string& output) {
z_stream deflate_s;
@ -40,7 +42,7 @@ static inline int compress(std::string const& input, std::string& output) {
}
void check_range(struct index *start, struct index *end, char *metabase, unsigned *file_bbox) {
void write_tile(struct index *start, struct index *end, char *metabase, unsigned *file_bbox, int z, unsigned tx, unsigned ty) {
GOOGLE_PROTOBUF_VERIFY_VERSION;
mapnik::vector::tile tile;
@ -59,6 +61,11 @@ void check_range(struct index *start, struct index *end, char *metabase, unsigne
for (i = start; i < end; i++) {
mapnik::vector::tile_feature *feature = layer->add_features();
int px = 0, py = 0;
int cmd_idx = -1;
int cmd = -1;
int length = 0;
printf("%llx ", i->index);
char *meta = metabase + i->fpos;
@ -87,15 +94,49 @@ void check_range(struct index *start, struct index *end, char *metabase, unsigne
printf("%d: ", op);
if (op == VT_MOVETO || op == VT_LINETO) {
int x, y;
deserialize_int(&meta, &x);
deserialize_int(&meta, &y);
if (op != cmd) {
if (cmd_idx >= 0) {
feature->set_geometry(cmd_idx, (length << CMD_BITS) | (cmd & ((1 << CMD_BITS) - 1)));
}
//double lat, lon;
//tile2latlon(x, y, 32, &lat,&lon);
//printf("%f,%f (%x/%x) ", lat, lon, x, y);
cmd = op;
length = 0;
cmd_idx = feature->geometry_size();
feature->add_geometry(0);
}
if (op == VT_MOVETO || op == VT_LINETO) {
int wx, wy;
deserialize_int(&meta, &wx);
deserialize_int(&meta, &wy);
long long wwx = (unsigned) wx;
long long wwy = (unsigned) wy;
wwx -= tx << (32 - z);
wwy -= ty << (32 - z);
wwx >>= (32 - 12 - z);
wwy >>= (32 - 12 - z);
int dx = wwx - px;
int dy = wwy - py;
feature->add_geometry((dx << 1) ^ (dx >> 31));
feature->add_geometry((dy << 1) ^ (dy >> 31));
px = wwx;
py = wwy;
length++;
printf("%lld,%lld ", wwx, wwy);
} else if (op == VT_CLOSEPATH) {
length++;
}
}
if (cmd_idx >= 0) {
feature->set_geometry(cmd_idx, (length << CMD_BITS) | (cmd & ((1 << CMD_BITS) - 1)));
}
int m;

3
tile.h
View File

@ -41,5 +41,4 @@ struct index {
};
void write_tile(char *name, struct pool *keys);
void check_range(struct index *start, struct index *end, char *metabase, unsigned *file_bbox);
void write_tile(struct index *start, struct index *end, char *metabase, unsigned *file_bbox, int z, unsigned x, unsigned y);