Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(examples) Use MapboxOverlay in mapbox (formerly safegraph) website example #8558

Merged
merged 8 commits into from Mar 6, 2024
Merged

chore(examples) Use MapboxOverlay in mapbox (formerly safegraph) website example #8558

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7de1ee7
chore(examples) Use MapboxOverlay in safegraph example
chrisgervang Feb 27, 2024
cd88aef
Merge branch 'master' into chr/refactor-safegraph-to-mapbox-overlay
chrisgervang Feb 29, 2024
5e2b626
restore arc layer
chrisgervang Feb 29, 2024
a83529f
mapbox css
chrisgervang Mar 1, 2024
a660894
rename safegraph folder to mapbox
chrisgervang Mar 2, 2024
2b0bf39
chore(examples) use react in mapbox website example
chrisgervang Mar 6, 2024
88721e3
Merge branch 'master' into chr/refactor-safegraph-to-mapbox-overlay
chrisgervang Mar 6, 2024
fd1c1bb
Merge branch 'master' into chr/refactor-safegraph-to-mapbox-overlay
chrisgervang Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 20 additions & 24 deletions examples/website/safegraph/app.js
View file
Open in desktop
@@ -1,5 +1,6 @@
import mapboxgl from 'mapbox-gl';
import {MapboxLayer} from '@deck.gl/mapbox';
import 'mapbox-gl/dist/mapbox-gl.css';
import {MapboxOverlay as DeckOverlay} from '@deck.gl/mapbox';
import {ArcLayer} from '@deck.gl/layers';
import {H3HexagonLayer} from '@deck.gl/geo-layers';
import {scaleLog} from 'd3-scale';
Expand Down Expand Up @@ -32,6 +33,10 @@ export function renderToDOM(container, data) {
pitch: 60
});

const deckOverlay = new DeckOverlay({
interleaved: true
})

map.addControl(new mapboxgl.NavigationControl(), 'top-left');

map.on('load', () => {
Expand All @@ -48,60 +53,51 @@ export function renderToDOM(container, data) {
}
});

renderLayers(map, data);
renderLayers(map, deckOverlay, data, '8a283082aa17fff');
});

map.addControl(deckOverlay)

return {
update: newData => renderLayers(map, newData),
update: newData => renderLayers(map, deckOverlay, newData),
remove: () => {
map.remove();
}
};
}

function renderLayers(map, data) {
function renderLayers(map, deckOverlay, data, selectedPOI) {
chrisgervang marked this conversation as resolved.
Show resolved Hide resolved
if (!data) {
return;
}
let selectedPOICentroid;
const [lat, lng] = cellToLatLng(selectedPOI);
let selectedPOICentroid = [lng, lat];

const arcLayer = new MapboxLayer({
const arcLayer = new ArcLayer({
id: 'deckgl-connections',
type: ArcLayer,
data: [],
data: data.filter(d => d.hex === selectedPOI),
getSourcePosition: d => selectedPOICentroid,
getTargetPosition: d => [d.home_lng, d.home_lat],
getSourceColor: [255, 0, 128],
getTargetColor: [0, 200, 255],
getWidth: d => Math.max(2, d.count / 15)
});

const selectPOI = hex => {
const [lat, lng] = cellToLatLng(hex);
selectedPOICentroid = [lng, lat];
arcLayer.setProps({
data: data.filter(d => d.hex === hex)
});
};

const poiLayer = new MapboxLayer({
const poiLayer = new H3HexagonLayer({
id: 'deckgl-pois',
type: H3HexagonLayer,
data: aggregateHexes(data),
opacity: 0.4,
pickable: true,
autoHighlight: true,
onClick: ({object}) => object && selectPOI(object.hex),
onClick: ({object}) => object && renderLayers(map, deckOverlay, data, object.hex),
getHexagon: d => d.hex,
getFillColor: d => colorScale(d.count),
extruded: false,
stroked: false
stroked: false,
beforeId: getFirstLabelLayerId(map.getStyle())
});

map.addLayer(poiLayer, getFirstLabelLayerId(map.getStyle()));
map.addLayer(arcLayer);

selectPOI('8a283082aa17fff');
deckOverlay.setProps({ layers: [poiLayer, arcLayer] })
}

function aggregateHexes(data) {
Expand Down
1 change: 0 additions & 1 deletion examples/website/safegraph/index.html
View file
Open in desktop
Expand Up @@ -3,7 +3,6 @@
<head>
<meta charset='UTF-8' />
<title>mapbox-custom-layer-example</title>
<link href="https://api.mapbox.com/mapbox-gl-js/v1.13.0/mapbox-gl.css" rel="stylesheet" />
<style>
body {
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
Expand Down
4 changes: 2 additions & 2 deletions examples/website/safegraph/package.json
View file
Open in desktop
Expand Up @@ -11,8 +11,8 @@
"dependencies": {
"@loaders.gl/csv": "^4.1.0",
"d3-scale": "^2.0.0",
"deck.gl": "^9.0.0-alpha",
"mapbox-gl": "^2.0.0"
"deck.gl": "^9.0.0-beta",
"mapbox-gl": "^3.0.0"
},
"devDependencies": {
"typescript": "^4.6.0",
Expand Down