kepler.gl 3.1.0 → 3.1.1

package/src/reducers/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kepler.gl/reducers",
   "author": "Shan He <shan@uber.com>",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "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",
-    "@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",
+    "@kepler.gl/actions": "3.1.1",
+    "@kepler.gl/cloud-providers": "3.1.1",
+    "@kepler.gl/common-utils": "3.1.1",
+    "@kepler.gl/constants": "3.1.1",
+    "@kepler.gl/deckgl-arrow-layers": "3.1.1",
+    "@kepler.gl/deckgl-layers": "3.1.1",
+    "@kepler.gl/effects": "3.1.1",
+    "@kepler.gl/layers": "3.1.1",
+    "@kepler.gl/localization": "3.1.1",
+    "@kepler.gl/processors": "3.1.1",
+    "@kepler.gl/schemas": "3.1.1",
+    "@kepler.gl/table": "3.1.1",
+    "@kepler.gl/tasks": "3.1.1",
+    "@kepler.gl/types": "3.1.1",
+    "@kepler.gl/utils": "3.1.1",
     "@loaders.gl/loader-utils": "^4.3.2",
     "@mapbox/geo-viewport": "^0.4.1",
     "@math.gl/web-mercator": "^3.6.2",

package/src/reducers/src/export-utils.ts

@@ -69,7 +69,7 @@ export function formatCsv(data: DataContainerInterface, fields: Field[]): string
 
   // parse geojson object as string
   for (const row of data.rows(true)) {
-    formattedData.push(row.map((d, i) => parseFieldValue(d, fields[i].type)));
+    formattedData.push(row.map((d, i) => parseFieldValue(d, fields[i].type, fields[i])));
   }
 
   return csvFormatRows(formattedData);

package/src/reducers/src/layer-utils.ts

@@ -20,6 +20,7 @@ import {
 } from '@kepler.gl/types';
 import {
   FindDefaultLayerPropsReturnValue,
+  FindDefaultLayerProps,
   Layer,
   LayerClassesType,
   OVERLAY_TYPE_CONST,
@@ -86,7 +87,7 @@ export function findDefaultLayer(dataset: KeplerTable, layerClasses: LayerClasse
         }))
       );
     },
-    [] as (LayerClassesType[keyof LayerClassesType] & {type: string})[]
+    [] as (FindDefaultLayerProps & {type: string})[]
   );
 
   // go through all layerProps to create layer

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

@@ -49,6 +49,7 @@ export type ProviderState = {
   currentProvider: string | null;
   successInfo: any;
   mapSaved: null | string;
+  savedMapId: null | string;
   initialState?: any;
   visualizations: MapListItem[];
 };
@@ -60,6 +61,7 @@ export const INITIAL_PROVIDER_STATE: ProviderState = {
   currentProvider: null,
   successInfo: {},
   mapSaved: null,
+  savedMapId: null,
   visualizations: []
 };
 
@@ -154,7 +156,8 @@ export const exportFileSuccessUpdater = (
     successInfo: response,
     ...(!options.isPublic
       ? {
-          mapSaved: provider.name
+          mapSaved: provider.name,
+          savedMapId: response?.info?.id ?? null
         }
       : {})
   };

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

@@ -22,6 +22,7 @@ import {
 } from '@kepler.gl/tasks';
 // Actions
 import {
+  addNotification,
   ActionTypes,
   CreateNewDatasetSuccessPayload,
   MapStateActions,
@@ -56,6 +57,7 @@ import {
   arrayInsert,
   computeSplitMapLayers,
   adjustValueToFilterDomain,
+  errorNotification,
   featureToFilterValue,
   filterDatasetCPU,
   generatePolygonFilter,
@@ -903,7 +905,18 @@ export function layerTypeChangeUpdater(
     // get a mint layer, with new id and type
     // because deck.gl uses id to match between new and old layer.
     // If type has changed but id is the same, it will break
-    newLayer.assignConfigToLayer(oldLayer.config, oldLayer.visConfigSettings);
+
+    const defaultLayerProps =
+      typeof state.layerClasses[newType].findDefaultLayerProps === 'function'
+        ? state.layerClasses[newType].findDefaultLayerProps(state.datasets[newLayer.config.dataId])
+        : null;
+
+    newLayer.assignConfigToLayer(
+      oldLayer.config,
+      oldLayer.visConfigSettings,
+      state.datasets,
+      defaultLayerProps
+    );
     newLayer.updateLayerDomain(state.datasets);
   }
 
@@ -1390,7 +1403,7 @@ function _updateFilterProp(state, filter, prop, value, valueIndex, datasetIds?)
  */
 export const setFilterPlotUpdater = (
   state: VisState,
-  {idx, newProp, valueIndex = 0}: VisStateActions.SetFilterPlotUpdaterAction
+  {idx, newProp}: VisStateActions.SetFilterPlotUpdaterAction
 ): VisState => {
   if (!state.filters[idx]) {
     Console.error(`filters[${idx}] is undefined`);
@@ -2337,15 +2350,37 @@ export const updateVisDataUpdater = (
 
   const datasets = toArray(action.datasets);
 
-  const allCreateDatasetsTasks = datasets.map(
-    ({info = {}, ...rest}) => createNewDataEntry({info, ...rest}, state.datasets) || {}
-  );
-  // call all Tasks
-  const datasetTasks = Task.allSettled(allCreateDatasetsTasks).map(results =>
-    createNewDatasetSuccess({results, addToMapOptions: options})
-  );
+  const createDatasetTasks: Task[] = [];
+  const notificationTasks: Task[] = [];
 
-  return withTask(updatedState, datasetTasks);
+  datasets.forEach(({info = {}, ...rest}, datasetIndex) => {
+    const task = createNewDataEntry({info, ...rest}, state.datasets);
+    if (task) {
+      createDatasetTasks.push(task);
+    } else {
+      notificationTasks.push(
+        ACTION_TASK().map(() =>
+          addNotification(
+            errorNotification({
+              message: `Failed to create a new dataset due to data verification errors`,
+              id: `dataset-failed-${datasetIndex}`
+            })
+          )
+        )
+      );
+    }
+  });
+
+  const datasetsAllSettledTask = createDatasetTasks.length
+    ? Task.allSettled(createDatasetTasks).map(results =>
+        createNewDatasetSuccess({results, addToMapOptions: options})
+      )
+    : null;
+
+  return withTask(updatedState, [
+    ...(datasetsAllSettledTask ? [datasetsAllSettledTask] : []),
+    ...notificationTasks
+  ]);
 };
 
 export const createNewDatasetSuccessUpdater = (

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

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,12 +14,14 @@ 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 arrow = _interopRequireWildcard(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 _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 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)); }
@@ -81,8 +84,9 @@ var propertiesV1 = exports.propertiesV1 = _objectSpread(_objectSpread({}, proper
 
 /**
  * TODO Consider moving this cast to ArrowDataContainer?
- * Prepare a data container for export as part of json / html.
+ * Prepare a data container for export as part of json / html files.
  * 1) Arrow tables can store Timestamps as BigInts, so convert numbers to ISOStrings compatible with Kepler.gl's TIMESTAMP.
+ * 2) Geoarrow binary buffers converted to hex wkb
  * @param dataContainer A data container to flatten.
  * @returns Row based data.
  */
@@ -91,13 +95,17 @@ var getAllDataForSaving = function getAllDataForSaving(dataContainer) {
   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) {
+      var field = dataContainer.getField(columnIndex);
+      if (arrow.DataType.isTimestamp(column.type) || arrow.DataType.isDate(column.type) || arrow.DataType.isTime(column.type)) {
         allData.forEach(function (row) {
           row[columnIndex] = new Date(row[columnIndex]).toISOString();
         });
+      } else if ((field === null || field === void 0 ? void 0 : field.type) === _constants.ALL_FIELD_TYPES.geoarrow) {
+        var formatter = _utils.FIELD_DISPLAY_FORMAT[_constants.ALL_FIELD_TYPES.geoarrow];
+        allData.forEach(function (row) {
+          row[columnIndex] = formatter(row[columnIndex], field);
+        });
       }
     };
     for (var columnIndex = 0; columnIndex < numColumns; ++columnIndex) {
@@ -106,6 +114,26 @@ var getAllDataForSaving = function getAllDataForSaving(dataContainer) {
   }
   return allData;
 };
+
+/**
+ * Transforms fields for saving as part of json / html files.
+ * @param fields The array of fields from a Kepler table.
+ * @returns The transformed fields array with GeoArrow types updated to GeoJSON.
+ */
+var getFieldsForSaving = function getFieldsForSaving(fields) {
+  return fields.map(function (field) {
+    if (field.type === _constants.ALL_FIELD_TYPES.geoarrow) {
+      // geoarrow binary data is transformed to hex wkb in getAllDataForSaving, so update the field accordingly
+      return {
+        name: field.name,
+        type: _constants.ALL_FIELD_TYPES.geojson,
+        format: '',
+        analyzerType: 'GEOMETRY'
+      };
+    }
+    return field;
+  });
+};
 var DatasetSchema = exports.DatasetSchema = /*#__PURE__*/function (_Schema2) {
   function DatasetSchema() {
     var _this2;
@@ -123,6 +151,7 @@ var DatasetSchema = exports.DatasetSchema = /*#__PURE__*/function (_Schema2) {
     value: function save(dataset) {
       var datasetFlattened = dataset.dataContainer ? _objectSpread(_objectSpread({}, dataset), {}, {
         allData: getAllDataForSaving(dataset.dataContainer),
+        fields: getFieldsForSaving(dataset.fields),
         // 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 ? {
@@ -190,4 +219,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","_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":[]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["_lodash","_interopRequireDefault","require","_window","arrow","_interopRequireWildcard","_constants","_versions","_schema","_commonUtils","_utils","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","_typeof","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","_callSuper","_getPrototypeOf2","_possibleConstructorReturn2","_isNativeReflectConstruct","Reflect","construct","constructor","Boolean","prototype","valueOf","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","getColumn","field","getField","DataType","isTimestamp","isDate","isTime","row","Date","toISOString","ALL_FIELD_TYPES","geoarrow","formatter","FIELD_DISPLAY_FORMAT","getFieldsForSaving","geojson","DatasetSchema","_Schema2","_this2","_len","args","Array","_key","concat","dataset","datasetFlattened","DATASET_FORMATS","updatedFields","needCalculateMeta","fieldOrder","sampleData","getSampleForTypeAnalyze","rows","meta","getFieldsFromData","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 * as arrow from 'apache-arrow';\n\nimport {ALL_FIELD_TYPES, 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, FIELD_DISPLAY_FORMAT} 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 files.\n * 1) Arrow tables can store Timestamps as BigInts, so convert numbers to ISOStrings compatible with Kepler.gl's TIMESTAMP.\n * 2) Geoarrow binary buffers converted to hex wkb\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 field = dataContainer.getField(columnIndex);\n\n      if (\n        arrow.DataType.isTimestamp(column.type) ||\n        arrow.DataType.isDate(column.type) ||\n        arrow.DataType.isTime(column.type)\n      ) {\n        allData.forEach(row => {\n          row[columnIndex] = new Date(row[columnIndex]).toISOString();\n        });\n      } else if (field?.type === ALL_FIELD_TYPES.geoarrow) {\n        const formatter = FIELD_DISPLAY_FORMAT[ALL_FIELD_TYPES.geoarrow];\n        allData.forEach(row => {\n          row[columnIndex] = formatter(row[columnIndex], field);\n        });\n      }\n    }\n  }\n\n  return allData;\n};\n\n/**\n * Transforms fields for saving as part of json / html files.\n * @param fields The array of fields from a Kepler table.\n * @returns The transformed fields array with GeoArrow types updated to GeoJSON.\n */\nconst getFieldsForSaving = (fields: KeplerTable['fields']) => {\n  return fields.map(field => {\n    if (field.type === ALL_FIELD_TYPES.geoarrow) {\n      // geoarrow binary data is transformed to hex wkb in getAllDataForSaving, so update the field accordingly\n      return {\n        name: field.name,\n        type: ALL_FIELD_TYPES.geojson,\n        format: '',\n        analyzerType: 'GEOMETRY'\n      };\n    }\n    return field;\n  });\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          fields: getFieldsForSaving(dataset.fields),\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",
+  "version": "3.1.1",
   "description": "kepler.gl schemas used by kepler.gl components, actions and reducers",
   "license": "MIT",
   "main": "dist/index.js",
@@ -30,12 +30,12 @@
     "umd"
   ],
   "dependencies": {
-    "@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",
+    "@kepler.gl/common-utils": "3.1.1",
+    "@kepler.gl/constants": "3.1.1",
+    "@kepler.gl/layers": "3.1.1",
+    "@kepler.gl/table": "3.1.1",
+    "@kepler.gl/types": "3.1.1",
+    "@kepler.gl/utils": "3.1.1",
     "@loaders.gl/loader-utils": "^4.3.2",
     "@types/keymirror": "^0.1.1",
     "@types/lodash.clonedeep": "^4.5.7",

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

@@ -3,15 +3,15 @@
 
 import pick from 'lodash.pick';
 import {console as globalConsole} from 'global/window';
-import {Type as ArrowTypes} from 'apache-arrow';
+import * as arrow from 'apache-arrow';
 
-import {DATASET_FORMATS} from '@kepler.gl/constants';
+import {ALL_FIELD_TYPES, 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';
+import {ArrowDataContainer, DataContainerInterface, FIELD_DISPLAY_FORMAT} from '@kepler.gl/utils';
 
 export type SavedField = {
   name: string;
@@ -104,8 +104,9 @@ export const propertiesV1 = {
 
 /**
  * TODO Consider moving this cast to ArrowDataContainer?
- * Prepare a data container for export as part of json / html.
+ * Prepare a data container for export as part of json / html files.
  * 1) Arrow tables can store Timestamps as BigInts, so convert numbers to ISOStrings compatible with Kepler.gl's TIMESTAMP.
+ * 2) Geoarrow binary buffers converted to hex wkb
  * @param dataContainer A data container to flatten.
  * @returns Row based data.
  */
@@ -117,15 +118,21 @@ const getAllDataForSaving = (dataContainer: DataContainerInterface): any[][] =>
 
     for (let columnIndex = 0; columnIndex < numColumns; ++columnIndex) {
       const column = dataContainer.getColumn(columnIndex);
-      const typeId = column.type?.typeId;
+      const field = dataContainer.getField(columnIndex);
+
       if (
-        typeId === ArrowTypes.Timestamp ||
-        typeId === ArrowTypes.Date ||
-        typeId === ArrowTypes.Time
+        arrow.DataType.isTimestamp(column.type) ||
+        arrow.DataType.isDate(column.type) ||
+        arrow.DataType.isTime(column.type)
       ) {
         allData.forEach(row => {
           row[columnIndex] = new Date(row[columnIndex]).toISOString();
         });
+      } else if (field?.type === ALL_FIELD_TYPES.geoarrow) {
+        const formatter = FIELD_DISPLAY_FORMAT[ALL_FIELD_TYPES.geoarrow];
+        allData.forEach(row => {
+          row[columnIndex] = formatter(row[columnIndex], field);
+        });
       }
     }
   }
@@ -133,6 +140,26 @@ const getAllDataForSaving = (dataContainer: DataContainerInterface): any[][] =>
   return allData;
 };
 
+/**
+ * Transforms fields for saving as part of json / html files.
+ * @param fields The array of fields from a Kepler table.
+ * @returns The transformed fields array with GeoArrow types updated to GeoJSON.
+ */
+const getFieldsForSaving = (fields: KeplerTable['fields']) => {
+  return fields.map(field => {
+    if (field.type === ALL_FIELD_TYPES.geoarrow) {
+      // geoarrow binary data is transformed to hex wkb in getAllDataForSaving, so update the field accordingly
+      return {
+        name: field.name,
+        type: ALL_FIELD_TYPES.geojson,
+        format: '',
+        analyzerType: 'GEOMETRY'
+      };
+    }
+    return field;
+  });
+};
+
 export class DatasetSchema extends Schema {
   key = 'dataset';
 
@@ -141,6 +168,7 @@ export class DatasetSchema extends Schema {
       ? {
           ...dataset,
           allData: getAllDataForSaving(dataset.dataContainer),
+          fields: getFieldsForSaving(dataset.fields),
           // we use flattenData to save arrow tables,
           // but once flattened it's not an arrow file anymore.
           metadata: {