@carto/kepler.gl 0.0.60 → 0.0.61-count-aggregation.2

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@carto/kepler.gl",
-  "author": "CARTO",
-  "homepage": "https://github.com/CartoDB/carto-kepler#readme",
-  "version": "0.0.60",
+  "author": "Shan He <shan@uber.com>",
+  "version": "0.0.61-count-aggregation.2",
   "description": "kepler.gl is a webgl based application to visualize large scale location data in the browser",
   "license": "MIT",
   "main": "dist/index.js",
@@ -16,7 +15,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/CartoDB/carto-kepler.git"
+    "url": "https://github.com/keplergl/kepler.gl.git"
   },
   "scripts": {
     "install:example": "cd examples/demo-app && yarn",
@@ -270,6 +269,10 @@
   "engines": {
     "node": ">=12.0.0"
   },
+  "maintainers": [
+    "Shan He <heshan0131@gmail.com>",
+    "Giuseppe Macri <gmacri@uber.com>"
+  ],
   "volta": {
     "node": "12.19.0"
   }

package/src/components/common/item-selector/dropdown-list.js

@@ -117,7 +117,7 @@ export default class DropdownList extends Component {
   ref = createRef();
 
   _resetState(callback) {
-    this.setState({currentOption: {}, submenuVisible: false, submenuPosition: {}}, callback);
+    // this.setState({currentOption: {}, submenuVisible: false, submenuPosition: {}}, callback);
   }
 
   _onClick(option, subOption, event) {

package/src/components/common/item-selector/item-selector.js

@@ -96,13 +96,14 @@ const DropdownWrapper = styled.div`
   left: 0;
   z-index: ${props => props.theme.dropdownWrapperZ};
   position: absolute;
-  bottom: ${props => (props.placement === 'top' ? props.theme.inputBoxHeight : 'auto')};
-  margin-top: ${props =>
-    props.placement === 'bottom' ? `${props.theme.dropdownWapperMargin}px` : 'auto'};
-  margin-bottom: ${props =>
-    props.placement === 'top' ? `${props.theme.dropdownWapperMargin}px` : 'auto'};
 `;
 
+// bottom: ${props => (props.placement === 'top' ? props.theme.inputBoxHeight : 'auto')};
+//   margin-top: ${props =>
+//     props.placement === 'bottom' ? `${props.theme.dropdownWapperMargin}px` : 'auto'};
+//   margin-bottom: ${props =>
+//     props.placement === 'top' ? `${props.theme.dropdownWapperMargin}px` : 'auto'};
+
 // The item-selector component dismount all its children if you click outside of the component because of listensToClickOutside function.
 // If you want to prevent this behaviour when you click on a child add this class to it.
 // It is useful for example, when you add the child component on the top of tree with a Portal as dropdown-list does with item-selector-submenu

package/src/components/common/portaled.js

@@ -112,7 +112,7 @@ const defaultModalStyle = {
   }
 };
 
-const WINDOW_PAD = 40;
+const WINDOW_PAD = 20;
 
 const noop = () => {};
 

package/src/components/map/map-popover.js

@@ -132,7 +132,7 @@ MapPopoverFactory.deps = [LayerHoverInfoFactory, CoordinateInfoFactory];
 
 function zoomBetweenLimits(visibilityByZoom, zoom) {
   if (visibilityByZoom) {
-    const roundedZoom = Math.floor(zoom);
+    const roundedZoom = Math.round(zoom);
     const currentZoomUnderMin = roundedZoom < visibilityByZoom?.min;
     const currentZoomOverMax = roundedZoom > visibilityByZoom?.max;
     if (currentZoomUnderMin || currentZoomOverMax) {

package/src/components/map-container.js

@@ -441,7 +441,7 @@ export default function MapContainerFactory(MapPopover, MapControl, Editor) {
             ) {
               return true;
             }
-            const currentZoomRange = Math.floor(mapState.zoom);
+            const currentZoomRange = Math.round(mapState.zoom);
 
             return (
               layer.props.visibilityByZoom.min <= currentZoomRange &&

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);
   }
 
   /**