@carto/api-client 0.5.15-alpha.raster-1 → 0.5.15-alpha.raster-2

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-1",
+  "version": "0.5.15-alpha.raster-2",
   "license": "MIT",
   "publishConfig": {
     "access": "public"

package/src/fetch-map/index.ts

@@ -15,3 +15,4 @@ 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,6 +25,7 @@ import {
   createBinaryProxy,
   formatDate,
   formatTimestamp,
+  getLog10ScaleSteps,
   scaleIdentity,
 } from './utils.js';
 import type {
@@ -212,9 +213,20 @@ export function getLayerProps(
 
 function domainFromAttribute(
   attribute: Attribute,
-  scaleType: ScaleType,
+  scaleType: ScaleType | 'log10steps',
   scaleLength: number
 ): number[] | string[] {
+  if (
+    scaleType === 'log10steps' &&
+    attribute.min !== undefined &&
+    attribute.max !== undefined
+  ) {
+    return getLog10ScaleSteps({
+      min: attribute.min,
+      max: attribute.max,
+      steps: scaleLength,
+    });
+  }
   if (scaleType === 'ordinal' || scaleType === 'point') {
     if (!attribute.categories) {
       return [0, 1];
@@ -256,7 +268,7 @@ function domainFromValues(values: any, scaleType: ScaleType) {
 function calculateDomain(
   data: TilejsonResult,
   name: string,
-  scaleType: ScaleType,
+  scaleType: ScaleType | 'log10steps',
   scaleLength?: number
 ) {
   if (data.tilestats) {
@@ -350,19 +362,22 @@ export function calculateLayerScale(
 ) {
   let domain: string[] | number[] = [];
   let scaleColor: string[] = [];
+  const {colors} = range;
 
-  if (scaleType !== 'identity') {
-    const {colorMap, colors} = range;
-
-    if (Array.isArray(colorMap)) {
+  if (scaleType === 'custom') {
+    if (range.uiCustomScaleType === 'logarithmic') {
+      domain = calculateDomain(data, name, 'log10steps', colors.length);
+      scaleColor = colors;
+    } else if (range.colorMap) {
+      const {colorMap} = range;
       colorMap.forEach(([value, color]) => {
         (domain as string[]).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);

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

@@ -13,6 +13,7 @@ import type {
   VisualChannels,
 } from './types.js';
 import {createColorScale, type ScaleType} from './layer-map.js';
+import {getLog10ScaleSteps} from './utils.js';
 
 const UNKNOWN_COLOR = [134, 141, 145];
 
@@ -377,10 +378,11 @@ export function domainFromRasterMetadataBand(
   }
   if (scaleType === 'custom') {
     if (colorRange.uiCustomScaleType === 'logarithmic') {
-      if (colorRange.colorMap) {
-        return colorRange.colorMap?.map(([value]) => value) || [];
-      }
-      return [band.stats.min, band.stats.max];
+      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) || [];

package/src/fetch-map/utils.ts

@@ -85,3 +85,59 @@ export function formatDate(value: string | number | Date): string {
 export function formatTimestamp(value: string | number | Date): string {
   return String(Math.floor(new Date(value).getTime() / 1000));
 }
+
+function roundedPow10(exp: number) {
+  // Math.pow(10, less than 4) generates "0.0...009999999999999999" instead of "0.0...01"
+  // round it ...
+  const raw = Math.pow(10, exp);
+  if (exp < 0) {
+    const shift = Math.pow(10, -exp);
+    return Math.round(raw * shift) / shift;
+  }
+  return raw;
+}
+
+/**
+ * Create domain for D3 threshold scale with logarithmic steps.
+ *
+ * If min is 0, it starts with max and goes down to fill color scale.
+ * If max is Infinity, it starts with 10 and goes up to fill color scale.
+ * Othersise it starts on first power of 10 that is greater than min.
+ *
+ * Generates `steps-1` entries, as this is what d3 threshold scale expects
+ *
+ * @see https://d3js.org/d3-scale/threshold
+ */
+export function getLog10ScaleSteps({
+  min,
+  max,
+  steps,
+}: {
+  min: number;
+  max: number;
+  steps: number;
+}): number[] {
+  if (min === 0) {
+    if (max === Infinity) {
+      // count aggregations have [0, Infinity]
+      // that will yield [10, 100, 1000, ...]
+      return [...Array(steps - 1)].map((_v, i) => roundedPow10(i + 1));
+    }
+    // if stats.min = 0, we only can attempt to start from max and decrease powers until
+    // we use all color buckets ...
+    const maxLog = Math.log10(max);
+    const endExponent = Math.ceil(maxLog);
+    const startExponent = endExponent - steps + 1;
+    return [...Array(steps - 1)].map((_v, i) =>
+      roundedPow10(startExponent + i)
+    );
+  } else {
+    const minLog = Math.log10(min);
+    const startExponent =
+      Math.ceil(minLog) === minLog ? minLog + 1 : Math.ceil(minLog);
+
+    return [...Array(steps - 1)].map((_v, i) =>
+      roundedPow10(startExponent + i)
+    );
+  }
+}

package/src/fetch-map/vec-expr-evaluator.ts

@@ -66,18 +66,6 @@ export function validateVecExprSyntax(
   return validate(parsed, context);
 }
 
-export function createValidationContext(
-  validSymbols: string[]
-): Record<string, unknown> {
-  return validSymbols.reduce(
-    (acc, symbol) => {
-      acc[symbol] = 1;
-      return acc;
-    },
-    {} as Record<string, unknown>
-  );
-}
-
 export type VecExprVecLike =
   | number[]
   | Float32Array