@deck.gl/carto 9.1.5 → 9.1.7

package/dist/index.cjs

@@ -563,7 +563,7 @@ function binaryToSpatialjson(binary) {
 }
 
 // dist/layers/schema/carto-spatial-tile-loader.js
-var VERSION = true ? "9.1.5" : "latest";
+var VERSION = true ? "9.1.7" : "latest";
 var id = "cartoSpatialTile";
 var DEFAULT_OPTIONS = {
   cartoSpatialTile: {
@@ -895,94 +895,8 @@ var H3Tileset2D = class extends import_geo_layers3._Tileset2D {
 
 // dist/layers/spatial-index-tile-layer.js
 var import_core7 = require("@loaders.gl/core");
-
-// dist/layers/schema/carto-raster-tile.js
-var ARRAY_TYPES = {
-  uint8: Uint8Array,
-  uint16: Uint16Array,
-  uint32: Uint32Array,
-  uint64: BigUint64Array,
-  int8: Int8Array,
-  int16: Int16Array,
-  int32: Int32Array,
-  int64: BigInt64Array,
-  float32: Float32Array,
-  float64: Float64Array
-};
-var BandReader = class {
-  static read(pbf, end) {
-    return pbf.readFields(BandReader._readField, { name: "", type: "", data: null }, end);
-  }
-  static _readField(tag, obj, pbf) {
-    if (tag === 1)
-      obj.name = pbf.readString();
-    else if (tag === 2)
-      obj.type = pbf.readString();
-    else if (tag === 3) {
-      const TypedArray = ARRAY_TYPES[obj.type];
-      if (!TypedArray) {
-        throw Error(`Invalid data type: ${obj.type}`);
-      }
-      obj.data = {};
-      const { compression } = TileReader3;
-      readPackedTypedArray(TypedArray, pbf, obj.data, { compression });
-    }
-  }
-};
-var TileReader3 = class {
-  static read(pbf, end) {
-    return pbf.readFields(TileReader3._readField, { blockSize: 0, bands: [] }, end);
-  }
-  static _readField(tag, obj, pbf) {
-    if (tag === 1)
-      obj.blockSize = pbf.readVarint();
-    else if (tag === 2)
-      obj.bands.push(BandReader.read(pbf, pbf.readVarint() + pbf.pos));
-  }
-};
-
-// dist/layers/schema/carto-raster-tile-loader.js
-var VERSION2 = true ? "9.1.5" : "latest";
-var id2 = "cartoRasterTile";
-var DEFAULT_OPTIONS2 = {
-  cartoRasterTile: {
-    metadata: null,
-    workerUrl: getWorkerUrl(id2, VERSION2)
-  }
-};
-var CartoRasterTileLoader = {
-  name: "CARTO Raster Tile",
-  version: VERSION2,
-  id: id2,
-  module: "carto",
-  extensions: ["pbf"],
-  mimeTypes: ["application/vnd.carto-raster-tile"],
-  category: "geometry",
-  parse: async (arrayBuffer, options) => parseCartoRasterTile(arrayBuffer, options),
-  parseSync: parseCartoRasterTile,
-  worker: true,
-  options: DEFAULT_OPTIONS2
-};
-function parseCartoRasterTile(arrayBuffer, options) {
-  var _a;
-  const metadata = (_a = options == null ? void 0 : options.cartoRasterTile) == null ? void 0 : _a.metadata;
-  if (!arrayBuffer || !metadata)
-    return null;
-  TileReader3.compression = metadata.compression;
-  const out = parsePbf(arrayBuffer, TileReader3);
-  const { bands, blockSize } = out;
-  const numericProps = {};
-  for (let i = 0; i < bands.length; i++) {
-    const { name, data } = bands[i];
-    numericProps[name] = data;
-  }
-  return { blockSize, cells: { numericProps, properties: [] } };
-}
-var carto_raster_tile_loader_default = CartoRasterTileLoader;
-
-// dist/layers/spatial-index-tile-layer.js
 var import_geo_layers4 = require("@deck.gl/geo-layers");
-(0, import_core7.registerLoaders)([carto_raster_tile_loader_default, carto_spatial_tile_loader_default]);
+(0, import_core7.registerLoaders)([carto_spatial_tile_loader_default]);
 function isFeatureIdDefined(value) {
   return value !== void 0 && value !== null && value !== "";
 }
@@ -1990,6 +1904,94 @@ var raster_layer_default = RasterLayer;
 
 // dist/layers/raster-tile-layer.js
 var import_geo_layers7 = require("@deck.gl/geo-layers");
+var import_core15 = require("@loaders.gl/core");
+
+// dist/layers/schema/carto-raster-tile.js
+var ARRAY_TYPES = {
+  uint8: Uint8Array,
+  uint16: Uint16Array,
+  uint32: Uint32Array,
+  uint64: BigUint64Array,
+  int8: Int8Array,
+  int16: Int16Array,
+  int32: Int32Array,
+  int64: BigInt64Array,
+  float32: Float32Array,
+  float64: Float64Array
+};
+var BandReader = class {
+  static read(pbf, end) {
+    return pbf.readFields(BandReader._readField, { name: "", type: "", data: null }, end);
+  }
+  static _readField(tag, obj, pbf) {
+    if (tag === 1)
+      obj.name = pbf.readString();
+    else if (tag === 2)
+      obj.type = pbf.readString();
+    else if (tag === 3) {
+      const TypedArray = ARRAY_TYPES[obj.type];
+      if (!TypedArray) {
+        throw Error(`Invalid data type: ${obj.type}`);
+      }
+      obj.data = {};
+      const { compression } = TileReader3;
+      readPackedTypedArray(TypedArray, pbf, obj.data, { compression });
+    }
+  }
+};
+var TileReader3 = class {
+  static read(pbf, end) {
+    return pbf.readFields(TileReader3._readField, { blockSize: 0, bands: [] }, end);
+  }
+  static _readField(tag, obj, pbf) {
+    if (tag === 1)
+      obj.blockSize = pbf.readVarint();
+    else if (tag === 2)
+      obj.bands.push(BandReader.read(pbf, pbf.readVarint() + pbf.pos));
+  }
+};
+
+// dist/layers/schema/carto-raster-tile-loader.js
+var VERSION2 = true ? "9.1.7" : "latest";
+var id2 = "cartoRasterTile";
+var DEFAULT_OPTIONS2 = {
+  cartoRasterTile: {
+    metadata: null,
+    workerUrl: getWorkerUrl(id2, VERSION2)
+  }
+};
+var CartoRasterTileLoader = {
+  name: "CARTO Raster Tile",
+  version: VERSION2,
+  id: id2,
+  module: "carto",
+  extensions: ["pbf"],
+  mimeTypes: ["application/vnd.carto-raster-tile"],
+  category: "geometry",
+  parse: async (arrayBuffer, options) => parseCartoRasterTile(arrayBuffer, options),
+  parseSync: parseCartoRasterTile,
+  worker: true,
+  options: DEFAULT_OPTIONS2
+};
+function parseCartoRasterTile(arrayBuffer, options) {
+  var _a;
+  const metadata = (_a = options == null ? void 0 : options.cartoRasterTile) == null ? void 0 : _a.metadata;
+  if (!arrayBuffer || !metadata)
+    return null;
+  TileReader3.compression = metadata.compression;
+  const out = parsePbf(arrayBuffer, TileReader3);
+  const { bands, blockSize } = out;
+  const numericProps = {};
+  for (let i = 0; i < bands.length; i++) {
+    const { name, data } = bands[i];
+    numericProps[name] = data;
+  }
+  return { blockSize, cells: { numericProps, properties: [] } };
+}
+var carto_raster_tile_loader_default = CartoRasterTileLoader;
+
+// dist/layers/raster-tile-layer.js
+(0, import_core15.registerLoaders)([carto_raster_tile_loader_default]);
 var renderSubLayers3 = (props) => {
   var _a, _b;
   const tileIndex = (_b = (_a = props.tile) == null ? void 0 : _a.index) == null ? void 0 : _b.q;
@@ -2043,7 +2045,7 @@ RasterTileLayer.defaultProps = defaultProps9;
 var raster_tile_layer_default = RasterTileLayer;
 
 // dist/layers/vector-tile-layer.js
-var import_core15 = require("@loaders.gl/core");
+var import_core16 = require("@loaders.gl/core");
 
 // dist/layers/schema/carto-properties-tile.js
 var TileReader4 = class {
@@ -2061,7 +2063,7 @@ var TileReader4 = class {
 };
 
 // dist/layers/schema/carto-properties-tile-loader.js
-var VERSION3 = true ? "9.1.5" : "latest";
+var VERSION3 = true ? "9.1.7" : "latest";
 var id3 = "cartoPropertiesTile";
 var DEFAULT_OPTIONS3 = {
   cartoPropertiesTile: {
@@ -2090,7 +2092,7 @@ var carto_properties_tile_loader_default = CartoPropertiesTileLoader;
 
 // dist/layers/schema/carto-vector-tile-loader.js
 var import_earcut = __toESM(require("earcut"), 1);
-var VERSION4 = true ? "9.1.5" : "latest";
+var VERSION4 = true ? "9.1.7" : "latest";
 var id4 = "cartoVectorTile";
 var DEFAULT_OPTIONS4 = {
   cartoVectorTile: {
@@ -2150,7 +2152,7 @@ var carto_vector_tile_loader_default = CartoVectorTileLoader;
 var import_extensions = require("@deck.gl/extensions");
 var import_geo_layers8 = require("@deck.gl/geo-layers");
 var import_layers5 = require("@deck.gl/layers");
-(0, import_core15.registerLoaders)([carto_properties_tile_loader_default, carto_vector_tile_loader_default]);
+(0, import_core16.registerLoaders)([carto_properties_tile_loader_default, carto_vector_tile_loader_default]);
 var defaultProps10 = {
   ...import_geo_layers8.MVTLayer.defaultProps,
   data: TilejsonPropType,
@@ -2213,6 +2215,7 @@ var VectorTileLayer = class extends import_geo_layers8.MVTLayer {
   }
   /* eslint-enable camelcase */
   renderSubLayers(props) {
+    var _a, _b, _c;
     if (props.data === null) {
       return null;
     }
@@ -2226,21 +2229,33 @@ var VectorTileLayer = class extends import_geo_layers8.MVTLayer {
       clipBounds: [west, south, east, north]
     };
     const applyClipExtensionToSublayerProps = (subLayerId) => {
-      var _a, _b, _c;
+      var _a2, _b2, _c2;
       return {
         [subLayerId]: {
           ...clipProps,
-          ...(_a = props == null ? void 0 : props._subLayerProps) == null ? void 0 : _a[subLayerId],
-          extensions: [...extensions, ...((_c = (_b = props == null ? void 0 : props._subLayerProps) == null ? void 0 : _b[subLayerId]) == null ? void 0 : _c.extensions) || []]
+          ...(_a2 = props == null ? void 0 : props._subLayerProps) == null ? void 0 : _a2[subLayerId],
+          extensions: [...extensions, ...((_c2 = (_b2 = props == null ? void 0 : props._subLayerProps) == null ? void 0 : _b2[subLayerId]) == null ? void 0 : _c2.extensions) || []]
         }
       };
     };
+    const defaultToPointLabelLayer = {
+      "points-text": {
+        type: point_label_layer_default,
+        ...(_a = props == null ? void 0 : props._subLayerProps) == null ? void 0 : _a["points-text"],
+        extensions: [
+          new import_extensions.CollisionFilterExtension(),
+          ...props.extensions || [],
+          ...((_c = (_b = props == null ? void 0 : props._subLayerProps) == null ? void 0 : _b["points-text"]) == null ? void 0 : _c.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")
@@ -2469,7 +2484,7 @@ function colorContinuous({ attr, domain, colors = DEFAULT_PALETTE, nullColor = N
 var import_api_client2 = require("@carto/api-client");
 
 // dist/api/parse-map.js
-var import_core16 = require("@deck.gl/core");
+var import_core17 = require("@deck.gl/core");
 
 // dist/api/layer-map.js
 var import_d3_array = require("d3-array");
@@ -2833,8 +2848,6 @@ function getTextAccessor({ name, type }, data) {
 }
 
 // dist/api/parse-map.js
-var import_extensions2 = require("@deck.gl/extensions");
-var collisionFilterExtension = new import_extensions2.CollisionFilterExtension();
 function parseMap(json) {
   const { keplerMapConfig, datasets, token } = json;
   assert(keplerMapConfig.version === "v1", "Only support Kepler v1");
@@ -2872,7 +2885,7 @@ function parseMap(json) {
           ...createLoadOptions(token)
         });
       } catch (e) {
-        import_core16.log.error(e.message)();
+        import_core17.log.error(e.message)();
         return void 0;
       }
     })
@@ -3072,8 +3085,9 @@ function createChannelProps(id5, type, config, visualChannels, data) {
     result._subLayerProps = {
       ...result._subLayerProps,
       "points-text": {
-        type: point_label_layer_default,
-        extensions: [collisionFilterExtension],
+        // The following props are injected by default by VectorTileLayer:
+        // type: PointLabelLayer,
+        // extensions: [new CollisionFilterExtension()],
         collisionEnabled: true,
         collisionGroup,
         // getPointRadius already has radiusScale baked in, so only pass one or the other