CARTO: Default to PointLabelLayer in VectorTileLayer (#9524)

Author: felixpalmer

modules/carto/src/api/parse-map.ts

@@ -17,13 +17,9 @@ import {
   negateAccessor,
   getMaxMarkerSize
 } from './layer-map';
-import PointLabelLayer from '../layers/point-label-layer';
-import {CollisionFilterExtension} from '@deck.gl/extensions';
 import {assert} from '../utils';
 import {KeplerMapConfig, MapDataset, MapLayerConfig, VisualChannels} from './types';
 
-const collisionFilterExtension = new CollisionFilterExtension();
-
 export type ParseMapResult = {
   /** Map id. */
   id: string;
@@ -343,8 +339,9 @@ function createChannelProps(
     result._subLayerProps = {
       ...result._subLayerProps,
       'points-text': {
-        type: PointLabelLayer,
-        extensions: [collisionFilterExtension],
+        // The following props are injected by default by VectorTileLayer:
+        // type: PointLabelLayer,
+        // extensions: [new CollisionFilterExtension()],
         collisionEnabled: true,
         collisionGroup,
 

modules/carto/src/layers/vector-tile-layer.ts

@@ -8,7 +8,7 @@ import CartoVectorTileLoader from './schema/carto-vector-tile-loader';
 registerLoaders([CartoPropertiesTileLoader, CartoVectorTileLoader]);
 
 import {DefaultProps} from '@deck.gl/core';
-import {ClipExtension} from '@deck.gl/extensions';
+import {ClipExtension, CollisionFilterExtension} from '@deck.gl/extensions';
 import {
   MVTLayer,
   MVTLayerProps,
@@ -22,6 +22,7 @@ import {GeoJsonLayer} from '@deck.gl/layers';
 import type {TilejsonResult} from '@carto/api-client';
 import {TilejsonPropType, injectAccessToken, mergeBoundaryData} from './utils';
 import {DEFAULT_TILE_SIZE} from '../constants';
+import PointLabelLayer from './point-label-layer';
 
 const defaultProps: DefaultProps<VectorTileLayerProps> = {
   ...MVTLayer.defaultProps,
@@ -153,12 +154,25 @@ export default class VectorTileLayer<
       };
     };
 
+    const defaultToPointLabelLayer = {
+      'points-text': {
+        type: PointLabelLayer,
+        ...props?._subLayerProps?.['points-text'],
+        extensions: [
+          new CollisionFilterExtension(),
+          ...(props.extensions || []),
+          ...(props?._subLayerProps?.['points-text']?.extensions || [])
+        ]
+      }
+    };
+
     const subLayerProps = {
       ...props,
       autoHighlight: false,
       // Do not perform clipping on points (#9059)
       _subLayerProps: {
         ...props._subLayerProps,
+        ...defaultToPointLabelLayer,
         ...applyClipExtensionToSublayerProps('polygons-fill'),
         ...applyClipExtensionToSublayerProps('polygons-stroke'),
         ...applyClipExtensionToSublayerProps('linestrings')