@deck.gl/carto 9.0.19 → 9.0.21

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.0.19",
+  "version": "9.0.21",
   "publishConfig": {
     "access": "public"
   },
@@ -47,9 +47,8 @@
     "@loaders.gl/mvt": "^4.2.0",
     "@loaders.gl/schema": "^4.2.0",
     "@loaders.gl/tiles": "^4.2.0",
-    "@luma.gl/constants": "^9.0.14",
-    "@luma.gl/core": "^9.0.14",
-    "@luma.gl/shadertools": "^9.0.14",
+    "@luma.gl/core": "^9.0.15",
+    "@luma.gl/shadertools": "^9.0.15",
     "@math.gl/web-mercator": "^4.0.0",
     "@types/d3-array": "^3.0.2",
     "@types/d3-color": "^1.4.2",
@@ -73,5 +72,5 @@
     "@deck.gl/layers": "^9.0.0",
     "@loaders.gl/core": "^4.2.0"
   },
-  "gitHead": "e03095d9247aca9a10f6a3e23e20a99492bf1c79"
+  "gitHead": "bb9a6c4887b58e210223d4c6f5472811bd096521"
 }

package/src/api/parse-map.ts

@@ -1,4 +1,4 @@
-import {GL} from '@luma.gl/constants';
+import {ColorParameters} from '@luma.gl/core';
 import {Layer, log} from '@deck.gl/core';
 import {
   AGGREGATION,
@@ -83,13 +83,18 @@ export function parseMap(json) {
   };
 }
 
-function createParametersProp(layerBlending, parameters: Record<string, any>) {
+function createParametersProp(layerBlending: string, parameters: ColorParameters) {
   if (layerBlending === 'additive') {
-    parameters.blendFunc = [GL.SRC_ALPHA, GL.DST_ALPHA];
-    parameters.blendEquation = GL.FUNC_ADD;
+    parameters.blendColorSrcFactor = parameters.blendAlphaSrcFactor = 'src-alpha';
+    parameters.blendColorDstFactor = parameters.blendAlphaDstFactor = 'dst-alpha';
+    parameters.blendColorOperation = parameters.blendAlphaOperation = 'add';
   } else if (layerBlending === 'subtractive') {
-    parameters.blendFunc = [GL.ONE, GL.ONE_MINUS_DST_COLOR, GL.SRC_ALPHA, GL.DST_ALPHA];
-    parameters.blendEquation = [GL.FUNC_SUBTRACT, GL.FUNC_ADD];
+    parameters.blendColorSrcFactor = 'one';
+    parameters.blendColorDstFactor = 'one-minus-dst-color';
+    parameters.blendAlphaSrcFactor = 'src-alpha';
+    parameters.blendAlphaDstFactor = 'dst-alpha';
+    parameters.blendColorOperation = 'subtract';
+    parameters.blendAlphaOperation = 'add';
   }
 
   return Object.keys(parameters).length ? {parameters} : {};

package/src/layers/schema/carto-tile.ts

@@ -33,14 +33,14 @@ export class PropertiesReader {
 // Doubles ========================================
 
 interface Doubles {
-  value: Float32Array;
+  value: Float64Array;
   size: number;
 }
 
 class DoublesReader {
   static read(pbf, end?: number): Doubles {
     const {value, size} = pbf.readFields(DoublesReader._readField, {value: [], size: 0}, end);
-    return {value: new Float32Array(value), size};
+    return {value, size};
   }
   static _readField(this: void, tag: number, obj, pbf) {
     if (tag === 1) readPackedTypedArray(Float64Array, pbf, obj);

package/src/sources/boundary-query-source.ts

@@ -6,7 +6,6 @@ export type BoundaryQuerySourceOptions = SourceOptions &
   FilterOptions & {
     columns?: string[];
     tilesetTableName: string;
-    matchingColumn?: string;
     propertiesSqlQuery: string;
     queryParameters?: QueryParameters;
   };
@@ -14,7 +13,6 @@ type UrlParameters = {
   columns?: string;
   filters?: Record<string, unknown>;
   tilesetTableName: string;
-  matchingColumn: string;
   propertiesSqlQuery: string;
   queryParameters?: Record<string, unknown> | unknown[];
 };
@@ -22,17 +20,9 @@ type UrlParameters = {
 export const boundaryQuerySource = async function (
   options: BoundaryQuerySourceOptions
 ): Promise<TilejsonResult> {
-  const {
-    columns,
-    filters,
-    tilesetTableName,
-    matchingColumn = 'id',
-    propertiesSqlQuery,
-    queryParameters
-  } = options;
+  const {columns, filters, tilesetTableName, propertiesSqlQuery, queryParameters} = options;
   const urlParameters: UrlParameters = {
     tilesetTableName,
-    matchingColumn,
     propertiesSqlQuery
   };
 

package/src/sources/boundary-table-source.ts

@@ -5,24 +5,21 @@ export type BoundaryTableSourceOptions = SourceOptions &
   FilterOptions & {
     tilesetTableName: string;
     columns?: string[];
-    matchingColumn?: string;
     propertiesTableName: string;
   };
 type UrlParameters = {
   filters?: Record<string, unknown>;
   tilesetTableName: string;
   columns?: string;
-  matchingColumn: string;
   propertiesTableName: string;
 };
 
 export const boundaryTableSource = async function (
   options: BoundaryTableSourceOptions
 ): Promise<TilejsonResult> {
-  const {filters, tilesetTableName, columns, matchingColumn = 'id', propertiesTableName} = options;
+  const {filters, tilesetTableName, columns, propertiesTableName} = options;
   const urlParameters: UrlParameters = {
     tilesetTableName,
-    matchingColumn,
     propertiesTableName
   };