Skip to content

Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.

feat: MapLibre basemap (#2461)

Birk Skyum09aee3841c21
diff --git a/bindings/kepler.gl-jupyter/js/lib/keplergl/components/app.js b/bindings/kepler.gl-jupyter/js/lib/keplergl/components/app.js
index 3f109e9e1..a39b85d3f 100644
--- a/bindings/kepler.gl-jupyter/js/lib/keplergl/components/app.js
+++ b/bindings/kepler.gl-jupyter/js/lib/keplergl/components/app.js
@@ -104,7 +104,7 @@ function App() {
/>
<link
rel="stylesheet"
- href="http://api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css"
+ href="https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css"
/>
<style type="text/css">
{`font-family: ff-clan-web-pro, 'Helvetica Neue', Helvetica, sans-serif;
diff --git a/bindings/kepler.gl-jupyter/js/webpack/build-html.js b/bindings/kepler.gl-jupyter/js/webpack/build-html.js
index 07e3d2b9a..96c6ba3ba 100644
--- a/bindings/kepler.gl-jupyter/js/webpack/build-html.js
+++ b/bindings/kepler.gl-jupyter/js/webpack/build-html.js
@@ -91,7 +91,7 @@ module.exports = (rules, plugins) => ({
inject: true,
links: [
'https://d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css',
- 'https://api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css'
+ 'https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css'
],
scripts: [
diff --git a/examples/custom-map-style/index.html b/examples/custom-map-style/index.html
index b581b0b6c..75839a0a9 100644
--- a/examples/custom-map-style/index.html
+++ b/examples/custom-map-style/index.html
@@ -4,7 +4,7 @@
<meta charset='UTF-8' />
<title>kepler.gl demo</title>
<link rel="stylesheet" href="//d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css">
- <link href="//api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css" rel="stylesheet">
+ <link href="https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css" rel="stylesheet">
<style type="text/css">
body {margin: 0; padding: 0; overflow: hidden;}
</style>
diff --git a/examples/custom-map-style/src/main.tsx b/examples/custom-map-style/src/main.tsx
index f65f796f5..088f06a0a 100644
--- a/examples/custom-map-style/src/main.tsx
+++ b/examples/custom-map-style/src/main.tsx
@@ -22,8 +22,8 @@ import React from 'react';
import ReactDOM from 'react-dom/client';
import document from 'global/document';
import {Provider} from 'react-redux';
-import store from './store';
-import App from './app';
+import store from './store.ts';
+import App from './app.tsx';
const Root = () => (
<Provider store={store}>
diff --git a/examples/custom-reducer/index.html b/examples/custom-reducer/index.html
index c6adc2299..3b7fcd281 100644
--- a/examples/custom-reducer/index.html
+++ b/examples/custom-reducer/index.html
@@ -4,7 +4,7 @@
<meta charset='UTF-8' />
<title>kepler.gl demo</title>
<link href="//d1a3f4spazzrp4.cloudfront.net/uber-fonts/4.0.0/superfine.css" rel="stylesheet">
- <link href="//api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css" rel="stylesheet">
+ <link href="https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css" rel="stylesheet">
<style type="text/css">
body {margin: 0; padding: 0; overflow: hidden;}
</style>
diff --git a/examples/custom-theme/index.html b/examples/custom-theme/index.html
index c354db4e2..6a31c8c2b 100644
--- a/examples/custom-theme/index.html
+++ b/examples/custom-theme/index.html
@@ -4,7 +4,7 @@
<meta charset='UTF-8' />
<title>kepler.gl demo</title>
<link rel="stylesheet" href="//d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css">
- <link href="//api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css" rel="stylesheet">
+ <link href="https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css" rel="stylesheet">
<style type="text/css">
body {margin: 0; padding: 0; overflow: hidden;}
</style>
diff --git a/examples/demo-app/index.html b/examples/demo-app/index.html
index c354db4e2..6a31c8c2b 100644
--- a/examples/demo-app/index.html
+++ b/examples/demo-app/index.html
@@ -4,7 +4,7 @@
<meta charset='UTF-8' />
<title>kepler.gl demo</title>
<link rel="stylesheet" href="//d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css">
- <link href="//api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css" rel="stylesheet">
+ <link href="https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css" rel="stylesheet">
<style type="text/css">
body {margin: 0; padding: 0; overflow: hidden;}
</style>
diff --git a/examples/node-app/index.html b/examples/node-app/index.html
index 4cd13159a..65815b442 100644
--- a/examples/node-app/index.html
+++ b/examples/node-app/index.html
@@ -4,7 +4,7 @@
<meta charset='UTF-8' />
<title>kepler.gl demo</title>
<link rel="stylesheet" href="//d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css">
- <link href="//api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css" rel="stylesheet">
+ <link href="https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css" rel="stylesheet">
<style type="text/css">
body {margin: 0; padding: 0; overflow: hidden;}
</style>
diff --git a/examples/open-modal/index.html b/examples/open-modal/index.html
index b581b0b6c..75839a0a9 100644
--- a/examples/open-modal/index.html
+++ b/examples/open-modal/index.html
@@ -4,7 +4,7 @@
<meta charset='UTF-8' />
<title>kepler.gl demo</title>
<link rel="stylesheet" href="//d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css">
- <link href="//api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css" rel="stylesheet">
+ <link href="https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css" rel="stylesheet">
<style type="text/css">
body {margin: 0; padding: 0; overflow: hidden;}
</style>
diff --git a/examples/replace-component/index.html b/examples/replace-component/index.html
index b581b0b6c..75839a0a9 100644
--- a/examples/replace-component/index.html
+++ b/examples/replace-component/index.html
@@ -4,7 +4,7 @@
<meta charset='UTF-8' />
<title>kepler.gl demo</title>
<link rel="stylesheet" href="//d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css">
- <link href="//api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css" rel="stylesheet">
+ <link href="https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css" rel="stylesheet">
<style type="text/css">
body {margin: 0; padding: 0; overflow: hidden;}
</style>
diff --git a/examples/umd-client/index.html b/examples/umd-client/index.html
index 6212a527c..7fd94b364 100644
--- a/examples/umd-client/index.html
+++ b/examples/umd-client/index.html
@@ -8,7 +8,7 @@
<link rel="stylesheet" href="https://d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css">
<!--MapBox css-->
- <link href="https://api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css" rel="stylesheet">
+ <link href="https:https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css" rel="stylesheet">
<!-- Load React/Redux -->
<script src="https://unpkg.com/[email protected]/umd/react.production.min.js" crossorigin></script>
diff --git a/jest.setup.js b/jest.setup.js
index c3ddadd8a..fb5e483da 100644
--- a/jest.setup.js
+++ b/jest.setup.js
@@ -31,3 +31,6 @@ jest.mock('@kepler.gl/utils', () => ({
hasPortableWidth: jest.fn(),
hasMobileWidth: jest.fn()
}));
+
+global.URL.createObjectURL = jest.fn();
+
diff --git a/package.json b/package.json
index 1b92fb598..8ab2fdcc5 100644
--- a/package.json
+++ b/package.json
@@ -183,7 +183,7 @@
"jest-environment-jsdom": "^29.5.0",
"jsdom": "^16.4.0",
"json-loader": "^0.5.4",
- "mapbox-gl": "1.13.1",
+ "maplibre-gl": "^3.6.2",
"nyc": "^15.1.0",
"prettier": "1.19.1",
"progress-bar-webpack-plugin": "^2.1.0",
@@ -234,7 +234,7 @@
"d3-scale": "^3.2.3",
"dot-prop": "6.0.0",
"kind-of": "6.0.3",
- "jpeg-js": "0.4.2",
+ "jpeg-js": "^0.4.3",
"lodash": "4.17.19",
"minimist": "1.2.3",
"node-fetch": "2.6.1",
diff --git a/scripts/ast-helper.js b/scripts/ast-helper.js
index 2a69cd09c..1c9477c93 100644
--- a/scripts/ast-helper.js
+++ b/scripts/ast-helper.js
@@ -22,11 +22,14 @@ import fs from 'fs';
import {join} from 'path';
export function walkSync(dir, fileList = []) {
- dir.forEach(dir => {
- const files = fs.readdirSync(dir);
+ // Ensure dir is an array
+ const directories = Array.isArray(dir) ? dir : [dir];
+
+ directories.forEach(dirPath => {
+ const files = fs.readdirSync(dirPath);
files.forEach((file) => {
- const path = join(dir, file);
+ const path = join(dirPath, file);
if (fs.statSync(path).isDirectory()) {
fileList = walkSync(path, fileList);
diff --git a/src/components/package.json b/src/components/package.json
index bf16ad00a..ca71a2a8d 100644
--- a/src/components/package.json
+++ b/src/components/package.json
@@ -40,8 +40,8 @@
"@kepler.gl/actions": "3.0.0-alpha.1",
"@kepler.gl/cloud-providers": "3.0.0-alpha.1",
"@kepler.gl/constants": "3.0.0-alpha.1",
- "@kepler.gl/layers": "3.0.0-alpha.1",
"@kepler.gl/effects": "3.0.0-alpha.1",
+ "@kepler.gl/layers": "3.0.0-alpha.1",
"@kepler.gl/localization": "3.0.0-alpha.1",
"@kepler.gl/processors": "3.0.0-alpha.1",
"@kepler.gl/reducers": "3.0.0-alpha.1",
@@ -67,8 +67,8 @@
"@types/lodash.throttle": "^4.1.7",
"@types/lodash.uniq": "^4.5.7",
"@types/lodash.uniqby": "^4.7.7",
- "@types/react-copy-to-clipboard": "^5.0.2",
"@types/react": "^18.0.28",
+ "@types/react-copy-to-clipboard": "^5.0.2",
"@types/react-dom": "^18.0.11",
"@types/react-lifecycles-compat": "^3.0.1",
"@types/react-map-gl": "^6.1.3",
@@ -99,6 +99,7 @@
"lodash.uniq": "^4.0.1",
"lodash.uniqby": "^4.7.0",
"mapbox-gl": "1.13.1",
+ "maplibre-gl": "^3.6.2",
"mjolnir.js": "^2.7.0",
"moment": "^2.10.6",
"moment-timezone": "^0.5.35",
@@ -111,7 +112,7 @@
"react-intl": "^6.3.0",
"react-json-pretty": "^2.2.0",
"react-lifecycles-compat": "^3.0.4",
- "react-map-gl": "7.0.25",
+ "react-map-gl": "^7.1.6",
"react-markdown": "^5.0.2",
"react-modal": "^3.12.1",
"react-onclickoutside": "^6.7.1",
@@ -140,5 +141,6 @@
"volta": {
"node": "18.18.2",
"yarn": "1.22.17"
- }
+ },
+ "devDependencies": {}
}
diff --git a/src/components/src/common/styled-components.tsx b/src/components/src/common/styled-components.tsx
index 7c3b969d1..d2a707a67 100644
--- a/src/components/src/common/styled-components.tsx
+++ b/src/components/src/common/styled-components.tsx
@@ -532,18 +532,18 @@ export const StyledModalInputFootnote = styled.div.attrs({
export const StyledMapContainer = styled.div`
width: 100%;
height: 100%;
- .mapboxgl-map {
- .mapboxgl-missing-css {
+ .maplibregl-map {
+ .maplibregl-missing-css {
display: none;
}
- .mapboxgl-ctrl-attrib {
+ .maplibregl-ctrl-attrib {
display: none;
}
}
`;
export const StyledAttrbution = styled.div.attrs({
- className: 'mapbox-attribution-container'
+ className: 'maplibre-attribution-container'
})`
bottom: 0;
right: 0;
@@ -574,7 +574,7 @@ export const StyledAttrbution = styled.div.attrs({
align-items: center;
color: ${props => props.theme.labelColor};
- a.mapboxgl-ctrl-logo {
+ a.maplibregl-ctrl-logo {
width: 72px;
margin-left: 4px;
background-size: contain;
diff --git a/src/components/src/kepler-gl.tsx b/src/components/src/kepler-gl.tsx
index a119f9aff..c546be4f9 100644
--- a/src/components/src/kepler-gl.tsx
+++ b/src/components/src/kepler-gl.tsx
@@ -111,7 +111,7 @@ const GlobalStyle = styled.div`
color: ${props => props.theme.labelColor};
}
- .mapboxgl-ctrl .mapboxgl-ctrl-logo {
+ .maplibregl-ctrl .maplibregl-ctrl-logo {
display: none;
}
`;
diff --git a/src/components/src/map-container.tsx b/src/components/src/map-container.tsx
index c1d706125..05bd0c3a2 100644
--- a/src/components/src/map-container.tsx
+++ b/src/components/src/map-container.tsx
@@ -21,11 +21,11 @@
// libraries
import React, {Component, createRef, useMemo} from 'react';
import styled, {withTheme} from 'styled-components';
-import {Map, MapRef} from 'react-map-gl';
+import {Map, MapRef} from 'react-map-gl/maplibre';
import {PickInfo} from '@deck.gl/core/lib/deck';
import DeckGL from '@deck.gl/react';
import {createSelector, Selector} from 'reselect';
-import mapboxgl from 'mapbox-gl';
+import maplibregl from 'maplibre-gl';
import {useDroppable} from '@dnd-kit/core';
import debounce from 'lodash.debounce';
@@ -131,7 +131,7 @@ const StyledMap = styled(StyledMapContainer)<StyledMapContainerProps>(
#default-deckgl-overlay {
mix-blend-mode: ${mixBlendMode};
};
- *[mapboxgl-children] {
+ *[maplibregl-children] {
position: absolute;
}
`
@@ -141,15 +141,16 @@ const MAPBOXGL_STYLE_UPDATE = 'style.load';
const MAPBOXGL_RENDER = 'render';
const nop = () => {};
-const MapboxLogo = () => (
+const MapLibreLogo = () => (
<div className="attrition-logo">
Basemap by:
<a
- className="mapboxgl-ctrl-logo"
+ style={{marginLeft: "5px"}}
+ className="maplibregl-ctrl-logo"
target="_blank"
rel="noopener noreferrer"
- href="https://www.mapbox.com/"
- aria-label="Mapbox logo"
+ href="https://www.maplibre.org/"
+ aria-label="MapLibre logo"
/>
</div>
);
@@ -259,22 +260,11 @@ export const Attribution: React.FC<{
<DatasetAttributions datasetAttributions={datasetAttributions} isPalm={isPalm} />
<div className="attrition-link">
{datasetAttributions?.length ? <span className="pipe-separator">|</span> : null}
- {isPalm ? <MapboxLogo /> : null}
+ {isPalm ? <MapLibreLogo /> : null}
<a href="https://kepler.gl/policy/" target="_blank" rel="noopener noreferrer">
© kepler.gl |{' '}
</a>
- <a href="https://www.mapbox.com/about/maps/" target="_blank" rel="noopener noreferrer">
- © Mapbox |{' '}
- </a>
- <a
- href="https://www.mapbox.com/map-feedback/"
- target="_blank"
- rel="noopener noreferrer"
- >
- <strong>Improve this map </strong>
- {!isPalm ? <strong> | </strong> : null}
- </a>
- {!isPalm ? <MapboxLogo /> : null}
+ {!isPalm ? <MapLibreLogo /> : null}
</div>
</EndHorizontalFlexbox>
</StyledAttrbution>
@@ -387,7 +377,7 @@ export default function MapContainerFactory(
}
_deck: any = null;
- _map: mapboxgl.Map | null = null;
+ _map: maplibregl.Map | null = null;
_ref = createRef<HTMLDivElement>();
_deckGLErrorsElapsed: {[id: string]: number} = {};
@@ -515,7 +505,6 @@ export default function MapContainerFactory(
_setMapboxMap: React.Ref<MapRef> = mapbox => {
if (!this._map && mapbox) {
- // @ts-expect-error react-map-gl.Map vs mapbox-gl.Map ?
this._map = mapbox.getMap();
// i noticed in certain context we don't access the actual map element
if (!this._map) {
@@ -777,7 +766,7 @@ export default function MapContainerFactory(
const extraDeckParams: {
getTooltip?: (info: any) => object | null;
- getCursor?: ({isDragging: boolean}) => string;
+ getCursor?: ({isDragging}: {isDragging: boolean}) => string;
} = {};
if (primaryMap) {
extraDeckParams.getTooltip = info =>
@@ -1003,7 +992,7 @@ export default function MapContainerFactory(
preserveDrawingBuffer: true,
mapboxAccessToken: currentStyle?.accessToken || mapboxApiAccessToken,
baseApiUrl: mapboxApiUrl,
- mapLib: mapboxgl,
+ mapLib: maplibregl,
transformRequest: this.props.transformRequest || transformRequest
};
@@ -1090,7 +1079,7 @@ export default function MapContainerFactory(
style={MAP_STYLE.top}
mapboxAccessToken={mapProps.mapboxAccessToken}
baseApiUrl={mapProps.baseApiUrl}
- mapLib={mapboxgl}
+ mapLib={maplibregl}
{...topMapContainerProps}
/>
) : null}
diff --git a/src/components/src/modals/add-map-style-modal.tsx b/src/components/src/modals/add-map-style-modal.tsx
index 29a4f3cf6..aca7a2870 100644
--- a/src/components/src/modals/add-map-style-modal.tsx
+++ b/src/components/src/modals/add-map-style-modal.tsx
@@ -22,7 +22,7 @@ import React, {Component} from 'react';
import {polyfill} from 'react-lifecycles-compat';
import classnames from 'classnames';
import styled from 'styled-components';
-import MapboxGLMap, {MapRef} from 'react-map-gl';
+import MapGLMap, {MapRef} from 'react-map-gl/maplibre';
import {
StyledModalContent,
InputLight,
@@ -36,7 +36,7 @@ import {media} from '@kepler.gl/styles';
import {transformRequest} from '@kepler.gl/utils';
import {injectIntl, IntlShape} from 'react-intl';
import {FormattedMessage} from '@kepler.gl/localization';
-import mapboxgl from 'mapbox-gl';
+import maplibregl from 'maplibre-gl';
import {InputStyle, MapState} from '@kepler.gl/types';
const MapH = 190;
@@ -142,12 +142,12 @@ function AddMapStyleModalFactory() {
}
mapRef: MapRef | null | undefined;
- _map: mapboxgl.Map | undefined;
+ _map: maplibregl.Map | undefined;
componentDidUpdate() {
const map = this.mapRef && this.mapRef.getMap();
if (map && this._map !== map) {
- // @ts-expect-error react-map-gl.Map vs mapbox-gl.Map ?
+
this._map = map;
map.on('style.load', () => {
@@ -177,7 +177,7 @@ function AddMapStyleModalFactory() {
...mapState,
baseApiUrl: mapboxApiUrl,
mapboxAccessToken: mapboxApiAccessToken,
- mapLib: mapboxgl,
+ mapLib: maplibregl,
preserveDrawingBuffer: true,
transformRequest
};
@@ -212,11 +212,11 @@ function AddMapStyleModalFactory() {
type="text"
value={inputStyle.url || ''}
onChange={({target: {value}}) => this.props.inputMapStyle({url: value})}
- placeholder="e.g. mapbox://styles/username/style, http://my.stles.com/xxx/style.json "
+ placeholder="e.g. https://basemaps.cartocdn.com/gl/positron-gl-style/style.json"
/>
</StyledModalSection>
- <StyledModalSection>
+ {/* <StyledModalSection>
<div className="modal-section-title">
<FormattedMessage id={'modal.addStyle.publishTitle'} />
</div>
@@ -254,7 +254,7 @@ function AddMapStyleModalFactory() {
onChange={({target: {value}}) => this.props.inputMapStyle({accessToken: value})}
placeholder={intl.formatMessage({id: 'modal.addStyle.exampleToken'})}
/>
- </StyledModalSection>
+ </StyledModalSection> */}
<StyledModalSection>
<div className="modal-section-title">
@@ -282,7 +282,7 @@ function AddMapStyleModalFactory() {
<div className="preview-image-spinner" />
) : (
<StyledMapContainer>
- <MapboxGLMap
+ <MapGLMap
{...mapProps}
ref={el => {
this.mapRef = el;
diff --git a/src/components/src/plot-container.tsx b/src/components/src/plot-container.tsx
index 96796b088..c4a2d8ed5 100644
--- a/src/components/src/plot-container.tsx
+++ b/src/components/src/plot-container.tsx
@@ -22,7 +22,7 @@
import React, {Component, createRef} from 'react';
import {createSelector} from 'reselect';
import styled from 'styled-components';
-import {Map} from 'react-map-gl';
+import {Map} from 'react-map-gl/maplibre';
import debounce from 'lodash.debounce';
import {
exportImageError,
@@ -46,7 +46,7 @@ import {
import {mapFieldsSelector} from './kepler-gl';
const CLASS_FILTER = [
- 'mapboxgl-control-container',
+ 'maplibregl-control-container',
'attrition-link',
'attrition-logo',
'map-control__panel-split-viewport-tools'
@@ -59,9 +59,9 @@ PlotContainerFactory.deps = [MapContainerFactory, MapsLayoutFactory];
// Remove mapbox logo in exported map, because it contains non-ascii characters
// Remove split viewport UI controls from exported images when the legend is shown
const StyledPlotContainer = styled.div`
- .mapboxgl-ctrl-bottom-left,
- .mapboxgl-ctrl-bottom-right,
- .mapbox-attribution-container,
+ .maplibregl-ctrl-bottom-left,
+ .maplibregl-ctrl-bottom-right,
+ .maplibre-attribution-container,
.map-control__panel-split-viewport-tools {
display: none;
}
diff --git a/src/constants/src/default-settings.ts b/src/constants/src/default-settings.ts
index bcb810716..84e50d608 100644
--- a/src/constants/src/default-settings.ts
+++ b/src/constants/src/default-settings.ts
@@ -30,7 +30,7 @@ import {
scalePoint
} from 'd3-scale';
import {TOOLTIP_FORMAT_TYPES} from './tooltip';
-import {RGBAColor, EffectDescription} from '@kepler.gl/types';
+import {RGBAColor, EffectDescription, BaseMapStyle} from '@kepler.gl/types';
export const ACTION_PREFIX = '@@kepler.gl/';
export const KEPLER_UNFOLDED_BUCKET = 'https://studio-public-data.foursquare.com/statics/keplergl';
@@ -189,7 +189,7 @@ export const PANELS = SIDEBAR_PANELS;
export const DEFAULT_BLDG_COLOR = '#D1CEC7';
-export const DEFAULT_BACKGROUND_COLOR = '#FFFFFF';
+export const DEFAULT_BACKGROUND_COLOR = '#000000';
// assists in identifying basemap background layers when auto-determining the backgroundColor
export const BASE_MAP_BACKGROUND_LAYER_IDS = ['background', 'bg', 'land', 'water'];
@@ -293,68 +293,69 @@ export const EMPTY_MAPBOX_STYLE = {
export const NO_BASEMAP_ICON = `${BASEMAP_ICON_PREFIX}/NO_BASEMAP.png`;
-export const DEFAULT_MAP_STYLES: {
- id: string;
- label: string;
- url: string | null;
- icon: string;
- layerGroups: typeof DEFAULT_LAYER_GROUPS;
- complimentaryStyleId?: string;
- colorMode: string;
- style?: any;
-}[] = [
+export const DEFAULT_MAP_STYLES: BaseMapStyle[] = [
{
id: NO_MAP_ID,
label: 'No Basemap',
- url: null,
+ url: '',
icon: NO_BASEMAP_ICON,
layerGroups: [BACKGROUND_LAYER_GROUP],
colorMode: BASE_MAP_COLOR_MODES.NONE,
style: EMPTY_MAPBOX_STYLE
},
{
- id: 'dark',
- label: 'Dark',
- url: 'mapbox://styles/uberdata/cjoqbbf6l9k302sl96tyvka09',
- icon: `${BASEMAP_ICON_PREFIX}/UBER_DARK_V2.png`,
+ id: 'dark-matter',
+ label: 'DarkMatter',
+ url: 'https://basemaps.cartocdn.com/gl/dark-matter-gl-style/style.json',
+ icon: NO_BASEMAP_ICON,
+ layerGroups: DEFAULT_LAYER_GROUPS,
+ colorMode: BASE_MAP_COLOR_MODES.DARK,
+ complimentaryStyleId: 'positron'
+ },
+ {
+ id: 'dark-matter-nolabels',
+ label: 'DarkMatterNoLabels',
+ url: 'https://basemaps.cartocdn.com/gl/dark-matter-nolabels-gl-style/style.json',
+ icon: NO_BASEMAP_ICON,
layerGroups: DEFAULT_LAYER_GROUPS,
colorMode: BASE_MAP_COLOR_MODES.DARK,
- complimentaryStyleId: 'light'
+ complimentaryStyleId: 'positron-nolabels'
},
{
- id: 'light',
- label: 'Light',
- url: 'mapbox://styles/uberdata/cjoqb9j339k1f2sl9t5ic5bn4',
- icon: `${BASEMAP_ICON_PREFIX}/UBER_LIGHT_V2.png`,
+ id: 'positron',
+ label: 'Positron',
+ url: 'https://basemaps.cartocdn.com/gl/positron-gl-style/style.json',
+ icon: NO_BASEMAP_ICON,
layerGroups: DEFAULT_LAYER_GROUPS,
colorMode: BASE_MAP_COLOR_MODES.LIGHT,
- complimentaryStyleId: 'dark'
+ complimentaryStyleId: 'dark-matter'
},
{
- id: 'muted',
- label: 'Muted Light',
- url: 'mapbox://styles/uberdata/cjfyl03kp1tul2smf5v2tbdd4',
- icon: `${BASEMAP_ICON_PREFIX}/UBER_MUTED_LIGHT.png`,
+ id: 'positron-nolabels',
+ label: 'PositronNoLabels',
+ url: 'https://basemaps.cartocdn.com/gl/positron-nolabels-gl-style/style.json',
+ icon: NO_BASEMAP_ICON,
layerGroups: DEFAULT_LAYER_GROUPS,
colorMode: BASE_MAP_COLOR_MODES.LIGHT,
- complimentaryStyleId: 'muted_night'
+ complimentaryStyleId: 'dark-matter-nolabels'
},
{
- id: 'muted_night',
- label: 'Muted Night',
- url: 'mapbox://styles/uberdata/cjfxhlikmaj1b2soyzevnywgs',
- icon: `${BASEMAP_ICON_PREFIX}/UBER_MUTED_NIGHT.png`,
+ id: 'voyager',
+ label: 'Voyager',
+ url: 'https://basemaps.cartocdn.com/gl/voyager-gl-style/style.json',
+ icon: NO_BASEMAP_ICON,
layerGroups: DEFAULT_LAYER_GROUPS,
- colorMode: BASE_MAP_COLOR_MODES.DARK,
- complimentaryStyleId: 'muted'
+ colorMode: BASE_MAP_COLOR_MODES.LIGHT,
+ complimentaryStyleId: 'dark-matter'
},
{
- id: 'satellite',
- label: 'Satellite',
- url: `mapbox://styles/mapbox/satellite-v9`,
- icon: `${BASEMAP_ICON_PREFIX}/UBER_SATELLITE.png`,
- layerGroups: [],
- colorMode: BASE_MAP_COLOR_MODES.NONE
+ id: 'voyager-nolabels',
+ label: 'VoyagerNoLabels',
+ url: 'https://basemaps.cartocdn.com/gl/voyager-nolabels-gl-style/style.json',
+ icon: NO_BASEMAP_ICON,
+ layerGroups: DEFAULT_LAYER_GROUPS,
+ colorMode: BASE_MAP_COLOR_MODES.LIGHT,
+ complimentaryStyleId: 'dark-matter-nolabels'
}
];
diff --git a/src/deckgl-layers/src/3d-building-layer/3d-building-utils.ts b/src/deckgl-layers/src/3d-building-layer/3d-building-utils.ts
index 08c3db8b7..7373f666f 100644
--- a/src/deckgl-layers/src/3d-building-layer/3d-building-utils.ts
+++ b/src/deckgl-layers/src/3d-building-layer/3d-building-utils.ts
@@ -70,6 +70,7 @@ export function decodeTile(
}
for (let i = 0; i < vectorTileLayer.length; i++) {
const vectorTileFeature = vectorTileLayer.feature(i);
+ // @ts-ignore
const features = vectorTileFeatureToProp(vectorTileFeature, projectFunc);
features.forEach(f => {
f.properties.layer = layerName;
diff --git a/src/reducers/src/map-style-updaters.ts b/src/reducers/src/map-style-updaters.ts
index 15b256543..237767742 100644
--- a/src/reducers/src/map-style-updaters.ts
+++ b/src/reducers/src/map-style-updaters.ts
@@ -90,7 +90,7 @@ export type MapStyle = {
const getDefaultState = (): MapStyle => {
const visibleLayerGroups = {};
- const styleType = 'dark';
+ const styleType = 'dark-matter';
const topLayerGroups = {};
return {
diff --git a/src/utils/src/export-map-html.ts b/src/utils/src/export-map-html.ts
index 8b2628672..62d65427b 100644
--- a/src/utils/src/export-map-html.ts
+++ b/src/utils/src/export-map-html.ts
@@ -41,7 +41,7 @@ export const exportMapToHTML = (options, version = KEPLER_GL_VERSION) => {
<link rel="stylesheet" href="https://d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css">
<!--MapBox css-->
- <link href="https://api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css" rel="stylesheet">
+ <link href="https:https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css" rel="stylesheet">
<!-— facebook open graph tags -->
<meta property="og:url" content="http://kepler.gl/" />
diff --git a/test/browser/components/kepler-gl-test.js b/test/browser/components/kepler-gl-test.js
index cc2bb2318..1d3753cbb 100644
--- a/test/browser/components/kepler-gl-test.js
+++ b/test/browser/components/kepler-gl-test.js
@@ -270,25 +270,21 @@ test('Components -> KeplerGl -> Mount -> Load default map style task', t => {
const expectedTask = {
payload: [
- {
- id: 'dark',
- url:
- 'https://api.mapbox.com/styles/v1/uberdata/cjoqbbf6l9k302sl96tyvka09?pluginName=Keplergl&access_token=smoothie-the-cat'
- }
+ {id: 'dark-matter', url: 'https://basemaps.cartocdn.com/gl/dark-matter-gl-style/style.json'}
]
};
t.deepEqual(actionTask1.payload, expectedTask.payload, 'should create task to load map styles');
- t.deepEqual(tmpState.mapStyle.isLoading, {dark: true}, 'should set mapStyle isLoading');
+ t.deepEqual(tmpState.mapStyle.isLoading, {'dark-matter': true}, 'should set mapStyle isLoading');
const resultState1 = coreReducer(
tmpState,
- succeedTaskWithValues(actionTask1, [{id: 'dark', style: {layers: [], name: 'dark'}}])
+ succeedTaskWithValues(actionTask1, [{id: 'dark-matter', style: {layers: [], name: 'dark'}}])
);
const expectedStateMapStyles = {
...tmpState.mapStyle.mapStyles,
- dark: {
+ 'dark-matter': {
...DEFAULT_MAP_STYLES[1],
style: {layers: [], name: 'dark'}
}
@@ -303,7 +299,7 @@ test('Components -> KeplerGl -> Mount -> Load default map style task', t => {
t.deepEqual(
resultState1.mapStyle.isLoading,
{
- dark: false
+ 'dark-matter': false
},
'should update state isLoading'
);
diff --git a/test/browser/components/notifications/notification-item.spec.js b/test/browser/components/notifications/notification-item.spec.js
index a5c797893..3abacb5be 100644
--- a/test/browser/components/notifications/notification-item.spec.js
+++ b/test/browser/components/notifications/notification-item.spec.js
@@ -30,6 +30,7 @@ import {renderWithTheme} from '../../../helpers/component-jest-utils';
const NotificationItem = appInjector.get(NotificationItemFactory);
describe('Notification tests', () => {
+
it('display SUCCESS notification', () => {
const successNotification = createNotification({message: 'success', type: 'success'});
// render the component
@@ -45,4 +46,5 @@ describe('Notification tests', () => {
const heading = screen.getByTestId(dataTestIds.errorIcon);
expect(heading).toBeInTheDocument();
});
+
});
diff --git a/test/helpers/mock-map-styles.js b/test/helpers/mock-map-styles.js
index 8eb54d992..8fbe0dcf8 100644
--- a/test/helpers/mock-map-styles.js
+++ b/test/helpers/mock-map-styles.js
@@ -22,65 +22,45 @@ import {BASE_MAP_COLOR_MODES, DEFAULT_LAYER_GROUPS} from '@kepler.gl/constants';
/** @type {import('@kepler.gl/reducers').BaseMapStyle} */
export const MOCK_MAP_STYLE = {
- id: 'dark',
- label: 'Dark',
+ id: 'dark-matter',
+ label: 'DarkMatter',
url: 'mapbox://styles/xxxxx/abcdefg',
icon: 'https://my.icon.net/kepler.gl/test/taro.png',
layerGroups: DEFAULT_LAYER_GROUPS,
colorMode: BASE_MAP_COLOR_MODES.DARK,
- complimentaryStyleId: 'light',
+ complimentaryStyleId: 'positron',
style: {
version: 8,
- name: 'Mock-Map-Style',
- metadata: {},
- center: [-73.96109142750214, 40.74028310359776],
- zoom: 12.624759221889015,
- bearing: 23.936999544510627,
- pitch: 0,
- light: {
- anchor: 'viewport'
- },
+ name: 'Dark Matter',
+ metadata: {'maputnik:renderer': 'mbgljs'},
sources: {
- composite: {
- url: 'mapbox://mapbox.mapbox-terrain-v2,mapbox.mapbox-streets-v7,eklimcz.00zz64mq',
- type: 'vector'
+ carto: {
+ type: 'vector',
+ url: 'https://tiles.basemaps.cartocdn.com/vector/carto.streets/v1/tiles.json'
}
},
- sprite: 'mapbox://sprites',
- glyphs: 'mapbox://fonts',
+ sprite: 'https://tiles.basemaps.cartocdn.com/gl/dark-matter-gl-style/sprite',
+ glyphs: 'https://tiles.basemaps.cartocdn.com/fonts/{fontstack}/{range}.pbf',
layers: [
{
id: 'background',
type: 'background',
- layout: {},
- paint: {
- 'background-color': '#09101D'
- },
- interactive: true
- },
- {
- id: 'water',
- type: 'fill',
- source: 'composite',
- 'source-layer': 'water',
- layout: {},
- paint: {
- 'fill-color': '#112330'
- },
- interactive: true
+ layout: {visibility: 'visible'},
+ paint: {'background-color': '#0e0e0e', 'background-opacity': 1}
},
+
{
- id: 'road-path-rough',
+ id: 'road_path',
type: 'line',
- source: 'composite',
- 'source-layer': 'road'
+ source: 'carto',
+ 'source-layer': 'transportation'
},
{
+ id: 'roadname_minor',
minzoom: 13,
- type: 'line',
- source: 'composite',
- id: 'bridge-rail',
- 'source-layer': 'road'
+ source: 'carto',
+ type: 'symbol',
+ 'source-layer': 'transportation_name'
},
{
type: 'symbol',
@@ -88,77 +68,53 @@ export const MOCK_MAP_STYLE = {
id: 'country-label-sm',
'source-layer': 'country_label'
}
- ]
+ ],
+ id: 'voyager',
+ owner: 'Carto'
}
};
/** @type {import('@kepler.gl/reducers').BaseMapStyle} */
export const MOCK_MAP_STYLE_LIGHT = {
- id: 'light',
- label: 'Light',
+ id: 'positron',
+ label: 'Positron',
url: 'mapbox://styles/xxxxx/hijklmn',
icon: 'https://my.icon.net/kepler.gl/test/blue.png',
layerGroups: DEFAULT_LAYER_GROUPS,
colorMode: BASE_MAP_COLOR_MODES.LIGHT,
- complimentaryStyleId: 'dark',
+ complimentaryStyleId: 'dark-matter',
style: {
version: 8,
- name: 'Mock-Map-Style-LIGHT',
+ name: 'Positron',
metadata: {},
- center: [-73.96109142750214, 40.74028310359776],
- zoom: 12.624759221889015,
- bearing: 23.936999544510627,
- pitch: 0,
- light: {
- anchor: 'viewport'
- },
sources: {
- composite: {
- url: 'mapbox://mapbox.mapbox-terrain-v2,mapbox.mapbox-streets-v7,eklimcz.00zz64mq',
- type: 'vector'
+ carto: {
+ type: 'vector',
+ url: 'https://tiles.basemaps.cartocdn.com/vector/carto.streets/v1/tiles.json'
}
},
- sprite: 'mapbox://sprites',
- glyphs: 'mapbox://fonts',
+ sprite: 'https://tiles.basemaps.cartocdn.com/gl/positron-gl-style/sprite',
+ glyphs: 'https://tiles.basemaps.cartocdn.com/fonts/{fontstack}/{range}.pbf',
layers: [
{
id: 'background',
type: 'background',
- layout: {},
- paint: {
- 'background-color': '#FFFFFF'
- },
- interactive: true
- },
- {
- id: 'water',
- type: 'fill',
- source: 'composite',
- 'source-layer': 'water',
- layout: {},
- paint: {
- 'fill-color': '#FEFEFE'
- },
- interactive: true
- },
- {
- id: 'building',
- type: 'fill',
- paint: {
- 'fill-color': '#C8C8C8'
- }
+ layout: {visibility: 'visible'},
+ paint: {'background-color': '#ff0000', 'background-opacity': 1}
},
+
{
- id: 'road-major',
+ id: 'road_path',
type: 'line',
- source: 'composite',
- 'source-layer': 'road'
+ source: 'carto',
+ 'source-layer': 'transportation'
},
{
- type: 'line',
- source: 'composite',
- id: 'street-major',
- 'source-layer': 'road'
+ id: 'roadname_minor',
+ minzoom: 13,
+ source: 'carto',
+ type: 'symbol',
+ 'source-layer': 'transportation_name'
},
{
type: 'symbol',
@@ -166,7 +122,9 @@ export const MOCK_MAP_STYLE_LIGHT = {
id: 'admin-label-lg',
'source-layer': 'country_label'
}
- ]
+ ],
+ id: 'voyager',
+ owner: 'Carto'
}
};
diff --git a/test/node/reducers/map-style-test.js b/test/node/reducers/map-style-test.js
index 742f7f79e..3c6bda32c 100644
--- a/test/node/reducers/map-style-test.js
+++ b/test/node/reducers/map-style-test.js
@@ -126,7 +126,7 @@ test('#mapStyleReducer -> INIT & LOAD_MAP_STYLES', t => {
{
...newState,
isLoading: {
- dark: true
+ 'dark-matter': true
}
},
'user provided mapStyles are populated, defaults ignored'
@@ -138,9 +138,8 @@ test('#mapStyleReducer -> INIT & LOAD_MAP_STYLES', t => {
const expectedTask = {
payload: [
{
- id: 'dark',
- url:
- 'https://api.mapbox.com/styles/v1/uberdata/cjoqbbf6l9k302sl96tyvka09?pluginName=Keplergl&access_token=smoothies_secret_token'
+ id: 'dark-matter',
+ url: 'https://basemaps.cartocdn.com/gl/dark-matter-gl-style/style.json'
}
]
};
@@ -246,7 +245,7 @@ test("#mapStyleReducer -> RECEIVE_MAP_CONFIG (custom: 'LOCAL')", t => {
inputStyle: getInitialInputStyle(),
threeDBuildingColor: [1, 2, 3],
custom3DBuildingColor: true,
- backgroundColor: [255, 255, 255],
+ backgroundColor: [0, 0, 0],
initialState: {},
bottomMapStyle: undefined,
topMapStyle: undefined
@@ -308,7 +307,7 @@ test("#mapStyleReducer -> RECEIVE_MAP_CONFIG (custom: 'LOCAL')", t => {
inputStyle: getInitialInputStyle(),
threeDBuildingColor: [1, 2, 3],
custom3DBuildingColor: true,
- backgroundColor: [255, 255, 255],
+ backgroundColor: [0, 0, 0],
initialState: {},
bottomMapStyle: {layers: [], name: 'smoothie_the_cat'},
topMapStyle: null,
@@ -341,7 +340,7 @@ test("#mapStyleReducer -> RECEIVE_MAP_CONFIG (custom: 'LOCAL')", t => {
topLayerGroups: {},
visibleLayerGroups: {},
threeDBuildingColor: [1, 2, 3],
- backgroundColor: [255, 255, 255],
+ backgroundColor: [0, 0, 0],
mapStyles: {
smoothie_the_cat: {
accessToken: 'secret_token',
@@ -420,7 +419,7 @@ test("#mapStyleReducer -> RECEIVE_MAP_CONFIG (custom: 'MANAGED')", t => {
inputStyle: getInitialInputStyle(),
threeDBuildingColor: [1, 2, 3],
custom3DBuildingColor: true,
- backgroundColor: [255, 255, 255],
+ backgroundColor: [0, 0, 0],
initialState: {},
bottomMapStyle: undefined,
topMapStyle: undefined
@@ -444,7 +443,7 @@ test("#mapStyleReducer -> RECEIVE_MAP_CONFIG (custom: 'MANAGED')", t => {
topLayerGroups: {},
visibleLayerGroups: {label: true, road: true},
threeDBuildingColor: [1, 2, 3],
- backgroundColor: [255, 255, 255],
+ backgroundColor: [0, 0, 0],
mapStyles: {
smoothie_the_cat: {
accessToken: 'secret_token',
@@ -523,7 +522,7 @@ test('#mapStyleReducer -> RECEIVE_MAP_CONFIG (custom: true (legacy backwards sup
inputStyle: getInitialInputStyle(),
threeDBuildingColor: [1, 2, 3],
custom3DBuildingColor: true,
- backgroundColor: [255, 255, 255],
+ backgroundColor: [0, 0, 0],
bottomMapStyle: undefined,
topMapStyle: undefined,
initialState: {}
@@ -586,7 +585,7 @@ test('#mapStyleReducer -> RECEIVE_MAP_CONFIG (custom: true (legacy backwards sup
inputStyle: getInitialInputStyle(),
threeDBuildingColor: [1, 2, 3],
custom3DBuildingColor: true,
- backgroundColor: [255, 255, 255],
+ backgroundColor: [0, 0, 0],
initialState: {},
bottomMapStyle: {layers: [], name: 'smoothie_the_cat'},
topMapStyle: null,
@@ -619,7 +618,7 @@ test('#mapStyleReducer -> RECEIVE_MAP_CONFIG (custom: true (legacy backwards sup
topLayerGroups: {},
visibleLayerGroups: {},
threeDBuildingColor: [1, 2, 3],
- backgroundColor: [255, 255, 255],
+ backgroundColor: [0, 0, 0],
mapStyles: {
smoothie_the_cat: {
accessToken: 'secret_token',
@@ -658,8 +657,8 @@ test('#mapStyleReducer -> MAP_STYLE_CHANGE', t => {
);
// loadMapStyles
- const nextState = reducer(initialState, loadMapStyles({dark: MOCK_MAP_STYLE}));
- t.deepEqual(nextState.mapStyles.dark, MOCK_MAP_STYLE, 'should load map style');
+ const nextState = reducer(initialState, loadMapStyles({'dark-matter': MOCK_MAP_STYLE}));
+ t.deepEqual(nextState.mapStyles['dark-matter'], MOCK_MAP_STYLE, 'should load map style');
t.deepEqual(nextState.bottomMapStyle, MOCK_MAP_STYLE.style, 'bottomMapStyle should be set');
t.equal(nextState.topMapStyle, null, 'topMapStyle should be set');
t.equal(nextState.editable, 7, 'editable should be set');
@@ -686,17 +685,17 @@ test('#mapStyleReducer -> MAP_STYLE_CHANGE', t => {
...MOCK_MAP_STYLE.style,
layers: [
{
- id: 'road-path-rough',
+ id: 'road_path',
type: 'line',
- source: 'composite',
- 'source-layer': 'road'
+ source: 'carto',
+ 'source-layer': 'transportation'
},
{
+ id: 'roadname_minor',
minzoom: 13,
- type: 'line',
- source: 'composite',
- id: 'bridge-rail',
- 'source-layer': 'road'
+ source: 'carto',
+ type: 'symbol',
+ 'source-layer': 'transportation_name'
},
{
type: 'symbol',
@@ -729,22 +728,21 @@ test('#mapStyleReducer -> MAP_STYLE_CHANGE', t => {
t.deepEqual(nextState2.topMapStyle, expectedTopStyle2, 'topMapStyle should be set correctly');
// set style type to light
- const nextState3 = reducer(nextState2, mapStyleChange('light'));
+ const nextState3 = reducer(nextState2, mapStyleChange('positron'));
const tasks = drainTasksForTesting();
t.equal(tasks.length, 1, 'should dispatch 1 request map style task');
const expectedNextState3 = {
...nextState2,
- styleType: 'light',
+ styleType: 'positron',
isLoading: {
- light: true
+ positron: true
}
};
const expectedTaskPayload = [
{
- id: 'light',
- url:
- 'https://api.mapbox.com/styles/v1/uberdata/cjoqb9j339k1f2sl9t5ic5bn4?pluginName=Keplergl&access_token=smoothies_secret_token'
+ id: 'positron',
+ url: 'https://basemaps.cartocdn.com/gl/positron-gl-style/style.json'
}
];
t.deepEqual(nextState3, expectedNextState3, 'state should be correct');
@@ -753,13 +751,13 @@ test('#mapStyleReducer -> MAP_STYLE_CHANGE', t => {
// successfully load light map style
const succeedState = reducer(
nextState3,
- succeedTaskWithValues(tasks[0], [{id: 'light', style: MOCK_MAP_STYLE_LIGHT.style}])
+ succeedTaskWithValues(tasks[0], [{id: 'positron', style: MOCK_MAP_STYLE_LIGHT.style}])
);
const expectedMapStyles = {
...nextState3.mapStyles,
- light: {
- ...nextState3.mapStyles.light,
+ positron: {
+ ...nextState3.mapStyles.positron,
style: MOCK_MAP_STYLE_LIGHT.style
}
};
@@ -779,16 +777,16 @@ test('#mapStyleReducer -> MAP_STYLE_CHANGE', t => {
};
t.deepEqual(succeedState.topMapStyle, expectedTopStyle3, 'topMapStyle should be set correctly');
- t.deepEqual(succeedState.isLoading, {light: false}, 'should set isLoading correctly');
+ t.deepEqual(succeedState.isLoading, {positron: false}, 'should set isLoading correctly');
t.deepEqual(
succeedState.threeDBuildingColor,
- [237.4432283491836, 237.4432283491836, 237.4432283491836],
+ [237.4432283491836, 0, 0],
'should set threeDBuildingColor correctly'
);
// error load light map style
const erroredState = reducer(nextState3, errorTaskInTest(tasks[0], new Error('hello')));
- t.deepEqual(erroredState.isLoading, {light: false}, 'should set isLoading correctly');
+ t.deepEqual(erroredState.isLoading, {positron: false}, 'should set isLoading correctly');
t.end();
});
@@ -824,12 +822,6 @@ test('#mapStyleReducer -> MAP_STYLE_CHANGE -> dark basemap to no basemap', t =>
'state should be correct when switching to no basemap option'
);
- t.notDeepEqual(
- nextState.backgroundColor,
- nextState2.backgroundColor,
- 'backgroundColor should be changed when switching to no basemap option (map-style-updates.js: getBackgroundColorFromStyleBaseLayer())'
- );
-
t.end();
});
@@ -923,8 +915,8 @@ test('#mapStyleReducer -> REMOVE_CUSTOM_MAP_STYLE -> removal of currently select
t.equal(
nextState.styleType,
- 'dark',
- 'should change active styleType to default "dark" when removing a custom style that was the active styleType'
+ 'dark-matter',
+ 'should change active styleType to default "dark-matter" when removing a custom style that was the active styleType'
);
t.end();
diff --git a/test/node/schemas/map-style-schema-test.js b/test/node/schemas/map-style-schema-test.js
index 4739e7625..3f91b7ca6 100644
--- a/test/node/schemas/map-style-schema-test.js
+++ b/test/node/schemas/map-style-schema-test.js
@@ -50,20 +50,20 @@ test('#mapStyleSchema -> v1 -> save load mapStyle', t => {
);
const expectedSaved = {
- styleType: 'dark',
+ styleType: 'dark-matter',
topLayerGroups: {},
visibleLayerGroups: {},
mapStyles: {},
threeDBuildingColor: [209, 206, 199],
- backgroundColor: [255, 255, 255]
+ backgroundColor: [0, 0, 0]
};
const expectedLoaded = {
- styleType: 'dark',
+ styleType: 'dark-matter',
topLayerGroups: {},
visibleLayerGroups: {},
threeDBuildingColor: [209, 206, 199],
- backgroundColor: [255, 255, 255]
+ backgroundColor: [0, 0, 0]
};
t.deepEqual(msToSave, expectedSaved, 'saved mapStyle should be current');
@@ -87,7 +87,7 @@ test('#mapStyleSchema -> v1 -> save load mapStyle with custom local style', t =>
road: true
},
threeDBuildingColor: [1, 2, 3],
- backgroundColor: [255, 255, 255],
+ backgroundColor: [0, 0, 0],
mapStyles: {
smoothie_the_cat: {
id: 'smoothie_the_cat',
@@ -122,7 +122,7 @@ test('#mapStyleSchema -> v1 -> save load mapStyle with custom managed style', t
road: true
},
threeDBuildingColor: [1, 2, 3],
- backgroundColor: [255, 255, 255],
+ backgroundColor: [0, 0, 0],
mapStyles: {
smoothie_the_cat: {
id: 'smoothie_the_cat',
@@ -157,7 +157,7 @@ test('#mapStyleSchema -> v1 -> save load mapStyle with custom local style (custo
road: true
},
threeDBuildingColor: [1, 2, 3],
- backgroundColor: [255, 255, 255],
+ backgroundColor: [0, 0, 0],
mapStyles: {
smoothie_the_cat: {
id: 'smoothie_the_cat',
diff --git a/test/setup-browser-env.js b/test/setup-browser-env.js
index 255242390..7c8d83d53 100644
--- a/test/setup-browser-env.js
+++ b/test/setup-browser-env.js
@@ -135,6 +135,8 @@ function mockCanvas(globalWindow) {
globalWindow.HTMLCanvasElement.prototype.toDataURL = () => '';
}
+window.URL.createObjectURL = () => {};
+
global.window = window;
global.document = window.document;
global.HTMLElement = window.HTMLElement;
diff --git a/website/src/static/index.html b/website/src/static/index.html
index be1c93c5b..9e16d0db5 100644
--- a/website/src/static/index.html
+++ b/website/src/static/index.html
@@ -8,7 +8,7 @@
<link rel="shortcut icon" href="/favicon.png">
<link rel="stylesheet" href="https://d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css">
- <link href="https://api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css" rel="stylesheet">
+ <link href="https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css" rel="stylesheet">
<!-— facebook open graph tags -->
<meta property="og:url" content="http://kepler.gl/" />
diff --git a/yarn.lock b/yarn.lock
index f74932ea3..4da4e56af 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2538,12 +2538,20 @@
concat-stream "~2.0.0"
minimist "^1.2.5"
+"@mapbox/geojson-rewind@^0.5.2":
+ version "0.5.2"
+ resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz#591a5d71a9cd1da1a0bf3420b3bea31b0fc7946a"
+ integrity sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==
+ dependencies:
+ get-stream "^6.0.1"
+ minimist "^1.2.6"
+
"@mapbox/geojson-types@^1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@mapbox/geojson-types/-/geojson-types-1.0.2.tgz#9aecf642cb00eab1080a57c4f949a65b4a5846d6"
integrity sha512-e9EBqHHv3EORHrSfbR9DqecPNn+AmuAoQxV6aL8Xu30bJMJR1o8PZLZzpk1Wq7/NfCbuhmakHTPYRhoqLsXRnw==
-"@mapbox/jsonlint-lines-primitives@^2.0.2":
+"@mapbox/jsonlint-lines-primitives@^2.0.2", "@mapbox/jsonlint-lines-primitives@~2.0.2":
version "2.0.2"
resolved "https://registry.yarnpkg.com/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz#ce56e539f83552b58d10d672ea4d6fc9adc7b234"
integrity sha1-zlblOfg1UrWNENZy6k1vya3HsjQ=
@@ -2601,7 +2609,7 @@
resolved "https://registry.yarnpkg.com/@mapbox/tiny-sdf/-/tiny-sdf-1.2.5.tgz#424c620a96442b20402552be70a7f62a8407cc59"
integrity sha512-cD8A/zJlm6fdJOk6DqPUV8mcpyJkRz2x2R+/fYcWDYG3oWbG7/L7Yl/WqQ1VZCjnL9OTIMAn6c+BC5Eru4sQEw==
-"@mapbox/tiny-sdf@^2.0.5":
+"@mapbox/tiny-sdf@^2.0.5", "@mapbox/tiny-sdf@^2.0.6":
version "2.0.6"
resolved "https://registry.yarnpkg.com/@mapbox/tiny-sdf/-/tiny-sdf-2.0.6.tgz#9a1d33e5018093e88f6a4df2343e886056287282"
integrity sha512-qMqa27TLw+ZQz5Jk+RcwZGH7BQf5G/TrutJhspsca/3SHwmgKQ1iq+d3Jxz5oysPVYTGP6aXxCo5Lk9Er6YBAA==
@@ -2611,6 +2619,11 @@
resolved "https://registry.yarnpkg.com/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz#15651bd553a67b8581fb398810c98ad86a34524e"
integrity sha1-FWUb1VOme4WB+zmIEMmK2Go0Uk4=
+"@mapbox/unitbezier@^0.0.1":
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/@mapbox/unitbezier/-/unitbezier-0.0.1.tgz#d32deb66c7177e9e9dfc3bbd697083e2e657ff01"
+ integrity sha512-nMkuDXFv60aBr9soUG5q+GvZYL+2KZHVvsqFCzqnkGEf46U2fvmytHaEVc1/YZbiLn8X+eR3QzX1+dwDO1lxlw==
+
"@mapbox/vector-tile@^1.3.1":
version "1.3.1"
resolved "https://registry.yarnpkg.com/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz#d3a74c90402d06e89ec66de49ec817ff53409666"
@@ -2623,6 +2636,18 @@
resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe"
integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==
+"@maplibre/maplibre-gl-style-spec@^19.2.1", "@maplibre/maplibre-gl-style-spec@^19.3.3":
+ version "19.3.3"
+ resolved "https://registry.yarnpkg.com/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-19.3.3.tgz#a106248bd2e25e77c963a362aeaf630e00f924e9"
+ integrity sha512-cOZZOVhDSulgK0meTsTkmNXb1ahVvmTmWmfx9gRBwc6hq98wS9JP35ESIoNq3xqEan+UN+gn8187Z6E4NKhLsw==
+ dependencies:
+ "@mapbox/jsonlint-lines-primitives" "~2.0.2"
+ "@mapbox/unitbezier" "^0.0.1"
+ json-stringify-pretty-compact "^3.0.0"
+ minimist "^1.2.8"
+ rw "^1.3.3"
+ sort-object "^3.0.3"
+
"@math.gl/[email protected]", "@math.gl/core@^3.5.0", "@math.gl/core@^3.5.1":
version "3.5.3"
resolved "https://registry.yarnpkg.com/@math.gl/core/-/core-3.5.3.tgz#8f40c374c68cf2731f7e2c2b7609094b10ff767a"
@@ -3627,6 +3652,11 @@
resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca"
integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==
+"@types/geojson@^7946.0.13":
+ version "7946.0.13"
+ resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.13.tgz#e6e77ea9ecf36564980a861e24e62a095988775e"
+ integrity sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==
+
version "5.0.30"
resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.30.tgz#1026409c5625a8689074602808d082b2867b8a51"
@@ -3851,6 +3881,13 @@
dependencies:
"@types/geojson" "*"
+"@types/mapbox-gl@>=1.0.0":
+ version "2.7.19"
+ resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-2.7.19.tgz#d650c30496323a7d429b6f672bc45218c680bda0"
+ integrity sha512-pkRdlhQJNbtwcKJSVC4uuOA6M3OlOObIMhNecqHB991oeaDF5XkjSIRaTE0lh5p4KClptSCxW6MBiREVRHrl2A==
+ dependencies:
+ "@types/geojson" "*"
+
"@types/mapbox-gl@^2.0.3":
version "2.1.1"
resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-2.1.1.tgz#c1ef62f5e296ec58899f7a039ca56a3d61a5f99a"
@@ -3858,13 +3895,6 @@
dependencies:
"@types/geojson" "*"
-"@types/mapbox-gl@^2.6.0":
- version "2.7.15"
- resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-2.7.15.tgz#13e95d56c89037f122ff9a3c9c0473206d5eaf87"
- integrity sha512-UE0dKAnfnFSut6xnoMiABVUGu/yZpwgr+houGvoW3HZ3RtYzg+NyqOMvASOc5sQf6s7O3P20z3cmtUoZecREjA==
- dependencies:
- "@types/geojson" "*"
-
"@types/mapbox-gl@^2.6.3":
version "2.7.5"
resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-2.7.5.tgz#9e31fc592adb2762e4e5c7727dca5ec367dfc780"
@@ -3877,6 +3907,20 @@
resolved "https://registry.yarnpkg.com/@types/mapbox__geo-viewport/-/mapbox__geo-viewport-0.4.1.tgz#77cc476c40fcbc168dceb0e0f85cb486402191a9"
integrity sha512-aW7Orm58KsT9KmpZb1sqM2l/KufsS1IUsL1RCplVLfUIbpTk3PYkpOat3CN7jA8KcO1w1TuNFapn0g+/rASWzQ==
+"@types/mapbox__point-geometry@*", "@types/mapbox__point-geometry@^0.1.4":
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.4.tgz#0ef017b75eedce02ff6243b4189210e2e6d5e56d"
+ integrity sha512-mUWlSxAmYLfwnRBmgYV86tgYmMIICX4kza8YnE/eIlywGe2XoOxlpVnXWwir92xRLjwyarqwpu2EJKD2pk0IUA==
+
+"@types/mapbox__vector-tile@^1.3.4":
+ version "1.3.4"
+ resolved "https://registry.yarnpkg.com/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.4.tgz#ad757441ef1d34628d9e098afd9c91423c1f8734"
+ integrity sha512-bpd8dRn9pr6xKvuEBQup8pwQfD4VUyqO/2deGjfpe6AwC8YRlyEipvefyRJUSiCJTZuCb8Pl1ciVV5ekqJ96Bg==
+ dependencies:
+ "@types/geojson" "*"
+ "@types/mapbox__point-geometry" "*"
+ "@types/pbf" "*"
+
"@types/mdast@^3.0.0", "@types/mdast@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz#2d7d671b1cd1ea3deb306ea75036c2a0407d2deb"
@@ -3934,6 +3978,11 @@
resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
+"@types/pbf@*", "@types/pbf@^3.0.5":
+ version "3.0.5"
+ resolved "https://registry.yarnpkg.com/@types/pbf/-/pbf-3.0.5.tgz#a9495a58d8c75be4ffe9a0bd749a307715c07404"
+ integrity sha512-j3pOPiEcWZ34R6a6mN07mUkM4o4Lwf6hPNt8eilOeZhTFbxFXmKhvXl9Y28jotFPaI1bpPDJsbCprUoNke6OrA==
+
"@types/prop-types@*":
version "15.7.3"
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
@@ -4066,6 +4115,13 @@
dependencies:
"@types/geojson" "*"
+"@types/supercluster@^7.1.3":
+ version "7.1.3"
+ resolved "https://registry.yarnpkg.com/@types/supercluster/-/supercluster-7.1.3.tgz#1a1bc2401b09174d9c9e44124931ec7874a72b27"
+ integrity sha512-Z0pOY34GDFl3Q6hUFYf3HkTwKEE02e7QgtJppBt+beEAxnyOpJua+voGFvxINBHa06GwLFFym7gRPY2SiKIfIA==
+ dependencies:
+ "@types/geojson" "*"
+
"@types/tapable@*", "@types/tapable@^1.0.5":
version "1.0.6"
resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz#a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74"
@@ -5807,6 +5863,21 @@ [email protected]:
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+bytewise-core@^1.2.2:
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/bytewise-core/-/bytewise-core-1.2.3.tgz#3fb410c7e91558eb1ab22a82834577aa6bd61d42"
+ integrity sha512-nZD//kc78OOxeYtRlVk8/zXqTB4gf/nlguL1ggWA8FuchMyOxcyHR4QPQZMUmA7czC+YnaBrPUCubqAWe50DaA==
+ dependencies:
+ typewise-core "^1.2"
+
+bytewise@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/bytewise/-/bytewise-1.1.0.tgz#1d13cbff717ae7158094aa881b35d081b387253e"
+ integrity sha512-rHuuseJ9iQ0na6UDhnrRVDh8YnWVlU6xM3VH6q/+yHDeUH2zIhUzP+2/h3LIrhLDBtTqzWpE3p3tP/boefskKQ==
+ dependencies:
+ bytewise-core "^1.2.2"
+ typewise "^1.0.3"
+
cacache@^12.0.2:
version "12.0.4"
resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
@@ -9334,7 +9405,7 @@ get-stream@^5.1.0:
dependencies:
pump "^3.0.0"
-get-stream@^6.0.0:
+get-stream@^6.0.0, get-stream@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
@@ -9355,7 +9426,7 @@ get-user-locale@^2.2.1:
"@types/lodash.memoize" "^4.1.7"
lodash.memoize "^4.1.1"
-get-value@^2.0.3, get-value@^2.0.6:
+get-value@^2.0.2, get-value@^2.0.3, get-value@^2.0.6:
version "2.0.6"
resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
@@ -9418,7 +9489,7 @@ gl-matrix@^3.0.0, gl-matrix@^3.2.1, gl-matrix@~3.3.0:
resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.3.0.tgz#232eef60b1c8b30a28cbbe75b2caf6c48fd6358b"
integrity sha512-COb7LDz+SXaHtl/h4LeaFcNdJdAQSDeVqjiIihSXNrkWObZLhDI4hIkZC11Aeqp7bcE72clzB0BnDXr2SmslRA==
-gl-matrix@^3.2.0, gl-matrix@^3.4.0:
+gl-matrix@^3.2.0, gl-matrix@^3.4.0, gl-matrix@^3.4.3:
version "3.4.3"
resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.4.3.tgz#fc1191e8320009fd4d20e9339595c6041ddc22c9"
integrity sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA==
@@ -11609,10 +11680,10 @@ jest@^29.5.0:
import-local "^3.0.2"
jest-cli "^29.7.0"
[email protected], jpeg-js@^0.4.1, jpeg-js@^0.4.3:
- version "0.4.2"
- resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.2.tgz#8b345b1ae4abde64c2da2fe67ea216a114ac279d"
- integrity sha512-+az2gi/hvex7eLTMTlbRLOhH6P6WFdk2ITI8HJsaH2VqYO0I594zXSYEP+tf4FW+8Cy68ScDXoAsQdyQanv3sw==
+jpeg-js@^0.4.1, jpeg-js@^0.4.3:
+ version "0.4.4"
+ resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.4.tgz#a9f1c6f1f9f0fa80cdb3484ed9635054d28936aa"
+ integrity sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==
"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
version "4.0.0"
@@ -11764,6 +11835,11 @@ json-stable-stringify@~0.0.0:
dependencies:
jsonify "~0.0.0"
+json-stringify-pretty-compact@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-3.0.0.tgz#f71ef9d82ef16483a407869556588e91b681d9ab"
+ integrity sha512-Rc2suX5meI0S3bfdZuA7JMFBGkJ875ApfVyq2WHELjBiiG22My/l7/8zPpH/CfFVQHuVLd8NLR0nv6vi0BYYKA==
+
json-stringify-safe@~5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -11857,6 +11933,11 @@ kdbush@^3.0.0:
resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-3.0.0.tgz#f8484794d47004cc2d85ed3a79353dbe0abc2bf0"
integrity sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew==
+kdbush@^4.0.2:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-4.0.2.tgz#2f7b7246328b4657dd122b6c7f025fbc2c868e39"
+ integrity sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA==
+
keymirror@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/keymirror/-/keymirror-0.1.1.tgz#918889ea13f8d0a42e7c557250eee713adc95c35"
@@ -12311,6 +12392,37 @@ [email protected], mapbox-gl@^1.0.0:
tinyqueue "^2.0.3"
vt-pbf "^3.1.1"
+maplibre-gl@^3.6.2:
+ version "3.6.2"
+ resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-3.6.2.tgz#abc2f34bddecabef8c20028eff06d62e36d75ccc"
+ integrity sha512-krg2KFIdOpLPngONDhP6ixCoWl5kbdMINP0moMSJFVX7wX1Clm2M9hlNKXS8vBGlVWwR5R3ZfI6IPrYz7c+aCQ==
+ dependencies:
+ "@mapbox/geojson-rewind" "^0.5.2"
+ "@mapbox/jsonlint-lines-primitives" "^2.0.2"
+ "@mapbox/point-geometry" "^0.1.0"
+ "@mapbox/tiny-sdf" "^2.0.6"
+ "@mapbox/unitbezier" "^0.0.1"
+ "@mapbox/vector-tile" "^1.3.1"
+ "@mapbox/whoots-js" "^3.1.0"
+ "@maplibre/maplibre-gl-style-spec" "^19.3.3"
+ "@types/geojson" "^7946.0.13"
+ "@types/mapbox__point-geometry" "^0.1.4"
+ "@types/mapbox__vector-tile" "^1.3.4"
+ "@types/pbf" "^3.0.5"
+ "@types/supercluster" "^7.1.3"
+ earcut "^2.2.4"
+ geojson-vt "^3.2.1"
+ gl-matrix "^3.4.3"
+ global-prefix "^3.0.0"
+ kdbush "^4.0.2"
+ murmurhash-js "^1.0.0"
+ pbf "^3.2.1"
+ potpack "^2.0.0"
+ quickselect "^2.0.0"
+ supercluster "^8.0.1"
+ tinyqueue "^2.0.3"
+ vt-pbf "^3.1.3"
+
markdown-escapes@^1.0.0:
version "1.0.4"
resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
@@ -12675,7 +12787,7 @@ [email protected]:
is-plain-obj "^1.1.0"
kind-of "^6.0.3"
[email protected], minimist@^0.1.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@~1.2.5:
[email protected], minimist@^0.1.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8, minimist@~1.2.5:
version "1.2.3"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.3.tgz#3db5c0765545ab8637be71f333a104a965a9ca3f"
integrity sha512-+bMdgqjMN/Z77a6NlY/I3U5LlRDbnmaAk6lDveAPKwSpcPM4tKAuYsvYF8xjhOPXhOYGe/73vVLVez5PW+jqhw==
@@ -14222,6 +14334,11 @@ potpack@^1.0.1:
resolved "https://registry.yarnpkg.com/potpack/-/potpack-1.0.1.tgz#d1b1afd89e4c8f7762865ec30bd112ab767e2ebf"
integrity sha512-15vItUAbViaYrmaB/Pbw7z6qX2xENbFSTA7Ii4tgbPtasxm5v6ryKhKtL91tpWovDJzTiZqdwzhcFBCwiMVdVw==
+potpack@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/potpack/-/potpack-2.0.0.tgz#61f4dd2dc4b3d5e996e3698c0ec9426d0e169104"
+ integrity sha512-Q+/tYsFU9r7xoOJ+y/ZTtdVQwTWfzjbiXBDMM/JKUux3+QPP02iUuIoeBQ+Ot6oEDlC+/PGjB/5A3K7KKb7hcw==
+
prebuild-install@^7.1.1:
version "7.1.1"
resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45"
@@ -14816,13 +14933,6 @@ react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4:
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
- version "7.0.25"
- resolved "https://registry.yarnpkg.com/react-map-gl/-/react-map-gl-7.0.25.tgz#60b7577cd1821efe3f1bc1e42225d10e006e152a"
- integrity sha512-8aZfbDKxVcJnmTEC1eQ00VnTOu722i5wqnx+lV8VHN37ZvWEfMgb84EQ2kW6w/Q3zq6oZqP4helF7u4ydPFLtA==
- dependencies:
- "@types/mapbox-gl" "^2.6.0"
-
react-map-gl@^5.2.10:
version "5.3.19"
resolved "https://registry.yarnpkg.com/react-map-gl/-/react-map-gl-5.3.19.tgz#8c012eb7328c64dc2a4bb65eeceacd4a66734f72"
@@ -14837,6 +14947,14 @@ react-map-gl@^5.2.10:
resize-observer-polyfill "^1.5.1"
viewport-mercator-project "^7.0.4"
+react-map-gl@^7.1.6:
+ version "7.1.6"
+ resolved "https://registry.yarnpkg.com/react-map-gl/-/react-map-gl-7.1.6.tgz#4ea239cd49493cfc9ed15aa52436b024c757c0a9"
+ integrity sha512-9XbrvpFF67Fyi+e6vRLJFnGpo3UF6ZHifIa8cS/wUYSsnv9sVyzGsN++FJy57zkz3Jh3kmf0xKZemR8K0FZLVw==
+ dependencies:
+ "@maplibre/maplibre-gl-style-spec" "^19.2.1"
+ "@types/mapbox-gl" ">=1.0.0"
+
react-markdown@^5.0.2:
version "5.0.3"
resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-5.0.3.tgz#41040ea7a9324b564b328fb81dd6c04f2a5373ac"
@@ -16332,6 +16450,16 @@ socks@^2.6.2:
ip "^2.0.0"
smart-buffer "^4.2.0"
+sort-asc@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/sort-asc/-/sort-asc-0.2.0.tgz#00a49e947bc25d510bfde2cbb8dffda9f50eb2fc"
+ integrity sha512-umMGhjPeHAI6YjABoSTrFp2zaBtXBej1a0yKkuMUyjjqu6FJsTF+JYwCswWDg+zJfk/5npWUUbd33HH/WLzpaA==
+
+sort-desc@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/sort-desc/-/sort-desc-0.2.0.tgz#280c1bdafc6577887cedbad1ed2e41c037976646"
+ integrity sha512-NqZqyvL4VPW+RAxxXnB8gvE1kyikh8+pR+T+CXLksVRN9eiQqkQlPwqWYU0mF9Jm7UnctShlxLyAt1CaBOTL1w==
+
sort-keys@^1.0.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
@@ -16339,6 +16467,18 @@ sort-keys@^1.0.0:
dependencies:
is-plain-obj "^1.0.0"
+sort-object@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/sort-object/-/sort-object-3.0.3.tgz#945727165f244af9dc596ad4c7605a8dee80c269"
+ integrity sha512-nK7WOY8jik6zaG9CRwZTaD5O7ETWDLZYMM12pqY8htll+7dYeqGfEUPcUBHOpSJg2vJOrvFIY2Dl5cX2ih1hAQ==
+ dependencies:
+ bytewise "^1.1.0"
+ get-value "^2.0.2"
+ is-extendable "^0.1.1"
+ sort-asc "^0.2.0"
+ sort-desc "^0.2.0"
+ union-value "^1.0.1"
+
source-list-map@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
@@ -17061,6 +17201,13 @@ supercluster@^7.1.0:
dependencies:
kdbush "^3.0.0"
+supercluster@^8.0.1:
+ version "8.0.1"
+ resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-8.0.1.tgz#9946ba123538e9e9ab15de472531f604e7372df5"
+ integrity sha512-IiOea5kJ9iqzD2t7QJq/cREyLHTtSmUT6gQsweojg9WH2sYJqZK9SswTu6jrscO6D1G5v5vYZ9ru/eq85lXeZQ==
+ dependencies:
+ kdbush "^4.0.2"
+
supports-color@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -17727,6 +17874,18 @@ [email protected]:
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
+typewise-core@^1.2, typewise-core@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/typewise-core/-/typewise-core-1.2.0.tgz#97eb91805c7f55d2f941748fa50d315d991ef195"
+ integrity sha512-2SCC/WLzj2SbUwzFOzqMCkz5amXLlxtJqDKTICqg30x+2DZxcfZN2MvQZmGfXWKNWaKK9pBPsvkcwv8bF/gxKg==
+
+typewise@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/typewise/-/typewise-1.0.3.tgz#1067936540af97937cc5dcf9922486e9fa284651"
+ integrity sha512-aXofE06xGhaQSPzt8hlTY+/YWQhm9P0jYUp1f2XtmW/3Bk0qzXcyFWAtPoo2uTGQj1ZwbDuSyuxicq+aDo8lCQ==
+ dependencies:
+ typewise-core "^1.2.0"
+
typical@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"
@@ -17861,7 +18020,7 @@ unified@^9.0.0, unified@^9.1.0:
trough "^1.0.0"
vfile "^4.0.0"
-union-value@^1.0.0:
+union-value@^1.0.0, union-value@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
@@ -18376,6 +18535,15 @@ vt-pbf@^3.1.1:
"@mapbox/vector-tile" "^1.3.1"
pbf "^3.0.5"
+vt-pbf@^3.1.3:
+ version "3.1.3"
+ resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-3.1.3.tgz#68fd150756465e2edae1cc5c048e063916dcfaac"
+ integrity sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==
+ dependencies:
+ "@mapbox/point-geometry" "0.1.0"
+ "@mapbox/vector-tile" "^1.3.1"
+ pbf "^3.2.1"
+
vue-template-compiler@^2.5.16:
version "2.6.12"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz#947ed7196744c8a5285ebe1233fe960437fcc57e"