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

Try using Wagyu's quick_clip

Browse Source
This commit is contained in:
Eric Fischer
2017-01-06 16:24:09 -08:00
parent 859202165d
commit 2fdec7d2e4
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ PG=
H = $(wildcard *.h) $(wildcard *.hpp) H = $(wildcard *.h) $(wildcard *.hpp)
C = $(wildcard *.c) $(wildcard *.cpp) C = $(wildcard *.c) $(wildcard *.cpp)
INCLUDES = -I/usr/local/include -I. INCLUDES = -I../wagyu/include -I/usr/local/include -I.
LIBS = -L/usr/local/lib LIBS = -L/usr/local/lib
tippecanoe: geojson.o jsonpull/jsonpull.o tile.o pool.o mbtiles.o geometry.o projection.o memfile.o mvt.o serial.o main.o text.o tippecanoe: geojson.o jsonpull/jsonpull.o tile.o pool.o mbtiles.o geometry.o projection.o memfile.o mvt.o serial.o main.o text.o
geometry.cpp
+20 -9
View File
@@ -11,6 +11,7 @@
#include <sqlite3.h> #include <sqlite3.h>
#include <mapbox/geometry.hpp> #include <mapbox/geometry.hpp>
#include <mapbox/geometry/wagyu/wagyu.hpp> #include <mapbox/geometry/wagyu/wagyu.hpp>
#include <mapbox/geometry/wagyu/quick_clip.hpp>
#include "geometry.hpp" #include "geometry.hpp"
#include "projection.hpp" #include "projection.hpp"
#include "serial.hpp" #include "serial.hpp"
@@ -520,6 +521,10 @@ 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 simple_clip_poly(drawvec &geom, long long minx, long long miny, long long maxx, long long maxy) {
drawvec out; drawvec out;
mapbox::geometry::point<long long> min(minx, miny);
mapbox::geometry::point<long long> max(maxx, maxy);
mapbox::geometry::box<long long> bbox(min, max);
for (size_t i = 0; i < geom.size(); i++) { for (size_t i = 0; i < geom.size(); i++) {
if (geom[i].op == VT_MOVETO) { if (geom[i].op == VT_MOVETO) {
size_t j; size_t j;
@@ -529,19 +534,25 @@ drawvec simple_clip_poly(drawvec &geom, long long minx, long long miny, long lon
} }
} }
drawvec tmp; mapbox::geometry::linear_ring<long long> ring;
for (size_t k = i; k < j; k++) { for (size_t k = i; k < j; k++) {
tmp.push_back(geom[k]); ring.push_back(mapbox::geometry::point<long long>(geom[k].x, geom[k].y));
} }
tmp = clip_poly1(tmp, minx, miny, maxx, maxy);
if (tmp.size() > 0) { optional_linear_ring<long long> lr = mapbox::geometry::wagyu::quick_clip::quick_lr_clip(ring, bbox);
if (tmp[0].x != tmp[tmp.size() - 1].x || tmp[0].y != tmp[tmp.size() - 1].y) {
fprintf(stderr, "Internal error: Polygon ring not closed\n"); if (lr) {
exit(EXIT_FAILURE); for (size_t k = 0; k < lr->size(); k++) {
if (k == 0) {
out.push_back(draw(VT_MOVETO, (*lr)[k].x, (*lr)[k].y));
} else {
out.push_back(draw(VT_LINETO, (*lr)[k].x, (*lr)[k].y));
} }
} }
for (size_t k = 0; k < tmp.size(); k++) {
out.push_back(tmp[k]); if (lr->size() > 0 && (*lr)[0] != (*lr)[lr->size() - 1]) {
out.push_back(draw(VT_LINETO, (*lr)[0].x, (*lr)[0].y));
}
} }
i = j - 1; i = j - 1;