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.

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

Feature/deckgl layers #51

Merged
merged 37 commits into from
Jun 6, 2024
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
5a5bb8e
Add deckgl dep
May 28, 2024
14472b7
Add method to add a deckgl layer to the map
May 29, 2024
b4ce9da
Add GridLayer example
May 29, 2024
5a508f6
Add deckgl headers to html template
May 29, 2024
1683e86
Add deckgl example
May 29, 2024
c44086f
Add multiple deck layers at once
May 29, 2024
673a663
Add another example
May 29, 2024
6539f81
Export render as default
May 29, 2024
3fa603e
Add support for deckgl layers in Jupyter
May 30, 2024
ff578b2
Add POC for deck tooltips
May 30, 2024
48d2297
Send picking object to Shiny
May 30, 2024
ce93d5e
Support tooltip for a single layer
May 30, 2024
9b0c9e0
Refactor
May 30, 2024
e246816
Support deck tooltips for multiple layers
May 30, 2024
9c6c217
Update example
May 30, 2024
133d33c
Add func to use maplibre tooltips with deck layers
May 30, 2024
2a4fab1
Add tooltip support for jupyter deck layers
May 30, 2024
0b32118
Change tooltip style
May 31, 2024
28d8fcb
Make maplibre tooltip work
May 31, 2024
d27435b
Add method to update deckgl layers
May 31, 2024
50c0d4d
Add example mixing layers
May 31, 2024
2c69bb6
Add func to ipywidget to update deck layers
May 31, 2024
94188eb
Refactor
May 31, 2024
6fb229e
Update doc strings
May 31, 2024
712a90f
Move docker workflows to obsolete
May 31, 2024
fc97c21
Update deck.gl docs
May 31, 2024
ebaf9c8
Rename 'tooltip_template' to tooltip in py
Jun 1, 2024
fde1289
Use MapLibre Popup as deck tooltio
Jun 1, 2024
6ed4286
Refactor
Jun 1, 2024
9d3e1ea
Refactor default tooltip
Jun 1, 2024
81cc292
Rebuild
Jun 1, 2024
ef75851
Update README
Jun 3, 2024
dc952c9
Update deck tooltip as well
Jun 4, 2024
bea28d2
Update tooltip ipywidget
Jun 4, 2024
f17cf35
Add more deckgl examples
Jun 4, 2024
ed1f63f
Increase versions
Jun 4, 2024
b3ecab8
Update docs
Jun 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refactor
Stefan Kuethe committed May 31, 2024
commit 94188ebda6c5b7b182a9497ddddff7875d2d10d8
8 changes: 4 additions & 4 deletions maplibre/srcjs/ipywidget.js

Large diffs are not rendered by default.

10 changes: 4 additions & 6 deletions srcjs/mapmethods.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
import { MapboxOverlay } from "@deck.gl/mapbox";
import { JSONConfiguration, JSONConverter } from "@deck.gl/json";
// import * as coreLayers from "@deck.gl/layers";
// import * as aggLayers from "@deck.gl/aggregation-layers";
import * as deckLayerCatalog from "./deck-layers";

import { getTextFromFeature, getDeckTooltip } from "./utils";

const jsonConverter = new JSONConverter({
configuration: new JSONConfiguration({ layers: deckLayerCatalog }),
});

function applyMapMethod(map, call) {
const [methodName, params] = call;
console.log(methodName, params);
map[methodName](...params);
}

function _convertDeckLayer(deckLayers) {
// TODO: Move jsonConverter on top of this module!?
const configuration = new JSONConfiguration({ layers: deckLayerCatalog });
const jsonConverter = new JSONConverter({ configuration });
// console.log("jsonConverter", jsonConverter);
return deckLayers.map((deckLayer) =>
jsonConverter.convert(
Object.assign(deckLayer, {