Merge branch 'master' into earcut-polygon

Conflicts:
	geometry.cc
This commit is contained in:
Eric Fischer
2016-04-14 16:21:56 -07:00
13 changed files with 526 additions and 102 deletions
+1 -1
View File
@@ -16,7 +16,7 @@ struct draw {
typedef std::vector<draw> drawvec;
drawvec decode_geometry(char **meta, int z, unsigned tx, unsigned ty, int detail, long long *bbox, unsigned initial_x, unsigned initial_y);
drawvec decode_geometry(FILE *meta, long long *geompos, int z, unsigned tx, unsigned ty, int detail, long long *bbox, unsigned initial_x, unsigned initial_y);
void to_tile_scale(drawvec &geom, int z, int detail);
drawvec remove_noop(drawvec geom, int type, int shift);
drawvec clip_point(drawvec &geom, int z, int detail, long long buffer);