@deck.gl/carto 9.1.4 → 9.1.6

package/package.json

@@ -3,7 +3,7 @@
   "description": "CARTO official integration with Deck.gl. Build geospatial applications using CARTO and Deck.gl.",
   "license": "MIT",
   "type": "module",
-  "version": "9.1.4",
+  "version": "9.1.6",
   "publishConfig": {
     "access": "public"
   },
@@ -49,8 +49,8 @@
     "@loaders.gl/mvt": "^4.2.0",
     "@loaders.gl/schema": "^4.2.0",
     "@loaders.gl/tiles": "^4.2.0",
-    "@luma.gl/core": "^9.1.2",
-    "@luma.gl/shadertools": "^9.1.2",
+    "@luma.gl/core": "^9.1.5",
+    "@luma.gl/shadertools": "^9.1.5",
     "@math.gl/web-mercator": "^4.1.0",
     "@types/d3-array": "^3.0.2",
     "@types/d3-color": "^1.4.2",
@@ -64,7 +64,7 @@
     "h3-js": "^4.1.0",
     "moment-timezone": "^0.5.33",
     "pbf": "^3.2.1",
-    "quadbin": "^0.2.0"
+    "quadbin": "^0.4.0"
   },
   "peerDependencies": {
     "@deck.gl/aggregation-layers": "^9.1.0",
@@ -73,7 +73,7 @@
     "@deck.gl/geo-layers": "^9.1.0",
     "@deck.gl/layers": "^9.1.0",
     "@loaders.gl/core": "^4.2.0",
-    "@luma.gl/core": "^9.1.0"
+    "@luma.gl/core": "^9.1.5"
   },
-  "gitHead": "92f3582b31ce0886dff8a61278b42feb0f8fe5f0"
+  "gitHead": "f550580cbd6f32b158771641868e1b7c2165440b"
 }

package/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,
 

package/src/layers/raster-layer-vertex.glsl.ts

@@ -41,11 +41,15 @@ void main(void) {
   // Get position directly from quadbin, rather than projecting
   // Important to set geometry.position before using project_ methods below
   // as geometry.worldPosition is not set (we don't know our lat/long)
-  geometry.position = vec4(tileOrigin + cellCenter, 0.0, 1.0);
+  geometry.position = vec4(tileOrigin, 0.0, 1.0);
   if (project.projectionMode == PROJECTION_MODE_WEB_MERCATOR_AUTO_OFFSET) {
     geometry.position.xyz -= project.commonOrigin;
   }
 
+  // Important to apply after tileOrigin & commonOrigin as they are large values which often
+  // cancel and thus cellCenter precision is lost if applied first.
+  geometry.position.xy += cellCenter;
+
   // calculate elevation, if 3d not enabled set to 0
   // cylindar geometry height are between -1.0 to 1.0, transform it to between 0, 1
   float elevation = 0.0;

package/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')