@carto/kepler.gl 0.0.85 → 0.0.86-alpha.deck9.1

package/package.json

@@ -2,7 +2,7 @@
   "name": "@carto/kepler.gl",
   "author": "CARTO",
   "homepage": "https://github.com/CartoDB/carto-kepler#readme",
-  "version": "0.0.85",
+  "version": "0.0.86-alpha.deck9.1",
   "description": "kepler.gl is a webgl based application to visualize large scale location data in the browser",
   "license": "MIT",
   "type": "commonjs",
@@ -218,15 +218,15 @@
     "@babel/register": "^7.12.1",
     "@babel/runtime": "^7.12.1",
     "@babel/traverse": "^7.12.1",
-    "@deck.gl/aggregation-layers": "^9.0.30",
-    "@deck.gl/carto": "^9.0.30",
-    "@deck.gl/core": "^9.0.30",
-    "@deck.gl/extensions": "^9.0.30",
-    "@deck.gl/geo-layers": "^9.0.30",
-    "@deck.gl/layers": "^9.0.30",
-    "@deck.gl/mesh-layers": "^9.0.30",
-    "@deck.gl/react": "^9.0.30",
-    "@deck.gl/test-utils": "^9.0.30",
+    "@deck.gl/aggregation-layers": "^9.1.2",
+    "@deck.gl/carto": "^9.1.2",
+    "@deck.gl/core": "^9.1.2",
+    "@deck.gl/extensions": "^9.1.2",
+    "@deck.gl/geo-layers": "^9.1.2",
+    "@deck.gl/layers": "^9.1.2",
+    "@deck.gl/mesh-layers": "^9.1.2",
+    "@deck.gl/react": "^9.1.2",
+    "@deck.gl/test-utils": "^9.1.2",
     "@loaders.gl/core": "^4.2.5",
     "@loaders.gl/csv": "^4.2.5",
     "@loaders.gl/gltf": "^4.2.5",
@@ -306,22 +306,22 @@
     "tough-cookie": "4.0.0"
   },
   "peerDependencies": {
-    "@deck.gl/aggregation-layers": "^9.0.30",
-    "@deck.gl/carto": "^9.0.30",
-    "@deck.gl/core": "^9.0.30",
-    "@deck.gl/extensions": "^9.0.30",
-    "@deck.gl/geo-layers": "^9.0.30",
-    "@deck.gl/layers": "^9.0.30",
-    "@deck.gl/mesh-layers": "^9.0.30",
-    "@deck.gl/react": "^9.0.30",
+    "@deck.gl/aggregation-layers": "^9.1.2",
+    "@deck.gl/carto": "^9.1.2",
+    "@deck.gl/core": "^9.1.2",
+    "@deck.gl/extensions": "^9.1.2",
+    "@deck.gl/geo-layers": "^9.1.2",
+    "@deck.gl/layers": "^9.1.2",
+    "@deck.gl/mesh-layers": "^9.1.2",
+    "@deck.gl/react": "^9.1.2",
     "@loaders.gl/core": "^4.2.5",
     "@loaders.gl/csv": "^4.2.5",
     "@loaders.gl/gltf": "^4.2.5",
     "@loaders.gl/json": "^4.2.5",
     "@loaders.gl/loader-utils": "^4.2.5",
-    "@luma.gl/constants": "^9.0.27",
-    "@luma.gl/core": "^9.0.27",
-    "@luma.gl/webgl": "^9.0.27",
+    "@luma.gl/constants": "^9.1.2",
+    "@luma.gl/core": "^9.1.2",
+    "@luma.gl/webgl": "^9.1.2",
     "react": ">=16.3",
     "react-dom": ">=16.3",
     "styled-components": "^4.x || ^5.x"

package/src/deckgl-layers/grid-layer/enhanced-cpu-grid-layer.ts

@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import {CPUGridLayer} from '@deck.gl/aggregation-layers';
+import {GridLayer} from '@deck.gl/aggregation-layers';
 import CPUAggregator, {AggregationType, getAggregatedData} from '../layer-utils/cpu-aggregator';
 
 export const gridAggregation: AggregationType = {
@@ -44,7 +44,7 @@ export const gridAggregation: AggregationType = {
 };
 
 // @ts-expect-error
-export default class ScaleEnhancedGridLayer extends CPUGridLayer<any> {
+export default class ScaleEnhancedGridLayer extends GridLayer<any> {
   static defaultProps = {
     // Avoid state changes by marking the callback as compare: false
     onSetColorDomain: {type: 'function', optional: true, compare: false}

package/src/deckgl-layers/layer-utils/cpu-aggregator.ts

@@ -19,12 +19,19 @@
 // THE SOFTWARE.
 
 /* eslint-disable guard-for-in */
-import {AGGREGATION_OPERATION, _BinSorter as BinSorter} from '@deck.gl/aggregation-layers';
+import type {AggregationOperation} from '@deck.gl/aggregation-layers';
+/* @ts-expect-error BinSorter has been removed in deck.gl 9.1 so this entire file will no longer work */
+import {_BinSorter as BinSorter} from '@deck.gl/aggregation-layers';
 import {console as Console} from 'global/window';
 
 import {aggregate} from '../../utils/aggregate-utils';
-import {AGGREGATION_TYPES, SCALE_FUNC, SCALE_TYPES, UNKNOWN_COLOR} from '../../constants/default-settings';
-import {RGBAColor} from '../../reducers';
+import {
+  AGGREGATION_TYPES,
+  SCALE_FUNC,
+  SCALE_TYPES,
+  UNKNOWN_COLOR
+} from '../../constants/default-settings';
+import {RGBAColor, ValueOf} from '../../reducers';
 
 export type UpdaterType = (this: CPUAggregator, step, props, dimensionUpdater) => void;
 export type BindedUpdaterType = () => void;
@@ -76,20 +83,23 @@ export type AggregationType = {
   updateSteps: AggregationUpdateStepsType[];
 };
 
-export const DECK_AGGREGATION_MAP = {
-  [AGGREGATION_OPERATION.SUM]: AGGREGATION_TYPES.sum,
-  [AGGREGATION_OPERATION.MEAN]: AGGREGATION_TYPES.average,
-  [AGGREGATION_OPERATION.MIN]: AGGREGATION_TYPES.minimum,
-  [AGGREGATION_OPERATION.MAX]: AGGREGATION_TYPES.maximum
+export const DECK_AGGREGATION_MAP: Partial<Record<
+  AggregationOperation,
+  ValueOf<typeof AGGREGATION_TYPES>
+>> = {
+  SUM: AGGREGATION_TYPES.sum,
+  MEAN: AGGREGATION_TYPES.average,
+  MIN: AGGREGATION_TYPES.minimum,
+  MAX: AGGREGATION_TYPES.maximum
 };
 
 export function getValueFunc(aggregation, accessor) {
-  if (!aggregation || !AGGREGATION_OPERATION[aggregation.toUpperCase()]) {
+  const op: AggregationOperation = aggregation.toUpperCase();
+  if (!aggregation || !DECK_AGGREGATION_MAP[aggregation.toUpperCase()]) {
     Console.warn(`Aggregation ${aggregation} is not supported`);
   }
 
-  const op = AGGREGATION_OPERATION[aggregation.toUpperCase()] || AGGREGATION_OPERATION.SUM;
-  const keplerOp = DECK_AGGREGATION_MAP[op];
+  const keplerOp = DECK_AGGREGATION_MAP[op || 'SUM'];
 
   return pts => aggregate(pts.map(accessor), keplerOp);
 }

package/src/layers/base-layer.ts

@@ -22,7 +22,7 @@ import {console as Console} from 'global/window';
 import keymirror from 'keymirror';
 import {CollisionFilterExtension, DataFilterExtension} from '@deck.gl/extensions';
 import {COORDINATE_SYSTEM, Layer as DeckLayer} from '@deck.gl/core';
-import {_PointLabelLayer as PointLabelLayer} from '@deck.gl/carto';
+import {PointLabelLayer} from '@deck.gl/carto';
 import DefaultLayerIcon from './default-layer-icon';
 import {diffUpdateTriggers} from './layer-update';
 import {rgb} from 'd3-color';
@@ -56,7 +56,12 @@ import {generateHashId, isPlainObject} from 'utils/utils';
 import {getLatLngBounds, notNullorUndefined} from 'utils/data-utils';
 import {getSampleData} from 'utils/table-utils/data-container-utils';
 
-import {hexToRgb, getColorGroupByName, reverseColorRange, checkColorOrFallback} from 'utils/color-utils';
+import {
+  hexToRgb,
+  getColorGroupByName,
+  reverseColorRange,
+  checkColorOrFallback
+} from 'utils/color-utils';
 import {getMaskExtensionProps} from 'utils/layer-utils';
 import {scaleOrdinal} from 'd3-scale';
 
@@ -473,10 +478,12 @@ class Layer {
   ): LayerBaseConfig & Partial<LayerColorConfig & LayerSizeConfig> {
     return {
       dataId: props.dataId || null,
-      ...{visibilityByZoom: {
-        min: (props as any).visibilityByZoom?.min || ZOOM_LEVEL_LIMITS.min,
-        max: (props as any).visibilityByZoom?.max || ZOOM_LEVEL_LIMITS.max
-      }}, // TODO: Clean up
+      ...{
+        visibilityByZoom: {
+          min: (props as any).visibilityByZoom?.min || ZOOM_LEVEL_LIMITS.min,
+          max: (props as any).visibilityByZoom?.max || ZOOM_LEVEL_LIMITS.max
+        }
+      }, // TODO: Clean up
       label: props.label || DEFAULT_LAYER_LABEL,
       color: props.color || colorMaker.next().value,
       columns: props.columns || {},
@@ -940,7 +947,7 @@ class Layer {
       newColorMap[newColorMap.length - 1][0] = prevValue + step;
 
       for (const [i, color] of unassignedColors.entries()) {
-        const value = i === unassignedColors.length - 1 ? null : prevValue + (step * (i + 2));
+        const value = i === unassignedColors.length - 1 ? null : prevValue + step * (i + 2);
         newColorMap.push([value, color]);
       }
     }
@@ -1140,7 +1147,7 @@ class Layer {
 
     // for `count` aggregation, we domain is actually `[0, Infinity]` so it doesn't make sense
     // to use it, so skip specyfying this domains
-    const domainIsInfinite = domain && (domain[0] === 0 && domain[1] === Infinity);
+    const domainIsInfinite = domain && domain[0] === 0 && domain[1] === Infinity;
     const scaleFactory = SCALE_FUNC[fixed ? 'linear' : scale];
     // @ts-ignore d3-scale type
     let result = scaleFactory();
@@ -1542,7 +1549,7 @@ class Layer {
     const {radiusField, sizeField, visConfig} = this.config as any;
     const {radiusRange, radius} = visConfig;
     const field = radiusField || sizeField;
-    return Math.ceil((field && radiusRange ? radiusRange[1] : radius));
+    return Math.ceil(field && radiusRange ? radiusRange[1] : radius);
   }
 
   shouldCalculateLayerData(props: string[]) {
@@ -1701,7 +1708,7 @@ class Layer {
 
     return d => {
       const wantedUrl =
-        (typeof iconUrlAccessor === 'function') ? iconUrlAccessor(d) : iconUrlAccessor;
+        typeof iconUrlAccessor === 'function' ? iconUrlAccessor(d) : iconUrlAccessor;
       const iconOk = Boolean(wantedUrl);
       mask = iconOk ? mask : true;
       const url = iconOk ? wantedUrl : FALLBACK_ICON;