From 394a76d954722cbc5490eab36dcd49f5b6be25b1 Mon Sep 17 00:00:00 2001 From: ironicbrew Date: Wed, 12 Feb 2025 15:05:37 -0700 Subject: [PATCH 1/5] Update using-with-react.md react-map-gl import --- docs/get-started/using-with-react.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/get-started/using-with-react.md b/docs/get-started/using-with-react.md index 8a11a6627a3..f0cbc265840 100644 --- a/docs/get-started/using-with-react.md +++ b/docs/get-started/using-with-react.md @@ -59,7 +59,7 @@ import DeckGL from '@deck.gl/react'; import {MapViewState} from '@deck.gl/core'; import {LineLayer} from '@deck.gl/layers'; import {ZoomWidget} from '@deck.gl/react'; -import {Map} from 'react-map-gl'; +import {Map} from 'react-map-gl/mapbox'; const INITIAL_VIEW_STATE: MapViewState = { longitude: -122.41669, From abbf39384298f9db5f81d5c6ad288f06d146517c Mon Sep 17 00:00:00 2001 From: ironicbrew Date: Wed, 12 Feb 2025 15:07:03 -0700 Subject: [PATCH 2/5] Update using-with-mapbox.md with new react-map-gl import --- docs/developer-guide/base-maps/using-with-mapbox.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/developer-guide/base-maps/using-with-mapbox.md b/docs/developer-guide/base-maps/using-with-mapbox.md index 3b1a7e753d2..a4dc2bbf49b 100644 --- a/docs/developer-guide/base-maps/using-with-mapbox.md +++ b/docs/developer-guide/base-maps/using-with-mapbox.md @@ -86,7 +86,7 @@ map.once('load', () => { ```tsx import React from 'react'; -import {Map, useControl} from 'react-map-gl'; +import {Map, useControl} from 'react-map-gl/mapbox'; import {MapboxOverlay} from '@deck.gl/mapbox'; import {DeckProps} from '@deck.gl/core'; import {ScatterplotLayer} from '@deck.gl/layers'; @@ -180,7 +180,7 @@ The reverse-controlled option is supported by the pre-built scripting bundle, an ```tsx import React from 'react'; -import {Map} from 'react-map-gl'; +import {Map} from 'react-map-gl/mapbox'; import DeckGL from '@deck.gl/react'; import {ScatterplotLayer} from '@deck.gl/layers'; import 'mapbox-gl/dist/mapbox-gl.css'; From 1650ebc436dd4a5564e08119e0fe6660f5d183cb Mon Sep 17 00:00:00 2001 From: ironicbrew Date: Wed, 12 Feb 2025 15:07:53 -0700 Subject: [PATCH 3/5] Update mapbox-layers-react.jsx with new react-map-gl import --- .../mapbox-layers-react/mapbox-layers-react.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/apps/mapbox-integration/mapbox-layers-react/mapbox-layers-react.jsx b/test/apps/mapbox-integration/mapbox-layers-react/mapbox-layers-react.jsx index 945efcf5b4e..c1c0921f05e 100644 --- a/test/apps/mapbox-integration/mapbox-layers-react/mapbox-layers-react.jsx +++ b/test/apps/mapbox-integration/mapbox-layers-react/mapbox-layers-react.jsx @@ -6,7 +6,7 @@ import React, {useState, useRef, useCallback} from 'react'; import {createRoot} from 'react-dom/client'; import DeckGL, {ScatterplotLayer, ArcLayer, TextLayer} from 'deck.gl'; -import {Map} from 'react-map-gl'; +import {Map} from 'react-map-gl/mapbox'; import MapboxLayer from '../../../../modules/mapbox/src/mapbox-layer'; From e583aab4614025e29aa0e5679ec769c163477057 Mon Sep 17 00:00:00 2001 From: ironicbrew Date: Wed, 12 Feb 2025 15:10:58 -0700 Subject: [PATCH 4/5] Update basemap.md with new react-map-gl import --- docs/api-reference/carto/basemap.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-reference/carto/basemap.md b/docs/api-reference/carto/basemap.md index a364d2edf35..31c95203e60 100644 --- a/docs/api-reference/carto/basemap.md +++ b/docs/api-reference/carto/basemap.md @@ -22,7 +22,7 @@ npm install @deck.gl/core @deck.gl/layers @deck.gl/carto ```js import {DeckGL} from '@deck.gl/react'; -import {StaticMap} from 'react-map-gl'; +import {StaticMap} from 'react-map-gl/maplibre'; import {BASEMAP} from '@deck.gl/carto'; From 971f32acdbc0f5ea2bc0b407bd4db372f8f1f844 Mon Sep 17 00:00:00 2001 From: ironicbrew Date: Wed, 12 Feb 2025 15:12:02 -0700 Subject: [PATCH 5/5] Update mapbox-overlay.md with new react-map-gl import --- docs/api-reference/mapbox/mapbox-overlay.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-reference/mapbox/mapbox-overlay.md b/docs/api-reference/mapbox/mapbox-overlay.md index 7a213197146..5b16b180b46 100644 --- a/docs/api-reference/mapbox/mapbox-overlay.md +++ b/docs/api-reference/mapbox/mapbox-overlay.md @@ -50,7 +50,7 @@ map.once('load', () => { ```tsx import React from 'react'; -import {Map, useControl} from 'react-map-gl'; +import {Map, useControl} from 'react-map-gl/mapbox'; import {MapboxOverlay} from '@deck.gl/mapbox'; import {DeckProps} from '@deck.gl/core'; import {ScatterplotLayer} from '@deck.gl/layers';