Skip to content

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

[Enhancement] filter invalid value when calculate trip layer domain (#1131)

Shan Hed95e99e9574f
diff --git a/src/layers/trip-layer/trip-utils.js b/src/layers/trip-layer/trip-utils.js
index ae2cb238f..8164bf2d3 100644
--- a/src/layers/trip-layer/trip-utils.js
+++ b/src/layers/trip-layer/trip-utils.js
@@ -134,13 +134,13 @@ export function parseTripGeoJsonTimestamp(dataToFeature) {
}
function findMinFromSorted(list = []) {
- return list.find(notNullorUndefined) || null;
+ return list.find(d => notNullorUndefined(d) && Number.isFinite(d)) || null;
}
function findMaxFromSorted(list = []) {
let i = list.length - 1;
while (i > 0) {
- if (notNullorUndefined(list[i])) {
+ if (notNullorUndefined(list[i]) && Number.isFinite(list[i])) {
return list[i];
}
i--;
@@ -151,8 +151,12 @@ function findMaxFromSorted(list = []) {
export function getAnimationDomainFromTimestamps(dataToTimeStamp = []) {
return dataToTimeStamp.reduce(
(accu, tss) => {
- accu[0] = Math.min(accu[0], findMinFromSorted(tss));
- accu[1] = Math.max(accu[1], findMaxFromSorted(tss));
+ const tsMin = findMinFromSorted(tss);
+ const tsMax = findMaxFromSorted(tss);
+ if (Number.isFinite(tsMin) && Number.isFinite(tsMax)) {
+ accu[0] = Math.min(accu[0], tsMin);
+ accu[1] = Math.max(accu[1], tsMax);
+ }
return accu;
},
[Infinity, -Infinity]
diff --git a/test/browser/layer-tests/trip-layer-specs.js b/test/browser/layer-tests/trip-layer-specs.js
index 40c952cfb..1c5f949a9 100644
--- a/test/browser/layer-tests/trip-layer-specs.js
+++ b/test/browser/layer-tests/trip-layer-specs.js
@@ -20,6 +20,8 @@
/* eslint-disable max-statements */
import test from 'tape';
+import cloneDeep from 'lodash.clonedeep';
+
import TripLayer, {defaultWidth} from 'layers/trip-layer/trip-layer';
import {
@@ -31,6 +33,7 @@ import {
valueFilterDomain0,
animationConfig
} from 'test/helpers/layer-utils';
+import {parseTripGeoJsonTimestamp} from 'layers/trip-layer/trip-utils';
import {TripLayerMeta, dataToFeature, dataToTimeStamp} from 'test/fixtures/trip-geojson';
test('#TripLayer -> constructor', t => {
@@ -400,3 +403,22 @@ test('#TripLayer -> renderLayer', t => {
testRenderLayerCases(t, TripLayer, TEST_CASES);
t.end();
});
+
+test('#TripLayer -> parseTripGeoJsonTimestamp', t => {
+ // mix with illegal character
+ const dataToFeature1 = cloneDeep(dataToFeature);
+ dataToFeature1[0].geometry.coordinates[0][3] = 0;
+ dataToFeature1[1].geometry.coordinates[0][3] = NaN;
+ dataToFeature1[2].geometry.coordinates[0][3] = null;
+ dataToFeature1[3].geometry.coordinates[0][3] = undefined;
+ dataToFeature1[4].geometry.coordinates[0][3] = 'a';
+
+ dataToFeature1[0].geometry.coordinates[
+ dataToFeature1[0].geometry.coordinates.length - 1
+ ][3] = NaN;
+
+ const result = parseTripGeoJsonTimestamp(dataToFeature1);
+
+ t.deepEqual(result.animationDomain, [1565577261, 1565578836], 'should filter out illugal value')
+ t.end();
+});