@carto/kepler.gl 0.0.71-alpha.2 → 0.0.71-alpha.4

package/dist/utils/custom-scales.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.scaleIdentity = scaleIdentity;
+
+function scaleIdentity() {
+  var unknown;
+
+  function scale(x) {
+    return x === null ? unknown : x;
+  }
+
+  scale.invert = scale;
+  scale.domain = scale.range = scaleIdentity;
+
+  scale.unknown = function (u) {
+    if (u) {
+      unknown = u;
+    }
+
+    return scale;
+  };
+
+  return scale;
+}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9jdXN0b20tc2NhbGVzLmpzIl0sIm5hbWVzIjpbInNjYWxlSWRlbnRpdHkiLCJ1bmtub3duIiwic2NhbGUiLCJ4IiwiaW52ZXJ0IiwiZG9tYWluIiwicmFuZ2UiLCJ1Il0sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBQU8sU0FBU0EsYUFBVCxHQUF5QjtBQUM5QixNQUFJQyxPQUFKOztBQUNBLFdBQVNDLEtBQVQsQ0FBZUMsQ0FBZixFQUFrQjtBQUNoQixXQUFPQSxDQUFDLEtBQUssSUFBTixHQUFhRixPQUFiLEdBQXVCRSxDQUE5QjtBQUNEOztBQUVERCxFQUFBQSxLQUFLLENBQUNFLE1BQU4sR0FBZUYsS0FBZjtBQUVBQSxFQUFBQSxLQUFLLENBQUNHLE1BQU4sR0FBZUgsS0FBSyxDQUFDSSxLQUFOLEdBQWNOLGFBQTdCOztBQUVBRSxFQUFBQSxLQUFLLENBQUNELE9BQU4sR0FBZ0IsVUFBQU0sQ0FBQyxFQUFJO0FBQ25CLFFBQUlBLENBQUosRUFBTztBQUNMTixNQUFBQSxPQUFPLEdBQUdNLENBQVY7QUFDRDs7QUFFRCxXQUFPTCxLQUFQO0FBQ0QsR0FORDs7QUFRQSxTQUFPQSxLQUFQO0FBQ0QiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZnVuY3Rpb24gc2NhbGVJZGVudGl0eSgpIHtcbiAgbGV0IHVua25vd247XG4gIGZ1bmN0aW9uIHNjYWxlKHgpIHtcbiAgICByZXR1cm4geCA9PT0gbnVsbCA/IHVua25vd24gOiB4O1xuICB9XG5cbiAgc2NhbGUuaW52ZXJ0ID0gc2NhbGU7XG5cbiAgc2NhbGUuZG9tYWluID0gc2NhbGUucmFuZ2UgPSBzY2FsZUlkZW50aXR5O1xuXG4gIHNjYWxlLnVua25vd24gPSB1ID0+IHtcbiAgICBpZiAodSkge1xuICAgICAgdW5rbm93biA9IHU7XG4gICAgfVxuXG4gICAgcmV0dXJuIHNjYWxlO1xuICB9O1xuXG4gIHJldHVybiBzY2FsZTtcbn1cbiJdfQ==

package/package.json

@@ -2,7 +2,7 @@
   "name": "@carto/kepler.gl",
   "author": "CARTO",
   "homepage": "https://github.com/CartoDB/carto-kepler#readme",
-  "version": "0.0.71-alpha.2",
+  "version": "0.0.71-alpha.4",
   "description": "kepler.gl is a webgl based application to visualize large scale location data in the browser",
   "license": "MIT",
   "main": "dist/index.js",
@@ -136,7 +136,7 @@
     "react-redux": "^7.1.3",
     "react-sortable-hoc": "^1.8.3",
     "react-tooltip": "^4.2.10",
-    "react-virtualized": "^9.21.1",
+    "react-virtualized": "git+https://git@github.com/remorses/react-virtualized-fixed-import.git#9.22.3",
     "react-vis": "^1.8.0",
     "redux": "^4.0.5",
     "redux-actions": "^2.2.1",
@@ -228,6 +228,7 @@
     "webpack-stats-plugin": "^0.2.1"
   },
   "resolutions": {
+    "d3-time": "^2.1.1",
     "d3-scale": "^3.2.3",
     "dot-prop": "6.0.0",
     "kind-of": "6.0.3",

package/src/components/side-panel/layer-panel/layer-configurator.js

@@ -41,7 +41,11 @@ import TextLabelPanelFactory from './text-label-panel';
 
 import {capitalizeFirstLetter} from 'utils/utils';
 
-import {CHANNEL_SCALES, CHANNEL_SCALE_SUPPORTED_FIELDS} from 'constants/default-settings';
+import {
+  CHANNEL_SCALES,
+  CHANNEL_SCALE_SUPPORTED_FIELDS,
+  SCALE_TYPES
+} from 'constants/default-settings';
 import {LAYER_TYPES} from 'layers/types';
 import {injectIntl} from 'react-intl';
 import ColorDimensionScaleSelectorFactory from './color-dimension-scale-selector';
@@ -1139,8 +1143,10 @@ export function LayerColorRangeSelectorFactory(ColorSelector) {
         onChange,
         property = 'colorRange',
         field = 'colorField',
+        scale = 'colorScale',
         setColorUI,
-        fields
+        fields,
+        handleCustomOnSelectHexColumn
       } = this.props;
       return (
         <SidePanelSection>
@@ -1154,6 +1160,9 @@ export function LayerColorRangeSelectorFactory(ColorSelector) {
                 selectedColor: layer.config.visConfig[property],
                 isRange: true,
                 setColor: colorRange => {
+                  layer.updateLayerConfig({
+                    [scale]: SCALE_TYPES.ordinal
+                  });
                   const {colorMap} = layer.config.visConfig[property];
                   const colorRangeUpdated = colorMap
                     ? layer.updateColorMap(property, colorMap, colorRange)
@@ -1165,12 +1174,17 @@ export function LayerColorRangeSelectorFactory(ColorSelector) {
             colorUI={layer.config.colorUI[property]}
             setColorUI={newConfig => setColorUI(property, newConfig)}
             onSelectHexColorColumn={colorColumn => {
+              if (handleCustomOnSelectHexColumn) {
+                handleCustomOnSelectHexColumn(layer, colorColumn);
+              }
+
               layer.updateLayerConfig({
                 [field]: {
                   ...layer.config[field],
                   colorColumn: colorColumn?.name,
                   colorColumnIdx: colorColumn?.fieldIdx
-                }
+                },
+                [scale]: SCALE_TYPES.identity
               });
 
               onChange({[property]: hexColorCustomPalette});

package/src/constants/default-settings.js

@@ -45,6 +45,7 @@ import {
 import {getHTMLMapModeTileUrl} from 'utils/utils';
 import {TOOLTIP_FORMAT_TYPES} from './tooltip';
 import {LAYER_TYPES} from 'layers/types';
+import {scaleIdentity} from 'utils/custom-scales';
 
 export const ACTION_PREFIX = '@@kepler.gl/';
 export const CLOUDFRONT = 'https://d1a3f4spazzrp4.cloudfront.net/kepler.gl';
@@ -310,7 +311,8 @@ export const SCALE_TYPES = keyMirror({
   point: null,
   custom: null,
   // UI-only type, resolving as custom
-  logarithmic: null
+  logarithmic: null,
+  identity: null
 });
 
 export const SCALE_FUNC = {
@@ -321,7 +323,8 @@ export const SCALE_FUNC = {
   [SCALE_TYPES.sqrt]: scaleSqrt,
   [SCALE_TYPES.log]: scaleLog,
   [SCALE_TYPES.point]: scalePoint,
-  [SCALE_TYPES.custom]: scaleThreshold
+  [SCALE_TYPES.custom]: scaleThreshold,
+  [SCALE_TYPES.identity]: scaleIdentity
 };
 
 export const ALL_FIELD_TYPES = keyMirror({

package/src/layers/base-layer.js

@@ -1195,7 +1195,7 @@ class Layer {
   validateScale(channel) {
     const visualChannel = this.visualChannels[channel];
     const {scale} = visualChannel;
-    if (!scale) {
+    if (!scale || this.config[scale] === SCALE_TYPES.identity) {
       // visualChannel doesn't have scale
       return;
     }

package/src/utils/custom-scales.js

@@ -0,0 +1,20 @@
+export function scaleIdentity() {
+  let unknown;
+  function scale(x) {
+    return x === null ? unknown : x;
+  }
+
+  scale.invert = scale;
+
+  scale.domain = scale.range = scaleIdentity;
+
+  scale.unknown = u => {
+    if (u) {
+      unknown = u;
+    }
+
+    return scale;
+  };
+
+  return scale;
+}