@deck.gl/carto 8.7.8 → 8.7.11

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.7.8",
+  "version": "8.7.11",
   "publishConfig": {
     "access": "public"
   },
@@ -57,5 +57,5 @@
     "@deck.gl/layers": "^8.0.0",
     "@loaders.gl/core": "^3.1.5"
   },
-  "gitHead": "2172dfe62ab2963f755601c1338e98e72cf032e7"
+  "gitHead": "05d5d8024eaf3ad161848088b8f1eda8679e9c2e"
 }

package/src/api/layer-map.ts

@@ -7,7 +7,8 @@ import {
   scalePoint,
   scaleQuantile,
   scaleQuantize,
-  scaleSqrt
+  scaleSqrt,
+  scaleThreshold
 } from 'd3-scale';
 import {format as d3Format} from 'd3-format';
 import moment from 'moment-timezone';
@@ -27,10 +28,13 @@ const SCALE_FUNCS = {
   point: scalePoint,
   quantile: scaleQuantile,
   quantize: scaleQuantize,
-  sqrt: scaleSqrt
+  sqrt: scaleSqrt,
+  custom: scaleThreshold
 };
 export type SCALE_TYPE = keyof typeof SCALE_FUNCS;
 
+const UNKNOWN_COLOR = '#868d91';
+
 export const AGGREGATION = {
   average: 'MEAN',
   maximum: 'MAX',
@@ -179,7 +183,11 @@ function domainFromAttribute(attribute, scaleType: SCALE_TYPE) {
 
 function domainFromValues(values, scaleType: SCALE_TYPE) {
   if (scaleType === 'ordinal') {
-    return [...new Set(values)].sort();
+    return groupSort(
+      values,
+      g => -g.length,
+      d => d
+    );
   } else if (scaleType === 'quantile') {
     return values.sort((a, b) => a - b);
   } else if (scaleType === 'log') {
@@ -226,13 +234,31 @@ export function getColorValueAccessor({name}, colorAggregation, data: any) {
 export function getColorAccessor(
   {name},
   scaleType: SCALE_TYPE,
-  {colors},
+  {colors, colorMap},
   opacity: number | undefined,
   data: any
 ) {
   const scale = SCALE_FUNCS[scaleType as any]();
-  scale.domain(calculateDomain(data, name, scaleType));
-  scale.range(colors);
+  let domain: (string | number)[] = [];
+  let scaleColor: string[] = [];
+
+  if (Array.isArray(colorMap)) {
+    colorMap.forEach(([value, color]) => {
+      domain.push(value);
+      scaleColor.push(color);
+    });
+  } else {
+    domain = calculateDomain(data, name, scaleType);
+    scaleColor = colors;
+  }
+
+  if (scaleType === 'ordinal') {
+    domain = domain.slice(0, scaleColor.length);
+  }
+
+  scale.domain(domain);
+  scale.range(scaleColor);
+  scale.unknown(UNKNOWN_COLOR);
   const alpha = opacity !== undefined ? Math.round(255 * Math.pow(opacity, 1 / 2.2)) : 255;
 
   const accessor = properties => {

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

@@ -116,6 +116,8 @@ type FetchLayerDataParams = {
   clientId?: string;
   format?: Format;
   formatTiles?: TileFormat;
+  aggregationExp?: string;
+  aggregationResLevel?: number;
 };
 
 /**
@@ -127,7 +129,9 @@ function getParameters({
   geoColumn,
   columns,
   schema,
-  clientId
+  clientId,
+  aggregationExp,
+  aggregationResLevel
 }: Omit<FetchLayerDataParams, 'connection' | 'credentials'>) {
   const parameters = [encodeParameter('client', clientId || DEFAULT_CLIENT)];
   if (schema) {
@@ -137,12 +141,18 @@ function getParameters({
   const sourceName = type === MAP_TYPES.QUERY ? 'q' : 'name';
   parameters.push(encodeParameter(sourceName, source));
 
-  if (GEO_COLUMN_SUPPORT.includes(type) && geoColumn) {
+  if (geoColumn) {
     parameters.push(encodeParameter('geo_column', geoColumn));
   }
-  if (COLUMNS_SUPPORT.includes(type) && columns) {
+  if (columns) {
     parameters.push(encodeParameter('columns', columns.join(',')));
   }
+  if (aggregationExp) {
+    parameters.push(encodeParameter('aggregationExp', aggregationExp));
+  }
+  if (aggregationResLevel) {
+    parameters.push(encodeParameter('aggregationResLevel', aggregationResLevel));
+  }
 
   return parameters.join('&');
 }
@@ -155,10 +165,21 @@ export async function mapInstantiation({
   geoColumn,
   columns,
   schema,
-  clientId
+  clientId,
+  aggregationExp,
+  aggregationResLevel
 }: FetchLayerDataParams): Promise<MapInstantiation> {
   const baseUrl = `${credentials.mapsUrl}/${connection}/${type}`;
-  const url = `${baseUrl}?${getParameters({type, source, geoColumn, columns, schema, clientId})}`;
+  const url = `${baseUrl}?${getParameters({
+    type,
+    source,
+    geoColumn,
+    columns,
+    schema,
+    clientId,
+    aggregationExp,
+    aggregationResLevel
+  })}`;
   const {accessToken} = credentials;
 
   if (url.length > MAX_GET_LENGTH && type === MAP_TYPES.QUERY) {
@@ -187,7 +208,11 @@ function checkFetchLayerDataParameters({
   type,
   source,
   connection,
-  credentials
+  credentials,
+  geoColumn,
+  columns,
+  aggregationExp,
+  aggregationResLevel
 }: FetchLayerDataParams) {
   assert(connection, 'Must define connection');
   assert(type, 'Must define a type');
@@ -196,6 +221,29 @@ function checkFetchLayerDataParameters({
   assert(credentials.apiVersion === API_VERSIONS.V3, 'Method only available for v3');
   assert(credentials.apiBaseUrl, 'Must define apiBaseUrl');
   assert(credentials.accessToken, 'Must define an accessToken');
+
+  if (columns) {
+    assert(
+      COLUMNS_SUPPORT.includes(type),
+      `The columns parameter is not supported by type ${type}`
+    );
+  }
+  if (geoColumn) {
+    assert(
+      GEO_COLUMN_SUPPORT.includes(type),
+      `The geoColumn parameter is not supported by type ${type}`
+    );
+  } else {
+    assert(!aggregationExp, 'Have aggregationExp, but geoColumn parameter is missing');
+    assert(!aggregationResLevel, 'Have aggregationResLevel, but geoColumn parameter is missing');
+  }
+
+  if (!aggregationExp) {
+    assert(
+      !aggregationResLevel,
+      'Have aggregationResLevel, but aggregationExp parameter is missing'
+    );
+  }
 }
 
 export interface FetchLayerDataResult {
@@ -213,7 +261,9 @@ export async function fetchLayerData({
   format,
   formatTiles,
   schema,
-  clientId
+  clientId,
+  aggregationExp,
+  aggregationResLevel
 }: FetchLayerDataParams): Promise<FetchLayerDataResult> {
   // Internally we split data fetching into two parts to allow us to
   // conditionally fetch the actual data, depending on the metadata state
@@ -227,7 +277,9 @@ export async function fetchLayerData({
     format,
     formatTiles,
     schema,
-    clientId
+    clientId,
+    aggregationExp,
+    aggregationResLevel
   });
 
   const data = await requestData({url, format: mapFormat, accessToken});
@@ -249,7 +301,9 @@ async function _fetchDataUrl({
   format,
   formatTiles,
   schema,
-  clientId
+  clientId,
+  aggregationExp,
+  aggregationResLevel
 }: FetchLayerDataParams) {
   const defaultCredentials = getDefaultCredentials();
   // Only pick up default credentials if they have been defined for
@@ -258,7 +312,16 @@ async function _fetchDataUrl({
     ...(defaultCredentials.apiVersion === API_VERSIONS.V3 && defaultCredentials),
     ...credentials
   };
-  checkFetchLayerDataParameters({type, source, connection, credentials: localCreds});
+  checkFetchLayerDataParameters({
+    type,
+    source,
+    connection,
+    credentials: localCreds,
+    geoColumn,
+    columns,
+    aggregationExp,
+    aggregationResLevel
+  });
 
   if (!localCreds.mapsUrl) {
     localCreds.mapsUrl = buildMapsUrlFromBase(localCreds.apiBaseUrl);
@@ -272,7 +335,9 @@ async function _fetchDataUrl({
     geoColumn,
     columns,
     schema,
-    clientId
+    clientId,
+    aggregationExp,
+    aggregationResLevel
   });
   let url: string | null = null;
   let mapFormat: Format | undefined;