[FE-8035] Upgrade Mapbox

package.json

@@ -53,15 +53,17 @@
     "test:unit": "find ./src -name '*.spec.js' | BABEL_ENV=test NODE_PATH=./src xargs nyc mocha --opts ./test/mocha.unit.opts"
   },
   "dependencies": {
+    "@mapbox/unitbezier": "0.0.0",
     "@mapd/mapd-draw": "git://github.com/omnisci/mapd-draw.git#fa59fbf68ded25619b5f71b3ee6a73cea9f8d149",
     "@turf/bbox": "^6.0.1",
     "@turf/bbox-clip": "^6.0.3",
+    "axios": "^0.19.0",
     "d3": "^3.5.17",
     "earcut": "^2.1.1",
     "fast-deep-equal": "^2.0.1",
     "http-server": "^0.11.1",
     "legendables": "git://github.com/omnisci/legendables.git#63e2ad9a8375a11e5510a5dadf0b7a4326fae888",
-    "mapbox-gl": "https://github.com/omnisci/mapbox-gl-js/tarball/35231362c7b6f2b63590fd184a38d8ac15fdf57d",
+    "mapbox-gl": "^1.1.1",
     "mapd-data-layer-2": "0.0.22",
     "moment": "^2.19.3",
     "ramda": "0.21.0",

scss/chart.scss

@@ -1868,6 +1868,25 @@ body {
     }
 }
 
+.mapboxgl-ctrl-bottom-right  {
+    // Attribution
+    .mapboxgl-ctrl.mapboxgl-ctrl-attrib {
+        margin: 0 !important;
+        position: absolute;
+        white-space: nowrap;
+        right: 100px;
+        bottom: 7px;
+        font-size: 11px;
+        &.mapboxgl-compact {
+            bottom: 5px;
+        }
+    }
+    // Zoom
+    .mapboxgl-ctrl.mapboxgl-ctrl-group {
+        margin: 0 10px 10px 0 !important;
+    }
+}
+
 .mapboxgl-ctrl-top-left {
     .mapboxgl-ctrl {
         margin: 8px 0 0 8px !important;
@@ -1963,22 +1982,6 @@ body {
   }
 }
 
-.mapbox-maplogo {
-      position:absolute;
-      display:block;
-      height: 20px;
-      width: 65px;
-      right: 80px !important;
-      bottom: 20px;
-      text-indent: -9999px;
-      z-index:99999;
-      overflow:hidden;
-      background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIIAAAAoCAMAAAAFWtJHAAAAwFBMVEUAAAAAAAAAAABtbW0AAAAAAAAAAAAAAAAAAAAAAAClpaUAAADp6ekAAAD5+fna2toAAAAMDAzv7+/Nzc0AAAA2Njb8/Pz9/f3T09MAAAAAAAD7+/sAAAArKyuxsbH39/fs7OwbGxuIiIjz8/N8fHyenp7u7u74+PgAAAC8vLxWVlbx8fF1dXXl5eVcXFyUlJTQ0NDFxcVCQkLAwMC4uLj19fXo6OjW1tarq6ve3t77+/vi4uL6+vrKysrNzc3///8w7gSSAAAAP3RSTlMAOQNdPSYBPywKexLLGPCxNEHXnzFL+v2nGwf1IEiE6dBFad9jd9PuLo1V2mDDV3Cjl06SiuXIq4C3973ym6BQMVUPAAAEXElEQVR4Ae2WCVP6OBiH05L0l1IqrVbkKHJ54I0oHn+PfP9vtUle0z/YdhbH2XVnd58ZnRJIeHiPJOx//mH4vQSAN+8FjAhFxgHIaPvJeZ99hxwEElon5iAQbj85Y98g8ODwjEOMAvGFyeE3FEKgodTBqj0BJGN9DhyNd5Ta3ean9QEopfaA+LsKhnEKRExqg4FSP6Og7oEkAjBWnxSCgBX4xF+kcLoPcOBQrSv0e5kH7s1j37jECQieCTPiFGxL5VHw2zQWCeeJiPt6kjRQw0XSkIdVChf67xGa4alSnZlT6HEQ8CK9ANbhvXUF9xlDkBfTuHDWScgC9+z5FQpPI12TlwC6+sV7ixR8CUMKiwjm2GQeOQWHMGuHGdbnObJAwCEqFJpNU5H6uaPUaEIKiQfg+PHk1+u4OwW9PlWW2ctbA4BHCtp+cNK+H8Jos4gDmC5ar4Nx9waaG/2B13NgDqS7+vm2RgEtEws82P+kwIHhs/pgkQKcFIhfd7CogtGNjYMHTLpurD0ERbYFw4JaD3GlQuNAL/JEsSAF4HqlCnaHACk4WhOn4OgCkMD5hSpYNYDJTD8Y46n+jsE1kPhVCuR6QBXhFK7MUOu9O6b1SWF3b+/9ZVWMGOlu93E8UDaAhgc7bfH+0DHqKXCkHzoNDFfU+zxiVQrUC9QXTuHYtKpN59OA3IxCG4b7jh6ZFuVockaNTW09mkJzOaPU49a6mE9cAchZpQJNpUWcwgV9r6FJswsFKrITp2B5pMBMdnS0z2HZNy2+BNKxSZxZfglkrFYBJxQnpzA5sN/HheR2aFQoZBLAi149dQoyAYYjW0hHlHguBAdMcR0DuDZ5omevX6+AI8qcU7ikKT3GBHCnXwydgmCC0tRwCnGQ2Wp6Be71yNIWfQSkOl9vAI1SBCNWrwC01RROgX7BuT2HI4r7tFAw086p/NwZEdOEa7R1uAFuNmQPuKAEAjYNQ0CyeoUEWHYBnpQVQgpvc0Ph+gsKlAnKg1+vEHsw5LKciLKCAJobiWBzYFGbCKpHqkZZrxBFHEASyFI59vJPCskcwNVGOWZAOqsrR+pKbaNeAMT1CixMEtlnsqopNxUMzVJT3tY35aXZm6a6Y9QhwMN6BUJWbE1lhbMO1WehkO7poO0sK7em9MJGxp1XSbC1gtugzzSLQmGsX7VntJGSwsPZ2d2z3bIPKzdoOp3Wzqt8G4XyMVUoFIxLx1S7+piaHtCvR3FeRVsq0GFdp9C5TbGpcNqsPqyHKxcfd14h21KhuLKUFU4f3osrC7F6uV3WXFnadL7wyAPeKDXw2RoJCO5GY4DouYvb/gepVXheLoewzPseQG9N/vzilrMIjoStE3++zvle4eSurw7XEe76ynI4aq+v7lEyt1x5awiFlFLQbHKIpabnM3eJLym4Szzzc/du7SU+zOXv9UNpECH7IoH/gecURPlN9vdQpeD47yhIFNX0U0QgvID9nENm+yxk/xb+AGAjNfRZuk9qAAAAAElFTkSuQmCC);
-      background-repeat:no-repeat;
-      background-position: 0 0 ;
-      background-size: 65px 20px;
-    }
-
 .mapd-draw-button-control-group {
   margin: 8px 0 0 8px;
   float: left;

src/charts/raster-chart.js

@@ -760,6 +760,9 @@ function genLayeredVega(chart) {
   const vegaSpec = {
     width: Math.round(width),
     height: Math.round(height),
+    viewRenderOptions: {
+      premultipliedAlpha: false
+    },
     data,
     scales,
     projections,

src/index.js

@@ -1,16 +1,14 @@
 require("../mapdc.css")
 require("../scss/chart.scss")
-require("mapbox-gl/dist/styles.css")
+require("mapbox-gl/dist/mapbox-gl.css")
 require("legendables/src/styles.css")
+require("./mixins/d3.box.js")
+require("./polyfills/inner-svg")
 
 if (process.env.BABEL_ENV !== "test") {
-  window.mapboxgl = require("mapbox-gl/dist/mapbox-gl.js")
-  require("mapbox-gl/dist/mapboxgl-overrides.js")
+  window.mapboxgl = require("mapbox-gl")
 }
 
-require("./mixins/d3.box.js")
-require("./polyfills/inner-svg")
-
 export * as d3 from "d3" // eslint-disable-line
 export * from "./core/core"
 export * from "./core/core-async"

src/mixins/coordinate-grid-raster-mixin.js

@@ -4,6 +4,7 @@ import bindEventHandlers from "./ui/coordinate-grid-raster-mixin-ui"
 import colorMixin from "./color-mixin"
 import d3 from "d3"
 import marginMixin from "./margin-mixin"
+import axios from "axios"
 
 /**
  * Coordinate Grid Raster is an abstract base chart designed to support coordinate grid based
@@ -681,54 +682,73 @@ export default function coordinateGridRasterMixin (_chart, _mapboxgl, browser) {
     }
   }
 
+  const TRANSPARENT_PNG_URL = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQYV2NgAAIAAAUAAarVyFEAAAAASUVORK5CYII=';
+
   function renderChart (imgUrl, renderBounds, queryId) {
     const gl = _gl
 
-    if (imgUrl) { // should we check to see if the imgUrl is the same from the previous render?
-      _mapboxgl.util.getImage(imgUrl, (err, img) => {
-        if (queryId === _queryId) {
-          const xdom = _chart.x().domain()
-          const ydom = _chart.y().domain()
+    const onImageLoad = (err, img) => {
+      if (err) {
+        throw err
+      }
+      if (queryId === _queryId) {
+        const xdom = _chart.x().domain()
+        const ydom = _chart.y().domain()
 
-          if (xdom[0] === renderBounds[0][0] && xdom[1] === renderBounds[1][0] && ydom[0] === renderBounds[2][1] && ydom[1] === renderBounds[0][1]) {
+        if (xdom[0] === renderBounds[0][0] && xdom[1] === renderBounds[1][0] && ydom[0] === renderBounds[2][1] && ydom[1] === renderBounds[0][1]) {
 
-            if (!_tex) {
-              createGLTexture()
-            }
+          if (!_tex) {
+            createGLTexture()
+          }
+
+          if (!_img || img.width != _img.width || img.height != _img.height) {
+            // Image was updated and dimensions changed.
+            gl.bindTexture(gl.TEXTURE_2D, _tex)
+            gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, img)
 
-            if (!_img || img.width != _img.width || img.height != _img.height) {
-              // Image was updated and dimensions changed.
-              gl.bindTexture(gl.TEXTURE_2D, _tex)
-              gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, img)
-
-              if (!_img) {
-                gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE)
-                gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE)
-                gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR)
-                gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR)
-              }
-            } else {
-              // Image was updated but dimensions unchanged.
-              gl.bindTexture(gl.TEXTURE_2D, _tex)
-              gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, gl.RGBA, gl.UNSIGNED_BYTE, img)
+            if (!_img) {
+              gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE)
+              gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE)
+              gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR)
+              gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR)
             }
-            _img = img
-
-            _scale[0] = 1
-            _scale[1] = 1
-            _offset[0] = 0
-            _offset[1] = 0
-            const xrange = _chart.xRange()
-            const yrange = _chart.yRange()
-            _currDataBounds[0][0] = xrange[0]
-            _currDataBounds[0][1] = xrange[1]
-            _currDataBounds[1][0] = yrange[0]
-            _currDataBounds[1][1] = yrange[1]
-
-            renderChart()
+          } else {
+            // Image was updated but dimensions unchanged.
+            gl.bindTexture(gl.TEXTURE_2D, _tex)
+            gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, gl.RGBA, gl.UNSIGNED_BYTE, img)
           }
+          _img = img
+
+          _scale[0] = 1
+          _scale[1] = 1
+          _offset[0] = 0
+          _offset[1] = 0
+          const xrange = _chart.xRange()
+          const yrange = _chart.yRange()
+          _currDataBounds[0][0] = xrange[0]
+          _currDataBounds[0][1] = xrange[1]
+          _currDataBounds[1][0] = yrange[0]
+          _currDataBounds[1][1] = yrange[1]
+
+          renderChart()
         }
-      })
+      }
+    }
+
+    if (imgUrl) { // should we check to see if the imgUrl is the same from the previous render?
+      axios.get(imgUrl, {
+        responseType: 'arraybuffer'
+      }).then(({ data }) => {
+        const img = new window.Image();
+        const URL = window.URL || window.webkitURL;
+        img.onload = () => {
+            onImageLoad(null, img);
+            URL.revokeObjectURL(img.src);
+        };
+        img.onerror = () => onImageLoad(new Error('Could not load scatterplot image'));
+        const blob = new window.Blob([new Uint8Array(data)], { type: 'image/png' });
+        img.src = data.byteLength ? URL.createObjectURL(blob) : TRANSPARENT_PNG_URL;
+      }) 
     }
 
     if (queryId !== null && queryId !== undefined) { _queryId = queryId }