@carto/kepler.gl 0.0.59 → 0.0.60-alpha.perf-improvements.2

package/src/layers/base-layer.js

@@ -21,9 +21,39 @@
 import {console as Console} from 'global/window';
 import keymirror from 'keymirror';
 import {DataFilterExtension} from '@deck.gl/extensions';
-import {COORDINATE_SYSTEM} from '@deck.gl/core';
+import {COORDINATE_SYSTEM, Layer as DeckLayer} from '@deck.gl/core';
 import {TextLayer} from '@deck.gl/layers';
 
+// Workaround until https://github.com/visgl/deck.gl/pull/7513 is released
+DeckLayer.defaultProps.getFilterValue = {type: 'accessor', value: 0};
+
+// Workaround until https://github.com/visgl/deck.gl/pull/7507 is released
+function deepEqual(a, b) {
+  if (a === b) {
+    return true;
+  }
+  if (!a || !b) {
+    return false;
+  }
+  for (const key in a) {
+    const aValue = a[key];
+    const bValue = b[key];
+    const equals = aValue === bValue || deepEqual(aValue, bValue);
+    if (!equals) {
+      return false;
+    }
+  }
+  return true;
+}
+
+DeckLayer.defaultProps.loadOptions = {
+  type: 'object',
+  value: {},
+  optional: true,
+  compare: true,
+  equal: deepEqual
+};
+
 import DefaultLayerIcon from './default-layer-icon';
 import {diffUpdateTriggers} from './layer-update';
 
@@ -1301,10 +1331,7 @@ class Layer {
       wrapLongitude: true,
       parameters: {depthTest: Boolean(mapState.dragRotate || this.config.visConfig.enable3d)},
       hidden: this.config.hidden,
-      visibilityByZoom: {
-        min: this.config.visibilityByZoom.min,
-        max: this.config.visibilityByZoom.max
-      },
+      visibilityByZoom: this.config.visibilityByZoom,
       // visconfig
       opacity: this.config.visConfig.opacity,
       highlightColor: this.config.highlightColor,
@@ -1356,8 +1383,8 @@ class Layer {
               ...updateTriggers,
               getText: textLabel[i].field?.name,
               getPixelOffset: {
+                ...updateTriggers.getPixelOffset,
                 ...updateTriggers.getRadius,
-                mapState,
                 anchor: textLabel[i].anchor,
                 alignment: textLabel[i].alignment
               },

package/src/layers/point-layer/point-layer.js

@@ -286,12 +286,6 @@ export default class PointLayer extends Layer {
     const radiusScale = this.getRadiusScale(fixedRadius);
     const radiusUnits = this.getRadiusUnit(fixedRadius);
 
-    const updateTriggers = {
-      getPosition: this.config.columns,
-      getFilterValue: gpuFilter.filterValueUpdateTriggers,
-      ...this.getVisualChannelUpdateTriggers()
-    };
-
     const defaultLayerProps = this.getDefaultDeckLayerProps(opts);
     const brushingProps = this.getBrushingExtensionProps(interactionConfig);
     const getPixelOffset = getTextOffsetByRadius(
@@ -302,6 +296,14 @@ export default class PointLayer extends Layer {
     );
     const extensions = [...defaultLayerProps.extensions, brushingExtension];
 
+    const {latitude, zoom} = mapState;
+    const updateTriggers = {
+      getPixelOffset: fixedRadius ? {latitude, zoom} : {},
+      getPosition: this.config.columns,
+      getFilterValue: gpuFilter.filterValueUpdateTriggers,
+      ...this.getVisualChannelUpdateTriggers()
+    };
+
     const sharedProps = {
       getFilterValue: data.getFilterValue,
       extensions,
@@ -366,8 +368,8 @@ export default class PointLayer extends Layer {
           getFilterValue: data.getFilterValue,
           updateTriggers: {
             getFilterValue: updateTriggers.getFilterValue,
-            getColor: [updateTriggers.getFillColor, this.config.visConfig.filled],
-            getIcon: [updateTriggers.getIconUrl, maxIconSize, useMask],
+            getColor: {...updateTriggers.getFillColor, filled: this.config.visConfig.filled},
+            getIcon: {...updateTriggers.getIconUrl, maxIconSize, useMask},
             getSize: updateTriggers.getRadius,
             getAngle: updateTriggers.getRotation
           }

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

@@ -1,45 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _reactIntl = require("react-intl");
-
-// 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.
-CustomMarkerCategoriesSelectorFactory.deps = [];
-
-function CustomMarkerCategoriesSelectorFactory() {
-  var CustomMarkerCategoriesSelector = function CustomMarkerCategoriesSelector() {
-    return /*#__PURE__*/_react["default"].createElement("div", null, "Component replaced by cloud native");
-  };
-
-  return (0, _reactIntl.injectIntl)(CustomMarkerCategoriesSelector);
-}
-
-var _default = CustomMarkerCategoriesSelectorFactory;
-exports["default"] = _default;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9jb21wb25lbnRzL3NpZGUtcGFuZWwvbGF5ZXItcGFuZWwvY3VzdG9tLW1hcmtlci1jYXRlZ29yaWVzLXNlbGVjdG9yLmpzIl0sIm5hbWVzIjpbIkN1c3RvbU1hcmtlckNhdGVnb3JpZXNTZWxlY3RvckZhY3RvcnkiLCJkZXBzIiwiQ3VzdG9tTWFya2VyQ2F0ZWdvcmllc1NlbGVjdG9yIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFvQkE7O0FBQ0E7O0FBckJBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBS0FBLHFDQUFxQyxDQUFDQyxJQUF0QyxHQUE2QyxFQUE3Qzs7QUFDQSxTQUFTRCxxQ0FBVCxHQUFpRDtBQUMvQyxNQUFNRSw4QkFBOEIsR0FBRyxTQUFqQ0EsOEJBQWlDLEdBQU07QUFDM0Msd0JBQU8sa0ZBQVA7QUFDRCxHQUZEOztBQUlBLFNBQU8sMkJBQVdBLDhCQUFYLENBQVA7QUFDRDs7ZUFFY0YscUMiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBDb3B5cmlnaHQgKGMpIDIwMjIgVWJlciBUZWNobm9sb2dpZXMsIEluYy5cbi8vXG4vLyBQZXJtaXNzaW9uIGlzIGhlcmVieSBncmFudGVkLCBmcmVlIG9mIGNoYXJnZSwgdG8gYW55IHBlcnNvbiBvYnRhaW5pbmcgYSBjb3B5XG4vLyBvZiB0aGlzIHNvZnR3YXJlIGFuZCBhc3NvY2lhdGVkIGRvY3VtZW50YXRpb24gZmlsZXMgKHRoZSBcIlNvZnR3YXJlXCIpLCB0byBkZWFsXG4vLyBpbiB0aGUgU29mdHdhcmUgd2l0aG91dCByZXN0cmljdGlvbiwgaW5jbHVkaW5nIHdpdGhvdXQgbGltaXRhdGlvbiB0aGUgcmlnaHRzXG4vLyB0byB1c2UsIGNvcHksIG1vZGlmeSwgbWVyZ2UsIHB1Ymxpc2gsIGRpc3RyaWJ1dGUsIHN1YmxpY2Vuc2UsIGFuZC9vciBzZWxsXG4vLyBjb3BpZXMgb2YgdGhlIFNvZnR3YXJlLCBhbmQgdG8gcGVybWl0IHBlcnNvbnMgdG8gd2hvbSB0aGUgU29mdHdhcmUgaXNcbi8vIGZ1cm5pc2hlZCB0byBkbyBzbywgc3ViamVjdCB0byB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnM6XG4vL1xuLy8gVGhlIGFib3ZlIGNvcHlyaWdodCBub3RpY2UgYW5kIHRoaXMgcGVybWlzc2lvbiBub3RpY2Ugc2hhbGwgYmUgaW5jbHVkZWQgaW5cbi8vIGFsbCBjb3BpZXMgb3Igc3Vic3RhbnRpYWwgcG9ydGlvbnMgb2YgdGhlIFNvZnR3YXJlLlxuLy9cbi8vIFRIRSBTT0ZUV0FSRSBJUyBQUk9WSURFRCBcIkFTIElTXCIsIFdJVEhPVVQgV0FSUkFOVFkgT0YgQU5ZIEtJTkQsIEVYUFJFU1MgT1Jcbi8vIElNUExJRUQsIElOQ0xVRElORyBCVVQgTk9UIExJTUlURUQgVE8gVEhFIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZLFxuLy8gRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQU5EIE5PTklORlJJTkdFTUVOVC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFXG4vLyBBVVRIT1JTIE9SIENPUFlSSUdIVCBIT0xERVJTIEJFIExJQUJMRSBGT1IgQU5ZIENMQUlNLCBEQU1BR0VTIE9SIE9USEVSXG4vLyBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQU4gQUNUSU9OIE9GIENPTlRSQUNULCBUT1JUIE9SIE9USEVSV0lTRSwgQVJJU0lORyBGUk9NLFxuLy8gT1VUIE9GIE9SIElOIENPTk5FQ1RJT04gV0lUSCBUSEUgU09GVFdBUkUgT1IgVEhFIFVTRSBPUiBPVEhFUiBERUFMSU5HUyBJTlxuLy8gVEhFIFNPRlRXQVJFLlxuXG5pbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnO1xuaW1wb3J0IHtpbmplY3RJbnRsfSBmcm9tICdyZWFjdC1pbnRsJztcblxuQ3VzdG9tTWFya2VyQ2F0ZWdvcmllc1NlbGVjdG9yRmFjdG9yeS5kZXBzID0gW107XG5mdW5jdGlvbiBDdXN0b21NYXJrZXJDYXRlZ29yaWVzU2VsZWN0b3JGYWN0b3J5KCkge1xuICBjb25zdCBDdXN0b21NYXJrZXJDYXRlZ29yaWVzU2VsZWN0b3IgPSAoKSA9PiB7XG4gICAgcmV0dXJuIDxkaXY+Q29tcG9uZW50IHJlcGxhY2VkIGJ5IGNsb3VkIG5hdGl2ZTwvZGl2PjtcbiAgfTtcblxuICByZXR1cm4gaW5qZWN0SW50bChDdXN0b21NYXJrZXJDYXRlZ29yaWVzU2VsZWN0b3IpO1xufVxuXG5leHBvcnQgZGVmYXVsdCBDdXN0b21NYXJrZXJDYXRlZ29yaWVzU2VsZWN0b3JGYWN0b3J5O1xuIl19

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

@@ -1,33 +0,0 @@
-// 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;