[node] Update changes in MapObserver::onDidFailLoadingMap

This commit is contained in:
Bruno de Oliveira Abinader
2017-03-15 16:07:58 +02:00
parent bfc7c2967c
commit 5e3308c5c0
3 changed files with 8 additions and 6 deletions

View File

@@ -42,8 +42,8 @@ static const char* releasedMessage() {
NodeBackend::NodeBackend()
: HeadlessBackend(sharedDisplay()) {}
void NodeBackend::onDidFailLoadingMap() {
throw std::runtime_error("Requires a map style to be a valid style JSON");
void NodeBackend::onDidFailLoadingMap(std::exception_ptr error) {
std::rethrow_exception(error);
}
void NodeMap::Init(v8::Local<v8::Object> target) {

View File

@@ -7,6 +7,8 @@
#include <mbgl/gl/headless_backend.hpp>
#include <mbgl/gl/offscreen_view.hpp>
#include <exception>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wshadow"
@@ -18,7 +20,7 @@ namespace node_mbgl {
class NodeBackend : public mbgl::HeadlessBackend {
public:
NodeBackend();
void onDidFailLoadingMap() final;
void onDidFailLoadingMap(std::exception_ptr) final;
};
class NodeMap : public Nan::ObjectWrap,

View File

@@ -311,11 +311,11 @@ test('Map', function(t) {
t.throws(function() {
map.load('foo bar');
}, /Requires a map style to be a valid style JSON/);
}, /Failed to parse style: 1 - Invalid value./);
t.throws(function() {
map.load('""');
}, /Requires a map style to be a valid style JSON/);
}, /Failed to parse style: style must be an object/);
map.release();
t.end();
@@ -335,7 +335,7 @@ test('Map', function(t) {
t.throws(function() {
map.load('invalid');
}, /Requires a map style to be a valid style JSON/);
}, /Failed to parse style: 0 - Invalid value./);
});
t.test('accepts an empty stylesheet string', function(t) {