Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Feat] Add OSM road tool to support point analysis on road networks (#3117)
Xun Li1542bb6f70cb
diff --git a/examples/demo-app/package.json b/examples/demo-app/package.jsonindex c67d2d301..c09c00ce8 100644--- a/examples/demo-app/package.json+++ b/examples/demo-app/package.json@@ -31,8 +31,8 @@"@loaders.gl/csv": "^4.3.2","@loaders.gl/json": "^4.3.2","@loaders.gl/parquet": "^4.3.2",- "@openassistant/core": "^0.4.3",- "@openassistant/ui": "^0.4.3",+ "@openassistant/core": "^0.4.4",+ "@openassistant/ui": "^0.4.4","@types/classnames": "^2.3.1","@types/keymirror": "^0.1.1","apache-arrow": ">=15.0.0",diff --git a/examples/demo-app/yarn.lock b/examples/demo-app/yarn.lockindex 02f9a213a..8732514d5 100644--- a/examples/demo-app/yarn.lock+++ b/examples/demo-app/yarn.lock@@ -4710,9 +4710,9 @@ __metadata:languageName: nodelinkType: hard-"@openassistant/core@npm:0.4.3, @openassistant/core@npm:^0.4.3":- version: 0.4.3- resolution: "@openassistant/core@npm:0.4.3"+"@openassistant/core@npm:0.4.4, @openassistant/core@npm:^0.4.4":+ version: 0.4.4+ resolution: "@openassistant/core@npm:0.4.4"dependencies:"@ai-sdk/openai": "npm:^1.3.21""@ai-sdk/react": "npm:^1.2.11"@@ -4741,7 +4741,7 @@ __metadata:optional: trueollama-ai-provider:optional: true- checksum: 10c0/4981ffe30c60174990b8dc9eb19f5fc51d26ad766bd33bc30dc0e8b2875ef65baedb564a9de87326a73a1d7adaf4cdcaa75f94572ebb73693dbb8c0648b12412+ checksum: 10c0/79ab709cd7e993b93758ab9ec1ac4e15a861ac8b3647de3fe9b19e2188f2056fec50fd9a4ed6d26c1026595d4b98758e84d274e8d028bba2c112db2252a63272languageName: nodelinkType: hard@@ -4822,13 +4822,13 @@ __metadata:languageName: nodelinkType: hard-"@openassistant/ui@npm:^0.4.3":- version: 0.4.3- resolution: "@openassistant/ui@npm:0.4.3"+"@openassistant/ui@npm:^0.4.4":+ version: 0.4.4+ resolution: "@openassistant/ui@npm:0.4.4"dependencies:"@iconify/react": "npm:^5.1.0""@nextui-org/react": "npm:^2.6.10"- "@openassistant/core": "npm:0.4.3"+ "@openassistant/core": "npm:0.4.4"framer-motion: "npm:^11.15.0"html2canvas: "npm:^1.4.1"next-themes: "npm:^0.4.4"@@ -4839,7 +4839,7 @@ __metadata:peerDependencies:react: ">=18.2"react-dom: ">=18.2"- checksum: 10c0/eeeb1c35aa1102a9984f2116cd9a35bb4df59dca8a16c50b72b5585ede635b9f12d5e62e39cb51a6f18508098f4e6a23e88fcc76d97baef7bbb02feca8786f22+ checksum: 10c0/642f8e606e2abab5ef710ba17a4e14a0d8926b1c57fb79b8a816adaaad342dbe058cfa58ab279bf09e43459dbcef0c04e1eb4d0e916211b9c4faa91a6aabae68languageName: nodelinkType: hard@@ -14934,8 +14934,8 @@ __metadata:"@loaders.gl/csv": "npm:^4.3.2""@loaders.gl/json": "npm:^4.3.2""@loaders.gl/parquet": "npm:^4.3.2"- "@openassistant/core": "npm:^0.4.3"- "@openassistant/ui": "npm:^0.4.3"+ "@openassistant/core": "npm:^0.4.4"+ "@openassistant/ui": "npm:^0.4.4""@types/classnames": "npm:^2.3.1""@types/keymirror": "npm:^0.1.1"apache-arrow: "npm:>=15.0.0"diff --git a/src/ai-assistant/package.json b/src/ai-assistant/package.jsonindex 467c16f92..ec6f72a74 100644--- a/src/ai-assistant/package.json+++ b/src/ai-assistant/package.json@@ -40,13 +40,13 @@"@kepler.gl/table": "3.1.7","@kepler.gl/types": "3.1.7","@kepler.gl/utils": "3.1.7",- "@openassistant/core": "^0.4.3",- "@openassistant/duckdb": "^0.4.3",- "@openassistant/echarts": "^0.4.3",- "@openassistant/geoda": "^0.4.3",- "@openassistant/osm": "^0.4.3",- "@openassistant/ui": "^0.4.3",- "@openassistant/utils": "^0.4.3",+ "@openassistant/core": "^0.4.4",+ "@openassistant/duckdb": "^0.4.4",+ "@openassistant/echarts": "^0.4.4",+ "@openassistant/geoda": "^0.4.4",+ "@openassistant/osm": "^0.4.4",+ "@openassistant/ui": "^0.4.4",+ "@openassistant/utils": "^0.4.4","color-interpolate": "^1.0.5","global": "^4.3.0","ollama-ai-provider": "^1.2.0",diff --git a/src/ai-assistant/src/constants.ts b/src/ai-assistant/src/constants.tsindex cc627f207..4aab0ffdc 100644--- a/src/ai-assistant/src/constants.ts+++ b/src/ai-assistant/src/constants.ts@@ -5,7 +5,7 @@ export const WELCOME_MESSAGE = `Hi, I am Kepler.gl AI Assistant!`;export const INSTRUCTIONS = `You are a Kepler.gl AI Assistant.Note:-- Make a plan to answer the question before calling tools+- IMPORTANT: make a plan if tools can be used to answer the question before calling tools- Add emojis to your responses to make them more engaging- For tool usage:@@ -32,6 +32,12 @@ Note:3. For spatial joins:a. Use the points dataset as the first (left) datasetb. Explain the join operation and its purpose+ 4. For using road or line dataset in spatial analysis (e.g. local moran, spatial weights, and spatial join):+ a. buffer the road by 1 meter first+ b. save the buffered road as a new dataset+ c. if needed, spatial join by buffered road (left) with points (right)+ d. if needed, create a spatial weights using the buffered road+ e. apply spatial analysis using the count in the result of spatial join- For spatial filtering:1. IMPORTANT: when use spatial filter to filter the points within polygons, please follow the steps:diff --git a/src/ai-assistant/src/tools/geo-tools.tsx b/src/ai-assistant/src/tools/geo-tools.tsxindex 15daa9950..5b95b88c0 100644--- a/src/ai-assistant/src/tools/geo-tools.tsx+++ b/src/ai-assistant/src/tools/geo-tools.tsx@@ -38,7 +38,8 @@ import {isochrone,getCachedData,IsochroneTool,- RoutingTool+ RoutingTool,+ roads} from '@openassistant/osm';import {Datasets} from '@kepler.gl/table';import {Layer} from '@kepler.gl/layers';@@ -206,6 +207,14 @@ export function getGeoTools(}};+ const roadsTool = {+ ...roads,+ context: {+ ...roads.context,+ getGeometries+ }+ };+return {classifyTool,weightsTool,@@ -226,7 +235,8 @@ export function getGeoTools(queryUSZipcodes,geocoding,routing: routingTool,- isochrone: isochroneTool+ isochrone: isochroneTool,+ roads: roadsTool};}diff --git a/src/ai-assistant/src/tools/lisa-tool.tsx b/src/ai-assistant/src/tools/lisa-tool.tsxindex d4c8b57d2..4601e88b3 100644--- a/src/ai-assistant/src/tools/lisa-tool.tsx+++ b/src/ai-assistant/src/tools/lisa-tool.tsx@@ -81,6 +81,7 @@ export function LisaToolComponent({for (let i = 0; i < colors.length; i++) {colorLegends[colors[i]] = labels[i];}+ const colorMap = colors.map((color, index) => [index, color]);const newLayer = {id: layerId,type: layer.type,@@ -93,17 +94,27 @@ export function LisaToolComponent({}, {}),colorScale: 'customOrdinal',colorField,- strokeColorField: null,+ strokeColorDomain: colorDomain,+ strokeColorField: colorField,+ strokeColorScale: 'customOrdinal',visConfig: {...layer.config.visConfig,colorRange: {...layer.config.visConfig.colorRange,colorDomain,- colors: colors,- colorMap: colors.map((color, index) => [index, color]),+ colors,+ colorMap,colorLegends},- stroked: false+ strokeColorRange: {+ category: 'Custom',+ name: 'custom',+ colors,+ colorMap+ },+ strokeOpacity: 1,+ stroked: true,+ strokedWidth: 0.5}}};diff --git a/yarn.lock b/yarn.lockindex ee8a03838..f9dee1f63 100644--- a/yarn.lock+++ b/yarn.lock@@ -3324,13 +3324,13 @@ __metadata:"@kepler.gl/table": "npm:3.1.7""@kepler.gl/types": "npm:3.1.7""@kepler.gl/utils": "npm:3.1.7"- "@openassistant/core": "npm:^0.4.3"- "@openassistant/duckdb": "npm:^0.4.3"- "@openassistant/echarts": "npm:^0.4.3"- "@openassistant/geoda": "npm:^0.4.3"- "@openassistant/osm": "npm:^0.4.3"- "@openassistant/ui": "npm:^0.4.3"- "@openassistant/utils": "npm:^0.4.3"+ "@openassistant/core": "npm:^0.4.4"+ "@openassistant/duckdb": "npm:^0.4.4"+ "@openassistant/echarts": "npm:^0.4.4"+ "@openassistant/geoda": "npm:^0.4.4"+ "@openassistant/osm": "npm:^0.4.4"+ "@openassistant/ui": "npm:^0.4.4"+ "@openassistant/utils": "npm:^0.4.4"color-interpolate: "npm:^1.0.5"global: "npm:^4.3.0"ollama-ai-provider: "npm:^1.2.0"@@ -6381,9 +6381,9 @@ __metadata:languageName: nodelinkType: hard-"@openassistant/common@npm:0.4.3":- version: 0.4.3- resolution: "@openassistant/common@npm:0.4.3"+"@openassistant/common@npm:0.4.4":+ version: 0.4.4+ resolution: "@openassistant/common@npm:0.4.4"dependencies:"@iconify/react": "npm:^5.1.0""@nextui-org/react": "npm:^2.6.10"@@ -6392,13 +6392,13 @@ __metadata:peerDependencies:react: ">=18.2"react-dom: ">=18.2"- checksum: 10c0/d557463d8bd271c6545bf3c093450ec517899fcaa85492108bfc44341f6e4e9755306a5a0d9fb71a9d458e4bd00ef0715b2bc0f9b9828d9e7700870012dce251+ checksum: 10c0/9a162d6bdda2535013fae7cc6bd2ca9c84591c69288344a62ee3187acdfcd5cbada68724319ee4626638a15821b072cff7a64f9134515ec901009793a85432c6languageName: nodelinkType: hard-"@openassistant/core@npm:0.4.3, @openassistant/core@npm:^0.4.3":- version: 0.4.3- resolution: "@openassistant/core@npm:0.4.3"+"@openassistant/core@npm:0.4.4, @openassistant/core@npm:^0.4.4":+ version: 0.4.4+ resolution: "@openassistant/core@npm:0.4.4"dependencies:"@ai-sdk/openai": "npm:^1.3.21""@ai-sdk/react": "npm:^1.2.11"@@ -6427,13 +6427,13 @@ __metadata:optional: trueollama-ai-provider:optional: true- checksum: 10c0/4981ffe30c60174990b8dc9eb19f5fc51d26ad766bd33bc30dc0e8b2875ef65baedb564a9de87326a73a1d7adaf4cdcaa75f94572ebb73693dbb8c0648b12412+ checksum: 10c0/79ab709cd7e993b93758ab9ec1ac4e15a861ac8b3647de3fe9b19e2188f2056fec50fd9a4ed6d26c1026595d4b98758e84d274e8d028bba2c112db2252a63272languageName: nodelinkType: hard-"@openassistant/duckdb@npm:^0.4.3":- version: 0.4.3- resolution: "@openassistant/duckdb@npm:0.4.3"+"@openassistant/duckdb@npm:^0.4.4":+ version: 0.4.4+ resolution: "@openassistant/duckdb@npm:0.4.4"dependencies:"@duckdb/duckdb-wasm": "npm:^1.29.0""@nextui-org/react": "npm:^2.6.8"@@ -6442,17 +6442,17 @@ __metadata:peerDependencies:react: ">=18.2"react-dom: ">=18.2"- checksum: 10c0/81aa11e9c5b34e9d438a902c6f2a5f0816a31994b05d8536419705cf31e403071d755717a256ae70881edf90b06036e2c0b94c7e739c00e28146c62ecc11872d+ checksum: 10c0/fa813628cb26d1fe18a9f4befd01d266f2aec0ae4c90fdde34f870296c677be1b0bd3c55f1cd08d860a56b7d944b8bfe1353e583c12a6dbd792bb0e491a43af4languageName: nodelinkType: hard-"@openassistant/echarts@npm:0.4.3, @openassistant/echarts@npm:^0.4.3":- version: 0.4.3- resolution: "@openassistant/echarts@npm:0.4.3"+"@openassistant/echarts@npm:0.4.4, @openassistant/echarts@npm:^0.4.4":+ version: 0.4.4+ resolution: "@openassistant/echarts@npm:0.4.4"dependencies:"@iconify/react": "npm:^5.1.0""@nextui-org/react": "npm:^2.6.10"- "@openassistant/common": "npm:0.4.3"+ "@openassistant/common": "npm:0.4.4"echarts: "npm:^5.5.1"echarts-for-react: "npm:^3.0.2"jstat: "npm:^1.9.6"@@ -6461,13 +6461,13 @@ __metadata:peerDependencies:react: ">=18.2"react-dom: ">=18.2"- checksum: 10c0/b03dedf95d74c501dfc429bec5a7ca2d439501f4974439d171261725541b869098101e423b422e6a59cb38c543155d9bf32f9434c9bede4854ddd47ca128c573+ checksum: 10c0/b33811c013fd0f269307a693aefdec7ad76e76e228f0fa5a2d5e292d5ca1bfeed8f591c0c89392f6c2401390fb9fe92f31114e957a7d28234503fffad380df97languageName: nodelinkType: hard-"@openassistant/geoda@npm:^0.4.3":- version: 0.4.3- resolution: "@openassistant/geoda@npm:0.4.3"+"@openassistant/geoda@npm:^0.4.4":+ version: 0.4.4+ resolution: "@openassistant/geoda@npm:0.4.4"dependencies:"@geoda/core": "npm:^0.0.9""@geoda/lisa": "npm:^0.0.9"@@ -6476,35 +6476,35 @@ __metadata:"@loaders.gl/gis": "npm:^4.3.3""@loaders.gl/schema": "npm:^4.3.3""@nextui-org/react": "npm:^2.6.8"- "@openassistant/common": "npm:0.4.3"- "@openassistant/echarts": "npm:0.4.3"+ "@openassistant/common": "npm:0.4.4"+ "@openassistant/echarts": "npm:0.4.4"framer-motion: "npm:^11.15.0"tailwindcss: "npm:^3.4.17"peerDependencies:react: ">=18.2"react-dom: ">=18.2"- checksum: 10c0/0614c4f8d2f95331afcb29741db87bb412db43bad030ea256e440413741178efe14593f7c1b332a4766fdc999ece87fc68ea7d152963f305bebadebcc474638f+ checksum: 10c0/3fc4c5220f4eca821b22a316310d787ee2b18fac1afc8a2ba953203a61f599bafd399bd40086112a0e94b1d558a7a86be8dc5da305e870ee88acb5e9968e53a1languageName: nodelinkType: hard-"@openassistant/osm@npm:^0.4.3":- version: 0.4.3- resolution: "@openassistant/osm@npm:0.4.3"+"@openassistant/osm@npm:^0.4.4":+ version: 0.4.4+ resolution: "@openassistant/osm@npm:0.4.4"dependencies:- "@openassistant/utils": "npm:0.4.3"+ "@openassistant/utils": "npm:0.4.4"zip3: "npm:^1.0.4"zod: "npm:^3.24.4"- checksum: 10c0/ff660b492e1642d50d654bdfacd918b8ff44193668ae94a877c5e11e479b2439bd5dbf52e2ccea2914b82ebbe1f5feb589b808af6015ecd11393c7d6903a3e6a+ checksum: 10c0/2f84547f66a8d5aff2633be596d9ca3c776562f2873c7f7842fb57068c110d96afce1d4e3fe61b343e329aee394b0da66e8a8f1904504c13fed9121e10cc5494languageName: nodelinkType: hard-"@openassistant/ui@npm:^0.4.3":- version: 0.4.3- resolution: "@openassistant/ui@npm:0.4.3"+"@openassistant/ui@npm:^0.4.4":+ version: 0.4.4+ resolution: "@openassistant/ui@npm:0.4.4"dependencies:"@iconify/react": "npm:^5.1.0""@nextui-org/react": "npm:^2.6.10"- "@openassistant/core": "npm:0.4.3"+ "@openassistant/core": "npm:0.4.4"framer-motion: "npm:^11.15.0"html2canvas: "npm:^1.4.1"next-themes: "npm:^0.4.4"@@ -6515,18 +6515,18 @@ __metadata:peerDependencies:react: ">=18.2"react-dom: ">=18.2"- checksum: 10c0/eeeb1c35aa1102a9984f2116cd9a35bb4df59dca8a16c50b72b5585ede635b9f12d5e62e39cb51a6f18508098f4e6a23e88fcc76d97baef7bbb02feca8786f22+ checksum: 10c0/642f8e606e2abab5ef710ba17a4e14a0d8926b1c57fb79b8a816adaaad342dbe058cfa58ab279bf09e43459dbcef0c04e1eb4d0e916211b9c4faa91a6aabae68languageName: nodelinkType: hard-"@openassistant/utils@npm:0.4.3, @openassistant/utils@npm:^0.4.3":- version: 0.4.3- resolution: "@openassistant/utils@npm:0.4.3"+"@openassistant/utils@npm:0.4.4, @openassistant/utils@npm:^0.4.4":+ version: 0.4.4+ resolution: "@openassistant/utils@npm:0.4.4"dependencies:zod: "npm:^3.24.4"peerDependencies:react: ">=18.2"- checksum: 10c0/1907e011f7e2797444e8e9cb1471066d4cc85ad9898aba5e68bbd4c87c0ffb1e3f53c79c7caee125f652735977408fefc98289b89e3d16ec76a7e7c1c864fe1a+ checksum: 10c0/31e97e407d6512cf2c46d6bef0c0e6b1c223e1cdd78195951286289fcfe75e79d1f2b8277734383284636fb8db16b326fa75baa51576a53859d27d6bb1cc9c3dlanguageName: nodelinkType: hard