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

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.7",
+  "version": "0.0.65-alpha.labels.9",
   "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/components/side-panel/layer-panel/text-label-panel.js

@@ -69,16 +69,6 @@ function TextLabelPanelFactory(RangeSlider, LayerConfigGroup, FieldSelector, Col
       const currentFields = textLabel.map(tl => tl.field && tl.field.name).filter(d => d);
 
       return (
-        // Switch only works with group/property set to customMarkers???
-        /* <LayerConfigGroup
-          type="boolean"
-          disabled={undefined}
-          layer={layer}
-          group="labels"
-          property="labelsEnabled"
-          label="panel.text.label"
-          collapsible
-        >*/
         <LayerConfigGroup label={'panel.text.label'} collapsible>
           <ConfigGroupCollapsibleHeader>
             <FieldSelector

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

@@ -190,14 +190,15 @@ export class PointLabelLayer extends CompositeLayer {
     const getPixelOffset = this.calculatePixelOffset(false);
     const backgroundPadding = this.calculateBackgroundPadding();
     const out = [
-      this.renderTextLayer('primary', {
+      // Text doesn't update via updateTrigger for some reason
+      this.renderTextLayer(`${updateTriggers.getText}-primary`, {
         backgroundPadding,
         getText,
         getPixelOffset,
         background: true // Only use background for primary label for faster collisions
       }),
       getSecondaryText &&
-        this.renderTextLayer('secondary', {
+        this.renderTextLayer(`${updateTriggers.getSecondaryText}-secondary`, {
           getText: getSecondaryText,
           getPixelOffset: this.calculatePixelOffset(true),
           getAlignmentBaseline: 'top',

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

@@ -291,6 +291,7 @@ export default class PointLayer extends Layer {
       getFilterValue: data.getFilterValue,
       extensions,
       filterRange: defaultLayerProps.filterRange,
+      maskId: defaultLayerProps.maskId,
       visible: defaultLayerProps.visible,
       ...brushingProps
     };

package/src/reducers/vis-state-updaters.js

@@ -315,16 +315,19 @@ function addOrRemoveTextLabels(newFields, textLabel) {
 
   // delete
   newTextLabel = newTextLabel.filter(tl => tl.field && !deleteFields.includes(tl.field.name));
-  newTextLabel = !newTextLabel.length ? [DEFAULT_TEXT_LABEL] : newTextLabel;
 
   // add
-  newTextLabel = [
-    ...newTextLabel.filter(tl => tl.field),
-    ...addFields.map(af => ({
-      ...DEFAULT_TEXT_LABEL,
-      field: af
-    }))
-  ];
+  newTextLabel = newTextLabel.filter(tl => tl.field);
+  const defaultLabel = newTextLabel.length ? DEFAULT_SECONDARY_TEXT_LABEL : DEFAULT_TEXT_LABEL;
+  newTextLabel = [...newTextLabel, ...addFields.map(af => ({...defaultLabel, field: af}))];
+
+  // limit to 2 labels (overwrite 2nd label with 3rd)
+  if (newTextLabel.length > 2) {
+    newTextLabel = [newTextLabel[0], newTextLabel[2]];
+  }
+
+  // default
+  newTextLabel = !newTextLabel.length ? [DEFAULT_TEXT_LABEL] : newTextLabel;
 
   return newTextLabel;
 }