diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2018-07-16 14:20:09 +0200 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-08-27 14:07:40 -0700 |
| commit | 30272924a907b4d557e45932bf3cc3d392d5e85b (patch) | |
| tree | 83ac18d933f0c1d87f43ba5975a2c981eda34b98 /src | |
| parent | 1e454642c8bc99698d25105fe0034916e2930fe6 (diff) | |
| download | qtlocation-mapboxgl-30272924a907b4d557e45932bf3cc3d392d5e85b.tar.gz | |
[node] capture invalid input data as `ParseError` objects
This allows us to distinguish them from other types of errors
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/style/sources/raster_source.cpp | 3 | ||||
| -rw-r--r-- | src/mbgl/style/sources/vector_source.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mbgl/style/sources/raster_source.cpp b/src/mbgl/style/sources/raster_source.cpp index 53f29d660b..c2f96dbd55 100644 --- a/src/mbgl/style/sources/raster_source.cpp +++ b/src/mbgl/style/sources/raster_source.cpp @@ -5,6 +5,7 @@ #include <mbgl/style/conversion/tileset.hpp> #include <mbgl/storage/file_source.hpp> #include <mbgl/util/mapbox.hpp> +#include <mbgl/util/exception.hpp> namespace mbgl { namespace style { @@ -59,7 +60,7 @@ void RasterSource::loadDescription(FileSource& fileSource) { conversion::Error error; optional<Tileset> tileset = conversion::convertJSON<Tileset>(*res.data, error); if (!tileset) { - observer->onSourceError(*this, std::make_exception_ptr(std::runtime_error(error.message))); + observer->onSourceError(*this, std::make_exception_ptr(util::StyleParseException(error.message))); return; } diff --git a/src/mbgl/style/sources/vector_source.cpp b/src/mbgl/style/sources/vector_source.cpp index ccdd453c75..6cede8fae9 100644 --- a/src/mbgl/style/sources/vector_source.cpp +++ b/src/mbgl/style/sources/vector_source.cpp @@ -6,6 +6,7 @@ #include <mbgl/storage/file_source.hpp> #include <mbgl/util/mapbox.hpp> #include <mbgl/util/constants.hpp> +#include <mbgl/util/exception.hpp> namespace mbgl { namespace style { @@ -56,7 +57,7 @@ void VectorSource::loadDescription(FileSource& fileSource) { conversion::Error error; optional<Tileset> tileset = conversion::convertJSON<Tileset>(*res.data, error); if (!tileset) { - observer->onSourceError(*this, std::make_exception_ptr(std::runtime_error(error.message))); + observer->onSourceError(*this, std::make_exception_ptr(util::StyleParseException(error.message))); return; } |