@carto/api-client 0.5.15-alpha.raster-5 → 0.5.16

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.15-alpha.raster-5",
+  "version": "0.5.16",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -71,7 +71,6 @@
     "d3-format": "^3.1.0",
     "d3-scale": "^4.0.2",
     "h3-js": "^4.1.0",
-    "jsep": "^1.4.0",
     "quadbin": "^0.4.1-alpha.0"
   },
   "devDependencies": {
@@ -122,7 +121,7 @@
     "rimraf": "^6.0.1",
     "semver": "^7.7.1",
     "thenby": "^1.3.4",
-    "tinybench": "^4.0.1",
+    "tinybench": "^5.0.1",
     "tsup": "^8.3.6",
     "typescript": "~5.9.2",
     "typescript-eslint": "^8.26.1",
@@ -132,6 +131,5 @@
   "resolutions": {
     "@carto/api-client": "portal:./",
     "rollup": "^4.20.0"
-  },
-  "stableVersion": "0.5.14"
+  }
 }

package/src/fetch-map/basemap-styles.ts

@@ -92,7 +92,7 @@ export const STYLE_LAYER_GROUPS: StyleLayerGroup[] = [
 ];
 
 export function applyLayerGroupFilters(
-  style: any, // this Maplibre/Mapbox style, we don't want to add a dependency on Maplibre
+  style: any,
   visibleLayerGroups: Record<StyleLayerGroupSlug, boolean>
 ) {
   if (!Array.isArray(style?.layers)) {

package/src/fetch-map/index.ts

@@ -1,8 +1,4 @@
-export {
-  default as BASEMAP,
-  applyLayerGroupFilters as _applyLayerGroupFilters,
-} from './basemap-styles.js';
-export {getRasterTileLayerStyleProps as _getRasterTileLayerStyleProps} from './raster-layer.js';
+export {default as BASEMAP} from './basemap-styles.js';
 export {fetchMap} from './fetch-map.js';
 export type {FetchMapOptions, FetchMapResult} from './fetch-map.js';
 export type {
@@ -15,4 +11,3 @@ export type {
 export * from './basemap.js';
 export * from './layer-map.js';
 export * from './parse-map.js';
-export {getLog10ScaleSteps as _getLog10ScaleSteps} from './utils.js';

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

@@ -25,11 +25,9 @@ import {
   createBinaryProxy,
   formatDate,
   formatTimestamp,
-  getLog10ScaleSteps,
   scaleIdentity,
 } from './utils.js';
 import type {
-  ColorRange,
   CustomMarkersRange,
   Dataset,
   MapLayerConfig,
@@ -40,7 +38,6 @@ import type {
 import type {ProviderType, SchemaField} from '../types.js';
 import {DEFAULT_AGGREGATION_EXP_ALIAS} from '../constants-internal.js';
 import {AggregationTypes} from '../constants.js';
-import type {Attribute, TilejsonResult} from '../sources/types.js';
 
 export type D3Scale = {
   domain: (d?: any) => any[];
@@ -75,21 +72,7 @@ function identity<T>(v: T): T {
   return v;
 }
 
-const hexToRGB = (c: any) => {
-  const {r, g, b} = rgb(c);
-  return [r, g, b];
-};
-
-const rgbToHex = (c: number[]) => {
-  const [r, g, b] = c;
-  const rStr = r.toString(16).padStart(2, '0');
-  const gStr = g.toString(16).padStart(2, '0');
-  const bStr = b.toString(16).padStart(2, '0');
-  return `#${rStr}${gStr}${bStr}`.toUpperCase();
-};
-
 const UNKNOWN_COLOR = '#868d91';
-const UNKNOWN_COLOR_RGB = hexToRGB(UNKNOWN_COLOR);
 
 export const OPACITY_MAP: Record<string, string> = {
   getFillColor: 'opacity',
@@ -130,13 +113,6 @@ const sharedPropMap = {
   },
 };
 
-const rasterPropsMap = {
-  isVisible: 'visible',
-  visConfig: {
-    opacity: 'opacity',
-  },
-};
-
 const customMarkersPropsMap = {
   color: 'getIconColor',
   visConfig: {
@@ -198,13 +174,6 @@ export function getLayerProps(
     );
   }
 
-  if (type === 'raster') {
-    return {
-      propMap: rasterPropsMap,
-      defaultProps: {},
-    };
-  }
-
   let basePropMap: any = sharedPropMap;
   if (config.visConfig?.customMarkers) {
     basePropMap = mergePropMaps(basePropMap, customMarkersPropsMap);
@@ -226,21 +195,18 @@ export function getLayerProps(
 }
 
 function domainFromAttribute(
-  attribute: Attribute,
+  attribute: any,
   scaleType: ScaleType,
   scaleLength: number
-): number[] | string[] {
+) {
   if (scaleType === 'ordinal' || scaleType === 'point') {
-    if (!attribute.categories) {
-      return [0, 1];
-    }
     return attribute.categories
       .map((c: any) => c.category)
       .filter((c: any) => c !== undefined && c !== null);
   }
 
   if (scaleType === 'quantile' && attribute.quantiles) {
-    return 'global' in attribute.quantiles
+    return attribute.quantiles.global
       ? attribute.quantiles.global[scaleLength]
       : attribute.quantiles[scaleLength];
   }
@@ -249,7 +215,7 @@ function domainFromAttribute(
   if (scaleType === 'log' && min === 0) {
     min = 1e-5;
   }
-  return [min ?? 0, attribute.max ?? 1];
+  return [min, attribute.max];
 }
 
 function domainFromValues(values: any, scaleType: ScaleType) {
@@ -269,8 +235,8 @@ function domainFromValues(values: any, scaleType: ScaleType) {
 }
 
 function calculateDomain(
-  data: TilejsonResult,
-  name: string,
+  data: any,
+  name: any,
   scaleType: ScaleType,
   scaleLength?: number
 ) {
@@ -278,16 +244,14 @@ function calculateDomain(
     // Tileset data type
     const {attributes} = data.tilestats.layers[0];
     const attribute = attributes.find((a: any) => a.attribute === name);
-    if (attribute) {
-      return domainFromAttribute(attribute, scaleType, scaleLength as number);
-    }
+    return domainFromAttribute(attribute, scaleType, scaleLength as number);
   }
 
   return [0, 1];
 }
 
 function normalizeAccessor(accessor: any, data: any) {
-  if (data.features || data.tilestats || data.raster_metadata) {
+  if (data.features || data.tilestats) {
     return (object: any, info: any) => {
       if (object) {
         return accessor(object.properties || object.__source.object.properties);
@@ -333,101 +297,61 @@ function findAccessorKey(keys: string[], properties: any): string[] {
 export function getColorAccessor(
   {name, colorColumn}: VisualChannelField,
   scaleType: ScaleType,
-  {aggregation, range}: {aggregation?: string; range: ColorRange},
+  {aggregation, range}: {aggregation: string; range: any},
   opacity: number | undefined,
-  data: TilejsonResult
-): {
-  accessor: any;
-  domain: number[] | string[];
-  scaleDomain: number[] | string[];
-  range: string[];
-} {
-  const {scale, domain} = calculateLayerScale(
+  data: any
+): {accessor: any; scale: any} {
+  const scale = calculateLayerScale(
     colorColumn || name,
-    colorColumn ? 'identity' : scaleType,
+    scaleType,
     range,
     data
   );
   const alpha = opacityToAlpha(opacity);
 
-  let accessorKeys = getAccessorKeys(colorColumn || name, aggregation);
+  let accessorKeys = getAccessorKeys(name, aggregation);
   const accessor = (properties: any) => {
     if (!(accessorKeys[0] in properties)) {
       accessorKeys = findAccessorKey(accessorKeys, properties);
     }
     const propertyValue = properties[accessorKeys[0]];
-    const scaled = scale(propertyValue);
-    const rgb = typeof scaled === 'string' ? hexToRGB(scaled) : scaled;
-    return [...rgb, propertyValue === null ? 0 : alpha];
-  };
-  return {
-    accessor: normalizeAccessor(accessor, data),
-    scaleDomain: scale.domain(),
-    domain,
-    range: (scale.range() || []).map(rgbToHex),
+    const {r, g, b} = rgb(scale(propertyValue));
+    return [r, g, b, propertyValue === null ? 0 : alpha];
   };
+  return {accessor: normalizeAccessor(accessor, data), scale};
 }
 
-export function calculateLayerScale(
-  name: string,
+function calculateLayerScale(
+  name: any,
   scaleType: ScaleType,
-  range: ColorRange,
-  data: TilejsonResult
-): {scale: D3Scale; domain: string[] | number[]} {
-  let domain: string[] | number[] = [];
-  let scaleDomain: number[] | undefined;
+  range: any,
+  data: any
+) {
+  const scale = SCALE_FUNCS[scaleType]();
+  let domain: (string | number)[] = [];
   let scaleColor: string[] = [];
-  const {colors} = range;
-
-  if (scaleType === 'custom') {
-    domain = calculateDomain(data, name, scaleType, colors.length);
-    const [min, max] = domain as number[];
-    if (range.uiCustomScaleType === 'logarithmic') {
-      scaleDomain = getLog10ScaleSteps({
-        min,
-        max,
-        steps: colors.length,
-      });
 
-      scaleColor = colors;
-    } else if (range.colorMap) {
-      const {colorMap} = range;
-      scaleDomain = [];
+  if (scaleType !== 'identity') {
+    const {colorMap, colors} = range;
+
+    if (Array.isArray(colorMap)) {
       colorMap.forEach(([value, color]) => {
-        (scaleDomain as number[]).push(Number(value));
+        domain.push(value);
         scaleColor.push(color);
       });
+    } else {
+      domain = calculateDomain(data, name, scaleType, colors.length);
+      scaleColor = colors;
     }
-  } else if (scaleType !== 'identity') {
-    domain = calculateDomain(data, name, scaleType, colors.length);
-    scaleColor = colors;
 
     if (scaleType === 'ordinal') {
       domain = domain.slice(0, scaleColor.length);
     }
   }
 
-  return {
-    scale: createColorScale(
-      scaleType,
-      scaleDomain || domain,
-      scaleColor.map(hexToRGB),
-      UNKNOWN_COLOR_RGB
-    ),
-    domain,
-  };
-}
-
-export function createColorScale<T>(
-  scaleType: ScaleType,
-  domain: string[] | number[],
-  range: T[],
-  unknown: T
-) {
-  const scale = SCALE_FUNCS[scaleType]();
   scale.domain(domain);
-  scale.range(range);
-  scale.unknown!(unknown as any);
+  scale.range(scaleColor);
+  scale.unknown!(UNKNOWN_COLOR);
 
   return scale;
 }
@@ -503,22 +427,13 @@ export function getSizeAccessor(
   {name}: VisualChannelField,
   scaleType: ScaleType | undefined,
   aggregation: string | null | undefined,
-  range: number[] | undefined,
-  data: TilejsonResult
-): {
-  accessor: any;
-  domain: number[];
-  scaleDomain: number[];
-  range: number[] | undefined;
-} {
+  range: Iterable<Range> | null | undefined,
+  data: any
+): {accessor: any; scale: any} {
   const scale = scaleType ? SCALE_FUNCS[scaleType]() : identity;
-  let domain: number[] = [];
-  if (scaleType && range) {
+  if (scaleType) {
     if (aggregation !== AggregationTypes.Count) {
-      domain = calculateDomain(data, name, scaleType) as number[];
-      (scale as D3Scale).domain(domain);
-    } else {
-      domain = (scale as D3Scale).domain();
+      (scale as D3Scale).domain(calculateDomain(data, name, scaleType));
     }
     (scale as D3Scale).range(range);
   }
@@ -531,12 +446,7 @@ export function getSizeAccessor(
     const propertyValue = properties[accessorKeys[0]];
     return scale(propertyValue);
   };
-  return {
-    accessor: normalizeAccessor(accessor, data),
-    domain,
-    scaleDomain: domain,
-    range,
-  };
+  return {accessor: normalizeAccessor(accessor, data), scale};
 }
 
 const FORMATS: Record<string, (value: any) => string> = {