Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Chore] Fix explicit src import (#1596)
Shan He6121a3436ce3
diff --git a/examples/demo-app/src/app.js b/examples/demo-app/src/app.jsindex 9913fdb27..67cc4f0e9 100644--- a/examples/demo-app/src/app.js+++ b/examples/demo-app/src/app.js@@ -40,7 +40,7 @@ import {onLoadCloudMapSuccess} from './actions';-import {loadCloudMap} from 'kepler.gl/actions';+import {loadCloudMap, addDataToMap, addNotification} from 'kepler.gl/actions';import {CLOUD_PROVIDERS} from './cloud-providers';const KeplerGl = require('kepler.gl/components').injectComponents([@@ -59,7 +59,7 @@ import sampleH3Data, {config as h3MapConfig} from './data/sample-hex-id-csv';import sampleS2Data, {config as s2MapConfig, dataId as s2DataId} from './data/sample-s2-data';import sampleAnimateTrip from './data/sample-animate-trip-data';import sampleIconCsv, {config as savedMapConfig} from './data/sample-icon-csv';-import {addDataToMap, addNotification} from 'kepler.gl/actions';+import {processCsvData, processGeojson} from 'kepler.gl/processors';/* eslint-enable no-unused-vars */diff --git a/package.json b/package.jsonindex f6b862462..4bb0b3731 100644--- a/package.json+++ b/package.json@@ -185,6 +185,7 @@"@probe.gl/test-utils": "^3.0.1","@testing-library/react-hooks": "^3.4.2","@types/d3-array": "^2.0.0",+ "@types/d3-scale": "^3.2.2","@types/geojson": "^7946.0.7","babel-eslint": "^10.1.0","babel-loader": "^8.0.0",diff --git a/src/components/common/animation-control/animation-control.js b/src/components/common/animation-control/animation-control.jsindex 02f226e26..d724c23ac 100644--- a/src/components/common/animation-control/animation-control.js+++ b/src/components/common/animation-control/animation-control.js@@ -25,9 +25,8 @@ import Slider from 'components/common/slider/slider';import {BottomWidgetInner} from 'components/common/styled-components';import PlaybackControlsFactory from './playback-controls';import FloatingTimeDisplayFactory from './floating-time-display';-import {snapToMarks} from 'utils/data-utils';+import {snapToMarks, datetimeFormatter} from 'utils/data-utils';import {DEFAULT_TIME_FORMAT} from 'constants/default-settings';-import {datetimeFormatter} from 'utils/data-utils';const SliderWrapper = styled.div`display: flex;diff --git a/src/components/common/color-legend.js b/src/components/common/color-legend.jsindex a1b4818cf..c2c6f832f 100644--- a/src/components/common/color-legend.js+++ b/src/components/common/color-legend.js@@ -147,6 +147,7 @@ export default class ColorLegend extends Component {const scaleFunction = SCALE_FUNC[scaleType];// color scale can only be quantize, quantile or ordinal+ // @ts-ignore fix d3 scaleconst scale = scaleFunction().domain(domain).range(range.colors);diff --git a/src/components/common/data-table/index.js b/src/components/common/data-table/index.jsindex b1cd12a51..fff479821 100644--- a/src/components/common/data-table/index.js+++ b/src/components/common/data-table/index.js@@ -30,8 +30,8 @@ import OptionDropdown from './option-dropdown';import Grid from './grid';import Button from './button';-import {ArrowUp, ArrowDown} from 'components/common/icons';-import {VertThreeDots} from 'components/common/icons';+import {ArrowUp, ArrowDown, VertThreeDots} from 'components/common/icons';+import {parseFieldValue} from 'utils/data-utils';import {adjustCellsToContainer} from './cell-size';diff --git a/src/components/common/slider/slider.js b/src/components/common/slider/slider.jsindex 8c45faa9c..f6e280ab0 100644--- a/src/components/common/slider/slider.js+++ b/src/components/common/slider/slider.js@@ -25,8 +25,7 @@ import styled from 'styled-components';import SliderHandle from './slider-handle';import SliderBarHandle from './slider-bar-handle';-import {normalizeSliderValue} from 'utils/data-utils';-import {clamp} from 'utils/data-utils';+import {normalizeSliderValue, clamp} from 'utils/data-utils';function noop() {}diff --git a/src/components/filters/filter-panels/polygon-filter-panel.js b/src/components/filters/filter-panels/polygon-filter-panel.jsindex 14bdb4200..ff8a53aa4 100644--- a/src/components/filters/filter-panels/polygon-filter-panel.js+++ b/src/components/filters/filter-panels/polygon-filter-panel.js@@ -22,8 +22,8 @@ import React, {useMemo, useCallback} from 'react';import {StyledFilterContent} from 'components/common/styled-components';import PolygonFilterFactory from 'components/filters/polygon-filter';import PanelHeaderActionFactory from 'components/side-panel/panel-header-action';-import {EyeSeen} from 'components/common/icons';-import {EyeUnseen} from 'components/common/icons';+import {EyeSeen, EyeUnseen} from 'components/common/icons';+import FilterPanelHeaderFactory from 'components/side-panel/filter-panel/filter-panel-header';import {StyledFilterPanel} from '../components';diff --git a/src/components/modal-container.js b/src/components/modal-container.jsindex 5c87c39f4..f7af49aba 100644--- a/src/components/modal-container.js+++ b/src/components/modal-container.js@@ -26,7 +26,7 @@ import {createSelector} from 'reselect';import get from 'lodash.get';import document from 'global/document';-import {EXPORT_DATA_TYPE_OPTIONS} from 'constants/default-settings';+import {EXPORT_DATA_TYPE_OPTIONS, EXPORT_MAP_FORMATS} from 'constants/default-settings';import ModalDialogFactory from './modals/modal-dialog';import {exportJson, exportHtml, exportData, exportImage, exportMap} from 'utils/export-utils';import {isValidMapInfo} from 'utils/map-info-utils';@@ -59,7 +59,7 @@ import {SHARE_MAP_ID,OVERWRITE_MAP_ID} from 'constants/default-settings';-import {EXPORT_MAP_FORMATS} from 'constants/default-settings';+import KeyEvent from 'constants/keyevent';import {getFileFormatNames, getFileExtensions} from '../reducers/vis-state-selectors';diff --git a/src/components/plot-container.js b/src/components/plot-container.jsindex 35648e4ef..db39b8f37 100644--- a/src/components/plot-container.js+++ b/src/components/plot-container.js@@ -28,9 +28,9 @@ import debounce from 'lodash.debounce';import {exportImageError} from 'utils/notifications-utils';import MapContainerFactory from './map-container';import MapsLayoutFactory from './maps-layout';-import {convertToPng} from 'utils/export-utils';+import {convertToPng, getScaleFromImageSize} from 'utils/export-utils';import {scaleMapStyleByResolution} from 'utils/map-style-utils/mapbox-gl-style-editor';-import {getScaleFromImageSize} from 'utils/export-utils';+import {findMapBounds} from 'utils/data-utils';import {getCenterAndZoomFromBounds} from 'utils/projection-utils';import {GEOCODER_LAYER_ID} from 'constants/default-settings';diff --git a/src/layers/aggregation-layer.js b/src/layers/aggregation-layer.jsindex d385f4054..31a20c933 100644--- a/src/layers/aggregation-layer.js+++ b/src/layers/aggregation-layer.js@@ -22,9 +22,12 @@ import memoize from 'lodash.memoize';import Layer from './base-layer';import {hexToRgb} from 'utils/color-utils';import {aggregate} from 'utils/aggregate-utils';-import {HIGHLIGH_COLOR_3D} from 'constants/default-settings';--import {CHANNEL_SCALES, FIELD_OPTS, DEFAULT_AGGREGATION} from 'constants/default-settings';+import {+ HIGHLIGH_COLOR_3D,+ CHANNEL_SCALES,+ FIELD_OPTS,+ DEFAULT_AGGREGATION+} from 'constants/default-settings';export const pointPosAccessor = ({lat, lng}) => dc => d => [dc.valueAt(d.index, lng.fieldIdx),diff --git a/src/layers/base-layer.js b/src/layers/base-layer.jsindex aea7a19ff..80584b945 100644--- a/src/layers/base-layer.js+++ b/src/layers/base-layer.js@@ -722,6 +722,7 @@ class Layer {cMap.set(k, typeof v === 'string' ? hexToRgb(v) : v);});+ // @ts-ignore d3 scaleconst scale = SCALE_FUNC[SCALE_TYPES.ordinal]().domain(cMap.keys()).range(cMap.values())@@ -790,6 +791,7 @@ class Layer {}getVisChannelScale(scale, domain, range, fixed) {+ // @ts-ignore d3-scale typereturn SCALE_FUNC[fixed ? 'linear' : scale]().domain(domain).range(fixed ? domain : range);diff --git a/src/reducers/provider-state-updaters.js b/src/reducers/provider-state-updaters.jsindex f990004c8..a8f229ec9 100644--- a/src/reducers/provider-state-updaters.js+++ b/src/reducers/provider-state-updaters.js@@ -20,7 +20,7 @@import {withTask} from 'react-palm/tasks';import {default as Console} from 'global/console';-import {generateHashId, getError, isPlainObject} from 'utils/utils';+import {generateHashId, getError, isPlainObject, toArray} from 'utils/utils';import {EXPORT_FILE_TO_CLOUD_TASK,ACTION_TASK,@@ -46,7 +46,7 @@ import {DATASET_FORMATS,OVERWRITE_MAP_ID} from 'constants/default-settings';-import {toArray} from 'utils/utils';+import {FILE_CONFLICT_MSG} from 'cloud-providers';import {DATASET_HANDLERS} from 'processors/data-processor';diff --git a/src/utils/dataset-utils.d.ts b/src/utils/dataset-utils.d.tsindex 9889370c0..f0277caab 100644--- a/src/utils/dataset-utils.d.ts+++ b/src/utils/dataset-utils.d.ts@@ -1,10 +1,10 @@--import {Datasets} from '../reducers/vis-state-updaters';+import {Datasets, Field} from '../reducers/vis-state-updaters';import {ProtoDataset} from '../actions';import {RGBColor} from 'reducers/types';-export function createNewDataEntry(data: ProtoDataset, datasets?: Datasets): Datasets+export function createNewDataEntry(data: ProtoDataset, datasets?: Datasets): Datasets;export function getNewDatasetColor(ds: Datasets): RGBColor;export const datasetColorMaker: Generator<RGBColor>;+export function findDefaultColorField(dataset: Dataset): false | Field;diff --git a/src/utils/index.js b/src/utils/index.jsindex 17318d31e..2e27eb815 100644--- a/src/utils/index.js+++ b/src/utils/index.js@@ -26,7 +26,7 @@ export {defaultFormatter,FIELD_DISPLAY_FORMAT} from './data-utils';-export {createNewDataEntry, datasetColorMaker} from './dataset-utils';+export {createNewDataEntry, datasetColorMaker, findDefaultColorField} from './dataset-utils';export {hexToRgb} from './color-utils';export {errorNotification} from './notifications-utils';export {dataURItoBlob, downloadFile} from './export-utils';diff --git a/src/utils/layer-utils.js b/src/utils/layer-utils.jsindex 9c3c0afd1..111a3c554 100644--- a/src/utils/layer-utils.js+++ b/src/utils/layer-utils.js@@ -17,6 +17,7 @@// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.+import {OVERLAY_TYPE} from 'layers/base-layer';import {GEOCODER_LAYER_ID} from 'constants/default-settings';diff --git a/src/utils/utils.js b/src/utils/utils.jsindex 0e5efdf8f..16043b0e5 100644--- a/src/utils/utils.js+++ b/src/utils/utils.js@@ -18,7 +18,6 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-// @ts-ignoreimport window from 'global/window';/**diff --git a/test/browser/components/modals/index.js b/test/browser/components/modals/index.jsindex 5d16bc3e9..d2602b69e 100644--- a/test/browser/components/modals/index.js+++ b/test/browser/components/modals/index.js@@ -21,7 +21,7 @@import './data-table-modal-test';import './save-map-modal-test';import './share-map-modal-test';-import './share-map-modal-test';+import './export-image-modal-test';import './load-data-modal-test';import './load-storage-map-test';diff --git a/test/browser/components/side-panel/side-panel-test.js b/test/browser/components/side-panel/side-panel-test.jsindex eb5267f1a..e7215f19b 100644--- a/test/browser/components/side-panel/side-panel-test.js+++ b/test/browser/components/side-panel/side-panel-test.js@@ -23,14 +23,14 @@ import test from 'tape';import sinon from 'sinon';import SidePanelFactory from 'components/side-panel';import SidebarFactory from 'components/side-panel/side-bar';-import PanelHeaderFactory from 'components/side-panel/panel-header';+import PanelHeaderFactory, {SaveExportDropdownFactory} from 'components/side-panel/panel-header';import LayerManagerFactory from 'components/side-panel/layer-manager';import FilterManagerFactory from 'components/side-panel/filter-manager';import InteractionManagerFactory from 'components/side-panel/interaction-manager';import MapManagerFactory from 'components/side-panel/map-manager';import PanelToggleFactory from 'components/side-panel/panel-toggle';import CustomPanelsFactory from 'components/side-panel/custom-panel';-import {SaveExportDropdownFactory} from 'components/side-panel/panel-header';+import ToolbarItem from 'components/common/toolbar-item';import * as VisStateActions from 'actions/vis-state-actions';diff --git a/test/browser/components/tooltip-config-test.js b/test/browser/components/tooltip-config-test.jsindex 958c648cc..d75dd7a3e 100644--- a/test/browser/components/tooltip-config-test.js+++ b/test/browser/components/tooltip-config-test.js@@ -27,8 +27,8 @@ import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils';import TooltipConfigFactory from 'components/side-panel/interaction-panel/tooltip-config';import DatasetTagFactory from 'components/side-panel/common/dataset-tag';import FieldSelectorFactory from 'components/common/field-selector';-import ChickletedInput from 'components/common/item-selector/chickleted-input';-import {ChickletButton} from 'components/common/item-selector/chickleted-input';+import ChickletedInput, {ChickletButton} from 'components/common/item-selector/chickleted-input';+import DropdownList from 'components/common/item-selector/dropdown-list';import Typeahead from 'components/common/item-selector/typeahead';diff --git a/test/node/utils/dataset-utils-test.js b/test/node/utils/dataset-utils-test.jsindex fa6625695..93b4ac3c3 100644--- a/test/node/utils/dataset-utils-test.js+++ b/test/node/utils/dataset-utils-test.js@@ -19,8 +19,8 @@// THE SOFTWARE.import test from 'tape';-import {findDefaultColorField} from 'utils/dataset-utils';-import {createNewDataEntry} from 'utils/dataset-utils';+import {findDefaultColorField, createNewDataEntry} from 'utils/dataset-utils';+import {processCsvData} from 'processors/data-processor';import csvData from 'test/fixtures/test-layer-data';diff --git a/website/src/reducers/index.js b/website/src/reducers/index.jsindex 59fa02df2..506ac6b0d 100644--- a/website/src/reducers/index.js+++ b/website/src/reducers/index.js@@ -19,10 +19,10 @@// THE SOFTWARE.import {combineReducers, createStore, applyMiddleware, compose} from 'redux';-import {routerReducer} from 'react-router-redux';+import {routerReducer, routerMiddleware} from 'react-router-redux';import {taskMiddleware} from 'react-palm/tasks';import thunk from 'redux-thunk';-import {routerMiddleware} from 'react-router-redux';+import {browserHistory} from 'react-router';import appReducer from './app';import demoReducer from '../../../examples/demo-app/src/reducers';diff --git a/yarn.lock b/yarn.lockindex 1519cb867..b7de31ac0 100644--- a/yarn.lock+++ b/yarn.lock@@ -2872,6 +2872,18 @@resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-2.8.0.tgz#4b70ccb0c6d2ef28dac1e7e653b3ecd1f4b1d1ee"integrity sha512-Q0ubcGHAmCRPh90/hoYB4eKWhxYKUxphwSeQrlz2tiabQ8S9zqhaE2CZJtCaLH2cjqKcjr52WPvmOA7ha0O4ZA==+"@types/d3-scale@^3.2.2":+ version "3.3.2"+ resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-3.3.2.tgz#18c94e90f4f1c6b1ee14a70f14bfca2bd1c61d06"+ integrity sha512-gGqr7x1ost9px3FvIfUMi5XA/F/yAf4UkUDtdQhpH92XCT0Oa7zkkRzY61gPVJq+DxpHn/btouw5ohWkbBsCzQ==+ dependencies:+ "@types/d3-time" "^2"++"@types/d3-time@^2":+ version "2.1.1"+ resolved "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-2.1.1.tgz#743fdc821c81f86537cbfece07093ac39b4bc342"+ integrity sha512-9MVYlmIgmRR31C5b4FVSWtuMmBHh2mOWQYfl7XAYOa8dsnb7iEmUmRSWSFgXFtkjxO65d7hTUHQC+RhR/9IWFg==+"@types/geojson@^7946.0.7":version "7946.0.7"resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"