Skip to content

chore(fetchMap): Import LayerFactory from [email protected] #202

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

chore(fetchMap): Import LayerFactory from [email protected] #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c82cbc
Import LayerFactory now that deck.gl exports it
felixpalmer Jun 4, 2025
3ee3926
Lint
felixpalmer Jun 4, 2025
53db23f
Format
felixpalmer Jun 4, 2025
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
43 changes: 12 additions & 31 deletions examples/06-fetch-map/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,16 @@ import {
getDataFilterExtensionProps,
GoogleBasemap,
LayerDescriptor,
LayerType,
MapLibreBasemap,
} from '@carto/api-client';
import {_ConstructorOf, Deck, Layer} from '@deck.gl/core';
import {Deck} from '@deck.gl/core';
import {DataFilterExtension} from '@deck.gl/extensions';
import maplibregl from 'maplibre-gl';
import 'maplibre-gl/dist/maplibre-gl.css';
import {Loader} from '@googlemaps/js-api-loader';
import {GoogleMapsOverlay} from '@deck.gl/google-maps';
import {MapboxOverlay} from '@deck.gl/mapbox';
import {
ClusterTileLayer,
H3TileLayer,
HeatmapTileLayer,
VectorTileLayer,
QuadbinTileLayer,
RasterTileLayer,
} from '@deck.gl/carto';
import {LayerFactory} from '@deck.gl/carto';
import {createLegend} from './legend.js';

type FetchMapResult = any; // TODO: fix type
Expand All @@ -34,29 +26,18 @@ const GOOGLE_MAPS_API_KEY = '';
const apiBaseUrl = 'https://gcp-us-east1.api.carto.com';
// const apiBaseUrl = 'https://gcp-us-east1-05.dev.api.carto.com';

// For now, define here. Eventually LayerFactory will be available in @deck.gl/carto
const layerClasses: Record<LayerType, _ConstructorOf<Layer>> = {
clusterTile: ClusterTileLayer,
h3: H3TileLayer,
heatmapTile: HeatmapTileLayer,
mvt: VectorTileLayer,
quadbin: QuadbinTileLayer,
raster: RasterTileLayer,
tileset: VectorTileLayer,
};
function LayerFactory(layers: LayerDescriptor[]) {
function createLayers(layers: LayerDescriptor[]) {
return layers
.map(({type, props, filters}) => {
const LayerClass = layerClasses[type];
if (!LayerClass) {
console.error(`No layer class found for type: ${type}`);
return null;
}
.map((descriptor) => {
const {filters} = descriptor;
const filterProps = filters && {
...getDataFilterExtensionProps(filters),
extensions: [new DataFilterExtension({filterSize: 4})],
};
return new LayerClass({...props, ...filterProps});
return LayerFactory({
...descriptor,
props: {...descriptor.props, ...filterProps},
});
})
.filter(Boolean);
}
Expand All @@ -77,7 +58,7 @@ function createMapWithMapLibreOverlay(result: FetchMapResult) {
})
);

const overlay = new MapboxOverlay({layers: LayerFactory(result.layers)});
const overlay = new MapboxOverlay({layers: createLayers(result.layers)});
map.addControl(overlay);

return overlay;
Expand All @@ -95,7 +76,7 @@ async function createMapWithGoogleMapsOverlay(result: FetchMapResult) {
disableDefaultUI: true,
});

const overlay = new GoogleMapsOverlay({layers: LayerFactory(result.layers)});
const overlay = new GoogleMapsOverlay({layers: createLayers(result.layers)});
overlay.setMap(map);

return overlay;
Expand All @@ -116,7 +97,7 @@ async function createMap(cartoMapId: string) {
// Autorefresh the data every 5 seconds
options.autoRefresh = 5;
options.onNewData = (result) => {
deck?.setProps({layers: LayerFactory(result.layers)});
deck?.setProps({layers: createLayers(result.layers)});
};
}

Expand Down
18 changes: 9 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@
"quadbin": "^0.4.1-alpha.0"
},
"devDependencies": {
"@deck.gl/aggregation-layers": "~9.1.6",
"@deck.gl/carto": "~9.1.6",
"@deck.gl/core": "~9.1.6",
"@deck.gl/extensions": "~9.1.6",
"@deck.gl/geo-layers": "~9.1.6",
"@deck.gl/google-maps": "~9.1.6",
"@deck.gl/layers": "~9.1.6",
"@deck.gl/mapbox": "~9.1.6",
"@deck.gl/mesh-layers": "~9.1.6",
"@deck.gl/aggregation-layers": "~9.2.0-alpha.2",
"@deck.gl/carto": "~9.2.0-alpha.2",
"@deck.gl/core": "~9.2.0-alpha.2",
"@deck.gl/extensions": "~9.2.0-alpha.2",
"@deck.gl/geo-layers": "~9.2.0-alpha.2",
"@deck.gl/google-maps": "~9.2.0-alpha.2",
"@deck.gl/layers": "~9.2.0-alpha.2",
"@deck.gl/mapbox": "~9.2.0-alpha.2",
"@deck.gl/mesh-layers": "~9.2.0-alpha.2",
"@eslint/js": "^9.21.0",
"@googlemaps/js-api-loader": "^1.16.6",
"@lit/react": "^1.0.7",
Expand Down
Loading