Skip to content

Commit

Permalink
clean up
Browse files Browse the repository at this point in the history
Signed-off-by: Xun Li <[email protected]>
  • Loading branch information
lixun910 committed Dec 18, 2023
1 parent a928fbf commit 5d0c75b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 15 deletions.
4 changes: 4 additions & 0 deletions examples/demo-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
"@kepler.gl/processors": "^3.0.0-alpha.1",
"@kepler.gl/reducers": "^3.0.0-alpha.1",
"@kepler.gl/styles": "^3.0.0-alpha.1",
"@loaders.gl/arrow": "^4.1.0-alpha.4",
"@loaders.gl/core": "^4.1.0-alpha.4",
"@loaders.gl/csv": "^4.1.0-alpha.4",
"@loaders.gl/json": "^4.1.0-alpha.4",
"d3-request": "^1.0.6",
"dropbox": "^4.0.12",
"global": "^4.3.0",
Expand Down
18 changes: 5 additions & 13 deletions examples/demo-app/src/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -295,26 +295,18 @@ function loadRemoteData(url) {

// Load data
return new Promise(resolve => {
const loaders = [CSVLoader, ArrowLoader, GeoJSONLoader];
const loadOptions = {
arrow: {
shape: 'arrow-table'
},
csv: {
shape: 'object-row-table'
},
metadata: true
};
const data = load(url, [CSVLoader, ArrowLoader, GeoJSONLoader], loadOptions);
const data = load(url, loaders, loadOptions);
resolve(data);
// requestMethod(url, (error, result) => {
// if (error) {
// reject(error);
// return;
// }
// const responseError = detectResponseError(result);
// if (responseError) {
// reject(responseError);
// return;
// }
// resolve(result);
// });
});
}

Expand Down
4 changes: 2 additions & 2 deletions examples/demo-app/src/reducers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {combineReducers} from 'redux';
import {handleActions} from 'redux-actions';

import keplerGlReducer, {combinedUpdaters, uiStateUpdaters} from '@kepler.gl/reducers';
import {processGeojson, processCsvData, processArrowTable} from '@kepler.gl/processors';
import {processGeojson, processRowObject, processArrowTable} from '@kepler.gl/processors';
import KeplerGlSchema from '@kepler.gl/schemas';
import {EXPORT_MAP_FORMATS} from '@kepler.gl/constants';

Expand Down Expand Up @@ -107,7 +107,7 @@ export const loadRemoteResourceSuccess = (state, action) => {
// TODO: replace generate with a different function
const datasetId = action.options.id || generateHashId(6);
const {dataUrl} = action.options;
let processorMethod = processCsvData;
let processorMethod = processRowObject;
// TODO: create helper to determine file ext eligibility
if (dataUrl.includes('.json') || dataUrl.includes('.geojson')) {
processorMethod = processGeojson;
Expand Down

0 comments on commit 5d0c75b

Please sign in to comment.