Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Feat] Add mapboxApiUrl to `KeplerGL` (#554)
Arni Sumarlidasone503bffcc5d5
diff --git a/package.json b/package.jsonindex b17779669..76868d3a9 100644--- a/package.json+++ b/package.json@@ -104,7 +104,7 @@"react-data-grid": "2.0.80-am-fix-defaultprops-warnings3337","react-file-drop": "^0.1.9","react-json-pretty": "^1.7.9",- "react-map-gl": "^4.0.14",+ "react-map-gl": "^5.0.3","react-markdown": "^4.0.6","react-modal": "^3.8.1","react-onclickoutside": "^6.7.1",diff --git a/src/actions/actions.js b/src/actions/actions.jsindex f6d2bb63e..9f930bf88 100644--- a/src/actions/actions.js+++ b/src/actions/actions.js@@ -144,11 +144,13 @@ export const receiveMapConfig = createAction(* @memberof main* @param {Object} payload* @param {string} payload.mapboxApiAccessToken - mapboxApiAccessToken to be saved to mapStyle reducer+ * @param {string} payload.mapboxApiUrl - mapboxApiUrl to be saved to mapStyle reducer.+ * @param {Boolean} payload.mapStylesReplaceDefault - mapStylesReplaceDefault to be saved to mapStyle reducer* @public*/export const keplerGlInit = createAction(ActionTypes.INIT,- ({mapboxApiAccessToken} = {}) => ({mapboxApiAccessToken})+ ({mapboxApiAccessToken, mapboxApiUrl, mapStylesReplaceDefault} = {}) => ({mapboxApiAccessToken, mapboxApiUrl, mapStylesReplaceDefault}));/**diff --git a/src/actions/identity-actions.js b/src/actions/identity-actions.jsindex 0285f1547..a6954912f 100644--- a/src/actions/identity-actions.js+++ b/src/actions/identity-actions.js@@ -32,11 +32,13 @@ import ActionTypes from 'constants/action-types';* @param {boolean} payload.mint - Whether to use a fresh empty state, when `mint: true` it will *always* load a fresh state when the component is re-mounted.* When `mint: false` it will register with existing instance state under the same `id`, when the component is unmounted then mounted again. Default: `true`* @param {string} payload.mapboxApiAccessToken - mapboxApiAccessToken to be saved in `map-style` reducer.+ * @param {string} payload.mapboxApiUrl - mapboxApiUrl to be saved in `map-style` reducer.+ * @param {Boolean} payload.mapStylesReplaceDefault - mapStylesReplaceDefault to be saved in `map-style` reducer.* @public*/export const registerEntry = createAction(ActionTypes.REGISTER_ENTRY,- ({id, mint, mapboxApiAccessToken}) => ({id, mint, mapboxApiAccessToken})+ ({id, mint, mapboxApiAccessToken, mapboxApiUrl, mapStylesReplaceDefault}) => ({id, mint, mapboxApiAccessToken, mapboxApiUrl, mapStylesReplaceDefault}));/**diff --git a/src/components/container.js b/src/components/container.jsindex f87ae2817..6e6e03b77 100644--- a/src/components/container.js+++ b/src/components/container.js@@ -64,6 +64,8 @@ export function ContainerFactory(KeplerGl) {* In case you create multiple kepler.gl instances using the same id, the kepler.gl state defined by the entry will be* overridden by the latest instance and reset to a blank state.* @param {string} props.mapboxApiAccessToken - _required_+ * @param {string} props.mapboxApiUrl - _optional_+ * @param {Boolean} props.mapStylesReplaceDefault - _optional_* You can create a free account at [www.mapbox.com](www.mapbox.com) and create a token at* [www.mapbox.com/account/access-tokens](www.mapbox.com/account/access-tokens)@@ -96,9 +98,9 @@ export function ContainerFactory(KeplerGl) {}componentWillMount() {- const {id, mint, mapboxApiAccessToken} = this.props;+ const {id, mint, mapboxApiAccessToken, mapboxApiUrl, mapStylesReplaceDefault} = this.props;// add a new entry to reducer- this.props.dispatch(registerEntry({id, mint, mapboxApiAccessToken}));+ this.props.dispatch(registerEntry({id, mint, mapboxApiAccessToken, mapboxApiUrl, mapStylesReplaceDefault}));}componentWillReceiveProps(nextProps) {diff --git a/src/components/kepler-gl.js b/src/components/kepler-gl.jsindex 4a04efacf..eff8c19d8 100644--- a/src/components/kepler-gl.js+++ b/src/components/kepler-gl.js@@ -97,6 +97,7 @@ function KeplerGlFactory(class KeplerGL extends Component {static defaultProps = {mapStyles: [],+ mapStylesReplaceDefault: false,width: 800,height: 800,appName: KEPLER_GL_NAME,@@ -183,6 +184,7 @@ function KeplerGlFactory(width,height,mapboxApiAccessToken,+ mapboxApiUrl,getMapboxRef,// redux state@@ -240,6 +242,7 @@ function KeplerGlFactory(const mapFields = {datasets,mapboxApiAccessToken,+ mapboxApiUrl,mapState,mapStyle,mapControls: uiState.mapControls,@@ -332,6 +335,7 @@ function KeplerGlFactory(mapState={mapState}uiState={uiState}mapboxApiAccessToken={mapboxApiAccessToken}+ mapboxApiUrl={mapboxApiUrl}visStateActions={visStateActions}uiStateActions={uiStateActions}mapStyleActions={mapStyleActions}diff --git a/src/components/map-container.js b/src/components/map-container.jsindex bd330786c..12fa306b1 100644--- a/src/components/map-container.js+++ b/src/components/map-container.js@@ -71,6 +71,7 @@ export default function MapContainerFactory(MapPopover, MapControl) {mapControls: PropTypes.object.isRequired,mousePos: PropTypes.object.isRequired,mapboxApiAccessToken: PropTypes.string.isRequired,+ mapboxApiUrl: PropTypes.string,toggleMapControl: PropTypes.func.isRequired,visStateActions: PropTypes.object.isRequired,mapStateActions: PropTypes.object.isRequired,@@ -318,7 +319,8 @@ export default function MapContainerFactory(MapPopover, MapControl) {layerData,layerOrder,visStateActions,- mapboxApiAccessToken+ mapboxApiAccessToken,+ mapboxApiUrl} = this.props;let deckGlLayers = [];@@ -336,6 +338,7 @@ export default function MapContainerFactory(MapPopover, MapControl) {deckGlLayers.push(new ThreeDBuildingLayer({id: '_keplergl_3d-building',mapboxApiAccessToken,+ mapboxApiUrl,threeDBuildingColor: mapStyle.threeDBuildingColor}));}@@ -392,7 +395,7 @@ export default function MapContainerFactory(MapPopover, MapControl) {render() {const {mapState, mapStyle, mapStateActions, mapLayers, layers, MapComponent,- datasets, mapboxApiAccessToken, mapControls, toggleMapControl+ datasets, mapboxApiAccessToken, mapboxApiUrl, mapControls, toggleMapControl} = this.props;if (!mapStyle.bottomMapStyle) {@@ -404,6 +407,7 @@ export default function MapContainerFactory(MapPopover, MapControl) {...mapState,preserveDrawingBuffer: true,mapboxApiAccessToken,+ mapboxApiUrl,onViewportChange: this._onViewportChange,transformRequest};diff --git a/src/components/modal-container.js b/src/components/modal-container.jsindex 69049d63a..b168a8bc4 100644--- a/src/components/modal-container.js+++ b/src/components/modal-container.js@@ -102,6 +102,7 @@ export default function ModalContainerFactory(containerW: PropTypes.number,containerH: PropTypes.number,mapboxApiAccessToken: PropTypes.string.isRequired,+ mapboxApiUrl: PropTypes.string,mapState: PropTypes.object.isRequired,mapStyle: PropTypes.object.isRequired,uiState: PropTypes.object.isRequired,@@ -375,6 +376,7 @@ export default function ModalContainerFactory(template = (<AddMapStyleModalmapboxApiAccessToken={this.props.mapboxApiAccessToken}+ mapboxApiUrl={this.props.mapboxApiUrl}mapState={this.props.mapState}inputStyle={mapStyle.inputStyle}inputMapStyle={this.props.mapStyleActions.inputMapStyle}diff --git a/src/deckgl-layers/3d-building-layer/3d-building-layer.js b/src/deckgl-layers/3d-building-layer/3d-building-layer.jsindex 108861a3b..691b7c3a0 100644--- a/src/deckgl-layers/3d-building-layer/3d-building-layer.js+++ b/src/deckgl-layers/3d-building-layer/3d-building-layer.js@@ -54,7 +54,7 @@ export default class ThreeDBuildingLayer extends CompositeLayer {return [new DeckGLTileLayer({- getTileData: (args) => getTileData(this.props.mapboxApiAccessToken, args),+ getTileData: (args) => getTileData(this.props.mapboxApiUrl, this.props.mapboxApiAccessToken, args),minZoom: 13,renderSubLayers: this.renderSubLayers.bind(this)})diff --git a/src/deckgl-layers/3d-building-layer/3d-building-utils.js b/src/deckgl-layers/3d-building-layer/3d-building-utils.jsindex 16afb852b..61f2122c9 100644--- a/src/deckgl-layers/3d-building-layer/3d-building-utils.js+++ b/src/deckgl-layers/3d-building-layer/3d-building-utils.js@@ -24,10 +24,11 @@ import {worldToLngLat} from 'viewport-mercator-project';/* global fetch */const TILE_SIZE = 512;-const MAP_SOURCE = 'https://a.tiles.mapbox.com/v4/mapbox.mapbox-streets-v7';+const MAPBOX_HOST = 'https://a.tiles.mapbox.com'+const MAP_SOURCE = '/v4/mapbox.mapbox-streets-v7';-export function getTileData(token, {x, y, z}) {- const mapSource = `${MAP_SOURCE}/${z}/${x}/${y}.vector.pbf?access_token=${token}`;+export function getTileData(host, token, {x, y, z}) {+ const mapSource = `${host || MAPBOX_HOST}${MAP_SOURCE}/${z}/${x}/${y}.vector.pbf?access_token=${token}`;return fetch(mapSource).then(response => response.arrayBuffer())diff --git a/src/reducers/map-style-updaters.js b/src/reducers/map-style-updaters.jsindex 0880396a1..bd62054ef 100644--- a/src/reducers/map-style-updaters.js+++ b/src/reducers/map-style-updaters.js@@ -60,6 +60,8 @@ const getDefaultState = () => {),// save mapbox access tokenmapboxApiAccessToken: null,+ mapboxApiUrl: null,+ mapStylesReplaceDefault: false,inputStyle: getInitialInputStyle(),threeDBuildingColor: hexToRgb(DEFAULT_BLDG_COLOR)};@@ -111,8 +113,10 @@ const mapStyleUpdaters = null;* @property {string} styleType - Default: `'dark'`* @property {Object} visibleLayerGroups - Default: `{}`* @property {Object} topLayerGroups - Default: `{}`- * @property {Object} mapStyles - mapping from style key to style objct+ * @property {Object} mapStyles - mapping from style key to style object* @property {string} mapboxApiAccessToken - Default: `null`+ * @Property {string} mapboxApiUrl - Default null+ * @Property {Boolean} mapStylesReplaceDefault - Default: `false`* @property {Object} inputStyle - Default: `{}`* @property {Array} threeDBuildingColor - Default: `[r, g, b]`* @public@@ -201,7 +205,10 @@ function getLayerGroupsFromStyle(style) {// Updaters/**- * Propagate `mapStyle` reducer with `mapboxApiAccessToken`+ * Propagate `mapStyle` reducer with `mapboxApiAccessToken` and `mapStylesReplaceDefault`.+ * if mapStylesReplaceDefault is true mapStyles is emptied; loadMapStylesUpdater() will+ * populate mapStyles.+ ** @memberof mapStyleUpdaters* @param {Object} state* @param {Object} action@@ -213,8 +220,12 @@ function getLayerGroupsFromStyle(style) {export const initMapStyleUpdater = (state, action) => ({...state,// save mapbox access token to map style state- mapboxApiAccessToken: (action.payload || {}).mapboxApiAccessToken+ mapboxApiAccessToken: (action.payload || {}).mapboxApiAccessToken,+ mapboxApiUrl: (action.payload || {}).mapboxApiUrl,+ mapStyles: action.payload && !action.payload.mapStylesReplaceDefault ? state.mapStyles : {},+ mapStylesReplaceDefault: action.payload.mapStylesReplaceDefault || false});+// });/*** Update `visibleLayerGroups`to change layer group visibility@@ -316,7 +327,7 @@ export const loadMapStylesUpdater = (state, action) => {export const loadMapStyleErrUpdater = (state) => state;export const requestMapStylesUpdater = (state, {payload: mapStyles}) => {- const loadMapStyleTasks = getLoadMapStyleTasks(mapStyles, state.mapboxApiAccessToken);+ const loadMapStyleTasks = getLoadMapStyleTasks(mapStyles, state.mapboxApiAccessToken, state.mapboxApiUrl);return withTask(state, loadMapStyleTasks);};@@ -335,7 +346,7 @@ export const receiveMapConfigUpdater = (state, {payload: {mapStyle}}) => {// if saved custom mapStyles load the style objectconst loadMapStyleTasks = mapStyle.mapStyles- ? getLoadMapStyleTasks(mapStyle.mapStyles, state.mapboxApiAccessToken)+ ? getLoadMapStyleTasks(mapStyle.mapStyles, state.mapboxApiAccessToken, state.mapboxApiUrl): null;// merge default mapStyles@@ -352,13 +363,13 @@ export const receiveMapConfigUpdater = (state, {payload: {mapStyle}}) => {return loadMapStyleTasks ? withTask(newState, loadMapStyleTasks) : newState;};-function getLoadMapStyleTasks(mapStyles, mapboxApiAccessToken) {+function getLoadMapStyleTasks(mapStyles, mapboxApiAccessToken, mapboxApiUrl) {return [Task.all(Object.values(mapStyles).map(({id, url, accessToken}) => ({id,- url: isValidStyleUrl(url) ? getStyleDownloadUrl(url, accessToken || mapboxApiAccessToken) : url+ url: isValidStyleUrl(url) ? getStyleDownloadUrl(url, accessToken || mapboxApiAccessToken, mapboxApiUrl) : url})).map(LOAD_MAP_STYLE_TASK)).bimap(@@ -392,6 +403,7 @@ export const resetMapConfigMapStyleUpdater = state => {const emptyConfig = {...INITIAL_MAP_STYLE,mapboxApiAccessToken: state.mapboxApiAccessToken,+ mapboxApiUrl: state.mapboxApiUrl,...state.initialState,mapStyles: state.mapStyles,initialState: state.initialStatediff --git a/src/reducers/root.js b/src/reducers/root.jsindex 1c7c788c3..24659d9f4 100644--- a/src/reducers/root.js+++ b/src/reducers/root.js@@ -31,13 +31,13 @@ const initialCoreState = {};export function provideInitialState(initialState) {const coreReducer = coreReducerFactory(initialState);- const handleRegisterEntry = (state, {payload: {id, mint, mapboxApiAccessToken}}) => ({+ const handleRegisterEntry = (state, {payload: {id, mint, mapboxApiAccessToken, mapboxApiUrl, mapStylesReplaceDefault}}) => ({// register a new entry to voyager reducer// by default, always create a mint state even if the same id already exist// if state.id exist and mint=false, keep the existing state...state,[id]: state[id] && mint === false ? state[id] : {- ...coreReducer(undefined, keplerGlInit({mapboxApiAccessToken}))+ ...coreReducer(undefined, keplerGlInit({mapboxApiAccessToken, mapboxApiUrl, mapStylesReplaceDefault}))}});diff --git a/src/utils/map-style-utils/mapbox-gl-style-editor.js b/src/utils/map-style-utils/mapbox-gl-style-editor.jsindex dd0e5c8ac..d1af46f7e 100644--- a/src/utils/map-style-utils/mapbox-gl-style-editor.js+++ b/src/utils/map-style-utils/mapbox-gl-style-editor.js@@ -96,7 +96,7 @@ export const editBottomMapStyle = memoize(const mapUrlRg = /^mapbox:\/\/styles\/[-a-z0-9]{2,256}\/[-a-z0-9]{2,256}/;const httpRg = /^(?=(http:|https:))/;-const mapboxStyleApiUrl = 'https://api.mapbox.com/styles/v1/';+const defaultMapboxApiUrl = 'https://api.mapbox.com';// valid style url// mapbox://styles/uberdata/cjfyl03kp1tul2smf5v2tbdd4@@ -105,7 +105,7 @@ export function isValidStyleUrl(url) {return typeof url === 'string' && Boolean(url.match(mapUrlRg) || url.match(httpRg));}-export function getStyleDownloadUrl(styleUrl, accessToken) {+export function getStyleDownloadUrl(styleUrl, accessToken, mapboxApiUrl) {if (styleUrl.startsWith('http')) {return styleUrl;}@@ -115,7 +115,7 @@ export function getStyleDownloadUrl(styleUrl, accessToken) {const styleId = styleUrl.replace('mapbox://styles/', '');// https://api.mapbox.com/styles/v1/heshan0131/cjg1bfumo1cwm2rlrjxkinfgw?pluginName=Keplergl&access_token=<token>- return `${mapboxStyleApiUrl}${styleId}?pluginName=Keplergl&access_token=${accessToken}`+ return `${mapboxApiUrl || defaultMapboxApiUrl}/styles/v1/${styleId}?pluginName=Keplergl&access_token=${accessToken}`}// style url not recognizeddiff --git a/test/browser/components/container-test.js b/test/browser/components/container-test.jsindex 74cdcb270..d4f90d792 100644--- a/test/browser/components/container-test.js+++ b/test/browser/components/container-test.js@@ -72,7 +72,7 @@ test('Components -> Container -> Mount with mint:true', t => {let actions = store.getActions();- let expectedActions0 = {type: '@@kepler.gl/REGISTER_ENTRY', payload: {id: 'map', mint: true, mapboxApiAccessToken: undefined}};+ let expectedActions0 = {type: '@@kepler.gl/REGISTER_ENTRY', payload: {id: 'map', mint: true, mapboxApiAccessToken: undefined, mapboxApiUrl: undefined, mapStylesReplaceDefault: undefined}};t.deepEqual(actions,@@ -117,7 +117,7 @@ test('Components -> Container -> Mount with mint:true', t => {actions = store.getActions();- expectedActions0 = {type: '@@kepler.gl/REGISTER_ENTRY', payload: {id: 'milkshake', mint: true, mapboxApiAccessToken: 'pk.smoothie'}};+ expectedActions0 = {type: '@@kepler.gl/REGISTER_ENTRY', payload: {id: 'milkshake', mint: true, mapboxApiAccessToken: 'pk.smoothie', mapboxApiUrl: undefined, mapStylesReplaceDefault: undefined}};t.deepEqual(actions,@@ -191,7 +191,7 @@ test('Components -> Container -> Mount with mint:false', t => {let actions = store.getActions();- let expectedActions0 = {type: '@@kepler.gl/REGISTER_ENTRY', payload: {id: 'milkshake', mint: false, mapboxApiAccessToken: 'hello.world'}};+ let expectedActions0 = {type: '@@kepler.gl/REGISTER_ENTRY', payload: {id: 'milkshake', mint: false, mapboxApiAccessToken: 'hello.world', mapboxApiUrl: undefined, mapStylesReplaceDefault: undefined}};t.deepEqual(actions,@@ -208,7 +208,8 @@ test('Components -> Container -> Mount with mint:false', t => {mapStyle: {...initialCoreState.mapStyle,// should replace access token- mapboxApiAccessToken: 'hello.world'+ mapboxApiAccessToken: 'hello.world',+ mapboxApiUrl: undefined}}}@@ -256,7 +257,7 @@ test('Components -> Container -> Mount then rename', t => {);}, 'Should not throw error when mount');- const expectedActions0 = {type: '@@kepler.gl/REGISTER_ENTRY', payload: {id: 'milkshake', mint: true, mapboxApiAccessToken: 'hello.world'}};+ const expectedActions0 = {type: '@@kepler.gl/REGISTER_ENTRY', payload: {id: 'milkshake', mint: true, mapboxApiAccessToken: 'hello.world', mapboxApiUrl: undefined, mapStylesReplaceDefault: undefined}};t.deepEqual(store.getActions().pop(),diff --git a/test/node/reducers/map-style-test.js b/test/node/reducers/map-style-test.jsindex fe0a6c5c7..5d10b2b67 100644--- a/test/node/reducers/map-style-test.js+++ b/test/node/reducers/map-style-test.js@@ -22,7 +22,7 @@ import test from 'tape';import {drainTasksForTesting, succeedTaskWithValues} from 'react-palm/tasks';import reducer from 'reducers/map-style';-import {INITIAL_MAP_STYLE} from 'reducers/map-style-updaters';+import {INITIAL_MAP_STYLE, loadMapStylesUpdater} from 'reducers/map-style-updaters';import {keplerGlInit, receiveMapConfig} from 'actions/actions';import SchemaManager from 'schemas';import {DEFAULT_MAP_STYLES} from 'constants/default-settings';@@ -58,9 +58,53 @@ test('#mapStyleReducer -> INIT', t => {{...INITIAL_MAP_STYLE,initialState: {},- mapboxApiAccessToken: 'smoothies_secret_token'+ mapboxApiAccessToken: 'smoothies_secret_token',+ mapboxApiUrl: undefined},- 'initialie map style with mapboxApiAccessToken'+ 'initialize map style with mapboxApiAccessToken'+ );+ t.end();+});++test('#mapStyleReducer -> INIT & LOAD_MAP_STYLES', t => {+ const myMapStyle = {+ id : 'default dark v9',+ label : 'default dark v9',+ url : 'mapbox://styles/mapbox/dark-v9',+ icon : `images/light.png`,+ layerGroups: []+ };+ const newState = reducer(+ InitialMapStyle,+ keplerGlInit({+ mapboxApiAccessToken: 'smoothies_secret_token',+ mapStylesReplaceDefault: true+ })+ );++ t.deepEqual(+ newState,+ {+ ...INITIAL_MAP_STYLE,+ mapStyles: {},+ initialState: {},+ mapboxApiAccessToken: 'smoothies_secret_token',+ mapboxApiUrl: undefined,+ mapStylesReplaceDefault: true+ },+ 'initialize map style with mapboxApiAccessToken and mapStylesReplaceDefault; mapStyles empty'+ );++ const mapStyles = {+ [myMapStyle.id]: myMapStyle+ };++ const finalState = loadMapStylesUpdater(newState, { payload: mapStyles });++ t.deepEqual(+ finalState,+ { ...newState, mapStyles: mapStyles },+ 'user provided mapStyles are populated, defaults ignored');t.end();@@ -108,6 +152,8 @@ test('#mapStyleReducer -> RECEIVE_MAP_CONFIG', t => {...defaultMapStyles},mapboxApiAccessToken: 'smoothies_secret_token',+ mapboxApiUrl: undefined,+ mapStylesReplaceDefault: false,inputStyle: {accessToken: null,error: false,@@ -174,6 +220,8 @@ test('#mapStyleReducer -> RECEIVE_MAP_CONFIG', t => {topLayerGroups: {},mapStyles: expectedMapStyles,mapboxApiAccessToken: 'smoothies_secret_token',+ mapboxApiUrl: undefined,+ mapStylesReplaceDefault: false,inputStyle: {accessToken: null,error: false,diff --git a/yarn.lock b/yarn.lockindex c8b6e8c24..f4cf5e8e1 100644--- a/yarn.lock+++ b/yarn.lock@@ -3652,9 +3652,10 @@ eslint@^5.16.0:table "^5.2.3"text-table "^0.2.0"-esm@^3.0.84:- version "3.2.22"- resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.22.tgz#5062c2e22fee3ccfee4e8f20da768330da90d6e3"+esm@~3.0.84:+ version "3.0.84"+ resolved "https://registry.yarnpkg.com/esm/-/esm-3.0.84.tgz#bb108989f4673b32d4f62406869c28eed3815a63"+ integrity sha512-SzSGoZc17S7P+12R9cg21Bdb7eybX25RnIeRZ80xZs+VZ3kdQKzqTp2k4hZJjR7p9l0186TTXSgrxzlMDBktlw==espree@^5.0.1:version "5.0.1"@@ -5723,9 +5724,10 @@ map-visit@^1.0.0:dependencies:object-visit "^1.0.0"-mapbox-gl@~0.53.0:- version "0.53.1"- resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-0.53.1.tgz#08a956d8da54b04bc7f29ab1319bddb9c97ddedf"+mapbox-gl@^1.0.0:+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-1.0.0.tgz#646df3e1812899f4331ab8ea695b182f4a4ea7d9"+ integrity sha512-+sfg6e3Ud6G9PNcdA56r6U0j2SJEQrnTTx/V8xt0xedIN9hrGIceKIukWz+tAgrw0KS5GKi6ThkWXPuwcGi36g==dependencies:"@mapbox/geojson-rewind" "^0.4.0""@mapbox/geojson-types" "^1.0.2"@@ -5738,7 +5740,7 @@ mapbox-gl@~0.53.0:"@mapbox/whoots-js" "^3.1.0"csscolorparser "~1.0.2"earcut "^2.1.5"- esm "^3.0.84"+ esm "~3.0.84"geojson-vt "^3.2.1"gl-matrix "^3.0.0"grid-index "^1.1.0"@@ -6043,14 +6045,7 @@ mixin-deep@^1.2.0:for-in "^1.0.2"is-extendable "^1.0.1"-mjolnir.js@^2.1.0:- version "2.1.0"- resolved "https://registry.yarnpkg.com/mjolnir.js/-/mjolnir.js-2.1.0.tgz#e8a4727e86d8f9352d6b6fe9cdc6faab0dcff15e"- dependencies:- "@babel/runtime" "^7.0.0"- hammerjs "^2.0.8"--mjolnir.js@^2.1.2:+mjolnir.js@^2.1.1, mjolnir.js@^2.1.2:version "2.1.2"resolved "https://registry.yarnpkg.com/mjolnir.js/-/mjolnir.js-2.1.2.tgz#db89819c418b6f3d200b1c51386fc7487f98bd5a"integrity sha512-OjvkNzTCdJd/I7XxgIomNozYS6me6OWY+t8I6SZlINaFmNmgAW3I5x+Hd8sgA+WxAjFvBf576lD7N1MGo89/WA==@@ -7381,14 +7376,15 @@ react-lifecycles-compat@^3.0.0:version "3.0.4"resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"-react-map-gl@^4.0.14:- version "4.1.2"- resolved "https://registry.yarnpkg.com/react-map-gl/-/react-map-gl-4.1.2.tgz#02b5d983c4d08be2f2d8e3ea2b58c87e4ac25ed3"+react-map-gl@^5.0.3:+ version "5.0.3"+ resolved "https://registry.yarnpkg.com/react-map-gl/-/react-map-gl-5.0.3.tgz#d48279da5f9c7ac9e674388abe3d40b32206408b"+ integrity sha512-lvnSId2IQ8GQmOb97MSNFECiH39uq8nYn86WVLN0NtGmlalXDGyMlXi6pqnWE45mGqfY3nuu3cgh+J6ekMze7w==dependencies:"@babel/runtime" "^7.0.0"- mapbox-gl "~0.53.0"- mjolnir.js "^2.1.0"- prop-types "^15.5.7"+ mapbox-gl "^1.0.0"+ mjolnir.js "^2.1.1"+ prop-types "^15.7.2"react-virtualized-auto-sizer "^1.0.2"viewport-mercator-project "^6.1.0"