summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDane Springmeyer <springmeyer@users.noreply.github.com>2018-06-29 22:17:29 -0700
committerKonstantin Käfer <mail@kkaefer.com>2018-07-02 16:24:21 +0200
commit3f87f867cfeb53d3d1880c366c14211ad1cb4bb6 (patch)
tree7954dedadbb9e024a9b709fce059bfd2c1403259
parentb587785fea150aa764da5d56403c84e4b8bb7084 (diff)
downloadqtlocation-mapboxgl-3f87f867cfeb53d3d1880c366c14211ad1cb4bb6.tar.gz
Change error message with invalid render usage (#12265)
* Change error message with invalid render usage This change disambiguates this error condition with a different error with the same error message at https://github.com/mapbox/mapbox-gl-native/blob/789baf4c1f252071bf58e689e050b34eb2656363/src/mbgl/map/map.cpp#L157-L160 * fix test expectation
-rw-r--r--platform/node/src/node_map.cpp2
-rw-r--r--platform/node/test/js/map.test.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp
index 521cca1a51..9283489670 100644
--- a/platform/node/src/node_map.cpp
+++ b/platform/node/src/node_map.cpp
@@ -386,7 +386,7 @@ void NodeMap::Render(const Nan::FunctionCallbackInfo<v8::Value>& info) {
}
if (nodeMap->callback) {
- return Nan::ThrowError("Map is currently rendering an image");
+ return Nan::ThrowError("Map is currently processing a RenderRequest");
}
try {
diff --git a/platform/node/test/js/map.test.js b/platform/node/test/js/map.test.js
index ce22816ef2..2223e54aaa 100644
--- a/platform/node/test/js/map.test.js
+++ b/platform/node/test/js/map.test.js
@@ -532,7 +532,7 @@ test('Map', function(t) {
t.throws(function() {
map.render({}, function() {});
map.render({}, function() {});
- }, /Map is currently rendering an image/);
+ }, /Map is currently processing a RenderRequest/);
map.release();
t.end();