@carto/kepler.gl 0.0.65-alpha.labels.6 → 0.0.65-alpha.labels.7

package/dist/constants/default-settings.js

@@ -134,7 +134,7 @@ var KEPLER_GL_NAME = 'kepler.gl'; // __PACKAGE_VERSION__ is automatically inject
 // an empty string which will allow us to retrieve the latest umd version
 
 exports.KEPLER_GL_NAME = KEPLER_GL_NAME;
-var KEPLER_GL_VERSION = "0.0.65-alpha.labels.6";
+var KEPLER_GL_VERSION = "0.0.65-alpha.labels.7";
 exports.KEPLER_GL_VERSION = KEPLER_GL_VERSION;
 var KEPLER_GL_WEBSITE = 'http://kepler.gl/';
 exports.KEPLER_GL_WEBSITE = KEPLER_GL_WEBSITE;

package/dist/deckgl-layers/point-label-layer/point-label-layer.js

@@ -15,6 +15,8 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
+var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
+
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -40,14 +42,43 @@ var LEFT = 0,
     RIGHT = 2,
     BOTTOM = 3;
 
+var EnhancedTextBackgroundLayer = /*#__PURE__*/function (_TextBackgroundLayer) {
+  (0, _inherits2["default"])(EnhancedTextBackgroundLayer, _TextBackgroundLayer);
+
+  var _super = _createSuper(EnhancedTextBackgroundLayer);
+
+  function EnhancedTextBackgroundLayer() {
+    (0, _classCallCheck2["default"])(this, EnhancedTextBackgroundLayer);
+    return _super.apply(this, arguments);
+  }
+
+  (0, _createClass2["default"])(EnhancedTextBackgroundLayer, [{
+    key: "getShaders",
+    value: function getShaders() {
+      var shaders = (0, _get2["default"])((0, _getPrototypeOf2["default"])(EnhancedTextBackgroundLayer.prototype), "getShaders", this).call(this);
+      var vs = shaders.vs; // Modify shader so that the padding is offset by the pixel offset to ensure the padding
+      // always captures the anchor point. As padding is uniform we cannot pass it a per-label value
+
+      vs = vs.replaceAll('padding.', '_padding.');
+      vs = vs.replace('void main(void) {', 'void main(void) {\n  vec4 _padding = padding + instancePixelOffsets.xyxy * vec4(1.0, 1.0, -1.0, -1.0);');
+      return _objectSpread(_objectSpread({}, shaders), {}, {
+        vs: vs
+      });
+    }
+  }]);
+  return EnhancedTextBackgroundLayer;
+}(_layers._TextBackgroundLayer); // TextLayer which includes modified text-background-layer-vertex shader and only renders the
+// primary background layer in the collision pass
+
+
 var EnhancedTextLayer = /*#__PURE__*/function (_TextLayer) {
   (0, _inherits2["default"])(EnhancedTextLayer, _TextLayer);
 
-  var _super = _createSuper(EnhancedTextLayer);
+  var _super2 = _createSuper(EnhancedTextLayer);
 
   function EnhancedTextLayer() {
     (0, _classCallCheck2["default"])(this, EnhancedTextLayer);
-    return _super.apply(this, arguments);
+    return _super2.apply(this, arguments);
   }
 
   (0, _createClass2["default"])(EnhancedTextLayer, [{
@@ -65,15 +96,7 @@ var EnhancedTextLayer = /*#__PURE__*/function (_TextLayer) {
     }
   }]);
   return EnhancedTextLayer;
-}(_layers.TextLayer); // TODO remove once https://github.com/visgl/deck.gl/pull/7757 out
-
-
-_layers.TextLayer.defaultProps.fontSettings = {
-  type: 'object',
-  value: {},
-  optional: true,
-  compare: 1
-};
+}(_layers.TextLayer);
 
 var defaultProps = _objectSpread(_objectSpread({}, _layers.TextLayer.defaultProps), {}, {
   getRadius: {
@@ -90,11 +113,11 @@ var defaultProps = _objectSpread(_objectSpread({}, _layers.TextLayer.defaultProp
 var PointLabelLayer = /*#__PURE__*/function (_CompositeLayer) {
   (0, _inherits2["default"])(PointLabelLayer, _CompositeLayer);
 
-  var _super2 = _createSuper(PointLabelLayer);
+  var _super3 = _createSuper(PointLabelLayer);
 
   function PointLabelLayer() {
     (0, _classCallCheck2["default"])(this, PointLabelLayer);
-    return _super2.apply(this, arguments);
+    return _super3.apply(this, arguments);
   }
 
   (0, _createClass2["default"])(PointLabelLayer, [{
@@ -125,14 +148,14 @@ var PointLabelLayer = /*#__PURE__*/function (_CompositeLayer) {
 
 
       var radiusPadding = 1 + 1 / 4;
-      return typeof getRadius === 'function' ? function (d) {
-        var r = (d ? getRadius(d) : 1) * radiusScale * radiusPadding;
+      return typeof getRadius === 'function' ? function (d, info) {
+        var r = (info ? getRadius(d, info) : 1) * radiusScale * radiusPadding;
         return [xMult * (r + xPadding), yMult * (r + yPadding) + yOffset];
       } : [xMult * (getRadius * radiusScale * radiusPadding + xPadding), yMult * (getRadius * radiusScale * radiusPadding + yPadding) + yOffset];
     }
   }, {
     key: "calculateBackgroundPadding",
-    value: function calculateBackgroundPadding(getPixelOffset) {
+    value: function calculateBackgroundPadding() {
       var _this$props2 = this.props,
           anchor = _this$props2.getTextAnchor,
           alignment = _this$props2.getAlignmentBaseline,
@@ -158,14 +181,8 @@ var PointLabelLayer = /*#__PURE__*/function (_CompositeLayer) {
       } else {
         backgroundPadding[LEFT] = 0.5 * paddingX;
         backgroundPadding[RIGHT] = 0.5 * paddingX;
-      } // For getRadius function, invoke without data, as there is no backgroundPadding accessor
-
+      }
 
-      var pixelOffset = Array.isArray(getPixelOffset) ? getPixelOffset : getPixelOffset();
-      backgroundPadding[LEFT] += pixelOffset[0];
-      backgroundPadding[RIGHT] -= pixelOffset[0];
-      backgroundPadding[TOP] += pixelOffset[1];
-      backgroundPadding[BOTTOM] -= pixelOffset[1];
       return backgroundPadding;
     }
   }, {
@@ -206,7 +223,12 @@ var PointLabelLayer = /*#__PURE__*/function (_CompositeLayer) {
           getPixelOffset: [updateTriggers.getRadius, updateTriggers.getTextAnchor, updateTriggers.getAlignmentBaseline, radiusScale, sizeScale]
         })
       }), {
-        getSize: 1
+        getSize: 1,
+        _subLayerProps: {
+          background: {
+            type: EnhancedTextBackgroundLayer
+          }
+        }
       }, // DEBUG
       SHOW_TEXT_BORDER ? {
         getBackgroundColor: [0, 0, 0, 0],
@@ -225,7 +247,7 @@ var PointLabelLayer = /*#__PURE__*/function (_CompositeLayer) {
           secondarySizeScale = _this$props4.secondarySizeScale,
           updateTriggers = _this$props4.updateTriggers;
       var getPixelOffset = this.calculatePixelOffset(false);
-      var backgroundPadding = this.calculateBackgroundPadding(getPixelOffset);
+      var backgroundPadding = this.calculateBackgroundPadding();
       var out = [this.renderTextLayer('primary', {
         backgroundPadding: backgroundPadding,
         getText: getText,
@@ -253,5 +275,6 @@ var PointLabelLayer = /*#__PURE__*/function (_CompositeLayer) {
 }(_core.CompositeLayer);
 
 exports.PointLabelLayer = PointLabelLayer;
+(0, _defineProperty2["default"])(PointLabelLayer, "layerName", 'PointLabelLayer');
 (0, _defineProperty2["default"])(PointLabelLayer, "defaultProps", defaultProps);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../../src/deckgl-layers/point-label-layer/point-label-layer.js"],"names":["SHOW_TEXT_BORDER","LEFT","TOP","RIGHT","BOTTOM","EnhancedTextLayer","layer","renderPass","background","id","includes","props","getBorderWidth","TextLayer","defaultProps","fontSettings","type","value","optional","compare","getRadius","radiusScale","min","PointLabelLayer","secondary","anchor","getTextAnchor","alignment","getAlignmentBaseline","getSecondaryText","secondarySizeScale","sizeScale","xMult","yMult","xPadding","yPadding","secondaryOffset","yOffset","radiusPadding","d","r","getPixelOffset","paddingX","paddingY","backgroundPadding","pixelOffset","Array","isArray","updateTriggersOverride","updateTriggers","data","characterSet","fontFamily","fontWeight","outlineColor","outlineWidth","getColor","getPosition","getSubLayerProps","getSize","getBackgroundColor","getBorderColor","getText","getSecondaryColor","secondaryOutlineColor","calculatePixelOffset","calculateBackgroundPadding","out","renderTextLayer","CompositeLayer"],"mappings":"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","sourcesContent":["import {CompositeLayer} from '@deck.gl/core';\nimport {TextLayer} from '@deck.gl/layers';\n\n// TODO remove prior to release\nconst SHOW_TEXT_BORDER = false;\n\nconst [LEFT, TOP, RIGHT, BOTTOM] = [0, 1, 2, 3];\nclass EnhancedTextLayer extends TextLayer {\n  filterSubLayer({layer, renderPass}) {\n    const background = layer.id.includes('primary-background');\n    if (renderPass === 'collision') {\n      return background; // Only draw primary background layer in collision pass\n    } else {\n      return !background || (SHOW_TEXT_BORDER && this.props.getBorderWidth); // Do not draw background layer in other passes\n    }\n  }\n}\n\n// TODO remove once https://github.com/visgl/deck.gl/pull/7757 out\nTextLayer.defaultProps.fontSettings = {type: 'object', value: {}, optional: true, compare: 1};\n\nconst defaultProps = {\n  ...TextLayer.defaultProps,\n  getRadius: {type: 'accessor', value: 1},\n  radiusScale: {type: 'number', min: 0, value: 1}\n};\n\nexport class PointLabelLayer extends CompositeLayer {\n  static defaultProps = defaultProps;\n\n  calculatePixelOffset(secondary) {\n    const {\n      getTextAnchor: anchor,\n      getAlignmentBaseline: alignment,\n      getRadius,\n      getSecondaryText,\n      radiusScale,\n      secondarySizeScale,\n      sizeScale\n    } = this.props;\n    const xMult = anchor === 'middle' ? 0 : anchor === 'start' ? 1 : -1;\n    const yMult = alignment === 'center' ? 0 : alignment === 'bottom' ? 1 : -1;\n\n    // Padding based on font size (font size / 4)\n    const xPadding = sizeScale / 4;\n    const yPadding = sizeScale * (1 + 1 / 4);\n\n    // Place secondary label under main label (secondary label always 'top' baseline aligned)\n    const secondaryOffset = 0.6 * (1 - yMult) * sizeScale;\n    let yOffset = secondary ? secondaryOffset : 0;\n\n    // Special case, position relative to secondary label\n    if (anchor === 'middle' && alignment === 'top' && getSecondaryText) {\n      yOffset -= secondaryOffset;\n      yOffset -= secondarySizeScale;\n      yOffset += sizeScale;\n    }\n\n    // Padding based on point radius (radius/ 4)\n    const radiusPadding = 1 + 1 / 4;\n\n    return typeof getRadius === 'function'\n      ? d => {\n          const r = (d ? getRadius(d) : 1) * radiusScale * radiusPadding;\n          return [xMult * (r + xPadding), yMult * (r + yPadding) + yOffset];\n        }\n      : [\n          xMult * (getRadius * radiusScale * radiusPadding + xPadding),\n          yMult * (getRadius * radiusScale * radiusPadding + yPadding) + yOffset\n        ];\n  }\n\n  calculateBackgroundPadding(getPixelOffset) {\n    const {getTextAnchor: anchor, getAlignmentBaseline: alignment, sizeScale} = this.props;\n\n    // Heuristics to avoid label overlap (should we base this on the text length?)\n    const paddingX = 12 * sizeScale;\n    const paddingY = 3 * sizeScale;\n    const backgroundPadding = [0, 0, 0, 0];\n    if (alignment === 'top') {\n      backgroundPadding[TOP] = paddingY;\n    } else if (alignment === 'bottom') {\n      backgroundPadding[BOTTOM] = paddingY;\n    } else {\n      backgroundPadding[TOP] = 0.5 * paddingY;\n      backgroundPadding[BOTTOM] = 0.5 * paddingY;\n    }\n    if (anchor === 'start') {\n      backgroundPadding[LEFT] = paddingX;\n    } else if (anchor === 'end') {\n      backgroundPadding[RIGHT] = paddingX;\n    } else {\n      backgroundPadding[LEFT] = 0.5 * paddingX;\n      backgroundPadding[RIGHT] = 0.5 * paddingX;\n    }\n\n    // For getRadius function, invoke without data, as there is no backgroundPadding accessor\n    const pixelOffset = Array.isArray(getPixelOffset) ? getPixelOffset : getPixelOffset();\n    backgroundPadding[LEFT] += pixelOffset[0];\n    backgroundPadding[RIGHT] -= pixelOffset[0];\n    backgroundPadding[TOP] += pixelOffset[1];\n    backgroundPadding[BOTTOM] -= pixelOffset[1];\n\n    return backgroundPadding;\n  }\n\n  renderTextLayer(id, {updateTriggers: updateTriggersOverride, ...props}) {\n    const {\n      data,\n\n      characterSet,\n      fontFamily,\n      fontSettings,\n      fontWeight,\n      outlineColor,\n      outlineWidth,\n      sizeScale,\n      radiusScale,\n\n      getAlignmentBaseline,\n      getColor,\n      getPosition,\n      getTextAnchor,\n\n      updateTriggers\n    } = this.props;\n\n    return new EnhancedTextLayer(\n      this.getSubLayerProps({\n        id,\n        data: data,\n\n        characterSet,\n        fontFamily,\n        fontSettings,\n        fontWeight,\n        outlineColor,\n        outlineWidth,\n        sizeScale,\n\n        getAlignmentBaseline,\n        getColor,\n        getPosition,\n        getTextAnchor,\n\n        updateTriggers: {\n          ...updateTriggers,\n          ...updateTriggersOverride,\n          getPixelOffset: [\n            updateTriggers.getRadius,\n            updateTriggers.getTextAnchor,\n            updateTriggers.getAlignmentBaseline,\n            radiusScale,\n            sizeScale\n          ]\n        }\n      }),\n      {\n        getSize: 1\n      },\n      // DEBUG\n      SHOW_TEXT_BORDER\n        ? {getBackgroundColor: [0, 0, 0, 0], getBorderColor: [255, 0, 0, 80], getBorderWidth: 1}\n        : {},\n      props\n    );\n  }\n\n  renderLayers() {\n    const {\n      getText,\n      getSecondaryColor,\n      getSecondaryText,\n      secondaryOutlineColor,\n      secondarySizeScale,\n      updateTriggers\n    } = this.props;\n    const getPixelOffset = this.calculatePixelOffset(false);\n    const backgroundPadding = this.calculateBackgroundPadding(getPixelOffset);\n    const out = [\n      this.renderTextLayer('primary', {\n        backgroundPadding,\n        getText,\n        getPixelOffset,\n        background: true // Only use background for primary label for faster collisions\n      }),\n      getSecondaryText &&\n        this.renderTextLayer('secondary', {\n          getText: getSecondaryText,\n          getPixelOffset: this.calculatePixelOffset(true),\n          getAlignmentBaseline: 'top',\n          updateTriggers: {getText: updateTriggers.getSecondaryText},\n\n          // Optional overrides\n          ...(getSecondaryColor && {getColor: getSecondaryColor}),\n          ...(secondarySizeScale && {sizeScale: secondarySizeScale}),\n          ...(secondaryOutlineColor && {outlineColor: secondaryOutlineColor})\n        })\n    ];\n\n    return out;\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../../src/deckgl-layers/point-label-layer/point-label-layer.js"],"names":["SHOW_TEXT_BORDER","LEFT","TOP","RIGHT","BOTTOM","EnhancedTextBackgroundLayer","shaders","vs","replaceAll","replace","TextBackgroundLayer","EnhancedTextLayer","layer","renderPass","background","id","includes","props","getBorderWidth","TextLayer","defaultProps","getRadius","type","value","radiusScale","min","PointLabelLayer","secondary","anchor","getTextAnchor","alignment","getAlignmentBaseline","getSecondaryText","secondarySizeScale","sizeScale","xMult","yMult","xPadding","yPadding","secondaryOffset","yOffset","radiusPadding","d","info","r","paddingX","paddingY","backgroundPadding","updateTriggersOverride","updateTriggers","data","characterSet","fontFamily","fontSettings","fontWeight","outlineColor","outlineWidth","getColor","getPosition","getSubLayerProps","getPixelOffset","getSize","_subLayerProps","getBackgroundColor","getBorderColor","getText","getSecondaryColor","secondaryOutlineColor","calculatePixelOffset","calculateBackgroundPadding","out","renderTextLayer","CompositeLayer"],"mappings":"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","sourcesContent":["import {CompositeLayer} from '@deck.gl/core';\nimport {TextLayer, _TextBackgroundLayer as TextBackgroundLayer} from '@deck.gl/layers';\n\n// TODO remove prior to release\nconst SHOW_TEXT_BORDER = false;\n\nconst [LEFT, TOP, RIGHT, BOTTOM] = [0, 1, 2, 3];\n\nclass EnhancedTextBackgroundLayer extends TextBackgroundLayer {\n  getShaders() {\n    const shaders = super.getShaders();\n    let vs = shaders.vs;\n\n    // Modify shader so that the padding is offset by the pixel offset to ensure the padding\n    // always captures the anchor point. As padding is uniform we cannot pass it a per-label value\n    vs = vs.replaceAll('padding.', '_padding.');\n    vs = vs.replace(\n      'void main(void) {',\n      'void main(void) {\\n  vec4 _padding = padding + instancePixelOffsets.xyxy * vec4(1.0, 1.0, -1.0, -1.0);'\n    );\n\n    return {...shaders, vs};\n  }\n}\n\n// TextLayer which includes modified text-background-layer-vertex shader and only renders the\n// primary background layer in the collision pass\nclass EnhancedTextLayer extends TextLayer {\n  filterSubLayer({layer, renderPass}) {\n    const background = layer.id.includes('primary-background');\n    if (renderPass === 'collision') {\n      return background; // Only draw primary background layer in collision pass\n    } else {\n      return !background || (SHOW_TEXT_BORDER && this.props.getBorderWidth); // Do not draw background layer in other passes\n    }\n  }\n}\n\nconst defaultProps = {\n  ...TextLayer.defaultProps,\n  getRadius: {type: 'accessor', value: 1},\n  radiusScale: {type: 'number', min: 0, value: 1}\n};\n\nexport class PointLabelLayer extends CompositeLayer {\n  static layerName = 'PointLabelLayer';\n  static defaultProps = defaultProps;\n\n  calculatePixelOffset(secondary) {\n    const {\n      getTextAnchor: anchor,\n      getAlignmentBaseline: alignment,\n      getRadius,\n      getSecondaryText,\n      radiusScale,\n      secondarySizeScale,\n      sizeScale\n    } = this.props;\n    const xMult = anchor === 'middle' ? 0 : anchor === 'start' ? 1 : -1;\n    const yMult = alignment === 'center' ? 0 : alignment === 'bottom' ? 1 : -1;\n\n    // Padding based on font size (font size / 4)\n    const xPadding = sizeScale / 4;\n    const yPadding = sizeScale * (1 + 1 / 4);\n\n    // Place secondary label under main label (secondary label always 'top' baseline aligned)\n    const secondaryOffset = 0.6 * (1 - yMult) * sizeScale;\n    let yOffset = secondary ? secondaryOffset : 0;\n\n    // Special case, position relative to secondary label\n    if (anchor === 'middle' && alignment === 'top' && getSecondaryText) {\n      yOffset -= secondaryOffset;\n      yOffset -= secondarySizeScale;\n      yOffset += sizeScale;\n    }\n\n    // Padding based on point radius (radius/ 4)\n    const radiusPadding = 1 + 1 / 4;\n\n    return typeof getRadius === 'function'\n      ? (d, info) => {\n          const r = (info ? getRadius(d, info) : 1) * radiusScale * radiusPadding;\n          return [xMult * (r + xPadding), yMult * (r + yPadding) + yOffset];\n        }\n      : [\n          xMult * (getRadius * radiusScale * radiusPadding + xPadding),\n          yMult * (getRadius * radiusScale * radiusPadding + yPadding) + yOffset\n        ];\n  }\n\n  calculateBackgroundPadding() {\n    const {getTextAnchor: anchor, getAlignmentBaseline: alignment, sizeScale} = this.props;\n\n    // Heuristics to avoid label overlap (should we base this on the text length?)\n    const paddingX = 12 * sizeScale;\n    const paddingY = 3 * sizeScale;\n    const backgroundPadding = [0, 0, 0, 0];\n    if (alignment === 'top') {\n      backgroundPadding[TOP] = paddingY;\n    } else if (alignment === 'bottom') {\n      backgroundPadding[BOTTOM] = paddingY;\n    } else {\n      backgroundPadding[TOP] = 0.5 * paddingY;\n      backgroundPadding[BOTTOM] = 0.5 * paddingY;\n    }\n    if (anchor === 'start') {\n      backgroundPadding[LEFT] = paddingX;\n    } else if (anchor === 'end') {\n      backgroundPadding[RIGHT] = paddingX;\n    } else {\n      backgroundPadding[LEFT] = 0.5 * paddingX;\n      backgroundPadding[RIGHT] = 0.5 * paddingX;\n    }\n\n    return backgroundPadding;\n  }\n\n  renderTextLayer(id, {updateTriggers: updateTriggersOverride, ...props}) {\n    const {\n      data,\n\n      characterSet,\n      fontFamily,\n      fontSettings,\n      fontWeight,\n      outlineColor,\n      outlineWidth,\n      sizeScale,\n      radiusScale,\n\n      getAlignmentBaseline,\n      getColor,\n      getPosition,\n      getTextAnchor,\n\n      updateTriggers\n    } = this.props;\n\n    return new EnhancedTextLayer(\n      this.getSubLayerProps({\n        id,\n        data: data,\n\n        characterSet,\n        fontFamily,\n        fontSettings,\n        fontWeight,\n        outlineColor,\n        outlineWidth,\n        sizeScale,\n\n        getAlignmentBaseline,\n        getColor,\n        getPosition,\n        getTextAnchor,\n\n        updateTriggers: {\n          ...updateTriggers,\n          ...updateTriggersOverride,\n          getPixelOffset: [\n            updateTriggers.getRadius,\n            updateTriggers.getTextAnchor,\n            updateTriggers.getAlignmentBaseline,\n            radiusScale,\n            sizeScale\n          ]\n        }\n      }),\n      {\n        getSize: 1,\n        _subLayerProps: {background: {type: EnhancedTextBackgroundLayer}}\n      },\n      // DEBUG\n      SHOW_TEXT_BORDER\n        ? {getBackgroundColor: [0, 0, 0, 0], getBorderColor: [255, 0, 0, 80], getBorderWidth: 1}\n        : {},\n      props\n    );\n  }\n\n  renderLayers() {\n    const {\n      getText,\n      getSecondaryColor,\n      getSecondaryText,\n      secondaryOutlineColor,\n      secondarySizeScale,\n      updateTriggers\n    } = this.props;\n    const getPixelOffset = this.calculatePixelOffset(false);\n    const backgroundPadding = this.calculateBackgroundPadding();\n    const out = [\n      this.renderTextLayer('primary', {\n        backgroundPadding,\n        getText,\n        getPixelOffset,\n        background: true // Only use background for primary label for faster collisions\n      }),\n      getSecondaryText &&\n        this.renderTextLayer('secondary', {\n          getText: getSecondaryText,\n          getPixelOffset: this.calculatePixelOffset(true),\n          getAlignmentBaseline: 'top',\n          updateTriggers: {getText: updateTriggers.getSecondaryText},\n\n          // Optional overrides\n          ...(getSecondaryColor && {getColor: getSecondaryColor}),\n          ...(secondarySizeScale && {sizeScale: secondarySizeScale}),\n          ...(secondaryOutlineColor && {outlineColor: secondaryOutlineColor})\n        })\n    ];\n\n    return out;\n  }\n}\n"]}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@carto/kepler.gl",
   "author": "CARTO",
   "homepage": "https://github.com/CartoDB/carto-kepler#readme",
-  "version": "0.0.65-alpha.labels.6",
+  "version": "0.0.65-alpha.labels.7",
   "description": "kepler.gl is a webgl based application to visualize large scale location data in the browser",
   "license": "MIT",
   "main": "dist/index.js",

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

@@ -1,10 +1,30 @@
 import {CompositeLayer} from '@deck.gl/core';
-import {TextLayer} from '@deck.gl/layers';
+import {TextLayer, _TextBackgroundLayer as TextBackgroundLayer} from '@deck.gl/layers';
 
 // TODO remove prior to release
 const SHOW_TEXT_BORDER = false;
 
 const [LEFT, TOP, RIGHT, BOTTOM] = [0, 1, 2, 3];
+
+class EnhancedTextBackgroundLayer extends TextBackgroundLayer {
+  getShaders() {
+    const shaders = super.getShaders();
+    let vs = shaders.vs;
+
+    // Modify shader so that the padding is offset by the pixel offset to ensure the padding
+    // always captures the anchor point. As padding is uniform we cannot pass it a per-label value
+    vs = vs.replaceAll('padding.', '_padding.');
+    vs = vs.replace(
+      'void main(void) {',
+      'void main(void) {\n  vec4 _padding = padding + instancePixelOffsets.xyxy * vec4(1.0, 1.0, -1.0, -1.0);'
+    );
+
+    return {...shaders, vs};
+  }
+}
+
+// TextLayer which includes modified text-background-layer-vertex shader and only renders the
+// primary background layer in the collision pass
 class EnhancedTextLayer extends TextLayer {
   filterSubLayer({layer, renderPass}) {
     const background = layer.id.includes('primary-background');
@@ -16,9 +36,6 @@ class EnhancedTextLayer extends TextLayer {
   }
 }
 
-// TODO remove once https://github.com/visgl/deck.gl/pull/7757 out
-TextLayer.defaultProps.fontSettings = {type: 'object', value: {}, optional: true, compare: 1};
-
 const defaultProps = {
   ...TextLayer.defaultProps,
   getRadius: {type: 'accessor', value: 1},
@@ -26,6 +43,7 @@ const defaultProps = {
 };
 
 export class PointLabelLayer extends CompositeLayer {
+  static layerName = 'PointLabelLayer';
   static defaultProps = defaultProps;
 
   calculatePixelOffset(secondary) {
@@ -60,8 +78,8 @@ export class PointLabelLayer extends CompositeLayer {
     const radiusPadding = 1 + 1 / 4;
 
     return typeof getRadius === 'function'
-      ? d => {
-          const r = (d ? getRadius(d) : 1) * radiusScale * radiusPadding;
+      ? (d, info) => {
+          const r = (info ? getRadius(d, info) : 1) * radiusScale * radiusPadding;
           return [xMult * (r + xPadding), yMult * (r + yPadding) + yOffset];
         }
       : [
@@ -70,7 +88,7 @@ export class PointLabelLayer extends CompositeLayer {
         ];
   }
 
-  calculateBackgroundPadding(getPixelOffset) {
+  calculateBackgroundPadding() {
     const {getTextAnchor: anchor, getAlignmentBaseline: alignment, sizeScale} = this.props;
 
     // Heuristics to avoid label overlap (should we base this on the text length?)
@@ -94,13 +112,6 @@ export class PointLabelLayer extends CompositeLayer {
       backgroundPadding[RIGHT] = 0.5 * paddingX;
     }
 
-    // For getRadius function, invoke without data, as there is no backgroundPadding accessor
-    const pixelOffset = Array.isArray(getPixelOffset) ? getPixelOffset : getPixelOffset();
-    backgroundPadding[LEFT] += pixelOffset[0];
-    backgroundPadding[RIGHT] -= pixelOffset[0];
-    backgroundPadding[TOP] += pixelOffset[1];
-    backgroundPadding[BOTTOM] -= pixelOffset[1];
-
     return backgroundPadding;
   }
 
@@ -156,7 +167,8 @@ export class PointLabelLayer extends CompositeLayer {
         }
       }),
       {
-        getSize: 1
+        getSize: 1,
+        _subLayerProps: {background: {type: EnhancedTextBackgroundLayer}}
       },
       // DEBUG
       SHOW_TEXT_BORDER
@@ -176,7 +188,7 @@ export class PointLabelLayer extends CompositeLayer {
       updateTriggers
     } = this.props;
     const getPixelOffset = this.calculatePixelOffset(false);
-    const backgroundPadding = this.calculateBackgroundPadding(getPixelOffset);
+    const backgroundPadding = this.calculateBackgroundPadding();
     const out = [
       this.renderTextLayer('primary', {
         backgroundPadding,