Skip to content

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

[fix] show sync layer animations when there is one dataset (#2803)

Igor Dykhta2178d9057c29
diff --git a/src/components/src/filters/filter-panels/filter-synced-dataset-panel.tsx b/src/components/src/filters/filter-panels/filter-synced-dataset-panel.tsx
index 0f9ed45e9..31a131570 100644
--- a/src/components/src/filters/filter-panels/filter-synced-dataset-panel.tsx
+++ b/src/components/src/filters/filter-panels/filter-synced-dataset-panel.tsx
@@ -297,6 +297,7 @@ function FilterSyncedDatasetPanelFactory(
/>
</>
)}
+ {/** sync with animatable layers */}
{isLinkedWithLayerTimeline ? (
<>
<StyledSeparator />
diff --git a/src/components/src/filters/filter-panels/time-range-filter-panel.tsx b/src/components/src/filters/filter-panels/time-range-filter-panel.tsx
index 029868e54..73f9e645c 100644
--- a/src/components/src/filters/filter-panels/time-range-filter-panel.tsx
+++ b/src/components/src/filters/filter-panels/time-range-filter-panel.tsx
@@ -53,8 +53,6 @@ function TimeRangeFilterPanelFactory(
[idx, setFilter]
);
- const totalDatasetsNum = useMemo(() => Object.keys(datasets).length, [datasets]);
-
const onSetFilterPlot = useCallback(
(newProp, valueIndex) => setFilterPlot(idx, newProp, valueIndex),
[idx, setFilterPlot]
@@ -136,19 +134,17 @@ function TimeRangeFilterPanelFactory(
))}
</FilterPanelHeader>
<StyledFilterContent className="filter-panel__content">
- {totalDatasetsNum > 1 && (
- <FilterSyncedDatasetPanel
- datasets={datasets}
- layers={layers}
- filter={filter}
- idx={idx}
- onFieldSelector={onFieldSelector}
- onSourceDataSelector={onSourceDataSelector}
- setFilter={setFilter}
- supportedFields={supportedFields}
- syncTimeFilterWithLayerTimeline={syncTimeFilterWithLayerTimeline}
- />
- )}
+ <FilterSyncedDatasetPanel
+ datasets={datasets}
+ layers={layers}
+ filter={filter}
+ idx={idx}
+ onFieldSelector={onFieldSelector}
+ onSourceDataSelector={onSourceDataSelector}
+ setFilter={setFilter}
+ supportedFields={supportedFields}
+ syncTimeFilterWithLayerTimeline={syncTimeFilterWithLayerTimeline}
+ />
{isHistogramVisible && (
<div className="filter-panel__filter">
<TimeRangeFilter
diff --git a/src/utils/src/plot.ts b/src/utils/src/plot.ts
index cb7c40ecb..9b02720d0 100644
--- a/src/utils/src/plot.ts
+++ b/src/utils/src/plot.ts
@@ -290,7 +290,7 @@ const getAgregationType = (field, aggregation) => {
return aggregation;
};
-const getAgregationAccessor = (field, dataContainer: DataContainerInterface, fields) => {
+const getAggregationAccessor = (field, dataContainer: DataContainerInterface, fields) => {
if (isPercentField(field)) {
const numeratorIdx = fields.findIndex(f => f.name === field.metadata.numerator);
const denominatorIdx = fields.findIndex(f => f.name === field.metadata.denominator);
@@ -310,13 +310,19 @@ export const getValueAggrFunc = (
dataset: KeplerTableModel<any, any>
): ((bin: Bin) => number) => {
const {dataContainer, fields} = dataset;
- return field && aggregation
+
+ // The passed-in field might not have all the fields set (e.g. valueAccessor)
+ const datasetField = fields.find(
+ f => field && (f.name === field || f.name === (field as Field).name)
+ );
+
+ return datasetField && aggregation
? bin =>
aggregate(
bin.indexes,
- getAgregationType(field, aggregation),
+ getAgregationType(datasetField, aggregation),
// @ts-expect-error can return {getNumerator, getDenominator}
- getAgregationAccessor(field, dataContainer, fields)
+ getAggregationAccessor(datasetField, dataContainer, fields)
)
: bin => bin.count;
};