Skip to content

Commit

Permalink
rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
lixun910 committed Jan 22, 2025
1 parent 7ffe9e7 commit e869287
Show file tree
Hide file tree
Showing 20 changed files with 81 additions and 62 deletions.
3 changes: 3 additions & 0 deletions src/duckdb/src/components/schema-panel.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project

import React, {useCallback, useEffect, useState} from 'react';
import {useSelector} from 'react-redux';
import styled from 'styled-components';
Expand Down
3 changes: 3 additions & 0 deletions src/duckdb/src/components/sql-panel.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project

import * as arrow from 'apache-arrow';
import React, {useCallback, useState, useEffect} from 'react';
import {useDispatch} from 'react-redux';
Expand Down
3 changes: 2 additions & 1 deletion src/duckdb/src/components/tree.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Copyright 2022 Foursquare Labs, Inc. All Rights Reserved.
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project

import {Collapsible, CollapsibleTrigger, CollapsibleContent} from '@radix-ui/react-collapsible';
import styled from 'styled-components';
Expand Down
3 changes: 3 additions & 0 deletions src/duckdb/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project

import {keplerGlDuckDBPlugin} from './plugin';
export {KeplerGlDuckDbTable} from './table/duckdb-table';
export {SqlPanel} from './components';
Expand Down
3 changes: 3 additions & 0 deletions src/duckdb/src/init.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project

// git@github.com:holdenmatt/duckdb-wasm-kit.git
import * as duckdb from '@duckdb/duckdb-wasm';
import {AsyncDuckDB, DuckDBConfig} from '@duckdb/duckdb-wasm';
Expand Down
2 changes: 1 addition & 1 deletion src/duckdb/src/processors/data-processor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ async function sniffCsvSchema(sample: RowData) {

// https://duckdb.org/docs/data/csv/auto_detection.html
const result = await c.query(`
FROM sniff_csv('${fileName}-${generateHashId}.csv',
FROM sniff_csv('${fileName}-${generateHashId}.csv',
sample_size = 500,
auto_type_candidates = ['FLOAT', 'INTEGER', 'TIMESTAMP', 'DATE', 'TIME', 'VARCHAR', 'BOOLEAN']);
`);
Expand Down
2 changes: 1 addition & 1 deletion src/duckdb/src/table/duckdb-table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export class KeplerGlDuckDbTable extends KeplerTable {
const createTableSql = `
install spatial;
load spatial;
CREATE TABLE '${this.label}' AS
CREATE TABLE '${this.label}' AS
SELECT *
FROM ST_READ('${this.id}');
`;
Expand Down
3 changes: 3 additions & 0 deletions src/duckdb/src/utils/perf.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project

// git@github.com:holdenmatt/duckdb-wasm-kit.git
const FgRed = '\x1b[31m';
const ResetColors = '\x1b[0m';
Expand Down
10 changes: 5 additions & 5 deletions src/effects/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/effects",
"author": "Shan He <[email protected]>",
"version": "3.1.0-alpha.5",
"version": "3.1.0-alpha.6",
"description": "kepler.gl viaual effects",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -31,10 +31,10 @@
],
"dependencies": {
"@deck.gl/core": "^8.9.27",
"@kepler.gl/common-utils": "3.1.0-alpha.5",
"@kepler.gl/constants": "3.1.0-alpha.5",
"@kepler.gl/types": "3.1.0-alpha.5",
"@kepler.gl/utils": "3.1.0-alpha.5",
"@kepler.gl/common-utils": "3.1.0-alpha.6",
"@kepler.gl/constants": "3.1.0-alpha.6",
"@kepler.gl/types": "3.1.0-alpha.6",
"@kepler.gl/utils": "3.1.0-alpha.6",
"@luma.gl/core": "^8.5.20",
"@luma.gl/shadertools": "^8.5.20",
"moment-timezone": "^0.5.35",
Expand Down
18 changes: 9 additions & 9 deletions src/layers/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/layers",
"author": "Shan He <[email protected]>",
"version": "3.1.0-alpha.5",
"version": "3.1.0-alpha.6",
"description": "kepler.gl constants used by kepler.gl components, actions and reducers",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -36,14 +36,14 @@
"@deck.gl/geo-layers": "^8.9.27",
"@deck.gl/layers": "^8.9.27",
"@deck.gl/mesh-layers": "^8.9.27",
"@kepler.gl/common-utils": "3.1.0-alpha.5",
"@kepler.gl/constants": "3.1.0-alpha.5",
"@kepler.gl/deckgl-arrow-layers": "3.1.0-alpha.5",
"@kepler.gl/deckgl-layers": "3.1.0-alpha.5",
"@kepler.gl/localization": "3.1.0-alpha.5",
"@kepler.gl/table": "3.1.0-alpha.5",
"@kepler.gl/types": "3.1.0-alpha.5",
"@kepler.gl/utils": "3.1.0-alpha.5",
"@kepler.gl/common-utils": "3.1.0-alpha.6",
"@kepler.gl/constants": "3.1.0-alpha.6",
"@kepler.gl/deckgl-arrow-layers": "3.1.0-alpha.6",
"@kepler.gl/deckgl-layers": "3.1.0-alpha.6",
"@kepler.gl/localization": "3.1.0-alpha.6",
"@kepler.gl/table": "3.1.0-alpha.6",
"@kepler.gl/types": "3.1.0-alpha.6",
"@kepler.gl/utils": "3.1.0-alpha.6",
"@loaders.gl/arrow": "^4.3.2",
"@loaders.gl/core": "^4.3.2",
"@loaders.gl/gis": "^4.3.2",
Expand Down
2 changes: 1 addition & 1 deletion src/localization/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/localization",
"author": "Shan He <[email protected]>",
"version": "3.1.0-alpha.5",
"version": "3.1.0-alpha.6",
"description": "kepler.gl constants used by kepler.gl components, actions and reducers",
"license": "MIT",
"main": "dist/index.js",
Expand Down
14 changes: 7 additions & 7 deletions src/processors/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/processors",
"author": "Shan He <[email protected]>",
"version": "3.1.0-alpha.5",
"version": "3.1.0-alpha.6",
"description": "kepler.gl constants used by kepler.gl components, actions and reducers",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -31,12 +31,12 @@
],
"dependencies": {
"@danmarshall/deckgl-typings": "4.9.22",
"@kepler.gl/common-utils": "3.1.0-alpha.5",
"@kepler.gl/constants": "3.1.0-alpha.5",
"@kepler.gl/schemas": "3.1.0-alpha.5",
"@kepler.gl/table": "3.1.0-alpha.5",
"@kepler.gl/types": "3.1.0-alpha.5",
"@kepler.gl/utils": "3.1.0-alpha.5",
"@kepler.gl/common-utils": "3.1.0-alpha.6",
"@kepler.gl/constants": "3.1.0-alpha.6",
"@kepler.gl/schemas": "3.1.0-alpha.6",
"@kepler.gl/table": "3.1.0-alpha.6",
"@kepler.gl/types": "3.1.0-alpha.6",
"@kepler.gl/utils": "3.1.0-alpha.6",
"@loaders.gl/arrow": "^4.3.2",
"@loaders.gl/core": "^4.3.2",
"@loaders.gl/csv": "^4.3.2",
Expand Down
32 changes: 16 additions & 16 deletions src/reducers/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/reducers",
"author": "Shan He <[email protected]>",
"version": "3.1.0-alpha.5",
"version": "3.1.0-alpha.6",
"description": "kepler.gl constants used by kepler.gl components, actions and reducers",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -31,21 +31,21 @@
],
"dependencies": {
"@dnd-kit/sortable": "^8.0.0",
"@kepler.gl/actions": "3.1.0-alpha.5",
"@kepler.gl/cloud-providers": "3.1.0-alpha.5",
"@kepler.gl/common-utils": "3.1.0-alpha.5",
"@kepler.gl/constants": "3.1.0-alpha.5",
"@kepler.gl/deckgl-arrow-layers": "3.1.0-alpha.5",
"@kepler.gl/deckgl-layers": "3.1.0-alpha.5",
"@kepler.gl/effects": "3.1.0-alpha.5",
"@kepler.gl/layers": "3.1.0-alpha.5",
"@kepler.gl/localization": "3.1.0-alpha.5",
"@kepler.gl/processors": "3.1.0-alpha.5",
"@kepler.gl/schemas": "3.1.0-alpha.5",
"@kepler.gl/table": "3.1.0-alpha.5",
"@kepler.gl/tasks": "3.1.0-alpha.5",
"@kepler.gl/types": "3.1.0-alpha.5",
"@kepler.gl/utils": "3.1.0-alpha.5",
"@kepler.gl/actions": "3.1.0-alpha.6",
"@kepler.gl/cloud-providers": "3.1.0-alpha.6",
"@kepler.gl/common-utils": "3.1.0-alpha.6",
"@kepler.gl/constants": "3.1.0-alpha.6",
"@kepler.gl/deckgl-arrow-layers": "3.1.0-alpha.6",
"@kepler.gl/deckgl-layers": "3.1.0-alpha.6",
"@kepler.gl/effects": "3.1.0-alpha.6",
"@kepler.gl/layers": "3.1.0-alpha.6",
"@kepler.gl/localization": "3.1.0-alpha.6",
"@kepler.gl/processors": "3.1.0-alpha.6",
"@kepler.gl/schemas": "3.1.0-alpha.6",
"@kepler.gl/table": "3.1.0-alpha.6",
"@kepler.gl/tasks": "3.1.0-alpha.6",
"@kepler.gl/types": "3.1.0-alpha.6",
"@kepler.gl/utils": "3.1.0-alpha.6",
"@loaders.gl/loader-utils": "^4.3.2",
"@mapbox/geo-viewport": "^0.4.1",
"@math.gl/web-mercator": "^3.6.2",
Expand Down
14 changes: 7 additions & 7 deletions src/schemas/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/schemas",
"author": "Shan He <[email protected]>",
"version": "3.1.0-alpha.5",
"version": "3.1.0-alpha.6",
"description": "kepler.gl schemas used by kepler.gl components, actions and reducers",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -30,12 +30,12 @@
"umd"
],
"dependencies": {
"@kepler.gl/common-utils": "3.1.0-alpha.5",
"@kepler.gl/constants": "3.1.0-alpha.5",
"@kepler.gl/layers": "3.1.0-alpha.5",
"@kepler.gl/table": "3.1.0-alpha.5",
"@kepler.gl/types": "3.1.0-alpha.5",
"@kepler.gl/utils": "3.1.0-alpha.5",
"@kepler.gl/common-utils": "3.1.0-alpha.6",
"@kepler.gl/constants": "3.1.0-alpha.6",
"@kepler.gl/layers": "3.1.0-alpha.6",
"@kepler.gl/table": "3.1.0-alpha.6",
"@kepler.gl/types": "3.1.0-alpha.6",
"@kepler.gl/utils": "3.1.0-alpha.6",
"@loaders.gl/loader-utils": "^4.3.2",
"@types/keymirror": "^0.1.1",
"@types/lodash.clonedeep": "^4.5.7",
Expand Down
4 changes: 2 additions & 2 deletions src/styles/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/styles",
"author": "Shan He <[email protected]>",
"version": "3.1.0-alpha.5",
"version": "3.1.0-alpha.6",
"description": "kepler.gl constants used by kepler.gl components, actions and reducers",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -30,7 +30,7 @@
"umd"
],
"dependencies": {
"@kepler.gl/constants": "3.1.0-alpha.5",
"@kepler.gl/constants": "3.1.0-alpha.6",
"@types/styled-components": "^5.1.32",
"styled-components": "6.1.8"
},
Expand Down
10 changes: 5 additions & 5 deletions src/table/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/table",
"author": "Shan He <[email protected]>",
"version": "3.1.0-alpha.5",
"version": "3.1.0-alpha.6",
"description": "kepler.gl constants used by kepler.gl components, actions and reducers",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -30,10 +30,10 @@
"umd"
],
"dependencies": {
"@kepler.gl/common-utils": "3.1.0-alpha.5",
"@kepler.gl/constants": "3.1.0-alpha.5",
"@kepler.gl/types": "3.1.0-alpha.5",
"@kepler.gl/utils": "3.1.0-alpha.5",
"@kepler.gl/common-utils": "3.1.0-alpha.6",
"@kepler.gl/constants": "3.1.0-alpha.6",
"@kepler.gl/types": "3.1.0-alpha.6",
"@kepler.gl/utils": "3.1.0-alpha.6",
"@loaders.gl/mvt": "^4.3.2",
"@loaders.gl/pmtiles": "^4.3.2",
"@types/d3-array": "^2.8.0",
Expand Down
4 changes: 2 additions & 2 deletions src/tasks/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/tasks",
"author": "Shan He <[email protected]>",
"version": "3.1.0-alpha.5",
"version": "3.1.0-alpha.6",
"description": "kepler.gl constants used by kepler.gl components, actions and reducers",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -30,7 +30,7 @@
"umd"
],
"dependencies": {
"@kepler.gl/processors": "3.1.0-alpha.5",
"@kepler.gl/processors": "3.1.0-alpha.6",
"react-palm": "^3.3.8"
},
"nyc": {
Expand Down
2 changes: 1 addition & 1 deletion src/types/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/types",
"author": "Shan He <[email protected]>",
"version": "3.1.0-alpha.5",
"version": "3.1.0-alpha.6",
"description": "kepler.gl types used by kepler.gl components, actions and reducers",
"license": "MIT",
"types": "index.d.ts",
Expand Down
8 changes: 4 additions & 4 deletions src/utils/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/utils",
"author": "Shan He <[email protected]>",
"version": "3.1.0-alpha.5",
"version": "3.1.0-alpha.6",
"description": "kepler.gl constants used by kepler.gl components, actions and reducers",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -32,9 +32,9 @@
"dependencies": {
"@deck.gl/core": "^8.9.27",
"@dnd-kit/sortable": "^8.0.0",
"@kepler.gl/common-utils": "3.1.0-alpha.5",
"@kepler.gl/constants": "3.1.0-alpha.5",
"@kepler.gl/types": "3.1.0-alpha.5",
"@kepler.gl/common-utils": "3.1.0-alpha.6",
"@kepler.gl/constants": "3.1.0-alpha.6",
"@kepler.gl/types": "3.1.0-alpha.6",
"@luma.gl/constants": "^8.5.20",
"@luma.gl/core": "^8.5.20",
"@mapbox/geo-viewport": "^0.4.1",
Expand Down
3 changes: 3 additions & 0 deletions src/utils/src/browser-utils.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project

/**
* Checks if the current device is an Apple device (Mac, iPhone, iPod, or iPad)
* @returns {boolean} True if the current device is an Apple device
Expand Down

0 comments on commit e869287

Please sign in to comment.