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

Merge branch 'master' into plugins

Browse Source
This commit is contained in:
Eric Fischer
2017-05-12 17:20:30 -07:00
parent 24bde0be03 27dadc8ade
commit b301512860
20 changed files with 197 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decode.cpp
+14 -4
View File
@@ -20,13 +20,15 @@
int minzoom = 0;
int maxzoom = 32;
bool force = false;
void handle(std::string message, int z, unsigned x, unsigned y, int describe, std::set<std::string> const &to_decode, bool pipeline) {
int within = 0;
mvt_tile tile;
bool was_compressed;
try {
if (!tile.decode(message)) {
if (!tile.decode(message, was_compressed)) {
fprintf(stderr, "Couldn't parse tile %d/%u/%u\n", z, x, y);
exit(EXIT_FAILURE);
}
@@ -39,7 +41,11 @@ void handle(std::string message, int z, unsigned x, unsigned y, int describe, st
printf("{ \"type\": \"FeatureCollection\"");
if (describe) {
printf(", \"properties\": { \"zoom\": %d, \"x\": %d, \"y\": %d }", z, x, y);
printf(", \"properties\": { \"zoom\": %d, \"x\": %d, \"y\": %d", z, x, y);
if (!was_compressed) {
printf(", \"compressed\": false");
}
printf(" }");
if (projection != projections) {
printf(", \"crs\": { \"type\": \"name\", \"properties\": { \"name\": ");
@@ -77,7 +83,7 @@ void handle(std::string message, int z, unsigned x, unsigned y, int describe, st
}
}
layer_to_geojson(stdout, layer, z, x, y, !pipeline, pipeline, pipeline, 0, 0, 0);
layer_to_geojson(stdout, layer, z, x, y, !pipeline, pipeline, pipeline, 0, 0, 0, !force);
if (!pipeline) {
if (describe) {
@@ -253,7 +259,7 @@ int main(int argc, char **argv) {
std::set<std::string> to_decode;
bool pipeline = false;
while ((i = getopt(argc, argv, "t:Z:z:l:c")) != -1) {
while ((i = getopt(argc, argv, "t:Z:z:l:cf")) != -1) {
switch (i) {
case 't':
set_projection_or_exit(optarg);
@@ -275,6 +281,10 @@ int main(int argc, char **argv) {
pipeline = true;
break;
case 'f':
force = true;
break;
default:
usage(argv);
}