diff --git a/examples/worldview/README.md b/examples/worldview/README.md index 8ad35822..5c248363 100644 --- a/examples/worldview/README.md +++ b/examples/worldview/README.md @@ -9,6 +9,7 @@ yarn ``` #### 2. Mapbox Token + Add mapbox access token to env. ```sh @@ -19,4 +20,4 @@ export MapboxAccessToken= ```sh yarn start-local -``` \ No newline at end of file +``` diff --git a/examples/worldview/package.json b/examples/worldview/package.json index 53a985d8..ec18c5df 100644 --- a/examples/worldview/package.json +++ b/examples/worldview/package.json @@ -39,6 +39,6 @@ "webpack-hot-middleware": "^2.24.3" }, "resolutions": { - "mapbox-gl": "2.4.1" + "mapbox-gl": "2.5.1" } } diff --git a/examples/worldview/src/app/App.js b/examples/worldview/src/app/App.js index ceb79c7f..bbe4941e 100644 --- a/examples/worldview/src/app/App.js +++ b/examples/worldview/src/app/App.js @@ -77,14 +77,14 @@ const WindowSize = styled.div` const KEPLER_MAP_ID = 'map'; const selectMapStyle = createSelectMapStyle(KEPLER_MAP_ID); -const sceneLayers = []; +let sceneLayers = []; const App = ({}) => { - useScene(); + sceneLayers = useScene(); const keplerDeckLayers = useKeplerDeckLayers(KEPLER_MAP_ID); const deckProps = useMemo(() => { return { - // layers: [...keplerDeckLayers, ...sceneLayers] - layers: [...sceneLayers, ...keplerDeckLayers] + layers: [...keplerDeckLayers, ...sceneLayers] + // layers: [...sceneLayers, ...keplerDeckLayers] // layers: [] // layers: keplerDeckLayers }; diff --git a/examples/worldview/src/features/map/Map.js b/examples/worldview/src/features/map/Map.js index bb8d6d99..33a2a09e 100644 --- a/examples/worldview/src/features/map/Map.js +++ b/examples/worldview/src/features/map/Map.js @@ -175,11 +175,11 @@ export class Map extends Component { const canvasClientSize = getCanvasClientSize(resolution, viewportMinAxis); // canvasClientSize * scalar = previewSize - const scalar = scale(previewSize, canvasClientSize); + // const scalar = scale(previewSize, canvasClientSize); const deckStyle = { width: `${canvasClientSize.width}px`, height: `${canvasClientSize.height}px`, - transform: `scale(${scalar})`, + // transform: `scale(${scalar})`, transformOrigin: 'top left' }; diff --git a/examples/worldview/src/features/map/MapContainer.js b/examples/worldview/src/features/map/MapContainer.js index afe5c31a..c2b250cb 100644 --- a/examples/worldview/src/features/map/MapContainer.js +++ b/examples/worldview/src/features/map/MapContainer.js @@ -48,7 +48,7 @@ export const MapContainer = ({previewSize, deckProps, staticMapProps, debug, vie resolution={resolution} updateTimeCursor={timeMs => dispatch(updateTimeCursor(timeMs))} debug={debug} - viewportMinAxis={viewportMinAxis} + viewportMinAxis={Math.min(resolution.width, resolution.height)} /> ); }; diff --git a/package.json b/package.json index ad51a7a0..c24dd0d3 100644 --- a/package.json +++ b/package.json @@ -78,8 +78,8 @@ "prettier": "^1.18.2", "react": "^16.13.1", "react-dom": "^16.13.1", - "react-map-gl": "^5.2.10", "react-intl": "^3.12.0", + "react-map-gl": "^5.2.10", "react-redux": "^7.1.3", "react-virtualized": "^9.21.0", "styled-components": "^4.4.1" diff --git a/yarn.lock b/yarn.lock index ad8640b7..ce4959ed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4248,9 +4248,9 @@ camelize@^1.0.0: integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs= caniuse-lite@^1.0.30001219: - version "1.0.30001230" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz#8135c57459854b2240b57a4a6786044bdc5a9f71" - integrity sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ== + version "1.0.30001277" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001277.tgz" + integrity sha512-J2WtYj2Pl6LBEG214XmbGw1gzZEsYuinQFPqYtpZDB3/vm49qNlrcbJrTMkHKmdRDdmXYwkG0tgOBJsuI+J12Q== capture-stack-trace@^1.0.0: version "1.0.1"