@deck.gl/carto 8.9.25 → 8.9.26

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/carto",
   "description": "CARTO official integration with Deck.gl. Build geospatial applications using CARTO and Deck.gl.",
   "license": "MIT",
-  "version": "8.9.25",
+  "version": "8.9.26",
   "publishConfig": {
     "access": "public"
   },
@@ -65,5 +65,5 @@
     "@deck.gl/layers": "^8.0.0",
     "@loaders.gl/core": "^3.4.2"
   },
-  "gitHead": "f292dd419819aa9e0a66f3d93f90936d03d8cbe9"
+  "gitHead": "3ed60c2dc561886f3a4f2f774977982215a5b1e3"
 }

package/src/api/maps-v3-client.ts

@@ -32,7 +32,7 @@ import {assert} from '../utils';
 
 const MAX_GET_LENGTH = 8192;
 const DEFAULT_CLIENT = 'deck-gl-carto';
-const V3_MINOR_VERSION = '3.1';
+const V3_MINOR_VERSION = '3.2';
 
 export type Headers = Record<string, string>;
 interface RequestParams {

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

@@ -57,19 +57,9 @@ export default class CartoTileLayer<ExtraProps extends {} = {}> extends MVTLayer
       return Promise.reject('Invalid URL');
     }
 
-    let loadOptions = this.getLoadOptions();
-    const {fetch, formatTiles} = this.props;
+    const loadOptions = this.getLoadOptions();
+    const {fetch} = this.props;
     const {signal} = tile;
-
-    // The backend doesn't yet support our custom mime-type, so force it here
-    // TODO remove once backend sends the correct mime-type
-    if (formatTiles === TILE_FORMATS.BINARY) {
-      loadOptions = {
-        ...loadOptions,
-        mimeType: 'application/vnd.carto-vector-tile'
-      };
-    }
-
     return fetch(url, {propName: 'data', layer: this, loadOptions, signal});
   }
 

package/src/layers/h3-tile-layer.ts

@@ -98,8 +98,7 @@ export default class H3TileLayer<DataT = any, ExtraPropsT extends {} = {}> exten
         maxZoom: maxresolution,
         loadOptions: {
           ...this.getLoadOptions(),
-          cartoSpatialTile: {scheme: 'h3'},
-          mimeType: 'application/vnd.carto-spatial-tile'
+          cartoSpatialTile: {scheme: 'h3'}
         }
       })
     ];

package/src/layers/quadbin-tile-layer.ts

@@ -71,8 +71,7 @@ export default class QuadbinTileLayer<
         maxZoom,
         loadOptions: {
           ...this.getLoadOptions(),
-          cartoSpatialTile: {scheme: 'quadbin'},
-          mimeType: 'application/vnd.carto-spatial-tile'
+          cartoSpatialTile: {scheme: 'quadbin'}
         }
       })
     ];

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

@@ -31,7 +31,7 @@ const CartoRasterTileLoader: LoaderWithParser = {
   parse: async (arrayBuffer, options?: CartoRasterTileLoaderOptions) =>
     parseCartoRasterTile(arrayBuffer, options),
   parseSync: parseCartoRasterTile,
-  worker: false, // TODO set to true once workers deployed to unpkg
+  worker: true,
   options: DEFAULT_OPTIONS
 };
 

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

@@ -33,7 +33,7 @@ const CartoSpatialTileLoader: LoaderWithParser = {
   parse: async (arrayBuffer, options?: CartoSpatialTileLoaderOptions) =>
     parseCartoSpatialTile(arrayBuffer, options),
   parseSync: parseCartoSpatialTile,
-  worker: false, // TODO set to true once workers deployed to unpkg
+  worker: true,
   options: DEFAULT_OPTIONS
 };
 

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

@@ -1,5 +1,6 @@
+import earcut from 'earcut';
 import {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
-import type {BinaryFeatures} from '@loaders.gl/schema';
+import type {BinaryFeatures, BinaryPolygonFeatures, TypedArray} from '@loaders.gl/schema';
 
 import {TileReader} from './carto-tile';
 import {parsePbf} from './tile-loader-utils';
@@ -31,10 +32,59 @@ const CartoVectorTileLoader: LoaderWithParser = {
   parse: async (arrayBuffer, options?: CartoVectorTileLoaderOptions) =>
     parseCartoVectorTile(arrayBuffer, options),
   parseSync: parseCartoVectorTile,
-  worker: false, // TODO set to true once workers deployed to unpkg
+  worker: true,
   options: DEFAULT_OPTIONS
 };
 
+function triangulatePolygon(
+  polygons: BinaryPolygonFeatures,
+  target: number[],
+  {
+    startPosition,
+    endPosition,
+    indices
+  }: {startPosition: number; endPosition: number; indices: TypedArray}
+): void {
+  const coordLength = polygons.positions.size;
+  const start = startPosition * coordLength;
+  const end = endPosition * coordLength;
+
+  // Extract positions and holes for just this polygon
+  const polygonPositions = polygons.positions.value.subarray(start, end);
+
+  // Holes are referenced relative to outer polygon
+  const holes = indices.slice(1).map((n: number) => n - startPosition);
+
+  // Compute triangulation
+  const triangles = earcut(polygonPositions, holes, coordLength);
+
+  // Indices returned by triangulation are relative to start
+  // of polygon, so we need to offset
+  for (let t = 0, tl = triangles.length; t < tl; ++t) {
+    target.push(startPosition + triangles[t]);
+  }
+}
+
+function triangulate(polygons: BinaryPolygonFeatures) {
+  const {polygonIndices, positions, primitivePolygonIndices} = polygons;
+  const triangles = [];
+
+  let rangeStart = 0;
+  for (let i = 0; i < polygonIndices.value.length - 1; i++) {
+    const startPosition = polygonIndices.value[i];
+    const endPosition = polygonIndices.value[i + 1];
+
+    // Extract hole indices between start & end position
+    const rangeEnd = primitivePolygonIndices.value.indexOf(endPosition);
+    const indices = primitivePolygonIndices.value.subarray(rangeStart, rangeEnd);
+    rangeStart = rangeEnd;
+
+    triangulatePolygon(polygons, triangles, {startPosition, endPosition, indices});
+  }
+
+  polygons.triangles = {value: new Uint32Array(triangles), size: 1};
+}
+
 function parseCartoVectorTile(
   arrayBuffer: ArrayBuffer,
   options?: CartoVectorTileLoaderOptions
@@ -42,8 +92,11 @@ function parseCartoVectorTile(
   if (!arrayBuffer) return null;
   const tile = parsePbf(arrayBuffer, TileReader);
 
-  // Note: there is slight, difference in `numericProps` type, however geojson/mvtlayer can cope with this
-  return tile as unknown as BinaryFeatures;
+  if (tile.polygons && !tile.polygons.triangles) {
+    triangulate(tile.polygons);
+  }
+
+  return tile;
 }
 
 export default CartoVectorTileLoader;

package/typed/layers/carto-tile-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"carto-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/carto-tile-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAE3C,OAAO,EACL,QAAQ,EACR,aAAa,EACb,SAAS,EAET,aAAa,EACb,cAAc,IAAI,aAAa,EAChC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAG7C,OAAO,EAAC,UAAU,EAAe,MAAM,wBAAwB,CAAC;AAUhE,kDAAkD;AAClD,oBAAY,mBAAmB,GAAG,oBAAoB,GAAG,aAAa,CAAC;AAEvE,0CAA0C;AAC1C,aAAK,oBAAoB,GAAG;IAC1B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,UAAU,CAAC;CAC1B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAc,CAAC,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,QAAQ,CAC9E,QAAQ,CAAC,oBAAoB,CAAC,GAAG,UAAU,CAC5C;IACC,MAAM,CAAC,SAAS,SAAoB;IACpC,MAAM,CAAC,YAAY,oCAAgB;IAEnC,eAAe,IAAI,IAAI;IAMvB,WAAW,CAAC,IAAI,EAAE,aAAa;IAsB/B,eAAe,CACb,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG;QAC1B,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,GAAG,CAAC;QACV,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,aAAa,CAAC;KACrB,GACA,YAAY,GAAG,IAAI;IAmBtB,cAAc,CAAC,MAAM,KAAA;CAYtB"}
+{"version":3,"file":"carto-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/carto-tile-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAE3C,OAAO,EACL,QAAQ,EACR,aAAa,EACb,SAAS,EAET,aAAa,EACb,cAAc,IAAI,aAAa,EAChC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAG7C,OAAO,EAAC,UAAU,EAAe,MAAM,wBAAwB,CAAC;AAUhE,kDAAkD;AAClD,oBAAY,mBAAmB,GAAG,oBAAoB,GAAG,aAAa,CAAC;AAEvE,0CAA0C;AAC1C,aAAK,oBAAoB,GAAG;IAC1B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,UAAU,CAAC;CAC1B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAc,CAAC,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,QAAQ,CAC9E,QAAQ,CAAC,oBAAoB,CAAC,GAAG,UAAU,CAC5C;IACC,MAAM,CAAC,SAAS,SAAoB;IACpC,MAAM,CAAC,YAAY,oCAAgB;IAEnC,eAAe,IAAI,IAAI;IAMvB,WAAW,CAAC,IAAI,EAAE,aAAa;IAY/B,eAAe,CACb,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG;QAC1B,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,GAAG,CAAC;QACV,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,aAAa,CAAC;KACrB,GACA,YAAY,GAAG,IAAI;IAmBtB,cAAc,CAAC,MAAM,KAAA;CAYtB"}

package/typed/layers/h3-tile-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"h3-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/h3-tile-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,KAAK,EACL,UAAU,EACV,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAC;AAqBvB,+CAA+C;AAC/C,oBAAY,gBAAgB,CAAC,KAAK,GAAG,GAAG,IAAI,iBAAiB,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC;AAI3F,aAAK,mBAAmB,CAAC,KAAK,GAAG,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAE5D,uCAAuC;AACvC,aAAK,iBAAiB,CAAC,KAAK,IAAI,mBAAmB,CAAC,KAAK,CAAC,GAAG;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,WAAW,CAAC,KAAK,GAAG,GAAG,EAAE,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CAC/F,WAAW,GAAG,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CACjD;IACC,MAAM,CAAC,SAAS,SAAiB;IACjC,MAAM,CAAC,YAAY,yCAAgB;IAEnC,KAAK,EAAG;QACN,QAAQ,EAAE,GAAG,CAAC;QACd,IAAI,EAAE,GAAG,CAAC;KACX,CAAC;IAEF,eAAe,IAAI,IAAI;IAKvB,WAAW,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IASxD,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAwC1C"}
+{"version":3,"file":"h3-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/h3-tile-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,KAAK,EACL,UAAU,EACV,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAC;AAqBvB,+CAA+C;AAC/C,oBAAY,gBAAgB,CAAC,KAAK,GAAG,GAAG,IAAI,iBAAiB,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC;AAI3F,aAAK,mBAAmB,CAAC,KAAK,GAAG,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAE5D,uCAAuC;AACvC,aAAK,iBAAiB,CAAC,KAAK,IAAI,mBAAmB,CAAC,KAAK,CAAC,GAAG;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,WAAW,CAAC,KAAK,GAAG,GAAG,EAAE,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CAC/F,WAAW,GAAG,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CACjD;IACC,MAAM,CAAC,SAAS,SAAiB;IACjC,MAAM,CAAC,YAAY,yCAAgB;IAEnC,KAAK,EAAG;QACN,QAAQ,EAAE,GAAG,CAAC;QACd,IAAI,EAAE,GAAG,CAAC;KACX,CAAC;IAEF,eAAe,IAAI,IAAI;IAKvB,WAAW,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IASxD,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAuC1C"}

package/typed/layers/quadbin-tile-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quadbin-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/quadbin-tile-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,KAAK,EACL,UAAU,EACV,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,YAAY,EAAE,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAKhE,eAAO,MAAM,eAAe;;SAO3B,CAAC;AAMF,oDAAoD;AACpD,oBAAY,qBAAqB,CAAC,KAAK,GAAG,GAAG,IAAI,sBAAsB,CAAC,KAAK,CAAC,GAC5E,mBAAmB,CAAC;AAEtB,4CAA4C;AAC5C,aAAK,sBAAsB,CAAC,KAAK,IAAI,iBAAiB,CAAC,KAAK,CAAC,GAAG;IAC9D,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,gBAAgB,CACnC,KAAK,GAAG,GAAG,EACX,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,cAAc,CAAC,UAAU,GAAG,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5E,MAAM,CAAC,SAAS,SAAsB;IACtC,MAAM,CAAC,YAAY,2CAAgB;IAEnC,KAAK,EAAG;QACN,QAAQ,EAAE,GAAG,CAAC;QACd,IAAI,EAAE,GAAG,CAAC;KACX,CAAC;IACF,eAAe,IAAI,IAAI;IAIvB,WAAW,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IASxD,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAmB1C"}
+{"version":3,"file":"quadbin-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/quadbin-tile-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,KAAK,EACL,UAAU,EACV,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,YAAY,EAAE,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAKhE,eAAO,MAAM,eAAe;;SAO3B,CAAC;AAMF,oDAAoD;AACpD,oBAAY,qBAAqB,CAAC,KAAK,GAAG,GAAG,IAAI,sBAAsB,CAAC,KAAK,CAAC,GAC5E,mBAAmB,CAAC;AAEtB,4CAA4C;AAC5C,aAAK,sBAAsB,CAAC,KAAK,IAAI,iBAAiB,CAAC,KAAK,CAAC,GAAG;IAC9D,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,gBAAgB,CACnC,KAAK,GAAG,GAAG,EACX,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,cAAc,CAAC,UAAU,GAAG,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5E,MAAM,CAAC,SAAS,SAAsB;IACtC,MAAM,CAAC,YAAY,2CAAgB;IAEnC,KAAK,EAAG;QACN,QAAQ,EAAE,GAAG,CAAC;QACd,IAAI,EAAE,GAAG,CAAC;KACX,CAAC;IACF,eAAe,IAAI,IAAI;IAIvB,WAAW,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IASxD,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAkB1C"}

package/typed/layers/schema/carto-vector-tile-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"carto-vector-tile-loader.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/carto-vector-tile-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAsBzE,QAAA,MAAM,qBAAqB,EAAE,gBAa5B,CAAC;AAaF,eAAe,qBAAqB,CAAC"}
+{"version":3,"file":"carto-vector-tile-loader.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/carto-vector-tile-loader.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAsBzE,QAAA,MAAM,qBAAqB,EAAE,gBAa5B,CAAC;AAiEF,eAAe,qBAAqB,CAAC"}