@deck.gl/carto 9.0.24 → 9.0.26

package/dist/cartoRasterTile-worker.js

@@ -1008,7 +1008,7 @@
   }
 
   // src/layers/schema/carto-raster-tile-loader.ts
-  var VERSION = true ? "9.0.24" : "latest";
+  var VERSION = true ? "9.0.26" : "latest";
   var id = "cartoRasterTile";
   var DEFAULT_OPTIONS = {
     cartoRasterTile: {

package/dist/cartoSpatialTile-worker.js

@@ -1397,7 +1397,7 @@
   }
 
   // src/layers/schema/carto-spatial-tile-loader.ts
-  var VERSION = true ? "9.0.24" : "latest";
+  var VERSION = true ? "9.0.26" : "latest";
   var id = "cartoSpatialTile";
   var DEFAULT_OPTIONS = {
     cartoSpatialTile: {

package/dist/cartoVectorTile-worker.js

@@ -1625,7 +1625,7 @@
   }
 
   // src/layers/schema/carto-vector-tile-loader.ts
-  var VERSION = true ? "9.0.24" : "latest";
+  var VERSION = true ? "9.0.26" : "latest";
   var id = "cartoVectorTile";
   var DEFAULT_OPTIONS = {
     cartoVectorTile: {

package/dist/dist.dev.js

@@ -7700,6 +7700,12 @@ var __exports__ = (() => {
       },
       has(target, property) {
         return property in numericProps || property in target;
+      },
+      ownKeys(target) {
+        return [...Object.keys(numericProps), ...Reflect.ownKeys(target)];
+      },
+      getOwnPropertyDescriptor(target, prop) {
+        return { enumerable: true, configurable: true };
       }
     });
   }
@@ -9113,6 +9119,7 @@ void main(void) {
       const [xOffset, yOffset, scale] = quadbinToOffset(tileIndex);
       const offset = [xOffset, yOffset, scale / blockSize];
       const CellLayer = this.getSubLayerClass("column", RasterColumnLayer);
+      const { highlightedObjectIndex, highlightColor } = this.state;
       return new CellLayer(
         this.props,
         this.getSubLayerProps({
@@ -9128,7 +9135,9 @@ void main(void) {
             data,
             length: blockSize * blockSize
           },
-          offset
+          offset,
+          highlightedObjectIndex,
+          highlightColor
         }
       );
     }
@@ -9143,11 +9152,39 @@ void main(void) {
         return accessor({ properties: proxy }, info);
       };
     }
+    getPickingInfo(params) {
+      const info = super.getPickingInfo(params);
+      if (info.index !== -1) {
+        info.object = this.getSubLayerAccessor((x) => x)(void 0, {
+          data: this.props,
+          index: info.index
+        });
+      }
+      return info;
+    }
+    _updateAutoHighlight(info) {
+      const { highlightedObjectIndex } = this.state;
+      let newHighlightedObjectIndex = -1;
+      if (info.index !== -1) {
+        newHighlightedObjectIndex = info.index;
+      }
+      if (highlightedObjectIndex !== newHighlightedObjectIndex) {
+        let { highlightColor } = this.props;
+        if (typeof highlightColor === "function") {
+          highlightColor = highlightColor(info);
+        }
+        this.setState({
+          highlightColor,
+          highlightedObjectIndex: newHighlightedObjectIndex
+        });
+      }
+    }
   };
   RasterLayer.layerName = "RasterLayer";
   RasterLayer.defaultProps = defaultProps8;
 
   // src/layers/raster-tile-layer.ts
+  var import_geo_layers7 = __toESM(require_geo_layers(), 1);
   var renderSubLayers3 = (props) => {
     const tileIndex = props.tile?.index?.q;
     if (!tileIndex)
@@ -9171,7 +9208,7 @@ void main(void) {
         return null;
       const { tiles: data, minzoom: minZoom, maxzoom: maxZoom } = tileJSON;
       return [
-        new SpatialIndexTileLayer(this.props, {
+        new import_geo_layers7.TileLayer(this.props, {
           id: `raster-tile-layer-${this.props.id}`,
           data,
           TilesetClass: QuadbinTileset2D,
@@ -9289,16 +9326,16 @@ void main(void) {
 
   // src/layers/vector-tile-layer.ts
   var import_extensions = __toESM(require_extensions(), 1);
-  var import_geo_layers7 = __toESM(require_geo_layers(), 1);
+  var import_geo_layers8 = __toESM(require_geo_layers(), 1);
   var import_layers5 = __toESM(require_layers(), 1);
   (0, import_core14.registerLoaders)([carto_properties_tile_loader_default, carto_vector_tile_loader_default]);
   var defaultProps10 = {
-    ...import_geo_layers7.MVTLayer.defaultProps,
+    ...import_geo_layers8.MVTLayer.defaultProps,
     data: TilejsonPropType,
     dataComparator: TilejsonPropType.equal,
     tileSize: DEFAULT_TILE_SIZE
   };
-  var VectorTileLayer = class extends import_geo_layers7.MVTLayer {
+  var VectorTileLayer = class extends import_geo_layers8.MVTLayer {
     constructor(...propObjects) {
       super(...propObjects);
     }
@@ -9325,7 +9362,7 @@ void main(void) {
     async getTileData(tile) {
       const tileJSON = this.props.data;
       const { tiles: tiles2, properties_tiles } = tileJSON;
-      const url = (0, import_geo_layers7._getURLFromTemplate)(tiles2, tile);
+      const url = (0, import_geo_layers8._getURLFromTemplate)(tiles2, tile);
       if (!url) {
         return Promise.reject("Invalid URL");
       }
@@ -9336,7 +9373,7 @@ void main(void) {
       if (!properties_tiles) {
         return await geometryFetch;
       }
-      const propertiesUrl = (0, import_geo_layers7._getURLFromTemplate)(properties_tiles, tile);
+      const propertiesUrl = (0, import_geo_layers8._getURLFromTemplate)(properties_tiles, tile);
       if (!propertiesUrl) {
         return Promise.reject("Invalid properties URL");
       }
@@ -9360,11 +9397,28 @@ void main(void) {
       }
       const tileBbox = props.tile.bbox;
       const { west, south, east, north } = tileBbox;
+      const extensions = [new import_extensions.ClipExtension(), ...props.extensions || []];
+      const clipProps = {
+        clipBounds: [west, south, east, north]
+      };
+      const applyClipExtensionToSublayerProps = (subLayerId) => {
+        return {
+          [subLayerId]: {
+            ...clipProps,
+            ...props?._subLayerProps?.[subLayerId],
+            extensions: [...extensions, ...props?._subLayerProps?.[subLayerId]?.extensions || []]
+          }
+        };
+      };
       const subLayerProps = {
         ...props,
         autoHighlight: false,
-        extensions: [new import_extensions.ClipExtension(), ...props.extensions || []],
-        clipBounds: [west, south, east, north]
+        _subLayerProps: {
+          ...props._subLayerProps,
+          ...applyClipExtensionToSublayerProps("polygons-fill"),
+          ...applyClipExtensionToSublayerProps("polygons-stroke"),
+          ...applyClipExtensionToSublayerProps("linestrings")
+        }
       };
       const subLayer = new import_layers5.GeoJsonLayer(subLayerProps);
       return subLayer;
@@ -13139,7 +13193,8 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
       aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_H3,
       sqlQuery,
       spatialDataColumn = "h3",
-      queryParameters
+      queryParameters,
+      filters
     } = options;
     const urlParameters = {
       aggregationExp,
@@ -13153,6 +13208,9 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     if (queryParameters) {
       urlParameters.queryParameters = queryParameters;
     }
+    if (filters) {
+      urlParameters.filters = filters;
+    }
     return baseSource("query", options, urlParameters);
   };
 
@@ -13162,7 +13220,8 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
       aggregationExp,
       aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_H3,
       spatialDataColumn = "h3",
-      tableName
+      tableName,
+      filters
     } = options;
     const urlParameters = {
       aggregationExp,
@@ -13173,6 +13232,9 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     if (aggregationResLevel) {
       urlParameters.aggregationResLevel = String(aggregationResLevel);
     }
+    if (filters) {
+      urlParameters.filters = filters;
+    }
     return baseSource("table", options, urlParameters);
   };
 
@@ -13200,7 +13262,8 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
       aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN,
       sqlQuery,
       spatialDataColumn = "quadbin",
-      queryParameters
+      queryParameters,
+      filters
     } = options;
     const urlParameters = {
       aggregationExp,
@@ -13214,6 +13277,9 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     if (queryParameters) {
       urlParameters.queryParameters = queryParameters;
     }
+    if (filters) {
+      urlParameters.filters = filters;
+    }
     return baseSource("query", options, urlParameters);
   };
 
@@ -13223,7 +13289,8 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
       aggregationExp,
       aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN,
       spatialDataColumn = "quadbin",
-      tableName
+      tableName,
+      filters
     } = options;
     const urlParameters = {
       aggregationExp,
@@ -13234,6 +13301,9 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     if (aggregationResLevel) {
       urlParameters.aggregationResLevel = String(aggregationResLevel);
     }
+    if (filters) {
+      urlParameters.filters = filters;
+    }
     return baseSource("table", options, urlParameters);
   };
 
@@ -13310,7 +13380,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   var import_moment_timezone = __toESM(require_moment_timezone2(), 1);
   var import_aggregation_layers = __toESM(require_aggregation_layers(), 1);
   var import_layers6 = __toESM(require_layers(), 1);
-  var import_geo_layers8 = __toESM(require_geo_layers(), 1);
+  var import_geo_layers9 = __toESM(require_geo_layers(), 1);
   var SCALE_FUNCS = {
     linear: linear2,
     ordinal,
@@ -13441,7 +13511,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
         defaultProps: { getPosition }
       },
       hexagonId: {
-        Layer: import_geo_layers8.H3HexagonLayer,
+        Layer: import_geo_layers9.H3HexagonLayer,
         propMap: { visConfig: { coverage: "coverage" } },
         defaultProps: { getHexagon: (d) => d[hexagonId], stroked: false }
       }

package/dist/index.cjs

@@ -486,6 +486,12 @@ function createBinaryProxy(data, index) {
     },
     has(target, property) {
       return property in numericProps || property in target;
+    },
+    ownKeys(target) {
+      return [...Object.keys(numericProps), ...Reflect.ownKeys(target)];
+    },
+    getOwnPropertyDescriptor(target, prop) {
+      return { enumerable: true, configurable: true };
     }
   });
 }
@@ -533,7 +539,7 @@ function binaryToSpatialjson(binary) {
 }
 
 // dist/layers/schema/carto-spatial-tile-loader.js
-var VERSION = true ? "9.0.24" : "latest";
+var VERSION = true ? "9.0.26" : "latest";
 var id = "cartoSpatialTile";
 var DEFAULT_OPTIONS = {
   cartoSpatialTile: {
@@ -896,7 +902,7 @@ var TileReader3 = class {
 };
 
 // dist/layers/schema/carto-raster-tile-loader.js
-var VERSION2 = true ? "9.0.24" : "latest";
+var VERSION2 = true ? "9.0.26" : "latest";
 var id2 = "cartoRasterTile";
 var DEFAULT_OPTIONS2 = {
   cartoRasterTile: {
@@ -1826,6 +1832,7 @@ var _RasterLayer = class extends import_core12.CompositeLayer {
     const [xOffset, yOffset, scale] = quadbinToOffset(tileIndex);
     const offset = [xOffset, yOffset, scale / blockSize];
     const CellLayer = this.getSubLayerClass("column", RasterColumnLayer);
+    const { highlightedObjectIndex, highlightColor } = this.state;
     return new CellLayer(this.props, this.getSubLayerProps({
       id: "cell",
       updateTriggers,
@@ -1838,7 +1845,9 @@ var _RasterLayer = class extends import_core12.CompositeLayer {
         data,
         length: blockSize * blockSize
       },
-      offset
+      offset,
+      highlightedObjectIndex,
+      highlightColor
     });
   }
   getSubLayerAccessor(accessor) {
@@ -1852,6 +1861,33 @@ var _RasterLayer = class extends import_core12.CompositeLayer {
       return accessor({ properties: proxy }, info);
     };
   }
+  getPickingInfo(params) {
+    const info = super.getPickingInfo(params);
+    if (info.index !== -1) {
+      info.object = this.getSubLayerAccessor((x) => x)(void 0, {
+        data: this.props,
+        index: info.index
+      });
+    }
+    return info;
+  }
+  _updateAutoHighlight(info) {
+    const { highlightedObjectIndex } = this.state;
+    let newHighlightedObjectIndex = -1;
+    if (info.index !== -1) {
+      newHighlightedObjectIndex = info.index;
+    }
+    if (highlightedObjectIndex !== newHighlightedObjectIndex) {
+      let { highlightColor } = this.props;
+      if (typeof highlightColor === "function") {
+        highlightColor = highlightColor(info);
+      }
+      this.setState({
+        highlightColor,
+        highlightedObjectIndex: newHighlightedObjectIndex
+      });
+    }
+  }
 };
 var RasterLayer = _RasterLayer;
 (() => {
@@ -1862,6 +1898,7 @@ var RasterLayer = _RasterLayer;
 })();
 
 // dist/layers/raster-tile-layer.js
+var import_geo_layers7 = require("@deck.gl/geo-layers");
 var renderSubLayers3 = (props) => {
   var _a, _b;
   const tileIndex = (_b = (_a = props.tile) == null ? void 0 : _a.index) == null ? void 0 : _b.q;
@@ -1886,7 +1923,7 @@ var _RasterTileLayer = class extends import_core13.CompositeLayer {
       return null;
     const { tiles: data, minzoom: minZoom, maxzoom: maxZoom } = tileJSON;
     return [
-      new SpatialIndexTileLayer(this.props, {
+      new import_geo_layers7.TileLayer(this.props, {
         id: `raster-tile-layer-${this.props.id}`,
         data,
         TilesetClass: QuadbinTileset2D,
@@ -1947,7 +1984,7 @@ var carto_properties_tile_loader_default = CartoPropertiesTileLoader;
 
 // dist/layers/schema/carto-vector-tile-loader.js
 var import_earcut = __toESM(require("earcut"), 1);
-var VERSION3 = true ? "9.0.24" : "latest";
+var VERSION3 = true ? "9.0.26" : "latest";
 var id3 = "cartoVectorTile";
 var DEFAULT_OPTIONS3 = {
   cartoVectorTile: {
@@ -2005,16 +2042,16 @@ var carto_vector_tile_loader_default = CartoVectorTileLoader;
 
 // dist/layers/vector-tile-layer.js
 var import_extensions = require("@deck.gl/extensions");
-var import_geo_layers7 = require("@deck.gl/geo-layers");
+var import_geo_layers8 = require("@deck.gl/geo-layers");
 var import_layers5 = require("@deck.gl/layers");
 (0, import_core14.registerLoaders)([carto_properties_tile_loader_default, carto_vector_tile_loader_default]);
 var defaultProps10 = {
-  ...import_geo_layers7.MVTLayer.defaultProps,
+  ...import_geo_layers8.MVTLayer.defaultProps,
   data: TilejsonPropType,
   dataComparator: TilejsonPropType.equal,
   tileSize: DEFAULT_TILE_SIZE
 };
-var _VectorTileLayer = class extends import_geo_layers7.MVTLayer {
+var _VectorTileLayer = class extends import_geo_layers8.MVTLayer {
   constructor(...propObjects) {
     super(...propObjects);
   }
@@ -2041,7 +2078,7 @@ var _VectorTileLayer = class extends import_geo_layers7.MVTLayer {
   async getTileData(tile) {
     const tileJSON = this.props.data;
     const { tiles, properties_tiles } = tileJSON;
-    const url = (0, import_geo_layers7._getURLFromTemplate)(tiles, tile);
+    const url = (0, import_geo_layers8._getURLFromTemplate)(tiles, tile);
     if (!url) {
       return Promise.reject("Invalid URL");
     }
@@ -2052,7 +2089,7 @@ var _VectorTileLayer = class extends import_geo_layers7.MVTLayer {
     if (!properties_tiles) {
       return await geometryFetch;
     }
-    const propertiesUrl = (0, import_geo_layers7._getURLFromTemplate)(properties_tiles, tile);
+    const propertiesUrl = (0, import_geo_layers8._getURLFromTemplate)(properties_tiles, tile);
     if (!propertiesUrl) {
       return Promise.reject("Invalid properties URL");
     }
@@ -2076,11 +2113,29 @@ var _VectorTileLayer = class extends import_geo_layers7.MVTLayer {
     }
     const tileBbox = props.tile.bbox;
     const { west, south, east, north } = tileBbox;
+    const extensions = [new import_extensions.ClipExtension(), ...props.extensions || []];
+    const clipProps = {
+      clipBounds: [west, south, east, north]
+    };
+    const applyClipExtensionToSublayerProps = (subLayerId) => {
+      var _a, _b, _c;
+      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) || []]
+        }
+      };
+    };
     const subLayerProps = {
       ...props,
       autoHighlight: false,
-      extensions: [new import_extensions.ClipExtension(), ...props.extensions || []],
-      clipBounds: [west, south, east, north]
+      _subLayerProps: {
+        ...props._subLayerProps,
+        ...applyClipExtensionToSublayerProps("polygons-fill"),
+        ...applyClipExtensionToSublayerProps("polygons-stroke"),
+        ...applyClipExtensionToSublayerProps("linestrings")
+      }
     };
     const subLayer = new import_layers5.GeoJsonLayer(subLayerProps);
     return subLayer;
@@ -2529,7 +2584,7 @@ var boundaryTableSource = async function(options) {
 
 // dist/sources/h3-query-source.js
 var h3QuerySource = async function(options) {
-  const { aggregationExp, aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_H3, sqlQuery, spatialDataColumn = "h3", queryParameters } = options;
+  const { aggregationExp, aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_H3, sqlQuery, spatialDataColumn = "h3", queryParameters, filters } = options;
   const urlParameters = {
     aggregationExp,
     spatialDataColumn,
@@ -2542,12 +2597,15 @@ var h3QuerySource = async function(options) {
   if (queryParameters) {
     urlParameters.queryParameters = queryParameters;
   }
+  if (filters) {
+    urlParameters.filters = filters;
+  }
   return baseSource("query", options, urlParameters);
 };
 
 // dist/sources/h3-table-source.js
 var h3TableSource = async function(options) {
-  const { aggregationExp, aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_H3, spatialDataColumn = "h3", tableName } = options;
+  const { aggregationExp, aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_H3, spatialDataColumn = "h3", tableName, filters } = options;
   const urlParameters = {
     aggregationExp,
     name: tableName,
@@ -2557,6 +2615,9 @@ var h3TableSource = async function(options) {
   if (aggregationResLevel) {
     urlParameters.aggregationResLevel = String(aggregationResLevel);
   }
+  if (filters) {
+    urlParameters.filters = filters;
+  }
   return baseSource("table", options, urlParameters);
 };
 
@@ -2579,7 +2640,7 @@ var rasterSource = async function(options) {
 
 // dist/sources/quadbin-query-source.js
 var quadbinQuerySource = async function(options) {
-  const { aggregationExp, aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN, sqlQuery, spatialDataColumn = "quadbin", queryParameters } = options;
+  const { aggregationExp, aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN, sqlQuery, spatialDataColumn = "quadbin", queryParameters, filters } = options;
   const urlParameters = {
     aggregationExp,
     q: sqlQuery,
@@ -2592,12 +2653,15 @@ var quadbinQuerySource = async function(options) {
   if (queryParameters) {
     urlParameters.queryParameters = queryParameters;
   }
+  if (filters) {
+    urlParameters.filters = filters;
+  }
   return baseSource("query", options, urlParameters);
 };
 
 // dist/sources/quadbin-table-source.js
 var quadbinTableSource = async function(options) {
-  const { aggregationExp, aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN, spatialDataColumn = "quadbin", tableName } = options;
+  const { aggregationExp, aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN, spatialDataColumn = "quadbin", tableName, filters } = options;
   const urlParameters = {
     aggregationExp,
     name: tableName,
@@ -2607,6 +2671,9 @@ var quadbinTableSource = async function(options) {
   if (aggregationResLevel) {
     urlParameters.aggregationResLevel = String(aggregationResLevel);
   }
+  if (filters) {
+    urlParameters.filters = filters;
+  }
   return baseSource("table", options, urlParameters);
 };
 
@@ -2674,7 +2741,7 @@ var import_d3_format = require("d3-format");
 var import_moment_timezone = __toESM(require("moment-timezone"), 1);
 var import_aggregation_layers = require("@deck.gl/aggregation-layers");
 var import_layers6 = require("@deck.gl/layers");
-var import_geo_layers8 = require("@deck.gl/geo-layers");
+var import_geo_layers9 = require("@deck.gl/geo-layers");
 var SCALE_FUNCS = {
   linear: import_d3_scale3.scaleLinear,
   ordinal: import_d3_scale3.scaleOrdinal,
@@ -2806,7 +2873,7 @@ function getLayer(type, config, dataset) {
       defaultProps: { getPosition }
     },
     hexagonId: {
-      Layer: import_geo_layers8.H3HexagonLayer,
+      Layer: import_geo_layers9.H3HexagonLayer,
       propMap: { visConfig: { coverage: "coverage" } },
       defaultProps: { getHexagon: (d) => d[hexagonId], stroked: false }
     }