ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-03-23 20:35:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MultiPoints are all movetos, no linetos

Browse Source
This commit is contained in:
Eric Fischer 2014-09-15 17:56:57 -07:00
parent 1dcfca9d51
commit ff5b632cf5
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -10,7 +10,7 @@ jsoncat: jsoncat.o jsonpull.o
cc -g -Wall -o $@ $^
geojson: geojson.o jsonpull.o
cc -g -Wall -o $@ $^
cc -g -Wall -o $@ $^ -lm
jsoncat.o jsonpull.o: jsonpull.h

11
geojson.c
View File

@ -56,6 +56,15 @@ int mb_geometry[GEOM_TYPES] = {
#define META_INTEGER JSON_NUMBER
#define META_BOOLEAN JSON_TRUE
// http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames
void latlon2tile(double lat, double lon, int zoom, unsigned int *x, unsigned int *y) {
double lat_rad = lat * M_PI / 180;
unsigned long long n = 1LL << zoom;
*x = n * ((lon + 180) / 360);
*y = n * (1 - (log(tan(lat_rad) + 1/cos(lat_rad)) / M_PI)) / 2;
}
void parse_geometry(int t, json_object *j) {
if (j == NULL || j->type != JSON_ARRAY) {
fprintf(stderr, "expected array for type %d\n", t);
@ -68,7 +77,7 @@ void parse_geometry(int t, json_object *j) {
int i;
for (i = 0; i < j->length; i++) {
if (within == GEOM_POINT) {
if (i == 0) {
if (i == 0 || t == GEOM_MULTIPOINT) {
printf(" moveto ");
} else {
printf(" lineto ");