Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions bindings/kepler.gl-jupyter/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@
"@kepler.gl/reducers": "^3.2.0",
"@kepler.gl/schemas": "^3.2.0",
"@kepler.gl/styles": "^3.2.0",
"@loaders.gl/arrow": "^4.3.2",
"@loaders.gl/core": "^4.3.2",
"@loaders.gl/csv": "^4.3.2",
"@loaders.gl/json": "^4.3.2",
"@loaders.gl/arrow": "^4.3.4",
"@loaders.gl/core": "^4.3.4",
"@loaders.gl/csv": "^4.3.4",
"@loaders.gl/json": "^4.3.4",
"global": "^4.3.0",
"node-polyfill-webpack-plugin": "^1.1.2",
"querystring": "0.2.1",
Expand All @@ -96,11 +96,11 @@
"styled-components": "6.1.8"
},
"resolutions": {
"@deck.gl/core": "^8.9.27",
"@deck.gl/react": "^8.9.27",
"@deck.gl/aggregation-layers": "^8.9.27",
"@deck.gl/geo-layers": "^8.9.27",
"@deck.gl/layers": "^8.9.27"
"@deck.gl/core": "^9.2.11",
"@deck.gl/react": "^9.2.11",
"@deck.gl/aggregation-layers": "^9.2.11",
"@deck.gl/geo-layers": "^9.2.11",
"@deck.gl/layers": "^9.2.11"
},
"jupyterlab": {
"extension": "babel/labplugin",
Expand Down
4 changes: 0 additions & 4 deletions examples/demo-app/esbuild.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,6 @@ function addAliases(externals, args) {
resolveAlias[`@deck.gl/${mdl}`] = useLocalDeck
? `${NODE_MODULES_DIR}/@deck.gl/${mdl}/src`
: `${EXTERNAL_DECK_SRC}/modules/${mdl}/src`;
// types are stored in different directory
resolveAlias[`@deck.gl/${mdl}/typed`] = useLocalDeck
? `${NODE_MODULES_DIR}/@deck.gl/${mdl}/typed`
: `${EXTERNAL_DECK_SRC}/modules/${mdl}/src/types`;
});

['luma.gl', 'probe.gl', 'loaders.gl'].forEach(name => {
Expand Down
18 changes: 9 additions & 9 deletions examples/demo-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
"@kepler.gl/schemas": "^3.2.0",
"@kepler.gl/styles": "^3.2.0",
"@kepler.gl/utils": "^3.2.0",
"@loaders.gl/arrow": "^4.3.2",
"@loaders.gl/core": "^4.3.2",
"@loaders.gl/csv": "^4.3.2",
"@loaders.gl/json": "^4.3.2",
"@loaders.gl/parquet": "^4.3.2",
"@loaders.gl/arrow": "^4.3.4",
"@loaders.gl/core": "^4.3.4",
"@loaders.gl/csv": "^4.3.4",
"@loaders.gl/json": "^4.3.4",
"@loaders.gl/parquet": "^4.3.4",
"@openassistant/core": "^0.5.17",
"@openassistant/ui": "^0.5.17",
"@types/classnames": "^2.3.1",
Expand Down Expand Up @@ -60,10 +60,10 @@
"usehooks-ts": "^3.1.0"
},
"resolutions": {
"@luma.gl/core": "8.5.21",
"@luma.gl/webgl": "8.5.21",
"@deck.gl/core": "8.9.27",
"@deck.gl/extensions": "8.9.27",
"@luma.gl/core": "9.2.6",
"@luma.gl/webgl": "9.2.6",
"@deck.gl/core": "9.2.11",
"@deck.gl/extensions": "9.2.11",
"react-vis": "1.11.7"
},
"engines": {
Expand Down
37 changes: 18 additions & 19 deletions examples/get-started-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,30 @@
},
"dependencies": {
"@babel/runtime": "^7.12.1",
"@deck.gl/aggregation-layers": "^8.9.27",
"@deck.gl/core": "^8.9.27",
"@deck.gl/extensions": "^8.9.27",
"@deck.gl/geo-layers": "^8.9.27",
"@deck.gl/layers": "^8.9.27",
"@deck.gl/mesh-layers": "^8.9.27",
"@deck.gl/aggregation-layers": "^9.2.11",
"@deck.gl/core": "^9.2.11",
"@deck.gl/extensions": "^9.2.11",
"@deck.gl/geo-layers": "^9.2.11",
"@deck.gl/layers": "^9.2.11",
"@deck.gl/mesh-layers": "^9.2.11",
"@dnd-kit/core": "^6.1.0",
"@dnd-kit/modifiers": "^7.0.0",
"@dnd-kit/sortable": "^8.0.0",
"@kepler.gl/components": "3.1.7",
"@kepler.gl/reducers": "3.1.7",
"@loaders.gl/arrow": "4.3.2",
"@loaders.gl/core": "4.3.2",
"@loaders.gl/gltf": "4.3.2",
"@loaders.gl/images": "4.3.2",
"@loaders.gl/mvt": "4.3.2",
"@loaders.gl/parquet": "4.3.2",
"@loaders.gl/pmtiles": "4.3.2",
"@luma.gl/core": "8.5.21",
"@luma.gl/engine": "8.5.21",
"@luma.gl/gltools": "8.5.21",
"@luma.gl/shadertools": "8.5.21",
"@luma.gl/webgl": "8.5.21",
"@loaders.gl/arrow": "4.3.4",
"@loaders.gl/core": "4.3.4",
"@loaders.gl/gltf": "4.3.4",
"@loaders.gl/images": "4.3.4",
"@loaders.gl/mvt": "4.3.4",
"@loaders.gl/parquet": "4.3.4",
"@loaders.gl/pmtiles": "4.3.4",
"@luma.gl/core": "9.2.6",
"@luma.gl/engine": "9.2.6",
"@luma.gl/shadertools": "9.2.6",
"@luma.gl/webgl": "9.2.6",
"@math.gl/core": "^4.0.0",
"@math.gl/web-mercator": "^3.6.2",
"@math.gl/web-mercator": "^4.1.0",
"apache-arrow": "17.0.0",
"gl-matrix": "^3.4.3",
"lodash": "4.17.21",
Expand Down
4 changes: 0 additions & 4 deletions examples/replace-component/esbuild.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,6 @@ function addAliases(externals, args) {
resolveAlias[`@deck.gl/${mdl}`] = useLocalDeck
? `${NODE_MODULES_DIR}/@deck.gl/${mdl}/src`
: `${EXTERNAL_DECK_SRC}/modules/${mdl}/src`;
// types are stored in different directory
resolveAlias[`@deck.gl/${mdl}/typed`] = useLocalDeck
? `${NODE_MODULES_DIR}/@deck.gl/${mdl}/typed`
: `${EXTERNAL_DECK_SRC}/modules/${mdl}/src/types`;
});

['luma.gl', 'probe.gl', 'loaders.gl'].forEach(name => {
Expand Down
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const config = {
// Some libraries (even if transitive) are transitioning to ESM and need additional transpilation. Relevant issues:
// - tiny-sdf: https://github.com/visgl/deck.gl/issues/7735
transformIgnorePatterns: [
'/node_modules\\/(?!(.*@mapbox\\/tiny-sdf\\.*|@loaders\\.gl))',
'/node_modules\\/(?!(.*@mapbox\\/tiny-sdf\\.*|@loaders\\.gl|@deck\\.gl|@deck\\.gl-community|@luma\\.gl|preact))',
'\\.pnp\\.[^\\/]+$'
]
};
Expand Down
63 changes: 37 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,14 @@
"umd"
],
"dependencies": {
"@deck.gl/mapbox": "^8.9.27",
"@deck.gl/mapbox": "^9.2.11",
"@hubble.gl/core": "1.4.0",
"@hubble.gl/react": "1.4.0",
"@kepler.gl/components": "3.2.6",
"@loaders.gl/polyfills": "^4.3.2",
"@loaders.gl/polyfills": "^4.3.4",
"@types/mapbox__geo-viewport": "^0.4.1",
"html-webpack-plugin": "^4.3.0",
"math.gl": "^4.1.0",
"monaco-editor": "^0.52.0",
"typedoc": "^0.19.2"
},
Expand All @@ -133,10 +134,11 @@
"@babel/runtime": "^7.12.1",
"@babel/traverse": "^7.12.1",
"@cfaester/enzyme-adapter-react-18": "^0.7.0",
"@deck.gl/test-utils": "^8.9.27",
"@loaders.gl/polyfills": "^4.3.2",
"@luma.gl/test-utils": "^8.5.20",
"@nebula.gl/layers": "1.0.2-alpha.1",
"@deck.gl-community/editable-layers": "9.2.8",
"@deck.gl-community/layers": "9.2.8",
"@deck.gl/test-utils": "^9.2.11",
"@loaders.gl/polyfills": "^4.3.4",
"@luma.gl/test-utils": "^9.2.6",
"@open-wc/webpack-import-meta-loader": "0.4.7",
"@probe.gl/env": "^3.5.0",
"@probe.gl/test-utils": "^3.5.0",
Expand Down Expand Up @@ -210,7 +212,7 @@
"tape": "^4.9.2",
"tape-catch": "^1.0.6",
"typedoc-plugin-markdown": "^3.0.11",
"typescript": "4.7.2",
"typescript": "5.6.3",
"url-loader": "^4.1.1",
"usehooks-ts": "^3.1.0",
"watchify": "^3.6.1",
Expand All @@ -223,25 +225,34 @@
"webpack-stats-plugin": "^0.2.1"
},
"resolutions": {
"@loaders.gl/core": "4.3.2",
"@loaders.gl/csv": "4.3.2",
"@loaders.gl/draco": "4.3.2",
"@loaders.gl/gltf": "4.3.2",
"@loaders.gl/json": "4.3.2",
"@loaders.gl/loader-utils": "4.3.2",
"@loaders.gl/polyfills": "4.3.2",
"@loaders.gl/arrow": "4.3.2",
"@loaders.gl/parquet": "4.3.2",
"@loaders.gl/gis": "4.3.2",
"@loaders.gl/schema": "4.3.2",
"@loaders.gl/wkt": "4.3.2",
"@loaders.gl/wms": "4.3.2",
"@luma.gl/constants": "8.5.21",
"@luma.gl/core": "8.5.21",
"@luma.gl/experimental": "8.5.21",
"@luma.gl/shadertools": "8.5.21",
"@luma.gl/test-utils": "8.5.21",
"@luma.gl/webgl": "8.5.21",
"@deck.gl/aggregation-layers": "9.2.11",
"@deck.gl/core": "9.2.11",
"@deck.gl/extensions": "9.2.11",
"@deck.gl/geo-layers": "9.2.11",
"@deck.gl/layers": "9.2.11",
"@deck.gl/mesh-layers": "9.2.11",
"@deck.gl/mapbox": "9.2.11",
"@deck.gl/react": "9.2.11",
"@deck.gl/widgets": "9.2.11",
"@loaders.gl/core": "4.3.4",
"@loaders.gl/csv": "4.3.4",
"@loaders.gl/draco": "4.3.4",
"@loaders.gl/gltf": "4.3.4",
"@loaders.gl/json": "4.3.4",
"@loaders.gl/loader-utils": "4.3.4",
"@loaders.gl/polyfills": "4.3.4",
"@loaders.gl/arrow": "4.3.4",
"@loaders.gl/parquet": "4.3.4",
"@loaders.gl/gis": "4.3.4",
"@loaders.gl/schema": "4.3.4",
"@loaders.gl/wkt": "4.3.4",
"@loaders.gl/wms": "4.3.4",
"@luma.gl/constants": "9.2.6",
"@luma.gl/core": "9.2.6",
"@luma.gl/engine": "9.2.6",
"@luma.gl/shadertools": "9.2.6",
"@luma.gl/test-utils": "9.2.6",
"@luma.gl/webgl": "9.2.6",
"@types/lodash": "4.17.5",
"browserslist": "^4.17.0",
"caniuse-lite": "^1.0.30001636",
Expand Down
2 changes: 1 addition & 1 deletion src/actions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"umd"
],
"dependencies": {
"@deck.gl/core": "^8.9.27",
"@deck.gl/core": "^9.2.11",
"@kepler.gl/cloud-providers": "3.2.6",
"@kepler.gl/constants": "3.2.6",
"@kepler.gl/layers": "3.2.6",
Expand Down
10 changes: 5 additions & 5 deletions src/actions/src/vis-state-actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright contributors to the kepler.gl project

// vis-state-reducer
import {PickInfo} from '@deck.gl/core/lib/deck';
import {PickingInfo} from '@deck.gl/core';
import {default as ActionTypes} from './action-types';
import {FileCacheItem} from '@kepler.gl/processors';
import {Layer, LayerBaseConfig} from '@kepler.gl/layers';
Expand Down Expand Up @@ -1112,7 +1112,7 @@ export function toggleFilterFeature(
}

export type OnLayerHoverUpdaterAction = {
info: PickInfo<any> | null;
info: PickingInfo<any> | null;
mapIndex?: number;
};
/**
Expand All @@ -1124,7 +1124,7 @@ export type OnLayerHoverUpdaterAction = {
* @public
*/
export function onLayerHover(
info: PickInfo<any> | null,
info: PickingInfo<any> | null,
mapIndex?: number
): Merge<OnLayerHoverUpdaterAction, {type: typeof ActionTypes.LAYER_HOVER}> {
return {
Expand All @@ -1135,7 +1135,7 @@ export function onLayerHover(
}

export type OnLayerClickUpdaterAction = {
info: PickInfo<any> | null;
info: PickingInfo<any> | null;
};
/**
* Trigger layer click event with clicked object
Expand All @@ -1145,7 +1145,7 @@ export type OnLayerClickUpdaterAction = {
* @public
*/
export function onLayerClick(
info: PickInfo<any> | null
info: PickingInfo<any> | null
): Merge<OnLayerClickUpdaterAction, {type: typeof ActionTypes.LAYER_CLICK}> {
return {
type: ActionTypes.LAYER_CLICK,
Expand Down
11 changes: 7 additions & 4 deletions src/ai-assistant/src/components/ai-assistant-component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,11 @@ export function AiAssistantComponent() {
const instructions = `${INSTRUCTIONS}\n\n${datasetMetaData}`;

// generate ideas from LLM
const {temporaryPrompt, restartChat: libraryRestartChat} = useAssistant({...assistantProps, instructions});

const {temporaryPrompt, restartChat: libraryRestartChat} = useAssistant({
...assistantProps,
instructions
});

const restartChatRef = useRef(libraryRestartChat);
restartChatRef.current = libraryRestartChat;

Expand Down Expand Up @@ -104,13 +107,13 @@ export function AiAssistantComponent() {

const onRestartAssistant = async () => {
dispatch(updateAiAssistantMessages([]));

try {
await restartChatRef.current();
} catch (e) {
console.error('Error restarting chat:', e);
}

setRestartKey(prev => prev + 1);
};

Expand Down
12 changes: 6 additions & 6 deletions src/ai-assistant/src/config/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
// Copyright contributors to the kepler.gl project

export const PROVIDER_DEFAULT_BASE_URLS = {
"openai": "https://api.openai.com/v1",
"anthropic": "https://api.anthropic.com/v1",
"google": "https://generativelanguage.googleapis.com/v1beta",
"deepseek": "https://api.deepseek.com/v1",
"xai": "https://api.x.ai/v1",
"ollama": "http://localhost:11434/api"
openai: 'https://api.openai.com/v1',
anthropic: 'https://api.anthropic.com/v1',
google: 'https://generativelanguage.googleapis.com/v1beta',
deepseek: 'https://api.deepseek.com/v1',
xai: 'https://api.x.ai/v1',
ollama: 'http://localhost:11434/api'
};

export const PROVIDER_MODELS = {
Expand Down
15 changes: 8 additions & 7 deletions src/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@
"umd"
],
"dependencies": {
"@deck.gl/core": "^8.9.27",
"@deck.gl/react": "^8.9.27",
"@deck.gl-community/editable-layers": "9.2.8",
"@deck.gl/core": "^9.2.11",
"@deck.gl/react": "^9.2.11",
"@deck.gl/widgets": "^9.2.11",
"@dnd-kit/core": "^6.1.0",
"@dnd-kit/modifiers": "^7.0.0",
"@dnd-kit/sortable": "^8.0.0",
Expand All @@ -52,11 +54,10 @@
"@kepler.gl/table": "3.2.6",
"@kepler.gl/types": "3.2.6",
"@kepler.gl/utils": "3.2.6",
"@loaders.gl/mvt": "^4.3.2",
"@loaders.gl/pmtiles": "^4.3.2",
"@loaders.gl/wms": "4.3.2",
"@loaders.gl/mvt": "^4.3.4",
"@loaders.gl/pmtiles": "^4.3.4",
"@loaders.gl/wms": "4.3.4",
"@mapbox/mapbox-sdk": "^0.15.3",
"@nebula.gl/edit-modes": "1.0.2-alpha.1",
"@tippyjs/react": "^4.2.0",
"@types/classnames": "^2.3.1",
"@types/d3-array": "^2.8.0",
Expand Down Expand Up @@ -91,7 +92,7 @@
"mapbox-gl": "1.13.1",
"maplibre-gl": "^3.6.2",
"markdown-to-jsx": "^7.7.6",
"mjolnir.js": "^2.7.0",
"mjolnir.js": "^3.0.0",
"moment": "^2.10.6",
"moment-timezone": "^0.5.35",
"prop-types": "^15.6.0",
Expand Down
2 changes: 1 addition & 1 deletion src/components/src/common/data-table/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ export const TableSection = ({
height={headerGridProps.height + browserScrollBarWidth}
width={headerGridWidth}
scrollLeft={scrollLeft}
onScroll={args => onScroll?.({...args, scrollTop:scrollTop ?? 0 })}
onScroll={args => onScroll?.({...args, scrollTop: scrollTop ?? 0})}
/>
</div>
<div
Expand Down
Loading
Loading