diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index bff23d733..93d801a70 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -53067,14 +53067,6 @@ "node": ">=4" } }, - "node_modules/viewport-mercator-project": { - "version": "6.2.3", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.0.0", - "gl-matrix": "^3.0.0" - } - }, "node_modules/vlq": { "version": "0.2.3", "license": "MIT" @@ -57951,10 +57943,10 @@ "version": "0.18.25", "license": "Apache-2.0", "dependencies": { + "@math.gl/web-mercator": "^4.1.0", "prop-types": "^15.8.1", "react-map-gl": "^6.1.19", - "supercluster": "^8.0.1", - "viewport-mercator-project": "^6.1.1" + "supercluster": "^8.0.1" }, "peerDependencies": { "@superset-ui/chart-controls": "*", @@ -57963,6 +57955,30 @@ "react": "^15 || ^16" } }, + "plugins/legacy-plugin-chart-map-box/node_modules/@math.gl/core": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@math.gl/core/-/core-4.1.0.tgz", + "integrity": "sha512-FrdHBCVG3QdrworwrUSzXIaK+/9OCRLscxI2OUy6sLOHyHgBMyfnEGs99/m3KNvs+95BsnQLWklVfpKfQzfwKA==", + "license": "MIT", + "dependencies": { + "@math.gl/types": "4.1.0" + } + }, + "plugins/legacy-plugin-chart-map-box/node_modules/@math.gl/types": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@math.gl/types/-/types-4.1.0.tgz", + "integrity": "sha512-clYZdHcmRvMzVK5fjeDkQlHUzXQSNdZ7s4xOqC3nJPgz4C/TZkUecTo9YS4PruZqtDda/ag4erndP0MIn40dGA==", + "license": "MIT" + }, + "plugins/legacy-plugin-chart-map-box/node_modules/@math.gl/web-mercator": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-4.1.0.tgz", + "integrity": "sha512-HZo3vO5GCMkXJThxRJ5/QYUYRr3XumfT8CzNNCwoJfinxy5NtKUd7dusNTXn7yJ40UoB8FMIwkVwNlqaiRZZAw==", + "license": "MIT", + "dependencies": { + "@math.gl/core": "4.1.0" + } + }, "plugins/legacy-plugin-chart-map-box/node_modules/kdbush": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz", @@ -68666,12 +68682,33 @@ "@superset-ui/legacy-plugin-chart-map-box": { "version": "file:plugins/legacy-plugin-chart-map-box", "requires": { + "@math.gl/web-mercator": "^4.1.0", "prop-types": "^15.8.1", "react-map-gl": "^6.1.19", - "supercluster": "^8.0.1", - "viewport-mercator-project": "^6.1.1" + "supercluster": "^8.0.1" }, "dependencies": { + "@math.gl/core": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@math.gl/core/-/core-4.1.0.tgz", + "integrity": "sha512-FrdHBCVG3QdrworwrUSzXIaK+/9OCRLscxI2OUy6sLOHyHgBMyfnEGs99/m3KNvs+95BsnQLWklVfpKfQzfwKA==", + "requires": { + "@math.gl/types": "4.1.0" + } + }, + "@math.gl/types": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@math.gl/types/-/types-4.1.0.tgz", + "integrity": "sha512-clYZdHcmRvMzVK5fjeDkQlHUzXQSNdZ7s4xOqC3nJPgz4C/TZkUecTo9YS4PruZqtDda/ag4erndP0MIn40dGA==" + }, + "@math.gl/web-mercator": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-4.1.0.tgz", + "integrity": "sha512-HZo3vO5GCMkXJThxRJ5/QYUYRr3XumfT8CzNNCwoJfinxy5NtKUd7dusNTXn7yJ40UoB8FMIwkVwNlqaiRZZAw==", + "requires": { + "@math.gl/core": "4.1.0" + } + }, "kdbush": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz", @@ -95387,13 +95424,6 @@ "unist-util-stringify-position": "^3.0.0" } }, - "viewport-mercator-project": { - "version": "6.2.3", - "requires": { - "@babel/runtime": "^7.0.0", - "gl-matrix": "^3.0.0" - } - }, "vlq": { "version": "0.2.3" }, diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/package.json b/superset-frontend/plugins/legacy-plugin-chart-map-box/package.json index 2e0ad2524..d2fd28884 100644 --- a/superset-frontend/plugins/legacy-plugin-chart-map-box/package.json +++ b/superset-frontend/plugins/legacy-plugin-chart-map-box/package.json @@ -26,10 +26,10 @@ "lib" ], "dependencies": { + "@math.gl/web-mercator": "^4.1.0", "prop-types": "^15.8.1", "react-map-gl": "^6.1.19", - "supercluster": "^8.0.1", - "viewport-mercator-project": "^6.1.1" + "supercluster": "^8.0.1" }, "peerDependencies": { "@superset-ui/chart-controls": "*", diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/MapBox.jsx b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/MapBox.jsx index 5c3e0e847..943cf7174 100644 --- a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/MapBox.jsx +++ b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/MapBox.jsx @@ -21,7 +21,7 @@ import { Component } from 'react'; import PropTypes from 'prop-types'; import MapGL from 'react-map-gl'; -import ViewportMercator from 'viewport-mercator-project'; +import { WebMercatorViewport } from '@math.gl/web-mercator'; import ScatterPlotGlowOverlay from './ScatterPlotGlowOverlay'; import './MapBox.css'; @@ -63,7 +63,7 @@ class MapBox extends Component { // Get a viewport that fits the given bounds, which all marks to be clustered. // Derive lat, lon and zoom from this viewport. This is only done on initial // render as the bounds don't update as we pan/zoom in the current design. - const mercator = new ViewportMercator({ + const mercator = new WebMercatorViewport({ width, height, }).fitBounds(bounds);