tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Catch exceptions when parsing tile PBFs

Browse Source 
Also improved the error message and updated the test case.
This commit is contained in:
Thiago Marcos P. Santos
2015-06-10 21:50:35 +03:00
committed by John Firebaugh
parent 3670a78569
commit d30fce5f7d
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mbgl/map/vector_tile_data.cpp
View File

@@ -76,7 +76,9 @@ bool VectorTileData::reparse(Worker&, std::function<void()> callback) {
if (result.is<State>()) {
state = result.get<State>();
} else {
error = result.get<std::string>();
std::stringstream message;
message << "Failed to parse [" << std::string(id) << "]: " << result.get<std::string>();
error = message.str();
state = State::obsolete;
}

8
src/mbgl/util/worker.cpp
View File

@@ -25,8 +25,12 @@ public:
}
TileParseResult parseVectorTile(TileWorker* worker, std::string data) {
VectorTile vectorTile(pbf(reinterpret_cast<const unsigned char *>(data.data()), data.size()));
return worker->parse(vectorTile);
try {
pbf tilePBF(reinterpret_cast<const unsigned char *>(data.data()), data.size());
return worker->parse(VectorTile(tilePBF));
} catch (const std::exception& ex) {
return TileParseResult(ex.what());
}
}
TileParseResult parseLiveTile(TileWorker* worker, const LiveTile* tile) {

2
test/style/resource_loading.cpp
View File

@@ -159,7 +159,7 @@ TEST_P(ResourceLoading, RequestWithCorruptedData) {
message << "Failed to parse ";
if (param == "vector.pbf") {
message << "\\[15\\/1638(3|4)\\/1638(3|4)\\]\\: pbf unknown field type exception";
message << "\\[1(5|6)\\/1638(3|4)\\/1638(3|4)\\]\\: pbf unknown field type exception";
} else {
message << "\\[test\\/fixtures\\/resources\\/" << param << "\\]";
}