Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Enhancement] add displayName to field and show displayName whenever available (#1538)
Shan He8524061ecb96
diff --git a/package.json b/package.jsonindex 8346fd181..c59baef8e 100644--- a/package.json+++ b/package.json@@ -193,7 +193,6 @@"babel-plugin-transform-builtin-extend": "^1.1.0","babel-tape-runner": "^3.0.0","babelify": "^10.0.0",- "coveralls": "^3.0.6","documentation": "^9.1.1","enzyme": "^3.9.0","enzyme-adapter-react-16": "^1.10.0",@@ -211,7 +210,7 @@"jest-puppeteer": "^4.4.0","jsdom": "^16.4.0","json-loader": "^0.5.4",- "nyc": "^11.4.1",+ "nyc": "^15.1.0","prettier": "1.19.1","progress-bar-webpack-plugin": "^2.1.0","puppeteer": "^2.1.1",diff --git a/src/actions/actions.d.ts b/src/actions/actions.d.tsindex 8f327e242..f3333413d 100644--- a/src/actions/actions.d.ts+++ b/src/actions/actions.d.ts@@ -40,6 +40,8 @@ export type ProtoDataset = {name: string;type?: string;format?: string;+ displayName?: string;+ id?: string;}[];rows: any[][];};@@ -63,7 +65,7 @@ export type AddDataToMapPayload = {datasets: ProtoDataset[] | ProtoDataset;options?: AddDataToMapOptions;config?: ParsedConfig;- info?: Partial<MapInfo>+ info?: Partial<MapInfo>;};export function addDataToMap(@@ -93,7 +95,9 @@ export type KeplerGlInitPayload = {initialUiState?: Partial<UiState>;};-export function keplerGlInit(options?: KeplerGlInitPayload): {+export function keplerGlInit(+ options?: KeplerGlInitPayload+): {type: ActionTypes.INIT;payload: KeplerGlInitPayload;};diff --git a/src/components/common/field-selector.js b/src/components/common/field-selector.jsindex 91f11069f..7ba01a613 100644--- a/src/components/common/field-selector.js+++ b/src/components/common/field-selector.js@@ -29,7 +29,8 @@ import {toArray} from 'utils/utils';import {notNullorUndefined} from 'utils/data-utils';import FieldTokenFactory from '../common/field-token';-const defaultDisplayOption = d => d.name;+const defaultDisplayOption = d => d.displayName || d.name;+const defaultValueOption = d => d.name;const StyledToken = styled.div`display: inline-block;@@ -128,8 +129,8 @@ function FieldSelectorFactory(FieldListItemFactory) {.map(d =>fields.find(f =>notNullorUndefined(d) && d.name- ? d.name === defaultDisplayOption(f)- : d === defaultDisplayOption(f)+ ? d.name === defaultValueOption(f)+ : d === defaultValueOption(f))).filter(d => d)@@ -156,7 +157,7 @@ function FieldSelectorFactory(FieldListItemFactory) {getOptionValue={d => d}closeOnSelect={this.props.closeOnSelect}displayOption={defaultDisplayOption}- filterOption="name"+ filterOption="displayName"fixedOptions={this.props.suggested}inputTheme={this.props.inputTheme}size={this.props.size}diff --git a/src/components/common/histogram-plot.js b/src/components/common/histogram-plot.jsindex b6eb37019..2dad6588c 100644--- a/src/components/common/histogram-plot.js+++ b/src/components/common/histogram-plot.js@@ -62,7 +62,7 @@ function HistogramPlotFactory() {const y = useMemo(() =>scaleLinear()- .domain([0, max(histogram, getValue)])+ .domain([0, Number(max(histogram, getValue))]).range([0, height]),[histogram, height, getValue]);diff --git a/src/components/common/item-selector/item-selector.js b/src/components/common/item-selector/item-selector.jsindex c16eabb3e..1f2ed7785 100644--- a/src/components/common/item-selector/item-selector.js+++ b/src/components/common/item-selector/item-selector.js@@ -277,6 +277,7 @@ class ItemSelector extends Component {className: classnames({active: this.state.showTypeahead}),+ displayOption,disabled: this.props.disabled,onClick: this._showTypeahead,error: this.props.isError,@@ -294,7 +295,6 @@ class ItemSelector extends Component {{...dropdownSelectProps}selectedItems={toArray(this.props.selectedItems)}placeholder={this.props.placeholder}- displayOption={displayOption}removeItem={this._removeItem}CustomChickletComponent={this.props.CustomChickletComponent}inputTheme={this.props.inputTheme}diff --git a/src/components/map/layer-hover-info.js b/src/components/map/layer-hover-info.jsindex 3c0ccfe83..69c19e518 100644--- a/src/components/map/layer-hover-info.js+++ b/src/components/map/layer-hover-info.js@@ -118,7 +118,13 @@ const EntryInfoRow = ({item, fields, data, primaryData, compareType}) => {compareType});- return <Row name={field.name} value={displayValue} deltaValue={displayDeltaValue} />;+ return (+ <Row+ name={field.displayName || field.name}+ value={displayValue}+ deltaValue={displayDeltaValue}+ />+ );};// TODO: supporting comparative value for aggregated cells as welldiff --git a/src/components/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.js b/src/components/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.jsindex 4aebd7a56..607f42147 100644--- a/src/components/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.js+++ b/src/components/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.js@@ -115,11 +115,14 @@ function TooltipChickletFactory(dataId, config, onChange, fields) {};render() {- const {disabled, name, remove} = this.props;+ const {disabled, item, displayOption, remove} = this.props;const {show} = this.state;const tooltipField = config.fieldsToShow[dataId].find(- fieldToShow => fieldToShow.name === name+ fieldToShow => fieldToShow.name === item.name);+ if (!tooltipField) {+ return null;+ }const formatLabels = getFormatLabels(fields, tooltipField.name);const hasFormat = Boolean(tooltipField.format);const selectionIndex = formatLabels.findIndex(fl => getValue(fl) === tooltipField.format);@@ -127,10 +130,10 @@ function TooltipChickletFactory(dataId, config, onChange, fields) {return (<ChickletButton ref={node => (this.node = node)}>- <ChickletTag>{name}</ChickletTag>+ <ChickletTag>{displayOption(item)}</ChickletTag>{formatLabels.length > 1 && (<ChickletAddonWrapper>- <ChickletAddon data-tip data-for={`addon-${name}`}>+ <ChickletAddon data-tip data-for={`addon-${tooltipField.name}`}><IconDiv status={hashStyle}><Hashheight="8px"@@ -140,7 +143,7 @@ function TooltipChickletFactory(dataId, config, onChange, fields) {}}/></IconDiv>- <Tooltip id={`addon-${name}`} effect="solid">+ <Tooltip id={`addon-${tooltipField.name}`} effect="solid"><span>{hasFormat ? (getFormatTooltip(formatLabels, tooltipField.format)@@ -155,7 +158,7 @@ function TooltipChickletFactory(dataId, config, onChange, fields) {<DropdownListoptions={formatLabels}selectionIndex={selectionIndex}- displayOption={item => item.label}+ displayOption={({label}) => label}onOptionSelected={(result, e) => {e.stopPropagation();this.setState({@@ -164,9 +167,9 @@ function TooltipChickletFactory(dataId, config, onChange, fields) {const oldFieldsToShow = config.fieldsToShow[dataId];const fieldsToShow = oldFieldsToShow.map(fieldToShow => {- return fieldToShow.name === name+ return fieldToShow.name === tooltipField.name? {- name,+ name: tooltipField.name,format: getValue(result)}: fieldToShow;diff --git a/src/components/side-panel/panel-header.js b/src/components/side-panel/panel-header.jsindex f97a2d354..bfdcb4cc0 100644--- a/src/components/side-panel/panel-header.js+++ b/src/components/side-panel/panel-header.js@@ -89,7 +89,7 @@ const StyledToolbar = styled(Toolbar)`export const PanelAction = ({item, onClick}) => (<StyledPanelAction data-tip data-for={`${item.id}-action`} onClick={onClick}>{item.label ? <p>{item.label}</p> : null}- <a target={item.blank ? '_blank' : ''} href={item.href}>+ <a target={item.blank ? '_blank' : ''} href={item.href} rel="noreferrer"><item.iconComponent height="20px" {...item.iconComponentProps} /></a>{item.tooltip ? (diff --git a/src/connect/with-local-selector.d.ts b/src/connect/with-local-selector.d.tsindex d36c4e4c9..f74a020e7 100644--- a/src/connect/with-local-selector.d.ts+++ b/src/connect/with-local-selector.d.ts@@ -1,8 +1,11 @@import {Component} from 'react';import KeplerGlContext from 'components/context';+import {ConnectedComponent} from 'react-redux';interface ContextSelector {(state: any, context: any): KeplerGlContext;}-export default function withLocalSelector<P, S>(component: Component<P, S>): Component<P, S>;+export default function withLocalSelector<P, S>(+ component: ConnectedComponent<P, S>+): Component<P, S>;diff --git a/src/layers/base-layer.js b/src/layers/base-layer.jsindex 3020f0673..ef76766fb 100644--- a/src/layers/base-layer.js+++ b/src/layers/base-layer.js@@ -337,7 +337,8 @@ class Layer {return {label: this.visConfigSettings[this.visualChannels[key].range].label,measure: this.config[this.visualChannels[key].field]- ? this.config[this.visualChannels[key].field].name+ ? (this.config[this.visualChannels[key].field].displayName ||+ this.config[this.visualChannels[key].field].name): this.visualChannels[key].defaultMeasure};}diff --git a/src/processors/data-processor.js b/src/processors/data-processor.jsindex 0e8ebb14d..bd4288d49 100644--- a/src/processors/data-processor.js+++ b/src/processors/data-processor.js@@ -308,6 +308,8 @@ export function getFieldsFromData(data, fieldOrder) {return {name,+ id: name,+ displayName: name,format,fieldIdx: index,type: analyzerTypeToFieldType(type),@@ -538,7 +540,7 @@ export function processGeojson(rawData) {* @returns {string} csv string*/export function formatCsv(data, fields) {- const columns = fields.map(f => f.name);+ const columns = fields.map(f => f.displayName || f.name);const formattedData = [columns];// parse geojson object as stringdiff --git a/src/processors/file-handler.d.ts b/src/processors/file-handler.d.tsindex 2b9825c68..751aade45 100644--- a/src/processors/file-handler.d.ts+++ b/src/processors/file-handler.d.ts@@ -18,7 +18,7 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import {ProtoDataset, AddDataToMapPayload} from 'actions/actions';+import {AddDataToMapPayload} from 'actions/actions';export type FileCacheItem = {data: any;diff --git a/src/reducers/vis-state-selectors.js b/src/reducers/vis-state-selectors.jsindex 008a168f2..d51c5cfb2 100644--- a/src/reducers/vis-state-selectors.js+++ b/src/reducers/vis-state-selectors.js@@ -20,7 +20,7 @@import {createSelector} from 'reselect';-// NOTE: default formats must match file-handler.js+// NOTE: default formats must match file-handler-test.jsconst DEFAULT_FILE_EXTENSIONS = ['csv', 'json', 'geojson'];const DEFAULT_FILE_FORMATS = ['CSV', 'Json', 'GeoJSON'];diff --git a/src/utils/dom-to-image.js b/src/utils/dom-to-image.jsindex bd04291b3..782cbefb5 100644--- a/src/utils/dom-to-image.js+++ b/src/utils/dom-to-image.js@@ -115,7 +115,7 @@ function toSvg(node, options) {/*** @param {Node} node - The DOM Node object to render- * @param {Object} options - Rendering options, @see {@link toSvg}+ * @param {Object} options - Rendering options* @return {Promise} - A promise that is fulfilled with a Uint8Array containing RGBA pixel data.* */function toPixelData(node, options) {@@ -126,7 +126,7 @@ function toPixelData(node, options) {/*** @param {Node} node - The DOM Node object to render- * @param {Object} options - Rendering options, @see {@link toSvg}+ * @param {Object} options - Rendering options* @return {Promise} - A promise that is fulfilled with a PNG image data URL* */function toPng(node, options) {@@ -135,7 +135,7 @@ function toPng(node, options) {/*** @param {Node} node - The DOM Node object to render- * @param {Object} options - Rendering options, @see {@link toSvg}+ * @param {Object} options - Rendering options* @return {Promise} - A promise that is fulfilled with a JPEG image data URL* */function toJpeg(node, options) {@@ -145,7 +145,7 @@ function toJpeg(node, options) {/*** @param {Node} node - The DOM Node object to render- * @param {Object} options - Rendering options, @see {@link toSvg}+ * @param {Object} options - Rendering options* @return {Promise} - A promise that is fulfilled with a PNG image blob* */function toBlob(node, options) {diff --git a/src/utils/table-utils/kepler-table.d.ts b/src/utils/table-utils/kepler-table.d.tsindex e16449b5c..32561a978 100644--- a/src/utils/table-utils/kepler-table.d.ts+++ b/src/utils/table-utils/kepler-table.d.ts@@ -7,11 +7,14 @@ export type Field = {analyzerType: string;id?: string;name: string;+ displayName: string;format: string;type: string;fieldIdx: number;valueAccessor(v: any[]): any;filterProps?: any;+ metadata?: any;+ displayName: string;};export type GpuFilter = {@@ -45,11 +48,7 @@ export type FilterDatasetOpt = {ignoreDomain?: boolean;};-export function sortDatasetByColumn(- dataset: Dataset,- column: string,- mode?: string-): Dataset;+export function sortDatasetByColumn(dataset: Dataset, column: string, mode?: string): Dataset;export function findPointFieldPairs(fields: Feild[]): FieldPair[];diff --git a/src/utils/table-utils/kepler-table.js b/src/utils/table-utils/kepler-table.jsindex ef1a76fe8..7172b8211 100644--- a/src/utils/table-utils/kepler-table.js+++ b/src/utils/table-utils/kepler-table.js@@ -71,6 +71,8 @@ class KeplerTable {const fields = data.fields.map((f, i) => ({...f,fieldIdx: i,+ id: f.name,+ displayName: f.displayName || f.name,valueAccessor: maybeToDate.bind(null,// is timediff --git a/test/browser/components/geocoder-panel-test.js b/test/browser/components/geocoder-panel-test.jsindex 01b71faa5..96e6b3cf2 100644--- a/test/browser/components/geocoder-panel-test.js+++ b/test/browser/components/geocoder-panel-test.js@@ -62,6 +62,8 @@ test('GeocoderPanel - render', t => {fields: [{name: 'lt',+ id: 'lt',+ displayName: 'lt',format: '',fieldIdx: 0,type: 'integer',@@ -70,6 +72,8 @@ test('GeocoderPanel - render', t => {},{name: 'ln',+ id: 'ln',+ displayName: 'ln',format: '',fieldIdx: 1,type: 'integer',@@ -78,6 +82,8 @@ test('GeocoderPanel - render', t => {},{name: 'icon',+ id: 'icon',+ displayName: 'icon',format: '',fieldIdx: 2,type: 'string',@@ -86,6 +92,8 @@ test('GeocoderPanel - render', t => {},{name: 'text',+ id: 'text',+ displayName: 'text',format: '',fieldIdx: 3,type: 'string',diff --git a/test/browser/file-handler.js b/test/browser/file-handler-test.jssimilarity index 94%rename from test/browser/file-handler.jsrename to test/browser/file-handler-test.jsindex 3e1622ea6..d35aa19f4 100644--- a/test/browser/file-handler.js+++ b/test/browser/file-handler-test.js@@ -46,8 +46,16 @@ global.FileReader = global.window.FileReader;global.Blob = global.window.Blob;test('#file-handler -> readFileInBatches.csv -> processFileData', async t => {- const cseFile = new File([dataWithNulls], 'text-data.csv', {type: 'text/csv'});- const gen = await readFileInBatches({file: cseFile, fileCache: []});+ const csvFile = new File([dataWithNulls], 'text-data.csv', {type: 'text/csv'});++ let gen = null;+ try {+ gen = await readFileInBatches({file: csvFile, fileList: []});+ } catch (e) {+ t.equal(true, false, 'Should read file correctly');+ t.end();+ return;+ }// metadata batchconst batch1 = await gen.next();@@ -66,7 +74,7 @@ test('#file-handler -> readFileInBatches.csv -> processFileData', async t => {t.deepEqual(Object.keys(batch1.value).sort(),Object.keys(expected1.value).sort(),- 'value should have same keyss'+ 'value should have same keys');t.equal(batch1.value.batchType, expected1.value.batchType, 'batch1.batchType should be the same');@@ -111,7 +119,7 @@ test('#file-handler -> readFileInBatches.csv -> processFileData', async t => {t.deepEqual(Object.keys(batch2.value).sort(),Object.keys(expected2.value).sort(),- 'value should have same keyss'+ 'value should have same keys');t.equal(batch2.value.fileName, expected2.value.fileName, 'batch2.fileName should be the same');@@ -151,7 +159,15 @@ test('#file-handler -> readFileInBatches.csv -> processFileData', async t => {test('#file-handler -> readFileInBatches.GeoJSON FeatureCollection -> processFileData', async t => {const geojsonFile = new File([geojsonString], 'text-data-1.geojson', {type: ''});- const gen = await readFileInBatches({file: geojsonFile, fileCache: []});++ let gen = null;+ try {+ gen = await readFileInBatches({file: geojsonFile, fileList: []});+ } catch (e) {+ t.equal(true, false, 'Should read file correctly');+ t.end();+ return;+ }// metadata batchconst batch1 = await gen.next();@@ -171,7 +187,7 @@ test('#file-handler -> readFileInBatches.GeoJSON FeatureCollection -> processFilt.deepEqual(Object.keys(batch1.value).sort(),Object.keys(expected1.value).sort(),- 'value should have same keyss'+ 'value should have same keys');t.equal(batch1.value.batchType, expected1.value.batchType, 'batch1.batchType should be the same');@@ -274,7 +290,14 @@ test('#file-handler -> readFileInBatches.GeoJSON FeatureCollection -> processFiltest('#file-handler -> readFileInBatches.GeoJSON Single Feature -> processFileData', async t => {const geojsonFile = new File([featureString], 'text-data-1.geojson', {type: ''});- const gen = await readFileInBatches({file: geojsonFile, fileCache: []});+ let gen = null;+ try {+ gen = await readFileInBatches({file: geojsonFile, fileList: []});+ } catch (e) {+ t.equal(true, false, 'Should read file correctly');+ t.end();+ return;+ }// metadata batchconst batch1 = await gen.next();@@ -294,7 +317,7 @@ test('#file-handler -> readFileInBatches.GeoJSON Single Feature -> processFileDat.deepEqual(Object.keys(batch1.value).sort(),Object.keys(expected1.value).sort(),- 'value should have same keyss'+ 'value should have same keys');t.equal(batch1.value.batchType, expected1.value.batchType, 'batch1.batchType should be the same');@@ -370,7 +393,15 @@ test('#file-handler -> readFileInBatches.GeoJSON Single Feature -> processFileDatest('#file-handler -> readFileInBatches.row -> processFileData', async t => {const fileName = 'row-data.json';const rowFile = new File([rowDataString], fileName, {type: ''});- const gen = await readFileInBatches({file: rowFile, fileCache: []});++ let gen = null;+ try {+ gen = await readFileInBatches({file: rowFile, fileList: []});+ } catch (e) {+ t.equal(true, false, 'Should read file correctly');+ t.end();+ return;+ }// metadata batchconst batch1 = await gen.next();@@ -389,7 +420,7 @@ test('#file-handler -> readFileInBatches.row -> processFileData', async t => {t.deepEqual(Object.keys(batch1.value).sort(),Object.keys(expected1.value).sort(),- 'value should have same keyss'+ 'value should have same keys');t.equal(batch1.value.batchType, expected1.value.batchType, 'batch1.batchType should be the same');@@ -494,7 +525,15 @@ test('#file-handler -> readFileInBatches.row -> processFileData', async t => {test('#file-handler -> readFileInBatches.keplerMap -> processFileData', async t => {const fileName = 'keplergl.json';const keplerGlMap = new File([JSON.stringify(keplerglMap)], fileName, {type: ''});- const gen = await readFileInBatches({file: keplerGlMap, fileCache: []});++ let gen = null;+ try {+ gen = await readFileInBatches({file: keplerGlMap, fileList: []});+ } catch (e) {+ t.equal(true, false, 'Should read file correctly');+ t.end();+ return;+ }// metadata batchconst batch1 = await gen.next();@@ -513,7 +552,7 @@ test('#file-handler -> readFileInBatches.keplerMap -> processFileData', async tt.deepEqual(Object.keys(batch1.value).sort(),Object.keys(expected1.value).sort(),- 'value should have same keyss'+ 'value should have same keys');t.equal(batch1.value.batchType, expected1.value.batchType, 'batch1.batchType should be the same');diff --git a/test/browser/index.js b/test/browser/index.jsindex fb74af5a9..cc982bf99 100644--- a/test/browser/index.js+++ b/test/browser/index.js@@ -32,4 +32,4 @@ require('./layer-tests');require('./reducers');// test processors-require('./file-handler');+require('./file-handler-test');diff --git a/test/fixtures/geojson-style.js b/test/fixtures/geojson-style.jsindex 783666a72..f72920018 100644--- a/test/fixtures/geojson-style.js+++ b/test/fixtures/geojson-style.js@@ -42,6 +42,8 @@ export const processedFeature = {export const processedFeatureFields = [{name: '_geojson',+ id: '_geojson',+ displayName: '_geojson',format: '',fieldIdx: 0,type: 'geojson',@@ -50,6 +52,8 @@ export const processedFeatureFields = [},{name: 'lat',+ id: 'lat',+ displayName: 'lat',format: '',fieldIdx: 1,type: 'real',@@ -58,6 +62,8 @@ export const processedFeatureFields = [},{name: 'lng',+ id: 'lng',+ displayName: 'lng',format: '',fieldIdx: 2,type: 'real',@@ -66,6 +72,8 @@ export const processedFeatureFields = [},{name: 'icon',+ id: 'icon',+ displayName: 'icon',format: '',fieldIdx: 3,type: 'string',@@ -100,6 +108,8 @@ export const processedFeatureRows = [export const processedFields = [{name: '_geojson',+ id: '_geojson',+ displayName: '_geojson',format: '',fieldIdx: 0,type: 'geojson',@@ -108,6 +118,8 @@ export const processedFields = [},{name: 'fillColor',+ id: 'fillColor',+ displayName: 'fillColor',format: '',fieldIdx: 1,type: 'geojson',@@ -116,6 +128,8 @@ export const processedFields = [},{name: 'radius',+ id: 'radius',+ displayName: 'radius',format: '',fieldIdx: 2,type: 'integer',@@ -124,6 +138,8 @@ export const processedFields = [},{name: 'id',+ id: 'id',+ displayName: 'id',format: '',fieldIdx: 3,type: 'string',diff --git a/test/fixtures/geojson.js b/test/fixtures/geojson.jsindex 74bc0b467..55667d875 100644--- a/test/fixtures/geojson.js+++ b/test/fixtures/geojson.js@@ -209,6 +209,8 @@ export const fields = [{type: 'geojson',name: '_geojson',+ id: '_geojson',+ displayName: '_geojson',format: '',fieldIdx: 0,analyzerType: 'GEOMETRY',@@ -217,6 +219,8 @@ export const fields = [{type: 'integer',name: 'OBJECTID',+ id: 'OBJECTID',+ displayName: 'OBJECTID',format: '',fieldIdx: 1,analyzerType: 'INT',@@ -225,6 +229,8 @@ export const fields = [{type: 'integer',name: 'ZIP_CODE',+ id: 'ZIP_CODE',+ displayName: 'ZIP_CODE',format: '',fieldIdx: 2,analyzerType: 'INT',@@ -233,6 +239,8 @@ export const fields = [{type: 'integer',name: 'ID',+ id: 'ID',+ displayName: 'ID',format: '',fieldIdx: 3,analyzerType: 'INT',@@ -241,6 +249,8 @@ export const fields = [{type: 'integer',name: 'TRIPS',+ id: 'TRIPS',+ displayName: 'TRIPS',format: '',fieldIdx: 4,analyzerType: 'INT',@@ -249,6 +259,8 @@ export const fields = [{type: 'string',name: 'RATE',+ id: 'RATE',+ displayName: 'RATE',format: '',fieldIdx: 5,analyzerType: 'STRING',@@ -257,6 +269,8 @@ export const fields = [{type: 'geojson',name: 'OBJ',+ id: 'OBJ',+ displayName: 'OBJ',format: '',fieldIdx: 6,analyzerType: 'OBJECT',@@ -529,6 +543,8 @@ export const geoJsonWithStyle = {export const geoStyleFields = [{name: '_geojson',+ id: '_geojson',+ displayName: '_geojson',format: '',fieldIdx: 0,type: 'geojson',@@ -537,6 +553,8 @@ export const geoStyleFields = [},{name: 'fillColor',+ id: 'fillColor',+ displayName: 'fillColor',format: '',fieldIdx: 1,type: 'geojson',@@ -545,6 +563,8 @@ export const geoStyleFields = [},{name: 'lineColor',+ id: 'lineColor',+ displayName: 'lineColor',format: '',fieldIdx: 2,type: 'geojson',@@ -553,6 +573,8 @@ export const geoStyleFields = [},{name: 'lineWidth',+ id: 'lineWidth',+ displayName: 'lineWidth',format: '',fieldIdx: 3,type: 'integer',@@ -561,6 +583,8 @@ export const geoStyleFields = [},{name: 'elevation',+ id: 'elevation',+ displayName: 'elevation',format: '',fieldIdx: 4,type: 'integer',@@ -569,6 +593,8 @@ export const geoStyleFields = [},{name: 'radius',+ id: 'radius',+ displayName: 'radius',format: '',fieldIdx: 5,type: 'integer',diff --git a/test/fixtures/row-object.js b/test/fixtures/row-object.jsindex 23062f862..31fc1dbd7 100644--- a/test/fixtures/row-object.js+++ b/test/fixtures/row-object.js@@ -23,6 +23,8 @@ const data = `[{"bedrooms": "Null", "bathrooms": "N/A", "effectiveyearbuilt": "Nexport const parsedFields = [{name: 'bedrooms',+ id: 'bedrooms',+ displayName: 'bedrooms',format: '',fieldIdx: 0,type: 'integer',@@ -31,6 +33,8 @@ export const parsedFields = [},{name: 'bathrooms',+ id: 'bathrooms',+ displayName: 'bathrooms',format: '',fieldIdx: 1,type: 'integer',@@ -39,6 +43,8 @@ export const parsedFields = [},{name: 'effectiveyearbuilt',+ id: 'effectiveyearbuilt',+ displayName: 'effectiveyearbuilt',format: '',fieldIdx: 2,type: 'integer',@@ -47,6 +53,8 @@ export const parsedFields = [},{name: 'roll_landbaseyear',+ id: 'roll_landbaseyear',+ displayName: 'roll_landbaseyear',format: '',fieldIdx: 3,type: 'integer',@@ -55,6 +63,8 @@ export const parsedFields = [},{name: 'roll_totlandimp',+ id: 'roll_totlandimp',+ displayName: 'roll_totlandimp',format: '',fieldIdx: 4,type: 'integer',@@ -63,6 +73,8 @@ export const parsedFields = [},{name: 'nettaxablevalue',+ id: 'nettaxablevalue',+ displayName: 'nettaxablevalue',format: '',fieldIdx: 5,type: 'integer',@@ -71,6 +83,8 @@ export const parsedFields = [},{name: 'center_lon',+ id: 'center_lon',+ displayName: 'center_lon',format: '',fieldIdx: 6,type: 'real',@@ -79,6 +93,8 @@ export const parsedFields = [},{name: 'roll_landvalue',+ id: 'roll_landvalue',+ displayName: 'roll_landvalue',format: '',fieldIdx: 7,type: 'integer',@@ -87,6 +103,8 @@ export const parsedFields = [},{name: 'usecodedescchar1',+ id: 'usecodedescchar1',+ displayName: 'usecodedescchar1',format: '',fieldIdx: 8,type: 'string',@@ -95,6 +113,8 @@ export const parsedFields = [},{name: 'usetype',+ id: 'usetype',+ displayName: 'usetype',format: '',fieldIdx: 9,type: 'string',@@ -103,6 +123,8 @@ export const parsedFields = [},{name: 'yearbuiltTS',+ id: 'yearbuiltTS',+ displayName: 'yearbuiltTS',format: 'X',fieldIdx: 10,type: 'timestamp',@@ -111,6 +133,8 @@ export const parsedFields = [},{name: 'yearbuilt',+ id: 'yearbuilt',+ displayName: 'yearbuilt',format: '',fieldIdx: 11,type: 'integer',@@ -119,6 +143,8 @@ export const parsedFields = [},{name: 'roll_impvalue',+ id: 'roll_impvalue',+ displayName: 'roll_impvalue',format: '',fieldIdx: 12,type: 'integer',@@ -127,6 +153,8 @@ export const parsedFields = [},{name: 'istaxableparcel',+ id: 'istaxableparcel',+ displayName: 'istaxableparcel',format: '',fieldIdx: 13,type: 'boolean',@@ -135,6 +163,8 @@ export const parsedFields = [},{name: 'propertylocation',+ id: 'propertylocation',+ displayName: 'propertylocation',format: '',fieldIdx: 14,type: 'string',@@ -143,6 +173,8 @@ export const parsedFields = [},{name: 'units',+ id: 'units',+ displayName: 'units',format: '',fieldIdx: 15,type: 'integer',@@ -151,6 +183,8 @@ export const parsedFields = [},{name: 'sqftmain',+ id: 'sqftmain',+ displayName: 'sqftmain',format: '',fieldIdx: 16,type: 'integer',@@ -159,6 +193,8 @@ export const parsedFields = [},{name: 'roll_totalvalue',+ id: 'roll_totalvalue',+ displayName: 'roll_totalvalue',format: '',fieldIdx: 17,type: 'integer',@@ -167,6 +203,8 @@ export const parsedFields = [},{name: 'situszip5',+ id: 'situszip5',+ displayName: 'situszip5',format: '',fieldIdx: 18,type: 'integer',@@ -175,6 +213,8 @@ export const parsedFields = [},{name: 'center_lat',+ id: 'center_lat',+ displayName: 'center_lat',format: '',fieldIdx: 19,type: 'real',diff --git a/test/fixtures/state-saved-v0.js b/test/fixtures/state-saved-v0.jsindex 01f5a7555..b09a9cdeb 100644--- a/test/fixtures/state-saved-v0.js+++ b/test/fixtures/state-saved-v0.js@@ -1156,6 +1156,8 @@ mergedLayer2.config = {isVisible: true,colorField: {name: 'song_name',+ id: 'song_name',+ displayName: 'song_name',type: 'string',format: '',fieldIdx: 0,@@ -1169,6 +1171,8 @@ mergedLayer2.config = {strokeColorDomain: [0, 1],sizeField: {name: 'int_range',+ id: 'int_range',+ displayName: 'int_range',format: '',type: 'integer',fieldIdx: 9,@@ -1236,6 +1240,8 @@ mergedLayer3.config = {isVisible: true,colorField: {name: 'int_range',+ displayName: 'int_range',+ id: 'int_range',type: 'integer',format: '',fieldIdx: 9,@@ -1299,6 +1305,8 @@ mergedLayer4.config = {isVisible: true,colorField: {name: 'ID',+ displayName: 'ID',+ id: 'ID',type: 'integer',format: '',fieldIdx: 3,diff --git a/test/fixtures/state-saved-v1-1.js b/test/fixtures/state-saved-v1-1.jsindex e95b3a31c..364c56246 100644--- a/test/fixtures/state-saved-v1-1.js+++ b/test/fixtures/state-saved-v1-1.js@@ -880,6 +880,8 @@ mergedLayer0.config = {highlightColor: [252, 242, 26, 255],colorField: {name: 'c_m_r',+ id: 'c_m_r',+ displayName: 'c_m_r',type: 'integer',format: '',fieldIdx: 8,@@ -890,6 +892,8 @@ mergedLayer0.config = {colorDomain: [45, 9642],strokeColorField: {name: 'c_m_r',+ id: 'c_m_r',+ displayName: 'c_m_r',type: 'integer',format: '',fieldIdx: 8,@@ -904,6 +908,8 @@ mergedLayer0.config = {textLabel: [DEFAULT_TEXT_LABEL],heightField: {name: 'c_a_v',+ id: 'c_a_v',+ displayName: 'c_a_v',type: 'real',format: '',fieldIdx: 10,@@ -2706,6 +2712,8 @@ mergedLayer1.config = {strokeColorDomain: [0, 1],sizeField: {name: 'c_ta',+ id: 'c_ta',+ displayName: 'c_ta',type: 'real',fieldIdx: 12,format: '',diff --git a/test/fixtures/state-saved-v1-3.js b/test/fixtures/state-saved-v1-3.jsindex 6da177873..2a9cdccc1 100644--- a/test/fixtures/state-saved-v1-3.js+++ b/test/fixtures/state-saved-v1-3.js@@ -359,6 +359,8 @@ mergedLayer0.config = {isVisible: true,colorField: {name: 'deliver_radius',+ id: 'deliver_radius',+ displayName: 'deliver_radius',type: 'integer',format: '',fieldIdx: 0,@@ -374,6 +376,8 @@ mergedLayer0.config = {strokeColorScale: 'quantile',sizeField: {name: 'deliver_radius',+ id: 'deliver_radius',+ displayName: 'deliver_radius',type: 'integer',format: '',fieldIdx: 0,diff --git a/test/fixtures/state-saved-v1-4.js b/test/fixtures/state-saved-v1-4.jsindex d246e2628..ea9c2c127 100644--- a/test/fixtures/state-saved-v1-4.js+++ b/test/fixtures/state-saved-v1-4.js@@ -224,6 +224,8 @@ mergedLayer0.config = {{field: {name: 'name',+ id: 'name',+ displayName: 'name',type: 'string',format: '',fieldIdx: 7,diff --git a/test/fixtures/test-csv-data.js b/test/fixtures/test-csv-data.jsindex 927418da4..c2f51d334 100644--- a/test/fixtures/test-csv-data.js+++ b/test/fixtures/test-csv-data.js@@ -458,6 +458,8 @@ export const testFields = [type: 'timestamp',fieldIdx: 0,name: 'gps_data.utc_timestamp',+ id: 'gps_data.utc_timestamp',+ displayName: 'gps_data.utc_timestamp',format: 'YYYY-M-D H:m:s',analyzerType: 'DATETIME',valueAccessor: values => values[0]@@ -466,6 +468,8 @@ export const testFields = [type: 'real',fieldIdx: 1,name: 'gps_data.lat',+ id: 'gps_data.lat',+ displayName: 'gps_data.lat',format: '',analyzerType: 'FLOAT',valueAccessor: values => values[1]@@ -474,6 +478,8 @@ export const testFields = [type: 'real',fieldIdx: 2,name: 'gps_data.lng',+ id: 'gps_data.lng',+ displayName: 'gps_data.lng',format: '',analyzerType: 'FLOAT',valueAccessor: values => values[2]@@ -482,6 +488,8 @@ export const testFields = [type: 'string',fieldIdx: 3,name: 'gps_data.types',+ id: 'gps_data.types',+ displayName: 'gps_data.types',format: '',analyzerType: 'STRING',valueAccessor: values => values[3]@@ -490,6 +498,8 @@ export const testFields = [type: 'timestamp',fieldIdx: 4,name: 'epoch',+ id: 'epoch',+ displayName: 'epoch',format: 'X',analyzerType: 'TIME',valueAccessor: values => values[4]@@ -498,6 +508,8 @@ export const testFields = [type: 'boolean',fieldIdx: 5,name: 'has_result',+ id: 'has_result',+ displayName: 'has_result',format: '',analyzerType: 'BOOLEAN',valueAccessor: values => values[5]@@ -506,6 +518,8 @@ export const testFields = [type: 'integer',fieldIdx: 6,name: 'id',+ id: 'id',+ displayName: 'id',format: '',analyzerType: 'INT',valueAccessor: values => values[6]@@ -514,6 +528,8 @@ export const testFields = [type: 'timestamp',fieldIdx: 7,name: 'time',+ id: 'time',+ displayName: 'time',format: 'YYYY-M-DTHH:mm:ss.SSSS',analyzerType: 'DATETIME',valueAccessor: values => values[7]@@ -522,6 +538,8 @@ export const testFields = [type: 'timestamp',fieldIdx: 8,name: 'begintrip_ts_utc',+ id: 'begintrip_ts_utc',+ displayName: 'begintrip_ts_utc',format: 'YYYY-M-D HH:mm:ssZZ',analyzerType: 'DATETIME',valueAccessor: values => values[8]@@ -530,6 +548,8 @@ export const testFields = [type: 'timestamp',fieldIdx: 9,name: 'begintrip_ts_local',+ id: 'begintrip_ts_local',+ displayName: 'begintrip_ts_local',format: 'YYYY-M-D HH:mm:ssZZ',analyzerType: 'DATETIME',valueAccessor: values => values[9]@@ -538,6 +558,8 @@ export const testFields = [type: 'date',fieldIdx: 10,name: 'date',+ id: 'date',+ displayName: 'date',format: 'YYYY-M-D',analyzerType: 'DATE',valueAccessor: values => values[10]@@ -882,6 +904,8 @@ export const wktCsvFields = [{type: 'integer',name: 'a_zip',+ id: 'a_zip',+ displayName: 'a_zip',format: '',fieldIdx: 0,analyzerType: 'INT',@@ -890,6 +914,8 @@ export const wktCsvFields = [{type: 'geojson',name: 'simplified_shape_v2',+ id: 'simplified_shape_v2',+ displayName: 'simplified_shape_v2',format: '',fieldIdx: 1,analyzerType: 'PAIR_GEOMETRY_FROM_STRING',@@ -898,6 +924,8 @@ export const wktCsvFields = [{type: 'geojson',name: 'simplified_shape',+ id: 'simplified_shape',+ displayName: 'simplified_shape',format: '',fieldIdx: 2,analyzerType: 'GEOMETRY_FROM_STRING',@@ -906,6 +934,8 @@ export const wktCsvFields = [{type: 'real',name: 'm_rate',+ id: 'm_rate',+ displayName: 'm_rate',format: '',fieldIdx: 3,analyzerType: 'FLOAT',@@ -914,6 +944,8 @@ export const wktCsvFields = [{type: 'string',name: 'c_zip_type',+ id: 'c_zip_type',+ displayName: 'c_zip_type',format: '',fieldIdx: 4,analyzerType: 'STRING',@@ -922,6 +954,8 @@ export const wktCsvFields = [{type: 'real',name: 'c_number',+ id: 'c_number',+ displayName: 'c_number',format: '',fieldIdx: 5,analyzerType: 'FLOAT',diff --git a/test/fixtures/test-hex-id-data.js b/test/fixtures/test-hex-id-data.jsindex 2c9419044..d8d3ccede 100644--- a/test/fixtures/test-hex-id-data.js+++ b/test/fixtures/test-hex-id-data.js@@ -184,6 +184,8 @@ export const mergedFilters = [const mergedFields = [{name: 'hex_id',+ id: 'hex_id',+ displayName: 'hex_id',format: '',fieldIdx: 0,type: 'string',@@ -192,6 +194,8 @@ const mergedFields = [},{name: 'value',+ id: 'value',+ displayName: 'value',format: '',fieldIdx: 1,type: 'integer',@@ -348,6 +352,8 @@ mergedH3Layer.config = {isConfigActive: false,colorField: {name: 'value',+ id: 'value',+ displayName: 'value',format: '',fieldIdx: 1,type: 'integer',diff --git a/test/node/reducers/composer-state-test.js b/test/node/reducers/composer-state-test.jsindex e96e0e284..7865acca9 100644--- a/test/node/reducers/composer-state-test.js+++ b/test/node/reducers/composer-state-test.js@@ -40,23 +40,31 @@ const mockRawData = {fields: [{name: 'start_point_lat',+ id: 'start_point_lat',+ displayName: 'start_point_lat',type: 'real',- tableFieldIndex: 1+ fieldIdx: 0},{name: 'start_point_lng',+ id: 'start_point_lng',+ displayName: 'start_point_lng',type: 'real',- tableFieldIndex: 3+ fieldIdx: 2},{name: 'end_point_lat',+ id: 'end_point_lat',+ displayName: 'end_point_lat',type: 'real',- tableFieldIndex: 4+ fieldIdx: 3},{name: 'end_point_lng',+ id: 'end_point_lng',+ displayName: 'end_point_lng',type: 'real',- tableFieldIndex: 2+ fieldIdx: 4}],rows: [diff --git a/test/node/reducers/vis-state-merger-test.js b/test/node/reducers/vis-state-merger-test.jsindex 6684acf20..982a67c8c 100644--- a/test/node/reducers/vis-state-merger-test.js+++ b/test/node/reducers/vis-state-merger-test.js@@ -268,7 +268,6 @@ test('VisStateMerger.current -> mergeLayers -> toEmptyState', t => {const appStateToSave = SchemaManager.save(stateToSave);const configToSave = appStateToSave.config;const configParsed = SchemaManager.parseSavedConfig(configToSave);-const oldState = cloneDeep(InitialState);const oldVisState = oldState.visState;diff --git a/test/node/reducers/vis-state-test.js b/test/node/reducers/vis-state-test.jsindex c68947448..fae1be868 100644--- a/test/node/reducers/vis-state-test.js+++ b/test/node/reducers/vis-state-test.js@@ -110,6 +110,8 @@ const mockData = {const expectedFields = [{name: 'start_point_lat',+ displayName: 'start_point_lat',+ id: 'start_point_lat',type: 'real',fieldIdx: 0,analyzerType: 'FLOAT',@@ -118,6 +120,8 @@ const expectedFields = [},{name: 'start_point_lng',+ displayName: 'start_point_lng',+ id: 'start_point_lng',type: 'real',fieldIdx: 1,analyzerType: 'FLOAT',@@ -126,6 +130,8 @@ const expectedFields = [},{name: 'end_point_lat',+ displayName: 'end_point_lat',+ id: 'end_point_lat',type: 'real',fieldIdx: 2,analyzerType: 'FLOAT',@@ -134,6 +140,8 @@ const expectedFields = [},{name: 'end_point_lng',+ displayName: 'end_point_lng',+ id: 'end_point_lng',type: 'real',fieldIdx: 3,analyzerType: 'FLOAT',@@ -145,6 +153,8 @@ const expectedFields = [const mockFilter = {fieldIdx: 0,name: mockData.fields[0].name,+ displayName: mockData.fields[0].name,+ id: mockData.fields[0].name,type: 'range',fieldType: 'real',value: [12.25, 12.28]@@ -154,21 +164,29 @@ const mockRawData = {fields: [{name: 'start_point_lat',+ id: 'start_point_lat',+ displayName: 'start_point_lat',type: 'real',fieldIdx: 0},{name: 'start_point_lng',+ id: 'start_point_lng',+ displayName: 'start_point_lng',type: 'real',fieldIdx: 1},{name: 'end_point_lat',+ id: 'end_point_lat',+ displayName: 'end_point_lat',type: 'real',fieldIdx: 2},{name: 'end_point_lng',+ id: 'end_point_lng',+ displayName: 'end_point_lng',type: 'real',fieldIdx: 3}@@ -2636,6 +2654,8 @@ test('#visStateReducer -> SET_FILTER_PLOT', t => {yAxis: {type: 'integer',name: 'id',+ displayName: 'id',+ id: 'id',format: '',fieldIdx: 6,analyzerType: 'INT',@@ -4933,7 +4953,7 @@ test('#visStateReducer -> LOAD_FILES', async t => {filesToLoad: [{type: 'text/csv', name: 'test-file-2.csv'}],onFinish: VisStateActions.loadFilesSuccess},- 'fileLoading should update to add result to fileCache'+ 'fileLoading should update to add result to fileCache 1');const [task5, ...more5] = drainTasksForTesting();t.equal(more5.length, 0, 'should ceate 1 task');@@ -4952,7 +4972,7 @@ test('#visStateReducer -> LOAD_FILES', async t => {loaders: [],loadOptions: {}},- 'should return an LOAD_FILE_TASK with 2nd file to load'+ 'should return an LOAD_FILE_TASK with 2nd file to load 2');const expectedFileLoadingProgress6 = {'test-file.csv': {percent: 1, message: 'Done', fileName: 'test-file.csv', error: null},@@ -4970,7 +4990,7 @@ test('#visStateReducer -> LOAD_FILES', async t => {filesToLoad: [],onFinish: VisStateActions.loadFilesSuccess},- 'fileLoading should update to add result to fileCache'+ 'fileLoading should update to add result to fileCache 3');// fast forward so we can test final resultconst asyncIterator2 = run('test-file-2.csv');diff --git a/test/node/utils/data-processor-test.js b/test/node/utils/data-processor-test.jsindex 65a5b0172..b6f5d00b0 100644--- a/test/node/utils/data-processor-test.js+++ b/test/node/utils/data-processor-test.js@@ -145,32 +145,40 @@ test('Processor -> processCsvData: duplicated field name', t => {fields: [{name: 'column1',+ id: 'column1',format: '',fieldIdx: 0,+ displayName: 'column1',type: 'string',analyzerType: 'STRING',valueAccessor: values => values[0]},{name: 'column1-0',+ id: 'column1-0',format: '',fieldIdx: 1,+ displayName: 'column1-0',type: 'string',analyzerType: 'STRING',valueAccessor: values => values[1]},{name: 'column1-1',+ id: 'column1-1',format: '',fieldIdx: 2,+ displayName: 'column1-1',type: 'string',analyzerType: 'STRING',valueAccessor: values => values[2]},{name: 'column2',+ id: 'column2',format: '',fieldIdx: 3,+ displayName: 'column2',type: 'string',analyzerType: 'STRING',valueAccessor: values => values[3]@@ -270,6 +278,8 @@ test('Processor => processGeojson: parse rows', t => {const expectedFields = [{name: '_geojson',+ id: '_geojson',+ displayName: '_geojson',format: '',fieldIdx: 0,type: 'geojson',@@ -278,6 +288,8 @@ test('Processor => processGeojson: parse rows', t => {},{name: 'TRIPS',+ id: 'TRIPS',+ displayName: 'TRIPS',format: '',fieldIdx: 1,type: 'integer',@@ -286,6 +298,8 @@ test('Processor => processGeojson: parse rows', t => {},{name: 'RATE',+ id: 'RATE',+ displayName: 'RATE',format: '',fieldIdx: 2,type: 'string',@@ -294,6 +308,8 @@ test('Processor => processGeojson: parse rows', t => {},{name: 'TIME',+ id: 'TIME',+ displayName: 'TIME',format: 'x',fieldIdx: 3,type: 'timestamp',@@ -554,6 +570,8 @@ test('Processor -> processRowObject', t => {fields: [{name: 'a',+ id: 'a',+ displayName: 'a',type: 'integer',format: '',fieldIdx: 0,@@ -562,6 +580,8 @@ test('Processor -> processRowObject', t => {},{name: 'b',+ id: 'b',+ displayName: 'b',type: 'string',format: '',fieldIdx: 1,@@ -570,6 +590,8 @@ test('Processor -> processRowObject', t => {},{name: 'c',+ id: 'c',+ displayName: 'c',type: 'boolean',format: '',fieldIdx: 2,@@ -578,6 +600,8 @@ test('Processor -> processRowObject', t => {},{name: 'd',+ id: 'd',+ displayName: 'd',type: 'real',format: '',fieldIdx: 3,diff --git a/test/node/utils/layer-utils-test.js b/test/node/utils/layer-utils-test.jsindex 986fb7824..d12faf6ce 100644--- a/test/node/utils/layer-utils-test.js+++ b/test/node/utils/layer-utils-test.js@@ -41,57 +41,57 @@ test('layerUtils -> findDefaultLayer.1', t => {// layer 1{name: 'one_lat',- tableFieldIndex: 1+ fieldIdx: 0},{name: 'one_lng',- tableFieldIndex: 2+ fieldIdx: 1},// layer 2{name: 'two_two.lng',- tableFieldIndex: 3+ fieldIdx: 2},{name: 'two_two.lat',- tableFieldIndex: 4+ fieldIdx: 3},// layer 3{name: 'three longitude',- tableFieldIndex: 5+ fieldIdx: 4},{name: 'three latitude',- tableFieldIndex: 6+ fieldIdx: 5},// layer 4{name: 'four._.lon',- tableFieldIndex: 7+ fieldIdx: 6},{name: 'four._.lat',- tableFieldIndex: 8+ fieldIdx: 7},// layer 5{name: 'lat',- tableFieldIndex: 9+ fieldIdx: 8},{name: 'lon',- tableFieldIndex: 10+ fieldIdx: 9},// non layer//{name: 'non_layer_longitude.alt',- tableFieldIndex: 11+ fieldIdx: 10},{name: 'non_layer_latitude.alt',- tableFieldIndex: 12+ fieldIdx: 11}];@@ -265,7 +265,7 @@ test('layerUtils -> findDefaultLayer.2', t => {// layer 1{name: 'all_points',- tableFieldIndex: 1+ fieldIdx: 0}];const dataId = 'milkshake';@@ -325,11 +325,11 @@ test('layerUtils -> findDefaultLayer.3', t => {// layer 1 & 2{name: 'begintrip_lat',- tableFieldIndex: 1+ fieldIdx: 0},{name: 'begintrip_lng',- tableFieldIndex: 2+ fieldIdx: 1}];@@ -375,20 +375,20 @@ test('layerUtils -> findDefaultLayer.4', t => {// layer 1 (grid), 2 (arc), 3 (point){name: 'begintrip_lat',- tableFieldIndex: 1+ fieldIdx: 0},{name: 'begintrip_lng',- tableFieldIndex: 2+ fieldIdx: 1},// layer 2 (arc), 4 (point){name: 'dropoff_lat',- tableFieldIndex: 3+ fieldIdx: 2},{name: 'dropoff_lng',- tableFieldIndex: 4+ fieldIdx: 3}];@@ -503,11 +503,11 @@ test('layerUtils -> findDefaultLayer.5', t => {// layer 1{name: 'one_late',- tableFieldIndex: 1+ fieldIdx: 0},{name: 'one_lng',- tableFieldIndex: 2+ fieldIdx: 1}];@@ -693,25 +693,25 @@ test('layerUtils -> findDefaultLayer:IconLayer', t => {const inputFields = [{name: 'begintrip_lat',- tableFieldIndex: 1+ fieldIdx: 0},{name: 'begintrip_lng',- tableFieldIndex: 2+ fieldIdx: 1},{name: 'dropoff_lat',- tableFieldIndex: 3+ fieldIdx: 2},{name: 'dropoff_lng',- tableFieldIndex: 4+ fieldIdx: 3}];const fieldPairs = findPointFieldPairs(inputFields);- const eventIcon = [{name: 'event_icon', tableFieldIndex: 5}];- const nameIcon = [{name: 'name.icon', tableFieldIndex: 5}];+ const eventIcon = [{name: 'event_icon', fieldIdx: 4}];+ const nameIcon = [{name: 'name.icon', fieldIdx: 4}];t.equal(findDefaultLayer(