From d90cd1886e170e65e89a31567ae645aea8e85b35 Mon Sep 17 00:00:00 2001
From: Igor Dykhta <igorDykhta@users.noreply.github.com>
Date: Thu, 4 Aug 2022 04:16:39 +0300
Subject: [PATCH] [Chore] fix types and missing import (#1891)

* upstream
* ts fix
Signed-off-by: Ihor Dykhta <dikhta.igor@gmail.com>
Signed-off-by: Ihor Dykhta <dikhta.igor@gmail.com>
Co-authored-by: Shan He <heshan0131@gmail.com>
---
 src/layers/src/icon-layer/icon-layer.ts |  4 +++-
 src/reducers/index.ts                   |  1 +
 src/reducers/vis-state-updaters.ts      |  1 +
 src/schemas/dataset-schema.ts           |  3 ++-
 src/schemas/schema-manager.ts           |  3 ++-
 src/utils/index.ts                      | 10 ++++++++++
 6 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/layers/src/icon-layer/icon-layer.ts b/src/layers/src/icon-layer/icon-layer.ts
index 41f4347ba0..67ea0d845e 100644
--- a/src/layers/src/icon-layer/icon-layer.ts
+++ b/src/layers/src/icon-layer/icon-layer.ts
@@ -20,6 +20,7 @@
 
 import window from 'global/window';
 import {BrushingExtension} from '@deck.gl/extensions';
+import GL from '@luma.gl/constants';
 
 import {SvgIconLayer} from '@kepler.gl/deckgl-layers';
 import IconLayerIcon from './icon-layer-icon';
@@ -354,7 +355,8 @@ export default class IconLayer extends Layer {
 
     const parameters = {
       // icons will be flat on the map when the altitude column is not used
-      depthTest: this.config.columns.altitude?.fieldIdx > -1
+      depthTest: this.config.columns.altitude?.fieldIdx > -1,
+      cullFace: GL.FRONT
     };
 
     return !this.iconGeometry
diff --git a/src/reducers/index.ts b/src/reducers/index.ts
index 60138a2a20..a8806c9ca0 100644
--- a/src/reducers/index.ts
+++ b/src/reducers/index.ts
@@ -61,6 +61,7 @@ export type {
   AnimationConfig,
   Brush,
   Coordinate,
+  KeplerTable,
   Datasets,
   Editor,
   Feature,
diff --git a/src/reducers/vis-state-updaters.ts b/src/reducers/vis-state-updaters.ts
index e9b94d305c..2e5eed2d95 100644
--- a/src/reducers/vis-state-updaters.ts
+++ b/src/reducers/vis-state-updaters.ts
@@ -103,6 +103,7 @@ import * as MapStateActions from 'actions/map-state-actions';
 import {LoaderObject} from '@loaders.gl/loader-utils';
 import {KeplerTable} from '../utils';
 
+export {KeplerTable};
 export type HistogramBin = {
   x0: number | undefined;
   x1: number | undefined;
diff --git a/src/schemas/dataset-schema.ts b/src/schemas/dataset-schema.ts
index 0f45eb8cdd..58c1017300 100644
--- a/src/schemas/dataset-schema.ts
+++ b/src/schemas/dataset-schema.ts
@@ -22,6 +22,7 @@ import pick from 'lodash.pick';
 import {console as globalConsole} from 'global/window';
 
 import {ProtoDataset} from 'actions';
+import {KeplerTable} from 'reducers';
 import {RGBColor} from 'types';
 import {VERSIONS} from './versions';
 import Schema from './schema';
@@ -113,7 +114,7 @@ export const propertiesV1 = {
 export class DatasetSchema extends Schema {
   key = 'dataset';
 
-  save(dataset): SavedDatasetV1['data'] {
+  save(dataset: KeplerTable): SavedDatasetV1['data'] {
     const datasetFlattened = dataset.dataContainer
       ? {
           ...dataset,
diff --git a/src/schemas/schema-manager.ts b/src/schemas/schema-manager.ts
index c1c1375624..f1ea927665 100644
--- a/src/schemas/schema-manager.ts
+++ b/src/schemas/schema-manager.ts
@@ -20,6 +20,7 @@
 
 import {console as Console} from 'global/window';
 
+import {Datasets} from 'reducers';
 import datasetSchema from './dataset-schema';
 import mapStyleSchema from './map-style-schema';
 import mapStateSchema from './map-state-schema';
@@ -210,7 +211,7 @@ export class KeplerGLSchema {
 
     const {visState} = state;
 
-    const datasets = Object.values(visState.datasets).map(ds => ({
+    const datasets = Object.values(visState.datasets as Datasets).map(ds => ({
       version: this._version,
       data: this._datasetSchema[this._version].save(ds)
     }));
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 7bb51b2188..42e2eba038 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -44,6 +44,13 @@ export {resetFilterGpuMode, assignGpuChannels} from 'utils/gpu-filter-utils';
 
 // REDUCER UTILS
 export {updateAllLayerDomainData} from '../reducers/vis-state-updaters';
+export {
+  validateLayerWithData,
+  validateLayersByDatasets,
+  validateSavedVisualChannels,
+  mergeLayers
+} from '../reducers/vis-state-merger';
+
 export {getHexFields, containValidTime} from '@kepler.gl/layers';
 
 export {
@@ -53,6 +60,9 @@ export {
 } from './table-utils/kepler-table';
 export {createDataContainer, createIndexedDataContainer} from './table-utils/data-container-utils';
 
+// Render
+export {renderedSize} from 'components/common/data-table/cell-size';
+
 export * from './color-utils';
 export * from './data-scale-utils';
 export * from './data-utils';