Skip to content

Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.

Geojson sample (#3)

Giuseppe Macrì96d421463755
diff --git a/examples/demo-app/src/actions.js b/examples/demo-app/src/actions.js
index a4b22101b..07adb05b2 100644
--- a/examples/demo-app/src/actions.js
+++ b/examples/demo-app/src/actions.js
@@ -29,6 +29,7 @@ export const INIT = 'INIT';
export const SET_LOADING_METHOD = 'SET_LOADING_METHOD';
export const LOAD_REMOTE_FILE_DATA_SUCCESS = 'LOAD_DATA_SUCCESS';
export const LOAD_MAP_SAMPLE_FILE = 'LOAD_MAP_SAMPLE_FILE';
+export const SET_SAMPLE_LOADING_STATUS = 'SET_SAMPLE_LOADING_STATUS';
// ACTIONS
export function setLoadingMethod(method) {
@@ -47,36 +48,58 @@ export function loadResponseFromRemoteFile(response, config, map) {
};
}
-export function laodMapSampleFile(samples) {
+export function loadMapSampleFile(samples) {
return {
type: LOAD_MAP_SAMPLE_FILE,
samples
};
}
+export function setLoadingMapStatus(isMapLoading) {
+ return {
+ type: SET_SAMPLE_LOADING_STATUS,
+ isMapLoading
+ };
+}
+
export function loadSampleMap(sample) {
return (dispatch) => {
dispatch(push(`/demo/${sample.id}`));
dispatch(loadRemoteMap(sample));
- dispatch(toggleModal(null));
+ dispatch(setLoadingMapStatus(true));
};
}
+function loadMapCallback(dispatch, error, result, sample, config) {
+ if (error) {
+ console.warn(`Error loading datafile ${sample.dataUrl}`);
+ // dispatch(ERROR)
+ } else {
+ dispatch(loadResponseFromRemoteFile(result, config, sample));
+ dispatch(toggleModal(null));
+ }
+}
+
function loadRemoteMap(sample) {
return (dispatch) => {
+ // Load configuration first
requestJson(sample.configUrl, (confError, config) => {
if (confError) {
Console.warn(`Error loading config file ${sample.configUrl}`);
// dispatch(error)
return;
}
- requestText(sample.dataUrl, (dataError, result) => {
- if (dataError) {
- Console.warn(`Error loading datafile ${sample.dataUrl}`);
- // dispatch(ERROR)
- } else {
- dispatch(loadResponseFromRemoteFile(result, config, sample));
- }
+
+ let requestMethod = requestText;
+
+
+ if (sample.dataUrl.includes('.json') || sample.dataUrl.includes('.geojson')) {
+ requestMethod = requestJson;
+ }
+
+ // Load data
+ requestMethod(sample.dataUrl, (dataError, result) => {
+ loadMapCallback(dispatch, dataError, result, sample, config);
});
})
}
@@ -94,13 +117,13 @@ export function loadSampleConfigurations(sampleMapId = null) {
if (error) {
Console.warn(`Error loading sample configuration file ${MAP_CONFIG_URL}`);
} else {
- dispatch(laodMapSampleFile(samples));
+ dispatch(loadMapSampleFile(samples));
// Load the specified map
if (sampleMapId) {
const map = samples.find(s => s.id === sampleMapId);
if (map) {
dispatch(loadRemoteMap(map));
- dispatch(toggleModal(null));
+ dispatch(setLoadingMapStatus(true));
}
}
}
diff --git a/examples/demo-app/src/components/load-data-modal/load-data-modal.js b/examples/demo-app/src/components/load-data-modal/load-data-modal.js
index d0b65dd04..71b11fb4c 100644
--- a/examples/demo-app/src/components/load-data-modal/load-data-modal.js
+++ b/examples/demo-app/src/components/load-data-modal/load-data-modal.js
@@ -22,6 +22,7 @@ import React, {Component} from 'react';
import classnames from 'classnames';
import styled, {ThemeProvider} from 'styled-components';
import {FileUpload} from 'kepler.gl/components';
+import LoadingSpinner from 'kepler.gl/components/common/loading-spinner';
import {themeLT} from 'kepler.gl/styles';
import {Icons} from 'kepler.gl/components/';
@@ -41,7 +42,7 @@ const propTypes = {
onSetLoadingMethod: React.PropTypes.func.isRequired
};
-export const ModalTab = styled.div`
+const ModalTab = styled.div`
align-items: flex-end;
display: flex;
border-bottom: 1px solid #d8d8d8;
@@ -122,30 +123,45 @@ const StyledTrySampleData = styled.div`
}
`;
+const StyledSpinner = styled.div`
+ text-align: center;
+ span {
+ margin: 0 auto;
+ }
+`;
+
class LoadDataModal extends Component {
render() {
- const {loadingMethod, currentOption, previousMethod, sampleMaps} = this.props;
+ const {loadingMethod, currentOption, previousMethod, sampleMaps, isMapLoading} = this.props;
return (
<ThemeProvider theme={themeLT}>
<div className="load-data-modal">
- {loadingMethod.id !== 'sample' ? (
- <Tabs
- method={loadingMethod.id}
- toggleMethod={this.props.onSetLoadingMethod}
- />
- ) : null}
- {loadingMethod.id === 'upload' ? (
- <FileUpload onFileUpload={this.props.onFileUpload} />
- ) : null}
- {loadingMethod.id === 'sample' ? (
- <SampleMapGallery
- sampleData={currentOption}
- sampleMaps={sampleMaps}
- back={() => this.props.onSetLoadingMethod(previousMethod.id)}
- onLoadSampleData={this.props.onLoadSampleData}/>
- ) : null}
+ {isMapLoading ? (
+ <StyledSpinner>
+ <LoadingSpinner />
+ </StyledSpinner>
+ ) : (
+ <div>
+ {loadingMethod.id !== 'sample' ? (
+ <Tabs
+ method={loadingMethod.id}
+ toggleMethod={this.props.onSetLoadingMethod}
+ />
+ ) : null}
+ {loadingMethod.id === 'upload' ? (
+ <FileUpload onFileUpload={this.props.onFileUpload} />
+ ) : null}
+ {loadingMethod.id === 'sample' ? (
+ <SampleMapGallery
+ sampleData={currentOption}
+ sampleMaps={sampleMaps}
+ back={() => this.props.onSetLoadingMethod(previousMethod.id)}
+ onLoadSampleData={this.props.onLoadSampleData}/>
+ ) : null}
+ </div>)
+ }
</div>
</ThemeProvider>
);
diff --git a/examples/demo-app/src/reducers.js b/examples/demo-app/src/reducers.js
index 9de3dd276..626856f0f 100644
--- a/examples/demo-app/src/reducers.js
+++ b/examples/demo-app/src/reducers.js
@@ -29,7 +29,8 @@ import {
INIT,
SET_LOADING_METHOD,
LOAD_MAP_SAMPLE_FILE,
- LOAD_REMOTE_FILE_DATA_SUCCESS
+ LOAD_REMOTE_FILE_DATA_SUCCESS,
+ SET_SAMPLE_LOADING_STATUS
} from './actions';
import {DEFAULT_LOADING_METHOD, LOADING_METHODS} from './constants/default-settings';
@@ -41,7 +42,8 @@ const initialAppState = {
loadingMethod: DEFAULT_LOADING_METHOD,
currentOption: DEFAULT_LOADING_METHOD.options[0],
previousMethod: null,
- sampleMaps: [] // this is used to store sample maps fetch from a remote json file
+ sampleMaps: [], // this is used to store sample maps fetch from a remote json file
+ isMapLoading: false // determine whether we are loading a sample map
};
// App reducer
@@ -58,6 +60,10 @@ export const appReducer = handleActions({
[LOAD_MAP_SAMPLE_FILE]: (state, action) => ({
...state,
sampleMaps: action.samples
+ }),
+ [SET_SAMPLE_LOADING_STATUS]: (state, action) => ({
+ ...state,
+ isMapLoading: action.isMapLoading
})
}, initialAppState);
@@ -72,13 +78,20 @@ const demoReducer = combineReducers({
// this can be moved into a action and call kepler.gl action
export const loadRemoteFileDataSuccess = (state, action) => {
const datasetId = action.map.id;
- const newData = Processor.processCsvData(action.response);
+ const {dataUrl} = action.map;
+ let processorMethod = Processor.processCsvData;
+
+ if (dataUrl.includes('.json') || dataUrl.includes('.geojson')) {
+ processorMethod = Processor.processGeojson;
+ }
+
const datasets = {
info: {
id: datasetId
},
- data: newData
+ data: processorMethod(action.response)
};
+
const config = KeplerGlSchema.parseSavedConfig(action.config);
const keplerGlInstance = combineUpdaters.addDataToMapComposed(
@@ -93,6 +106,10 @@ export const loadRemoteFileDataSuccess = (state, action) => {
return {
...state,
+ app: {
+ ...state.app,
+ isMapLoading: false, // we turn of the spinner
+ },
keplerGl: {
...state.keplerGl, // in case you keep multiple instances
map: keplerGlInstance