From 5bc21a1f0fc7a629e34a36bcf0a165c8e8d668a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= Date: Thu, 26 Sep 2019 18:01:40 -0400 Subject: [PATCH 1/3] bump mapbox-gl to 1.3.2 --- package-lock.json | 30 ++++++++++++------------------ package.json | 2 +- src/plots/mapbox/constants.js | 2 +- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 48f4dfc1416..98f2e412b0b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3255,9 +3255,9 @@ } }, "earcut": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.1.5.tgz", - "integrity": "sha512-QFWC7ywTVLtvRAJTVp8ugsuuGQ5mVqNmJ1cRYeLrSHgP3nycr2RHTJob9OtM0v8ujuoKN0NY1a93J/omeTL1PA==" + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.1.tgz", + "integrity": "sha512-5jIMi2RB3HtGPHcYd9Yyl0cczo84y+48lgKPxMijliNQaKAHEZJbdzLmKmdxG/mCdS/YD9DQ1gihL8mxzR0F9w==" }, "ecc-jsbn": { "version": "0.1.2", @@ -3715,11 +3715,6 @@ "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==", "dev": true }, - "esm": { - "version": "3.0.84", - "resolved": "https://registry.npmjs.org/esm/-/esm-3.0.84.tgz", - "integrity": "sha512-SzSGoZc17S7P+12R9cg21Bdb7eybX25RnIeRZ80xZs+VZ3kdQKzqTp2k4hZJjR7p9l0186TTXSgrxzlMDBktlw==" - }, "espree": { "version": "6.1.1", "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.1.tgz", @@ -4593,9 +4588,9 @@ "integrity": "sha512-sT5C0pwB1/e9G9AvAoLsoaJtbMGjfd/jfxo8jMCKqYYEnjZuFvqV5rehqar0538EmssjdDeiEWnKyBSTw7quoA==" }, "gl-matrix": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.0.0.tgz", - "integrity": "sha512-PD4mVH/C/Zs64kOozeFnKY8ybhgwxXXQYGWdB4h68krAHknWJgk9uKOn6z8YElh5//vs++90pb6csrTIDWnexA==" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.1.0.tgz", + "integrity": "sha512-526NA+3EA+ztAQi0IZpSWiM0fyQXIp7IbRvfJ4wS/TjjQD0uv0fVybXwwqqSOlq33UckivI0yMDlVtboWm3k7A==" }, "gl-matrix-invert": { "version": "1.0.0", @@ -6726,9 +6721,9 @@ } }, "mapbox-gl": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.1.1.tgz", - "integrity": "sha512-i57kASg8J/U/lJzBePyqTP2ImKUcx8FkHyCjb3ssWYaBBXHUeZ4STGXXfU9u1AQU9170PjDIJLubUUB1vLLSBQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.3.2.tgz", + "integrity": "sha512-6Ro7GbTMWxcbc836m6rbBNkesgTncbE1yXWeuHlr89esSqaItKr0+ntOu8rZie3fv+GtitkbODysXzIGCA7G+w==", "requires": { "@mapbox/geojson-rewind": "^0.4.0", "@mapbox/geojson-types": "^1.0.2", @@ -6741,7 +6736,6 @@ "@mapbox/whoots-js": "^3.1.0", "csscolorparser": "~1.0.2", "earcut": "^2.1.5", - "esm": "~3.0.84", "geojson-vt": "^3.2.1", "gl-matrix": "^3.0.0", "grid-index": "^1.1.0", @@ -10593,9 +10587,9 @@ } }, "supercluster": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-6.0.1.tgz", - "integrity": "sha512-NTth/FBFUt9mwW03+Z6Byscex+UHu0utroIe6uXjGu9PrTuWtW70LYv9I1vPSYYIHQL74S5zAkrXrHEk0L7dGA==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-6.0.2.tgz", + "integrity": "sha512-aa0v2HURjBTOpbcknilcfxGDuArM8khklKSmZ/T8ZXL0BuRwb5aRw95lz+2bmWpFvCXDX/+FzqHxmg0TIaJErw==", "requires": { "kdbush": "^3.0.0" } diff --git a/package.json b/package.json index 1cea2ebfa7c..bffbecb041f 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "glslify": "^7.0.0", "has-hover": "^1.0.1", "has-passive-events": "^1.0.0", - "mapbox-gl": "1.1.1", + "mapbox-gl": "^1.3.2", "matrix-camera-controller": "^2.1.3", "mouse-change": "^1.4.0", "mouse-event-offset": "^3.0.2", diff --git a/src/plots/mapbox/constants.js b/src/plots/mapbox/constants.js index 37f0dc8f3c8..64fa29e7356 100644 --- a/src/plots/mapbox/constants.js +++ b/src/plots/mapbox/constants.js @@ -8,7 +8,7 @@ 'use strict'; -var requiredVersion = '1.1.1'; +var requiredVersion = '1.3.2'; var stylesNonMapbox = { 'open-street-map': { From 47bf955d12c1188e3ed13c9f50809a0374a6c8a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= Date: Thu, 26 Sep 2019 18:02:25 -0400 Subject: [PATCH 2/3] add delay before resolve mapobx subplot promises ... to workaround a mapbox-gl bug introduced in 1.3.0 --- src/plots/mapbox/mapbox.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plots/mapbox/mapbox.js b/src/plots/mapbox/mapbox.js index 86e678ca228..dbc6e866549 100644 --- a/src/plots/mapbox/mapbox.js +++ b/src/plots/mapbox/mapbox.js @@ -367,7 +367,10 @@ proto.resolveOnRender = function(resolve) { if(map.loaded()) { map.off('render', onRender); // resolve at end of render loop - setTimeout(resolve, 0); + // + // Need a 10ms delay (0ms should suffice to skip a thread in the + // render loop) to workaround mapbox-gl bug introduced in v1.3.0 + setTimeout(resolve, 10); } }); }; From 4130c3935b08d75c48685d9f49c96d4657ed9260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= Date: Fri, 27 Sep 2019 09:47:01 -0400 Subject: [PATCH 3/3] ping mapbox-gl to 1.3.2 (not ^1.3.2) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bffbecb041f..a323ecf8951 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "glslify": "^7.0.0", "has-hover": "^1.0.1", "has-passive-events": "^1.0.0", - "mapbox-gl": "^1.3.2", + "mapbox-gl": "1.3.2", "matrix-camera-controller": "^2.1.3", "mouse-change": "^1.4.0", "mouse-event-offset": "^3.0.2",