@carto/kepler.gl 0.0.37 → 0.0.38

package/package.json

@@ -2,7 +2,7 @@
   "name": "@carto/kepler.gl",
   "author": "CARTO",
   "homepage": "https://github.com/CartoDB/carto-kepler#readme",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "kepler.gl is a webgl based application to visualize large scale location data in the browser",
   "license": "MIT",
   "main": "dist/index.js",

package/src/components/index.js

@@ -196,7 +196,8 @@ export {
 export {
   HowToButton,
   LayerColorRangeSelector,
-  LayerColorSelector
+  LayerColorSelector,
+  AggregationTypeSelector
 } from './side-panel/layer-panel/layer-configurator';
 
 export {default as ColorPalette} from './side-panel/layer-panel/color-palette';

package/src/layers/base-layer.js

@@ -823,7 +823,8 @@ class Layer {
         defaultValue,
         getAttributeValue,
         nullValue,
-        channelScaleType
+        channelScaleType,
+        aggregation
       } = this.visualChannels[channel];
 
       const shouldGetScale = this.config[field];
@@ -834,6 +835,7 @@ class Layer {
         // It's important to declare as const all the parameters that we are going to be use in the getEncodedChannelValue call
         // otherwise, the oldLayerData parameter in formatLayerData method will be wrong (you can check the formatLayerData TileLayer method in Builder as example)
         const fieldConfig = this.config[field];
+        const aggregationValue = this.config.visConfig[aggregation];
 
         const scaleFunction =
           channelScaleType === CHANNEL_SCALES.color
@@ -845,6 +847,7 @@ class Layer {
             scaleFunction,
             dataAccessor(dataContainer)(d),
             fieldConfig,
+            aggregationValue,
             nullValue
           );
       } else if (typeof getAttributeValue === 'function') {
@@ -914,6 +917,8 @@ class Layer {
     scale,
     data,
     field,
+    // In builder we overwrite the getValue function and we use the _aggregation parameter in spatial index layers as the QuadkeyLayer.
+    _aggregation,
     nullValue = NO_VALUE_COLOR,
     getValue = defaultGetFieldValue
   ) {

package/src/layers/layer-factory.js

@@ -233,6 +233,15 @@ export const LAYER_VIS_CONFIGS = {
     property: 'sizeAggregation',
     condition: config => config.sizeField
   },
+  heightAggregation: {
+    type: 'select',
+    defaultValue: AGGREGATION_TYPES.average,
+    label: 'layerVisConfigs.heightAggregation',
+    options: Object.keys(AGGREGATION_TYPES),
+    group: PROPERTY_GROUPS.height,
+    property: 'heightAggregation',
+    condition: config => config.heightField
+  },
   percentile: {
     type: 'number',
     defaultValue: [0, 100],

package/src/reducers/vis-state-merger.js

@@ -291,9 +291,9 @@ export function mergeInteractionTooltipConfig(state, tooltipConfig = {}) {
     } else {
       // if dataset is loaded
       const allFields = state.datasets[dataId].fields.map(d => d.name);
-      const foundFieldsToShow = tooltipConfig.fieldsToShow[dataId].filter(field =>
-        allFields.includes(field.name)
-      );
+      const foundFieldsToShow = state.datasets[dataId].metadata.isDynamicSpatialIndex
+        ? tooltipConfig.fieldsToShow[dataId]
+        : tooltipConfig.fieldsToShow[dataId].filter(field => allFields.includes(field.name));
 
       mergedTooltip[dataId] = foundFieldsToShow;
     }

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

@@ -1715,7 +1715,9 @@ export function addDefaultLayers(state, datasets) {
  * @returns {Object} nextState
  */
 export function addDefaultTooltips(state, dataset) {
-  const tooltipFields = findFieldsToShow(dataset);
+  const tooltipFields = dataset.metadata.isDynamicSpatialIndex
+    ? {[dataset.id]: []}
+    : findFieldsToShow(dataset);
   const merged = {
     ...state.interactionConfig.tooltip.config.fieldsToShow,
     ...tooltipFields