@carto/api-client 0.5.21 → 0.5.22

package/package.json

@@ -8,7 +8,7 @@
   "homepage": "https://github.com/CartoDB/carto-api-client#readme",
   "author": "Don McCurdy <donmccurdy@carto.com>",
   "packageManager": "yarn@4.3.1",
-  "version": "0.5.21",
+  "version": "0.5.22",
   "license": "MIT",
   "publishConfig": {
     "access": "public"

package/src/fetch-map/parse-map.ts

@@ -39,10 +39,10 @@ import type {TilejsonResult} from '../sources/types.js';
 
 export type Scale = {
   type: ScaleType;
-  field: VisualChannelField;
+  field?: VisualChannelField;
 
   /** Natural domain of the scale, as defined by the data  */
-  domain: string[] | number[];
+  domain?: string[] | number[];
 
   /** Domain of the user to construct d3 scale */
   scaleDomain?: string[] | number[];
@@ -277,17 +277,29 @@ function createChannelProps(
           rasterMetadata,
           visualChannels,
         }),
-        scales: {}, // TODO
+        scales: {
+          fillColor: {
+            type: 'identity',
+          },
+        },
       };
     } else {
-      return {
-        channelProps: getRasterTileLayerStylePropsScaledBand({
+      const {dataTransform, updateTriggers, ...scaleProps} =
+        getRasterTileLayerStylePropsScaledBand({
           layerConfig: config,
           visualChannels,
           rasterMetadata,
-        }),
+        });
+
+      return {
+        channelProps: {
+          dataTransform,
+          updateTriggers,
+        },
         scales: {
-          // TODO
+          ...(scaleProps.type && {
+            fillColor: scaleProps,
+          }),
         },
       };
     }

package/src/fetch-map/raster-layer.ts

@@ -376,20 +376,9 @@ export function domainFromRasterMetadataBand(
   if (scaleType === 'ordinal') {
     return colorRange.colorMap?.map(([value]) => value) || [];
   }
-  if (scaleType === 'custom') {
-    if (colorRange.uiCustomScaleType === 'logarithmic') {
-      return getLog10ScaleSteps({
-        min: band.stats.min,
-        max: band.stats.max,
-        steps: colorRange.colors.length,
-      });
-    } else {
-      // actually custom, read colorMap
-      return colorRange.colorMap?.map(([value]) => value) || [];
-    }
-  }
-  const scaleLength = colorRange.colors.length;
+
   if (scaleType === 'quantile') {
+    const scaleLength = colorRange.colors.length;
     const quantiles = band.stats.quantiles?.[scaleLength];
     if (!quantiles) {
       return [0, 1];
@@ -433,9 +422,21 @@ export function getRasterTileLayerStylePropsScaledBand({
 
   const domain = domainFromRasterMetadataBand(bandInfo, scaleType, colorRange);
 
+  let scaleDomain = domain;
+  if (scaleType === 'custom') {
+    if (colorRange.uiCustomScaleType === 'logarithmic') {
+      scaleDomain = getLog10ScaleSteps({
+        min: bandInfo.stats.min,
+        max: bandInfo.stats.max,
+        steps: colorRange.colors.length,
+      });
+    } else {
+      scaleDomain = colorRange.colorMap?.map(([value]) => value) || [];
+    }
+  }
   const scaleFun = createColorScale(
     scaleType,
-    domain,
+    scaleDomain,
     colorRange.colors.map(hexToRGB),
     UNKNOWN_COLOR
   );
@@ -453,6 +454,11 @@ export function getRasterTileLayerStylePropsScaledBand({
       layerConfig,
       visualChannels,
     }),
+    domain: domain,
+    scaleDomain: scaleFun.domain(),
+    range: colorRange.colors,
+    type: scaleType,
+    field: colorField,
   };
 }
 

package/src/fetch-map/types.ts

@@ -31,6 +31,7 @@ export type VisualChannels = {
   heightScale?: ScaleType;
 
   weightField?: VisualChannelField;
+  uniqueValuesColorScale?: ScaleType;
 };
 
 export type ColorRange = {