@carto/kepler.gl 0.0.61 → 0.0.62

package/src/components/side-panel/layer-panel/custom-marker-categories-selector.js

@@ -0,0 +1,33 @@
+// Copyright (c) 2022 Uber Technologies, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import React from 'react';
+import {injectIntl} from 'react-intl';
+
+CustomMarkerCategoriesSelectorFactory.deps = [];
+function CustomMarkerCategoriesSelectorFactory() {
+  const CustomMarkerCategoriesSelector = () => {
+    return <div>Component replaced by cloud native</div>;
+  };
+
+  return injectIntl(CustomMarkerCategoriesSelector);
+}
+
+export default CustomMarkerCategoriesSelectorFactory;

package/src/constants/default-settings.js

@@ -460,6 +460,7 @@ export const FIELD_TYPES_AGGREGATORS = {
   date: null,
   geojson: null,
   integer: [
+    AGGREGATION_TYPES.count,
     AGGREGATION_TYPES.average,
     AGGREGATION_TYPES.maximum,
     AGGREGATION_TYPES.minimum,
@@ -468,6 +469,7 @@ export const FIELD_TYPES_AGGREGATORS = {
     AGGREGATION_TYPES.variance
   ],
   real: [
+    AGGREGATION_TYPES.count,
     AGGREGATION_TYPES.average,
     AGGREGATION_TYPES.maximum,
     AGGREGATION_TYPES.minimum,
@@ -481,6 +483,10 @@ export const FIELD_TYPES_AGGREGATORS = {
 };
 
 export const FIELD_AGGREGATORS = [
+  {
+    id: AGGREGATION_TYPES.count,
+    displayName: 'COUNT'
+  },
   {
     id: AGGREGATION_TYPES.average,
     displayName: 'AVG'
@@ -525,6 +531,7 @@ export const linearFieldScaleFunctions = {
 
 export const linearFieldAggrScaleFunctions = {
   [CHANNEL_SCALES.colorAggr]: {
+    [AGGREGATION_TYPES.count]: [SCALE_TYPES.custom],
     [AGGREGATION_TYPES.average]: [SCALE_TYPES.quantize, SCALE_TYPES.quantile, SCALE_TYPES.custom],
     [AGGREGATION_TYPES.maximum]: [SCALE_TYPES.quantize, SCALE_TYPES.quantile, SCALE_TYPES.custom],
     [AGGREGATION_TYPES.minimum]: [SCALE_TYPES.quantize, SCALE_TYPES.quantile, SCALE_TYPES.custom],
@@ -535,6 +542,7 @@ export const linearFieldAggrScaleFunctions = {
   },
 
   [CHANNEL_SCALES.sizeAggr]: {
+    [AGGREGATION_TYPES.count]: [SCALE_TYPES.linear, SCALE_TYPES.sqrt, SCALE_TYPES.log],
     [AGGREGATION_TYPES.average]: [SCALE_TYPES.linear, SCALE_TYPES.sqrt, SCALE_TYPES.log],
     [AGGREGATION_TYPES.maximum]: [SCALE_TYPES.linear, SCALE_TYPES.sqrt, SCALE_TYPES.log],
     [AGGREGATION_TYPES.minimum]: [SCALE_TYPES.linear, SCALE_TYPES.sqrt, SCALE_TYPES.log],

package/src/layers/base-layer.js

@@ -975,10 +975,16 @@ class Layer {
         .unknown(UNKNOWN_COLOR);
     }
 
+    // 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 scaleFactory = SCALE_FUNC[fixed ? 'linear' : scale];
     // @ts-ignore d3-scale type
-    return SCALE_FUNC[fixed ? 'linear' : scale]()
-      .domain(domain)
-      .range(fixed ? domain : range);
+    let result = scaleFactory();
+    if (domain && !domainIsInfinite) {
+      result = result.domain(domain);
+    }
+    return result.range(fixed ? domain : range);
   }
 
   /**