From 8b493af48a7eaa10e3c4e8586fbde6fb95989708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Tue, 5 Mar 2019 12:34:47 +0100 Subject: [PATCH 1/2] ensure we're calling the correct cancellation function (#7988) --- src/util/actor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/actor.js b/src/util/actor.js index e663f5e261a..edeb8b53e70 100644 --- a/src/util/actor.js +++ b/src/util/actor.js @@ -102,7 +102,7 @@ class Actor { if (cancelable && this.callbacks[data.id] === null) { // Only add the cancelable callback if the done callback wasn't already called. // Otherwise we will never be able to delete it. - this.callbacks[data.id] = cancelable; + this.callbacks[data.id] = cancelable.cancel; } } else if (typeof data.id !== 'undefined' && this.parent.getWorkerSource) { // data.type == sourcetype.method From c4a22bf78e661114ac2da0481c6a4e0eee57122f Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Tue, 5 Mar 2019 15:11:43 +0200 Subject: [PATCH 2/2] Add the default value for the 'text-radial-offset' property --- src/style-spec/reference/v8.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/style-spec/reference/v8.json b/src/style-spec/reference/v8.json index 6389001a419..8c9a3c2eec7 100644 --- a/src/style-spec/reference/v8.json +++ b/src/style-spec/reference/v8.json @@ -1798,6 +1798,7 @@ "text-radial-offset": { "type": "number", "units": "ems", + "default": 0, "doc": "Radial offset of text, in the direction of the symbol's anchor. Useful in combination with `text-variable-anchor`, which doesn't support the two-dimensional `text-offset`.", "requires": [ {