MapLibre basemap #2461
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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/maplibre'; | ||
| import {PickInfo} from '@deck.gl/core/lib/deck'; | ||
| import DeckGL from '@deck.gl/react'; | ||
| import {createSelector, Selector} from 'reselect'; | ||
| 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}; | ||
| }; | ||
| *[maplibregl-children] { | ||
| position: absolute; | ||
| } | ||
| ` | ||
|
|
@@ -141,15 +141,16 @@ const MAPBOXGL_STYLE_UPDATE = 'style.load'; | |
| const MAPBOXGL_RENDER = 'render'; | ||
| const nop = () => {}; | ||
|
|
||
| const MapLibreLogo = () => ( | ||
|
There was a problem hiding this comment. Maybe we should use react-map-gl's There was a problem hiding this comment. There should be not a logo but a small attribution text (this is from a deck.gl example ). For some reason this seems to have been lost in the kepler.gl baseline (presumably not an issue with this PR): #2462. If so we could land this and fix that separately. Or fix that first, and rebase to make sure maplibre doesn't clobber it. There was a problem hiding this comment. If we remove this code in and then also remove this in Then the default attribution will show up: There was a problem hiding this comment. Using There was a problem hiding this comment. Anyways, we should probably rework the attribution rendering, and it can be done in a separate PR. |
||
| <div className="attrition-logo"> | ||
| Basemap by: | ||
| <a | ||
| style={{marginLeft: "5px"}} | ||
| className="maplibregl-ctrl-logo" | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| 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 ? <MapLibreLogo /> : null} | ||
| <a href="https://kepler.gl/policy/" target="_blank" rel="noopener noreferrer"> | ||
| © kepler.gl |{' '} | ||
| </a> | ||
| {!isPalm ? <MapLibreLogo /> : null} | ||
| </div> | ||
| </EndHorizontalFlexbox> | ||
| </StyledAttrbution> | ||
|
|
@@ -387,7 +377,7 @@ export default function MapContainerFactory( | |
| } | ||
|
|
||
| _deck: any = 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) { | ||
| 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}: {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: 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={maplibregl} | ||
| {...topMapContainerProps} | ||
| /> | ||
| ) : null} | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Q: Have you tested the jupyter integration?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, in general I had a hard time running the examples and would love some help with that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How can I test the jupyter bindings locally?