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) Add interleaved mapbox-overlay to gallery #8556

Merged
merged 15 commits into from Mar 6, 2024
Merged

chore(examples) Add interleaved mapbox-overlay to gallery #8556

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3bad59b
chore(examples) Use maplibre in MapboxLayer gallery
chrisgervang Feb 27, 2024
50c51c2
chore(examples) rename mapbox to maplibre in gallery
chrisgervang Feb 28, 2024
2064bff
Merge branch 'master' into chr/use-maplibre-in-gallery
chrisgervang Feb 29, 2024
5c1a2d0
chore(examples) rename mapbox to maplibre in links
chrisgervang Feb 29, 2024
7c888bd
Merge branch 'master' into chr/use-maplibre-in-gallery
chrisgervang Feb 29, 2024
640ffc4
Merge branch 'master' into chr/use-maplibre-in-gallery
chrisgervang Feb 29, 2024
4609d50
fix 3d building height
chrisgervang Mar 1, 2024
573b194
remove 2d building layer
chrisgervang Mar 1, 2024
ba7154c
Merge branch 'master' into chr/use-maplibre-in-gallery
chrisgervang Mar 1, 2024
e37c323
Merge branch 'master' into chr/use-maplibre-in-gallery
chrisgervang Mar 1, 2024
94499e7
Merge branch 'master' into chr/use-maplibre-in-gallery
chrisgervang Mar 6, 2024
26e42f8
Merge branch 'master' into chr/use-maplibre-in-gallery
chrisgervang Mar 6, 2024
15f3f37
chore(gallery) add mapbox-overlay example
chrisgervang Mar 6, 2024
f5e2ad5
Merge branch 'master' into chr/use-maplibre-in-gallery
chrisgervang Mar 6, 2024
fab6f69
fix doc links
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
2 changes: 1 addition & 1 deletion docs/developer-guide/base-maps/using-with-mapbox.md
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

| Pure JS | React | Overlaid | Interleaved |
| ----- | ----- | ----- | ----- |
| ✓ | ✓ | [example](https://github.com/visgl/deck.gl/tree/master/examples/get-started/pure-js/maplibre) | [example](https://deck.gl/gallery/mapbox-layer) |
| ✓ | ✓ | [example](https://github.com/visgl/deck.gl/tree/master/examples/get-started/pure-js/mapbox) | [example](https://deck.gl/examples/mapbox) |
chrisgervang marked this conversation as resolved.
Show resolved Hide resolved

[Mapbox GL JS](https://github.com/mapbox/mapbox-gl-js) is a powerful open-source map renderer from [Mapbox](https://mapbox.com). deck.gl's `MapView` is designed to sync perfectly with the camera of Mapbox, at every zoom level and rotation angle.

Expand Down
4 changes: 2 additions & 2 deletions docs/get-started/using-with-map.md
View file
Open in desktop
Expand Up @@ -23,8 +23,8 @@ There are two types of integration between deck.gl and a base map renderer:
| [Google Maps JavaScript API](https://developers.google.com/maps/documentation/javascript/deckgl-overlay-view) | ✓ | ✓ | [example](https://github.com/visgl/deck.gl/tree/master/examples/get-started/pure-js/google-maps) | [example](https://developers.google.com/maps/documentation/javascript/examples/deckgl-tripslayer) | [link](../developer-guide/base-maps/using-with-google-maps.md) |
| [harp.gl](https://www.harp.gl/) | ✓ | | [example](https://github.com/visgl/deck.gl/tree/master/examples/get-started/pure-js/harp.gl) | | |
| [Leaflet](https://leafletjs.com/) | ✓ | | [example](https://github.com/visgl/deck.gl/tree/master/examples/get-started/pure-js/leaflet) | | |
| [Mapbox GL JS](https://docs.mapbox.com/mapbox-gl-js/api/) | ✓ | ✓ | [example](https://github.com/visgl/deck.gl/tree/master/examples/get-started/pure-js/maplibre) | [example](https://deck.gl/gallery/mapbox-layer) | [link](../developer-guide/base-maps/using-with-mapbox.md) |
| [MapLibre GL JS](https://maplibre.org/maplibre-gl-js-docs/api/) | ✓ | ✓ | [example](https://github.com/visgl/deck.gl/tree/master/examples/get-started/pure-js/maplibre) | [example](https://deck.gl/gallery/mapbox-layer) | [link](../developer-guide/base-maps/using-with-mapbox.md#compatibility-with-mapbox-gl-js-forks) |
| [Mapbox GL JS](https://docs.mapbox.com/mapbox-gl-js/api/) | ✓ | ✓ | [example](https://github.com/visgl/deck.gl/tree/master/examples/get-started/pure-js/mapbox) | [example](https://deck.gl/examples/mapbox) | [link](../developer-guide/base-maps/using-with-mapbox.md) |
| [MapLibre GL JS](https://maplibre.org/maplibre-gl-js-docs/api/) | ✓ | ✓ | [example](https://github.com/visgl/deck.gl/tree/master/examples/get-started/pure-js/mapbox) | [example](https://deck.gl/gallery/maplibre-overlay) | [link](../developer-guide/base-maps/using-with-mapbox.md#compatibility-with-mapbox-gl-js-forks) |
| [OpenLayers](https://openlayers.org/) | ✓ | | [example](https://github.com/visgl/deck.gl/tree/master/examples/get-started/pure-js/openlayers) | | |

It is also important to understand the difference between the JS library that renders the map and the map data provider. For example, you can use Mapbox GL JS with the Mapbox service, but also with any other service that hosts Mapbox Vector Tiles. When using a base map, be sure to follow the terms and conditions, as well as the attribution requirements of both the JS library and the data provider.
0 examples/gallery/images/mapbox-layer.jpg → examples/gallery/images/maplibre-layer.jpg
View file
Open in desktop
File renamed without changes
26 changes: 13 additions & 13 deletions examples/gallery/src/mapbox-layer.html → examples/gallery/src/maplibre-layer.html
View file
Open in desktop
@@ -1,10 +1,11 @@
<html>
<head>
<title>Interleaving deck.gl with Mapbox Layers</title>
<script src="https://unpkg.com/deck.gl@^8.8.0/dist.min.js"></script>
<script src="https://api.tiles.mapbox.com/mapbox-gl-js/v1.13.0/mapbox-gl.js"></script>
<title>Interleaving deck.gl with Maplibre Layers using MapboxLayer</title>

<script src="https://unpkg.com/deck.gl@^9.0.0-beta.5/dist.min.js"></script>
<script src="https://unpkg.com/maplibre-gl@^3.0.0/dist/maplibre-gl.js"></script>

<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v1.13.0/mapbox-gl.css" rel="stylesheet" />
<link href="https://unpkg.com/maplibre-gl@^3.0.0/dist/maplibre-gl.css" rel="stylesheet" />
</head>

<body style="margin:0"></body>
Expand All @@ -13,24 +14,23 @@

const {MapboxLayer, ScatterplotLayer, ArcLayer} = deck;

mapboxgl.accessToken = '<mapbox-access-token>';

const map = new mapboxgl.Map({
const map = new maplibregl.Map({
container: document.body,
style: 'mapbox://styles/mapbox/light-v9',
style: 'https://basemaps.cartocdn.com/gl/positron-gl-style/style.json',
center: [-122.4, 37.79],
zoom: 15,
pitch: 60
});

map.on('load', () => {
map.on('style.load', () => {
const firstLabelLayerId = map.getStyle().layers.find(layer => layer.type === 'symbol').id;

map.removeLayer('building')
map.removeLayer('building-top')
map.addLayer({
'id': '3d-buildings',
'source': 'composite',
'source': 'carto',
'source-layer': 'building',
'filter': ['==', 'extrude', 'true'],
'type': 'fill-extrusion',
'minzoom': 15,
'paint': {
Expand All @@ -41,12 +41,12 @@
'fill-extrusion-height': [
"interpolate", ["linear"], ["zoom"],
15, 0,
15.05, ["get", "height"]
15.05, ["get", "render_height"]
],
'fill-extrusion-base': [
"interpolate", ["linear"], ["zoom"],
15, 0,
15.05, ["get", "min_height"]
15.05, ["get", "render_min_height"]
],
'fill-extrusion-opacity': .6
}
Expand Down
9 changes: 5 additions & 4 deletions examples/gallery/src/maplibre-overlay.html
View file
Open in desktop
Expand Up @@ -22,14 +22,15 @@
pitch: 60
});

map.on('load', () => {
map.on('style.load', () => {
const firstLabelLayerId = map.getStyle().layers.find(layer => layer.type === 'symbol').id;

map.removeLayer('building')
map.removeLayer('building-top')
map.addLayer({
'id': '3d-buildings',
'source': 'carto',
'source-layer': 'building',
'filter': ['==', 'extrude', 'true'],
'type': 'fill-extrusion',
'minzoom': 15,
'paint': {
Expand All @@ -40,12 +41,12 @@
'fill-extrusion-height': [
"interpolate", ["linear"], ["zoom"],
15, 0,
15.05, ["get", "height"]
15.05, ["get", "render_height"]
],
'fill-extrusion-base': [
"interpolate", ["linear"], ["zoom"],
15, 0,
15.05, ["get", "min_height"]
15.05, ["get", "render_min_height"]
],
'fill-extrusion-opacity': .6
}
Expand Down