kepler.gl 3.1.0-alpha.6 → 3.1.0

package/src/reducers/dist/vis-state.d.ts

@@ -32,6 +32,7 @@ export declare const visStateReducerFactory: (initialState?: {}) => import("redu
         "3D": typeof import("@kepler.gl/layers").ScenegraphLayer;
         trip: typeof import("@kepler.gl/layers/dist/trip-layer/trip-layer").default;
         s2: typeof import("@kepler.gl/layers/dist/s2-geometry-layer/s2-geometry-layer").default;
+        vectorTile: typeof import("@kepler.gl/layers").VectorTileLayer;
     };
     animationConfig: import("@kepler.gl/types").AnimationConfig;
     editor: import("@kepler.gl/types").Editor;
@@ -84,6 +85,7 @@ export declare const visStateReducerFactory: (initialState?: {}) => import("redu
         "3D": typeof import("@kepler.gl/layers").ScenegraphLayer;
         trip: typeof import("@kepler.gl/layers/dist/trip-layer/trip-layer").default;
         s2: typeof import("@kepler.gl/layers/dist/s2-geometry-layer/s2-geometry-layer").default;
+        vectorTile: typeof import("@kepler.gl/layers").VectorTileLayer;
     };
     animationConfig: import("@kepler.gl/types").AnimationConfig;
     editor: import("@kepler.gl/types").Editor;
@@ -137,6 +139,7 @@ declare const _default: import("redux-actions").ReduxCompatibleReducer<{
         "3D": typeof import("@kepler.gl/layers").ScenegraphLayer;
         trip: typeof import("@kepler.gl/layers/dist/trip-layer/trip-layer").default;
         s2: typeof import("@kepler.gl/layers/dist/s2-geometry-layer/s2-geometry-layer").default;
+        vectorTile: typeof import("@kepler.gl/layers").VectorTileLayer;
     };
     animationConfig: import("@kepler.gl/types").AnimationConfig;
     editor: import("@kepler.gl/types").Editor;
@@ -189,6 +192,7 @@ declare const _default: import("redux-actions").ReduxCompatibleReducer<{
         "3D": typeof import("@kepler.gl/layers").ScenegraphLayer;
         trip: typeof import("@kepler.gl/layers/dist/trip-layer/trip-layer").default;
         s2: typeof import("@kepler.gl/layers/dist/s2-geometry-layer/s2-geometry-layer").default;
+        vectorTile: typeof import("@kepler.gl/layers").VectorTileLayer;
     };
     animationConfig: import("@kepler.gl/types").AnimationConfig;
     editor: import("@kepler.gl/types").Editor;

package/src/reducers/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kepler.gl/reducers",
   "author": "Shan He <shan@uber.com>",
-  "version": "3.1.0-alpha.6",
+  "version": "3.1.0",
   "description": "kepler.gl constants used by kepler.gl components, actions and reducers",
   "license": "MIT",
   "main": "dist/index.js",
@@ -31,21 +31,21 @@
   ],
   "dependencies": {
     "@dnd-kit/sortable": "^8.0.0",
-    "@kepler.gl/actions": "3.1.0-alpha.6",
-    "@kepler.gl/cloud-providers": "3.1.0-alpha.6",
-    "@kepler.gl/common-utils": "3.1.0-alpha.6",
-    "@kepler.gl/constants": "3.1.0-alpha.6",
-    "@kepler.gl/deckgl-arrow-layers": "3.1.0-alpha.6",
-    "@kepler.gl/deckgl-layers": "3.1.0-alpha.6",
-    "@kepler.gl/effects": "3.1.0-alpha.6",
-    "@kepler.gl/layers": "3.1.0-alpha.6",
-    "@kepler.gl/localization": "3.1.0-alpha.6",
-    "@kepler.gl/processors": "3.1.0-alpha.6",
-    "@kepler.gl/schemas": "3.1.0-alpha.6",
-    "@kepler.gl/table": "3.1.0-alpha.6",
-    "@kepler.gl/tasks": "3.1.0-alpha.6",
-    "@kepler.gl/types": "3.1.0-alpha.6",
-    "@kepler.gl/utils": "3.1.0-alpha.6",
+    "@kepler.gl/actions": "3.1.0",
+    "@kepler.gl/cloud-providers": "3.1.0",
+    "@kepler.gl/common-utils": "3.1.0",
+    "@kepler.gl/constants": "3.1.0",
+    "@kepler.gl/deckgl-arrow-layers": "3.1.0",
+    "@kepler.gl/deckgl-layers": "3.1.0",
+    "@kepler.gl/effects": "3.1.0",
+    "@kepler.gl/layers": "3.1.0",
+    "@kepler.gl/localization": "3.1.0",
+    "@kepler.gl/processors": "3.1.0",
+    "@kepler.gl/schemas": "3.1.0",
+    "@kepler.gl/table": "3.1.0",
+    "@kepler.gl/tasks": "3.1.0",
+    "@kepler.gl/types": "3.1.0",
+    "@kepler.gl/utils": "3.1.0",
     "@loaders.gl/loader-utils": "^4.3.2",
     "@mapbox/geo-viewport": "^0.4.1",
     "@math.gl/web-mercator": "^3.6.2",

package/src/reducers/src/ui-state-updaters.ts

@@ -902,3 +902,27 @@ export const togglePanelListViewUpdater = (
     [stateProp]: listView
   };
 };
+
+/**
+ * Update state of the loading indicator.
+ * @memberof uiStateUpdaters
+ * @param state uiState
+ * @param action
+ * @param action.payload Payload with change of number of active loading actions.
+ * @returns nextState
+ * @public
+ */
+export const setLoadingIndicatorUpdater = (
+  state: UiState,
+  {payload: {change}}: UIStateActions.SetLoadingIndicatorAction
+): UiState => {
+  let {loadingIndicatorValue} = state;
+  if (!loadingIndicatorValue) {
+    loadingIndicatorValue = 0;
+  }
+
+  return {
+    ...state,
+    loadingIndicatorValue: Math.max(loadingIndicatorValue + change, 0)
+  };
+};

package/src/reducers/src/ui-state.ts

@@ -44,7 +44,9 @@ const actionHandler = {
   [ActionTypes.TOGGLE_SPLIT_MAP]: uiStateUpdaters.toggleSplitMapUpdater,
   [ActionTypes.SHOW_DATASET_TABLE]: uiStateUpdaters.showDatasetTableUpdater,
   [ActionTypes.SET_LOCALE]: uiStateUpdaters.setLocaleUpdater,
-  [ActionTypes.TOGGLE_PANEL_LIST_VIEW]: uiStateUpdaters.togglePanelListViewUpdater
+  [ActionTypes.TOGGLE_PANEL_LIST_VIEW]: uiStateUpdaters.togglePanelListViewUpdater,
+
+  [ActionTypes.SET_LOADING_INDICATOR]: uiStateUpdaters.setLoadingIndicatorUpdater
 };
 
 /* Reducer */

package/src/reducers/src/vis-state-updaters.ts

@@ -41,6 +41,7 @@ import {
   setFilter,
   processFileContent,
   fitBounds as fitMapBounds,
+  setLoadingIndicator,
   toggleLayerForMap,
   applyFilterConfig
 } from '@kepler.gl/actions';
@@ -71,7 +72,8 @@ import {
   updateFilterPlot,
   removeFilterPlot,
   isLayerAnimatable,
-  isSideFilter
+  isSideFilter,
+  getApplicationConfig
 } from '@kepler.gl/utils';
 import {generateHashId, toArray} from '@kepler.gl/common-utils';
 // Mergers
@@ -2327,17 +2329,23 @@ export const updateVisDataUpdater = (
       })
     : state;
 
+  // indicate that something is in progress
+  const setIsLoadingTask = ACTION_TASK().map(() => {
+    return setLoadingIndicator({change: 1});
+  });
+  const updatedState = withTask(previousState, setIsLoadingTask);
+
   const datasets = toArray(action.datasets);
 
   const allCreateDatasetsTasks = datasets.map(
     ({info = {}, ...rest}) => createNewDataEntry({info, ...rest}, state.datasets) || {}
   );
   // call all Tasks
-  const tasks = Task.allSettled(allCreateDatasetsTasks).map(results =>
+  const datasetTasks = Task.allSettled(allCreateDatasetsTasks).map(results =>
     createNewDatasetSuccess({results, addToMapOptions: options})
   );
 
-  return withTask(previousState, tasks);
+  return withTask(updatedState, datasetTasks);
 };
 
 export const createNewDatasetSuccessUpdater = (
@@ -2376,7 +2384,16 @@ export const createNewDatasetSuccessUpdater = (
     layerMergers
   };
 
-  return applyMergersUpdater(mergedState, {mergers: datasetMergers, postMergerPayload});
+  const updatedState = applyMergersUpdater(mergedState, {
+    mergers: datasetMergers,
+    postMergerPayload
+  });
+
+  // resolve active loading initiated by updateVisDataUpdater
+  const setIsLoadingTask = ACTION_TASK().map(() => {
+    return setLoadingIndicator({change: -1});
+  });
+  return withTask(updatedState, setIsLoadingTask);
 };
 
 /**
@@ -2773,7 +2790,9 @@ export const nextFileBatchUpdater = (
   });
 
   return withTask(stateWithProgress, [
-    ...(fileName.endsWith('arrow') && accumulated?.data?.length > 0
+    ...(getApplicationConfig().useArrowProgressiveLoading &&
+    fileName.endsWith('arrow') &&
+    accumulated?.data?.length > 0
       ? [
           PROCESS_FILE_DATA({content: accumulated, fileCache: []}).bimap(
             result => loadFilesSuccess(result),

package/src/schemas/dist/dataset-schema.js

@@ -13,9 +13,12 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _lodash = _interopRequireDefault(require("lodash.pick"));
 var _window = require("global/window");
+var _apacheArrow = require("apache-arrow");
+var _constants = require("@kepler.gl/constants");
 var _versions = require("./versions");
 var _schema = _interopRequireDefault(require("./schema"));
 var _commonUtils = require("@kepler.gl/common-utils");
+var _utils = require("@kepler.gl/utils");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
@@ -75,6 +78,34 @@ var propertiesV1 = exports.propertiesV1 = _objectSpread(_objectSpread({}, proper
   metadata: null,
   disableDataOperation: null
 });
+
+/**
+ * TODO Consider moving this cast to ArrowDataContainer?
+ * Prepare a data container for export as part of json / html.
+ * 1) Arrow tables can store Timestamps as BigInts, so convert numbers to ISOStrings compatible with Kepler.gl's TIMESTAMP.
+ * @param dataContainer A data container to flatten.
+ * @returns Row based data.
+ */
+var getAllDataForSaving = function getAllDataForSaving(dataContainer) {
+  var allData = dataContainer.flattenData();
+  if (dataContainer instanceof _utils.ArrowDataContainer) {
+    var numColumns = dataContainer.numColumns();
+    var _loop = function _loop(columnIndex) {
+      var _column$type;
+      var column = dataContainer.getColumn(columnIndex);
+      var typeId = (_column$type = column.type) === null || _column$type === void 0 ? void 0 : _column$type.typeId;
+      if (typeId === _apacheArrow.Type.Timestamp || typeId === _apacheArrow.Type.Date || typeId === _apacheArrow.Type.Time) {
+        allData.forEach(function (row) {
+          row[columnIndex] = new Date(row[columnIndex]).toISOString();
+        });
+      }
+    };
+    for (var columnIndex = 0; columnIndex < numColumns; ++columnIndex) {
+      _loop(columnIndex);
+    }
+  }
+  return allData;
+};
 var DatasetSchema = exports.DatasetSchema = /*#__PURE__*/function (_Schema2) {
   function DatasetSchema() {
     var _this2;
@@ -91,7 +122,12 @@ var DatasetSchema = exports.DatasetSchema = /*#__PURE__*/function (_Schema2) {
     key: "save",
     value: function save(dataset) {
       var datasetFlattened = dataset.dataContainer ? _objectSpread(_objectSpread({}, dataset), {}, {
-        allData: dataset.dataContainer.flattenData()
+        allData: getAllDataForSaving(dataset.dataContainer),
+        // we use flattenData to save arrow tables,
+        // but once flattened it's not an arrow file anymore.
+        metadata: _objectSpread(_objectSpread({}, dataset.metadata), dataset.metadata.format === _constants.DATASET_FORMATS.arrow ? {
+          format: _constants.DATASET_FORMATS.row
+        } : {})
       }) : dataset;
       return this.savePropertiesOrApplySchema(datasetFlattened)[this.key];
     }
@@ -154,4 +190,4 @@ var datasetSchema = exports.datasetSchema = (0, _defineProperty2["default"])((0,
   properties: propertiesV1
 }));
 var _default = exports["default"] = datasetSchema;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["_lodash","_interopRequireDefault","require","_window","_versions","_schema","_commonUtils","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","_callSuper","_getPrototypeOf2","_possibleConstructorReturn2","_isNativeReflectConstruct","Reflect","construct","constructor","Boolean","prototype","valueOf","call","fieldPropertiesV0","exports","name","type","fieldPropertiesV1","format","analyzerType","metadata","FieldSchema","_Schema","_classCallCheck2","_inherits2","_createClass2","key","value","save","fields","_this","map","f","savePropertiesOrApplySchema","load","Schema","propertiesV0","id","label","color","allData","version","VERSIONS","v0","properties","propertiesV1","v1","disableDataOperation","DatasetSchema","_Schema2","_this2","_len","args","Array","_key","concat","dataset","datasetFlattened","dataContainer","flattenData","updatedFields","needCalculateMeta","hasOwnProperty","fieldOrder","sampleData","getSampleForTypeAnalyze","rows","meta","getFieldsFromData","i","pick","globalConsole","warn","data","info","datasetSchema","_default"],"sources":["../src/dataset-schema.ts"],"sourcesContent":["// SPDX-License-Identifier: MIT\n// Copyright contributors to the kepler.gl project\n\nimport pick from 'lodash.pick';\nimport {console as globalConsole} from 'global/window';\n\nimport {ProtoDataset, RGBColor, JsonObject} from '@kepler.gl/types';\nimport {KeplerTable} from '@kepler.gl/table';\nimport {VERSIONS} from './versions';\nimport Schema from './schema';\nimport {getFieldsFromData, getSampleForTypeAnalyze} from '@kepler.gl/common-utils';\n\nexport type SavedField = {\n  name: string;\n  type: string;\n  format?: string;\n  analyzerType?: string;\n};\n\nexport type ParsedField = {\n  name: string;\n  type: string;\n  format: string;\n  analyzerType: string;\n};\n\nexport type SavedDatasetV1 = {\n  version: 'v1';\n  data: {\n    id: string;\n    label: string;\n    color: RGBColor;\n    allData: any[][];\n    fields: SavedField[];\n    type?: string;\n    metadata?: JsonObject;\n    disableDataOperation?: boolean;\n  };\n};\n\nexport type ParsedDataset = {\n  data: {\n    fields: ParsedField[];\n    rows: any[][];\n  };\n  info: {\n    id?: string;\n    label?: string;\n    color?: RGBColor;\n  };\n};\n\n// version v0\nexport const fieldPropertiesV0 = {\n  name: null,\n  type: null\n};\n\nexport const fieldPropertiesV1 = {\n  name: null,\n  type: null,\n  format: null,\n  analyzerType: null,\n  metadata: null\n};\n\nexport class FieldSchema extends Schema {\n  save(fields) {\n    return {\n      [this.key]: fields.map(f => this.savePropertiesOrApplySchema(f)[this.key])\n    };\n  }\n  load(fields) {\n    return {[this.key]: fields};\n  }\n}\n\nexport const propertiesV0 = {\n  id: null,\n  label: null,\n  color: null,\n  allData: null,\n  fields: new FieldSchema({\n    key: 'fields',\n    version: VERSIONS.v0,\n    properties: fieldPropertiesV0\n  })\n};\n\nexport const propertiesV1 = {\n  ...propertiesV0,\n  fields: new FieldSchema({\n    key: 'fields',\n    version: VERSIONS.v1,\n    properties: fieldPropertiesV1\n  }),\n  type: null,\n  metadata: null,\n  disableDataOperation: null\n};\n\nexport class DatasetSchema extends Schema {\n  key = 'dataset';\n\n  save(dataset: KeplerTable): SavedDatasetV1['data'] {\n    const datasetFlattened = dataset.dataContainer\n      ? {\n          ...dataset,\n          allData: dataset.dataContainer.flattenData()\n        }\n      : dataset;\n\n    return this.savePropertiesOrApplySchema(datasetFlattened)[this.key];\n  }\n  load(dataset: SavedDatasetV1['data']): ProtoDataset {\n    const {fields, allData} = dataset;\n    let updatedFields = fields;\n\n    // recalculate field type\n    // because we have updated type-analyzer\n    // we need to add format to each field\n    const needCalculateMeta =\n      fields[0] &&\n      (!Object.prototype.hasOwnProperty.call(fields[0], 'format') ||\n        !Object.prototype.hasOwnProperty.call(fields[0], 'analyzerType'));\n\n    if (needCalculateMeta) {\n      const fieldOrder = fields.map(f => f.name);\n\n      const sampleData = getSampleForTypeAnalyze({\n        fields: fieldOrder,\n        rows: allData\n      });\n      const meta = getFieldsFromData(sampleData, fieldOrder);\n\n      updatedFields = meta.map((f, i) => ({\n        ...pick(meta[i], ['name', 'type', 'format']),\n        analyzerType: meta[i].analyzerType\n      }));\n\n      updatedFields.forEach((f, i) => {\n        if (fields[i].type !== f.type) {\n          // if newly detected field type is different from saved type\n          // we log it but won't update it, cause we don't want to break people's map\n          globalConsole.warn(`detect ${f.name} type is now ${f.type} instead of ${fields[i].type}`);\n        }\n      });\n    }\n\n    // get format of all fields\n    return {\n      data: {fields: updatedFields, rows: dataset.allData},\n      info: pick(dataset, ['id', 'label', 'color', 'type']),\n      ...(dataset.metadata ? {metadata: dataset.metadata} : {}),\n      ...(dataset.disableDataOperation ? {disableDataOperation: dataset.disableDataOperation} : {})\n    };\n  }\n}\n\nexport const datasetSchema = {\n  [VERSIONS.v0]: new DatasetSchema({\n    key: 'dataset',\n    version: VERSIONS.v0,\n    properties: propertiesV0\n  }),\n  [VERSIONS.v1]: new DatasetSchema({\n    key: 'dataset',\n    version: VERSIONS.v1,\n    properties: propertiesV1\n  })\n};\n\nexport default datasetSchema;\n"],"mappings":"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","ignoreList":[]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["_lodash","_interopRequireDefault","require","_window","_apacheArrow","_constants","_versions","_schema","_commonUtils","_utils","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","_callSuper","_getPrototypeOf2","_possibleConstructorReturn2","_isNativeReflectConstruct","Reflect","construct","constructor","Boolean","prototype","valueOf","call","fieldPropertiesV0","exports","name","type","fieldPropertiesV1","format","analyzerType","metadata","FieldSchema","_Schema","_classCallCheck2","_inherits2","_createClass2","key","value","save","fields","_this","map","f","savePropertiesOrApplySchema","load","Schema","propertiesV0","id","label","color","allData","version","VERSIONS","v0","properties","propertiesV1","v1","disableDataOperation","getAllDataForSaving","dataContainer","flattenData","ArrowDataContainer","numColumns","_loop","columnIndex","_column$type","column","getColumn","typeId","ArrowTypes","Timestamp","Date","Time","row","toISOString","DatasetSchema","_Schema2","_this2","_len","args","Array","_key","concat","dataset","datasetFlattened","DATASET_FORMATS","arrow","updatedFields","needCalculateMeta","hasOwnProperty","fieldOrder","sampleData","getSampleForTypeAnalyze","rows","meta","getFieldsFromData","i","pick","globalConsole","warn","data","info","datasetSchema","_default"],"sources":["../src/dataset-schema.ts"],"sourcesContent":["// SPDX-License-Identifier: MIT\n// Copyright contributors to the kepler.gl project\n\nimport pick from 'lodash.pick';\nimport {console as globalConsole} from 'global/window';\nimport {Type as ArrowTypes} from 'apache-arrow';\n\nimport {DATASET_FORMATS} from '@kepler.gl/constants';\nimport {ProtoDataset, RGBColor, JsonObject} from '@kepler.gl/types';\nimport {KeplerTable} from '@kepler.gl/table';\nimport {VERSIONS} from './versions';\nimport Schema from './schema';\nimport {getFieldsFromData, getSampleForTypeAnalyze} from '@kepler.gl/common-utils';\nimport {ArrowDataContainer, DataContainerInterface} from '@kepler.gl/utils';\n\nexport type SavedField = {\n  name: string;\n  type: string;\n  format?: string;\n  analyzerType?: string;\n};\n\nexport type ParsedField = {\n  name: string;\n  type: string;\n  format: string;\n  analyzerType: string;\n};\n\nexport type SavedDatasetV1 = {\n  version: 'v1';\n  data: {\n    id: string;\n    label: string;\n    color: RGBColor;\n    allData: any[][];\n    fields: SavedField[];\n    type?: string;\n    metadata?: JsonObject;\n    disableDataOperation?: boolean;\n  };\n};\n\nexport type ParsedDataset = {\n  data: {\n    fields: ParsedField[];\n    rows: any[][];\n  };\n  info: {\n    id?: string;\n    label?: string;\n    color?: RGBColor;\n  };\n};\n\n// version v0\nexport const fieldPropertiesV0 = {\n  name: null,\n  type: null\n};\n\nexport const fieldPropertiesV1 = {\n  name: null,\n  type: null,\n  format: null,\n  analyzerType: null,\n  metadata: null\n};\n\nexport class FieldSchema extends Schema {\n  save(fields) {\n    return {\n      [this.key]: fields.map(f => this.savePropertiesOrApplySchema(f)[this.key])\n    };\n  }\n  load(fields) {\n    return {[this.key]: fields};\n  }\n}\n\nexport const propertiesV0 = {\n  id: null,\n  label: null,\n  color: null,\n  allData: null,\n  fields: new FieldSchema({\n    key: 'fields',\n    version: VERSIONS.v0,\n    properties: fieldPropertiesV0\n  })\n};\n\nexport const propertiesV1 = {\n  ...propertiesV0,\n  fields: new FieldSchema({\n    key: 'fields',\n    version: VERSIONS.v1,\n    properties: fieldPropertiesV1\n  }),\n  type: null,\n  metadata: null,\n  disableDataOperation: null\n};\n\n/**\n * TODO Consider moving this cast to ArrowDataContainer?\n * Prepare a data container for export as part of json / html.\n * 1) Arrow tables can store Timestamps as BigInts, so convert numbers to ISOStrings compatible with Kepler.gl's TIMESTAMP.\n * @param dataContainer A data container to flatten.\n * @returns Row based data.\n */\nconst getAllDataForSaving = (dataContainer: DataContainerInterface): any[][] => {\n  const allData = dataContainer.flattenData();\n\n  if (dataContainer instanceof ArrowDataContainer) {\n    const numColumns = dataContainer.numColumns();\n\n    for (let columnIndex = 0; columnIndex < numColumns; ++columnIndex) {\n      const column = dataContainer.getColumn(columnIndex);\n      const typeId = column.type?.typeId;\n      if (\n        typeId === ArrowTypes.Timestamp ||\n        typeId === ArrowTypes.Date ||\n        typeId === ArrowTypes.Time\n      ) {\n        allData.forEach(row => {\n          row[columnIndex] = new Date(row[columnIndex]).toISOString();\n        });\n      }\n    }\n  }\n\n  return allData;\n};\n\nexport class DatasetSchema extends Schema {\n  key = 'dataset';\n\n  save(dataset: KeplerTable): SavedDatasetV1['data'] {\n    const datasetFlattened = dataset.dataContainer\n      ? {\n          ...dataset,\n          allData: getAllDataForSaving(dataset.dataContainer),\n          // we use flattenData to save arrow tables,\n          // but once flattened it's not an arrow file anymore.\n          metadata: {\n            ...dataset.metadata,\n            ...(dataset.metadata.format === DATASET_FORMATS.arrow\n              ? {format: DATASET_FORMATS.row}\n              : {})\n          }\n        }\n      : dataset;\n\n    return this.savePropertiesOrApplySchema(datasetFlattened)[this.key];\n  }\n  load(dataset: SavedDatasetV1['data']): ProtoDataset {\n    const {fields, allData} = dataset;\n    let updatedFields = fields;\n\n    // recalculate field type\n    // because we have updated type-analyzer\n    // we need to add format to each field\n    const needCalculateMeta =\n      fields[0] &&\n      (!Object.prototype.hasOwnProperty.call(fields[0], 'format') ||\n        !Object.prototype.hasOwnProperty.call(fields[0], 'analyzerType'));\n\n    if (needCalculateMeta) {\n      const fieldOrder = fields.map(f => f.name);\n\n      const sampleData = getSampleForTypeAnalyze({\n        fields: fieldOrder,\n        rows: allData\n      });\n      const meta = getFieldsFromData(sampleData, fieldOrder);\n\n      updatedFields = meta.map((f, i) => ({\n        ...pick(meta[i], ['name', 'type', 'format']),\n        analyzerType: meta[i].analyzerType\n      }));\n\n      updatedFields.forEach((f, i) => {\n        if (fields[i].type !== f.type) {\n          // if newly detected field type is different from saved type\n          // we log it but won't update it, cause we don't want to break people's map\n          globalConsole.warn(`detect ${f.name} type is now ${f.type} instead of ${fields[i].type}`);\n        }\n      });\n    }\n\n    // get format of all fields\n    return {\n      data: {fields: updatedFields, rows: dataset.allData},\n      info: pick(dataset, ['id', 'label', 'color', 'type']),\n      ...(dataset.metadata ? {metadata: dataset.metadata} : {}),\n      ...(dataset.disableDataOperation ? {disableDataOperation: dataset.disableDataOperation} : {})\n    };\n  }\n}\n\nexport const datasetSchema = {\n  [VERSIONS.v0]: new DatasetSchema({\n    key: 'dataset',\n    version: VERSIONS.v0,\n    properties: propertiesV0\n  }),\n  [VERSIONS.v1]: new DatasetSchema({\n    key: 'dataset',\n    version: VERSIONS.v1,\n    properties: propertiesV1\n  })\n};\n\nexport default datasetSchema;\n"],"mappings":"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","ignoreList":[]}

package/src/schemas/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kepler.gl/schemas",
   "author": "Shan He <shan@uber.com>",
-  "version": "3.1.0-alpha.6",
+  "version": "3.1.0",
   "description": "kepler.gl schemas used by kepler.gl components, actions and reducers",
   "license": "MIT",
   "main": "dist/index.js",
@@ -30,16 +30,17 @@
     "umd"
   ],
   "dependencies": {
-    "@kepler.gl/common-utils": "3.1.0-alpha.6",
-    "@kepler.gl/constants": "3.1.0-alpha.6",
-    "@kepler.gl/layers": "3.1.0-alpha.6",
-    "@kepler.gl/table": "3.1.0-alpha.6",
-    "@kepler.gl/types": "3.1.0-alpha.6",
-    "@kepler.gl/utils": "3.1.0-alpha.6",
+    "@kepler.gl/common-utils": "3.1.0",
+    "@kepler.gl/constants": "3.1.0",
+    "@kepler.gl/layers": "3.1.0",
+    "@kepler.gl/table": "3.1.0",
+    "@kepler.gl/types": "3.1.0",
+    "@kepler.gl/utils": "3.1.0",
     "@loaders.gl/loader-utils": "^4.3.2",
     "@types/keymirror": "^0.1.1",
     "@types/lodash.clonedeep": "^4.5.7",
     "@types/lodash.pick": "^4.4.6",
+    "apache-arrow": ">=15.0.0",
     "global": "^4.3.0",
     "keymirror": "^0.1.1",
     "lodash.clonedeep": "^4.0.1",

package/src/schemas/src/dataset-schema.ts

@@ -3,12 +3,15 @@
 
 import pick from 'lodash.pick';
 import {console as globalConsole} from 'global/window';
+import {Type as ArrowTypes} from 'apache-arrow';
 
+import {DATASET_FORMATS} from '@kepler.gl/constants';
 import {ProtoDataset, RGBColor, JsonObject} from '@kepler.gl/types';
 import {KeplerTable} from '@kepler.gl/table';
 import {VERSIONS} from './versions';
 import Schema from './schema';
 import {getFieldsFromData, getSampleForTypeAnalyze} from '@kepler.gl/common-utils';
+import {ArrowDataContainer, DataContainerInterface} from '@kepler.gl/utils';
 
 export type SavedField = {
   name: string;
@@ -99,6 +102,37 @@ export const propertiesV1 = {
   disableDataOperation: null
 };
 
+/**
+ * TODO Consider moving this cast to ArrowDataContainer?
+ * Prepare a data container for export as part of json / html.
+ * 1) Arrow tables can store Timestamps as BigInts, so convert numbers to ISOStrings compatible with Kepler.gl's TIMESTAMP.
+ * @param dataContainer A data container to flatten.
+ * @returns Row based data.
+ */
+const getAllDataForSaving = (dataContainer: DataContainerInterface): any[][] => {
+  const allData = dataContainer.flattenData();
+
+  if (dataContainer instanceof ArrowDataContainer) {
+    const numColumns = dataContainer.numColumns();
+
+    for (let columnIndex = 0; columnIndex < numColumns; ++columnIndex) {
+      const column = dataContainer.getColumn(columnIndex);
+      const typeId = column.type?.typeId;
+      if (
+        typeId === ArrowTypes.Timestamp ||
+        typeId === ArrowTypes.Date ||
+        typeId === ArrowTypes.Time
+      ) {
+        allData.forEach(row => {
+          row[columnIndex] = new Date(row[columnIndex]).toISOString();
+        });
+      }
+    }
+  }
+
+  return allData;
+};
+
 export class DatasetSchema extends Schema {
   key = 'dataset';
 
@@ -106,7 +140,15 @@ export class DatasetSchema extends Schema {
     const datasetFlattened = dataset.dataContainer
       ? {
           ...dataset,
-          allData: dataset.dataContainer.flattenData()
+          allData: getAllDataForSaving(dataset.dataContainer),
+          // we use flattenData to save arrow tables,
+          // but once flattened it's not an arrow file anymore.
+          metadata: {
+            ...dataset.metadata,
+            ...(dataset.metadata.format === DATASET_FORMATS.arrow
+              ? {format: DATASET_FORMATS.row}
+              : {})
+          }
         }
       : dataset;