@deck.gl/carto 9.2.0-beta.2 → 9.2.0-beta.4

package/dist/cartoPropertiesTile-worker.js

@@ -5530,7 +5530,7 @@
   };
 
   // src/layers/schema/carto-properties-tile-loader.ts
-  var VERSION = true ? "9.2.0-beta.2" : "latest";
+  var VERSION = true ? "9.2.0-beta.4" : "latest";
   var id = "cartoPropertiesTile";
   var DEFAULT_OPTIONS = {
     cartoPropertiesTile: {

package/dist/cartoRasterTile-worker.js

@@ -5516,7 +5516,7 @@
   };
 
   // src/layers/schema/carto-raster-tile-loader.ts
-  var VERSION = true ? "9.2.0-beta.2" : "latest";
+  var VERSION = true ? "9.2.0-beta.4" : "latest";
   var id = "cartoRasterTile";
   var DEFAULT_OPTIONS = {
     cartoRasterTile: {

package/dist/cartoSpatialTile-worker.js

@@ -5915,7 +5915,7 @@
   }
 
   // src/layers/schema/carto-spatial-tile-loader.ts
-  var VERSION = true ? "9.2.0-beta.2" : "latest";
+  var VERSION = true ? "9.2.0-beta.4" : "latest";
   var id = "cartoSpatialTile";
   var DEFAULT_OPTIONS = {
     cartoSpatialTile: {

package/dist/cartoVectorTile-worker.js

@@ -6135,7 +6135,7 @@
   };
 
   // src/layers/schema/carto-vector-tile-loader.ts
-  var VERSION = true ? "9.2.0-beta.2" : "latest";
+  var VERSION = true ? "9.2.0-beta.4" : "latest";
   var id = "cartoVectorTile";
   var DEFAULT_OPTIONS = {
     cartoVectorTile: {

package/dist/dist.dev.js

@@ -5833,6 +5833,8 @@ var __exports__ = (() => {
   __export(src_exports, {
     BASEMAP: () => basemap_default,
     CARTO_LAYERS: () => CARTO_LAYERS,
+    CARTO_SOURCES: () => CARTO_SOURCES,
+    CartoAPIError: () => CartoAPIError,
     ClusterTileLayer: () => ClusterTileLayer,
     H3TileLayer: () => H3TileLayer,
     HeatmapTileLayer: () => heatmap_tile_layer_default,
@@ -5840,6 +5842,7 @@ var __exports__ = (() => {
     PointLabelLayer: () => PointLabelLayer,
     QuadbinTileLayer: () => QuadbinTileLayer,
     RasterTileLayer: () => RasterTileLayer,
+    SOURCE_DEFAULTS: () => SOURCE_DEFAULTS,
     VectorTileLayer: () => VectorTileLayer,
     _GOOGLE_BASEMAPS: () => GOOGLE_BASEMAPS2,
     _QuadbinLayer: () => QuadbinLayer,
@@ -5849,11 +5852,24 @@ var __exports__ = (() => {
     _applyLayerGroupFilters: () => applyLayerGroupFilters2,
     _fetchStyle: () => fetchStyle2,
     _getStyleUrl: () => getStyleUrl2,
+    boundaryQuerySource: () => boundaryQuerySource,
+    boundaryTableSource: () => boundaryTableSource,
     colorBins: () => colorBins,
     colorCategories: () => colorCategories,
     colorContinuous: () => colorContinuous,
     fetchBasemapProps: () => fetchBasemapProps2,
-    fetchMap: () => fetchMap2
+    fetchMap: () => fetchMap2,
+    h3QuerySource: () => h3QuerySource,
+    h3TableSource: () => h3TableSource,
+    h3TilesetSource: () => h3TilesetSource,
+    quadbinQuerySource: () => quadbinQuerySource,
+    quadbinTableSource: () => quadbinTableSource,
+    quadbinTilesetSource: () => quadbinTilesetSource,
+    query: () => query,
+    rasterSource: () => rasterSource,
+    vectorQuerySource: () => vectorQuerySource,
+    vectorTableSource: () => vectorTableSource,
+    vectorTilesetSource: () => vectorTilesetSource
   });
 
   // src/layers/cluster-tile-layer.ts
@@ -17940,6 +17956,12 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   }) {
     return buildV3Path(apiBaseUrl, "v3", "maps", connectionName, endpoint);
   }
+  function buildQueryUrl({
+    apiBaseUrl,
+    connectionName
+  }) {
+    return buildV3Path(apiBaseUrl, "v3", "sql", connectionName, "query");
+  }
   var DEFAULT_HEADERS = {
     Accept: "application/json",
     "Content-Type": "application/json"
@@ -18112,6 +18134,43 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     }
     return json;
   }
+  var boundaryQuerySource = async function(options) {
+    const {
+      columns,
+      filters,
+      tilesetTableName,
+      propertiesSqlQuery,
+      queryParameters
+    } = options;
+    const urlParameters = {
+      tilesetTableName,
+      propertiesSqlQuery
+    };
+    if (columns) {
+      urlParameters.columns = columns.join(",");
+    }
+    if (filters) {
+      urlParameters.filters = filters;
+    }
+    if (queryParameters) {
+      urlParameters.queryParameters = queryParameters;
+    }
+    return baseSource("boundary", options, urlParameters);
+  };
+  var boundaryTableSource = async function(options) {
+    const { filters, tilesetTableName, columns, propertiesTableName } = options;
+    const urlParameters = {
+      tilesetTableName,
+      propertiesTableName
+    };
+    if (columns) {
+      urlParameters.columns = columns.join(",");
+    }
+    if (filters) {
+      urlParameters.filters = filters;
+    }
+    return baseSource("boundary", options, urlParameters);
+  };
   var _WidgetSource = class _WidgetSource2 {
     constructor(props) {
       __publicField(this, "props");
@@ -19967,6 +20026,22 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     const tileParams = new URL(tilejson.tiles[0]).searchParams;
     return tileParams.get("formatTiles") === "mvt" ? "mvt" : "binary";
   }
+  var h3TilesetSource = async function(options) {
+    const { tableName, spatialDataColumn = "h3" } = options;
+    const urlParameters = { name: tableName };
+    return baseSource("tileset", options, urlParameters).then(
+      (result) => ({
+        ...result,
+        widgetSource: new WidgetTilesetSource({
+          ...options,
+          tileFormat: getTileFormat(result),
+          spatialDataColumn,
+          spatialDataType: "h3",
+          spatialDataBounds: result.bounds
+        })
+      })
+    );
+  };
   var quadbinQuerySource = async function(options) {
     const {
       aggregationExp,
@@ -20045,6 +20120,22 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
       })
     );
   };
+  var quadbinTilesetSource = async function(options) {
+    const { tableName, spatialDataColumn = "quadbin" } = options;
+    const urlParameters = { name: tableName };
+    return baseSource("tileset", options, urlParameters).then(
+      (result) => ({
+        ...result,
+        widgetSource: new WidgetTilesetSource({
+          ...options,
+          tileFormat: getTileFormat(result),
+          spatialDataColumn,
+          spatialDataType: "quadbin",
+          spatialDataBounds: result.bounds
+        })
+      })
+    );
+  };
   var rasterSource = async function(options) {
     const { tableName, filters } = options;
     const urlParameters = { name: tableName };
@@ -20065,6 +20156,98 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
       })
     );
   };
+  var trajectoryQuerySource = async function(options) {
+    const {
+      columns,
+      spatialDataColumn = DEFAULT_GEO_COLUMN,
+      sqlQuery,
+      tileResolution = DEFAULT_TILE_RESOLUTION,
+      queryParameters,
+      aggregationExp,
+      trajectoryIdColumn,
+      timestampColumn
+    } = options;
+    const spatialDataType = "trajectory";
+    const urlParameters = {
+      spatialDataColumn,
+      spatialDataType,
+      tileResolution: tileResolution.toString(),
+      q: sqlQuery,
+      trajectoryIdColumn,
+      timestampColumn
+    };
+    if (columns) {
+      urlParameters.columns = columns.join(",");
+    }
+    if (queryParameters) {
+      urlParameters.queryParameters = queryParameters;
+    }
+    if (aggregationExp) {
+      urlParameters.aggregationExp = aggregationExp;
+    }
+    const result = await baseSource(
+      "query",
+      options,
+      urlParameters
+    );
+    const widgetSource = new WidgetQuerySource({
+      ...options,
+      // NOTE: Parameters with default values above must be explicitly passed here.
+      spatialDataColumn,
+      spatialDataType,
+      tileResolution
+    });
+    const timestampRange = await widgetSource.getRange({ column: timestampColumn });
+    return {
+      ...result,
+      widgetSource,
+      timestampRange
+    };
+  };
+  var trajectoryTableSource = async function(options) {
+    const {
+      columns,
+      spatialDataColumn = DEFAULT_GEO_COLUMN,
+      tableName,
+      tileResolution = DEFAULT_TILE_RESOLUTION,
+      aggregationExp,
+      trajectoryIdColumn,
+      timestampColumn
+    } = options;
+    const spatialDataType = "trajectory";
+    const urlParameters = {
+      name: tableName,
+      spatialDataColumn,
+      spatialDataType,
+      tileResolution: tileResolution.toString(),
+      trajectoryIdColumn,
+      timestampColumn
+    };
+    if (columns) {
+      urlParameters.columns = columns.join(",");
+    }
+    if (aggregationExp) {
+      urlParameters.aggregationExp = aggregationExp;
+    }
+    const result = await baseSource(
+      "table",
+      options,
+      urlParameters
+    );
+    const widgetSource = new WidgetTableSource({
+      ...options,
+      // NOTE: Parameters with default values above must be explicitly passed here.
+      spatialDataColumn,
+      spatialDataType,
+      tileResolution
+    });
+    const timestampRange = await widgetSource.getRange({ column: timestampColumn });
+    return {
+      ...result,
+      widgetSource,
+      timestampRange
+    };
+  };
   var vectorQuerySource = async function(options) {
     const {
       columns,
@@ -20161,6 +20344,64 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
       })
     );
   };
+  var CARTO_SOURCES = {
+    boundaryQuerySource,
+    boundaryTableSource,
+    h3QuerySource,
+    h3TableSource,
+    h3TilesetSource,
+    quadbinQuerySource,
+    quadbinTableSource,
+    quadbinTilesetSource,
+    rasterSource,
+    trajectoryQuerySource,
+    trajectoryTableSource,
+    vectorQuerySource,
+    vectorTableSource,
+    vectorTilesetSource
+  };
+  var query = async function(options) {
+    const {
+      apiBaseUrl = SOURCE_DEFAULTS.apiBaseUrl,
+      maxLengthURL = SOURCE_DEFAULTS.maxLengthURL,
+      clientId = getClient(),
+      localCache,
+      connectionName,
+      sqlQuery,
+      queryParameters,
+      internalParameters
+    } = options;
+    const urlParameters = { q: sqlQuery };
+    if (queryParameters) {
+      urlParameters.queryParameters = JSON.stringify(queryParameters);
+    }
+    const baseUrl = buildQueryUrl({ apiBaseUrl, connectionName });
+    const headers = {
+      Authorization: `Bearer ${options.accessToken}`,
+      ...options.headers
+    };
+    const parameters = {
+      client: clientId,
+      ...options.tags,
+      ...internalParameters,
+      ...urlParameters
+    };
+    const errorContext = {
+      requestType: "SQL",
+      connection: options.connectionName,
+      type: "query",
+      source: JSON.stringify(parameters, void 0, 2)
+    };
+    return await requestWithParameters({
+      baseUrl,
+      parameters,
+      headers,
+      errorContext,
+      maxLengthURL,
+      localCache,
+      signal: options.signal
+    });
+  };
   var cartoStyleUrlTemplate = "https://basemaps.cartocdn.com/gl/{basemap}-gl-style/style.json";
   var CARTO_MAP_STYLES = ["positron", "dark-matter", "voyager"];
   var GOOGLE_BASEMAPS = {

package/dist/index.cjs

@@ -32,6 +32,8 @@ var dist_exports = {};
 __export(dist_exports, {
   BASEMAP: () => basemap_default,
   CARTO_LAYERS: () => CARTO_LAYERS,
+  CARTO_SOURCES: () => import_api_client3.CARTO_SOURCES,
+  CartoAPIError: () => import_api_client3.CartoAPIError,
   ClusterTileLayer: () => cluster_tile_layer_default,
   H3TileLayer: () => h3_tile_layer_default,
   HeatmapTileLayer: () => heatmap_tile_layer_default,
@@ -39,6 +41,7 @@ __export(dist_exports, {
   PointLabelLayer: () => point_label_layer_default,
   QuadbinTileLayer: () => quadbin_tile_layer_default,
   RasterTileLayer: () => raster_tile_layer_default,
+  SOURCE_DEFAULTS: () => import_api_client3.SOURCE_DEFAULTS,
   VectorTileLayer: () => vector_tile_layer_default,
   _GOOGLE_BASEMAPS: () => GOOGLE_BASEMAPS,
   _QuadbinLayer: () => quadbin_layer_default,
@@ -48,11 +51,24 @@ __export(dist_exports, {
   _applyLayerGroupFilters: () => applyLayerGroupFilters,
   _fetchStyle: () => fetchStyle,
   _getStyleUrl: () => getStyleUrl,
+  boundaryQuerySource: () => import_api_client3.boundaryQuerySource,
+  boundaryTableSource: () => import_api_client3.boundaryTableSource,
   colorBins: () => colorBins,
   colorCategories: () => colorCategories,
   colorContinuous: () => colorContinuous,
   fetchBasemapProps: () => fetchBasemapProps,
-  fetchMap: () => fetchMap
+  fetchMap: () => fetchMap,
+  h3QuerySource: () => import_api_client3.h3QuerySource,
+  h3TableSource: () => import_api_client3.h3TableSource,
+  h3TilesetSource: () => import_api_client3.h3TilesetSource,
+  quadbinQuerySource: () => import_api_client3.quadbinQuerySource,
+  quadbinTableSource: () => import_api_client3.quadbinTableSource,
+  quadbinTilesetSource: () => import_api_client3.quadbinTilesetSource,
+  query: () => import_api_client3.query,
+  rasterSource: () => import_api_client3.rasterSource,
+  vectorQuerySource: () => import_api_client3.vectorQuerySource,
+  vectorTableSource: () => import_api_client3.vectorTableSource,
+  vectorTilesetSource: () => import_api_client3.vectorTilesetSource
 });
 module.exports = __toCommonJS(dist_exports);
 
@@ -673,7 +689,7 @@ function binaryToSpatialjson(binary) {
 }
 
 // dist/layers/schema/carto-spatial-tile-loader.js
-var VERSION = true ? "9.2.0-beta.2" : "latest";
+var VERSION = true ? "9.2.0-beta.4" : "latest";
 var id = "cartoSpatialTile";
 var DEFAULT_OPTIONS = {
   cartoSpatialTile: {
@@ -2035,7 +2051,7 @@ var TileReader3 = class {
 };
 
 // dist/layers/schema/carto-raster-tile-loader.js
-var VERSION2 = true ? "9.2.0-beta.2" : "latest";
+var VERSION2 = true ? "9.2.0-beta.4" : "latest";
 var id2 = "cartoRasterTile";
 var DEFAULT_OPTIONS2 = {
   cartoRasterTile: {
@@ -2147,7 +2163,7 @@ var TileReader4 = class {
 };
 
 // dist/layers/schema/carto-properties-tile-loader.js
-var VERSION3 = true ? "9.2.0-beta.2" : "latest";
+var VERSION3 = true ? "9.2.0-beta.4" : "latest";
 var id3 = "cartoPropertiesTile";
 var DEFAULT_OPTIONS3 = {
   cartoPropertiesTile: {
@@ -2176,7 +2192,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.2.0-beta.2" : "latest";
+var VERSION4 = true ? "9.2.0-beta.4" : "latest";
 var id4 = "cartoVectorTile";
 var DEFAULT_OPTIONS4 = {
   cartoVectorTile: {
@@ -2907,6 +2923,7 @@ async function fetchBasemapProps({ config, errorContext, applyLayerFilters = tru
 }
 
 // dist/index.js
+var import_api_client3 = require("@carto/api-client");
 var CARTO_LAYERS = {
   ClusterTileLayer: cluster_tile_layer_default,
   H3TileLayer: h3_tile_layer_default,