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

Merge pull request #176 from mapbox/decode-limit

Browse Source 
Increase maximum tile size for decoding
This commit is contained in:
Eric Fischer 2016-02-19 16:56:44 -08:00
commit 3c85d3243a
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 1.9.2
* Increase maximum tile size for tippecanoe-decode
## 1.9.1 ## 1.9.1
* Incorporate Mapnik's Clipper upgrades for consistent results between Mac and Linux * Incorporate Mapnik's Clipper upgrades for consistent results between Mac and Linux

7
decode.cc
View File

@ -5,6 +5,8 @@
#include <string> #include <string>
#include <zlib.h> #include <zlib.h>
#include <math.h> #include <math.h>
#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
#include <google/protobuf/io/coded_stream.h>
#include "vector_tile.pb.h" #include "vector_tile.pb.h"
#include "tile.h" #include "tile.h"
@ -88,7 +90,10 @@ void handle(std::string message, int z, unsigned x, unsigned y, int describe) {
if (is_compressed(message)) { if (is_compressed(message)) {
std::string uncompressed; std::string uncompressed;
decompress(message, uncompressed); decompress(message, uncompressed);
if (!tile.ParseFromString(uncompressed)) { google::protobuf::io::ArrayInputStream stream(uncompressed.c_str(), uncompressed.length());
google::protobuf::io::CodedInputStream codedstream(&stream);
codedstream.SetTotalBytesLimit(10 * 67108864, 5 * 67108864);
if (!tile.ParseFromCodedStream(&codedstream)) {
fprintf(stderr, "Couldn't decompress tile %d/%u/%u\n", z, x, y); fprintf(stderr, "Couldn't decompress tile %d/%u/%u\n", z, x, y);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }

2
version.h
View File

@ -1 +1 @@
#define VERSION "tippecanoe v1.9.1\n" #define VERSION "tippecanoe v1.9.2\n"