[colorscale] add very basic custom threshold scale support

GeoDaCenter · Jan 20, 2024 · 166ad0e · 166ad0e
1 parent f35cd60
commit 166ad0e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/constants/src/default-settings.ts b/src/constants/src/default-settings.ts
@@ -8,6 +8,7 @@ import {
   scaleQuantize,
   scaleQuantile,
   scaleOrdinal,
+  scaleThreshold,
   scaleSqrt,
   scaleLog,
   scalePoint
@@ -391,7 +392,10 @@ export const SCALE_TYPES = keyMirror({
   log: null,
 
   // ordinal domain to linear range
-  point: null
+  point: null,
+
+  // custom domain to custom range
+  custom: null
 });
 
 export const SCALE_FUNC = {
@@ -401,7 +405,8 @@ export const SCALE_FUNC = {
   [SCALE_TYPES.ordinal]: scaleOrdinal,
   [SCALE_TYPES.sqrt]: scaleSqrt,
   [SCALE_TYPES.log]: scaleLog,
-  [SCALE_TYPES.point]: scalePoint
+  [SCALE_TYPES.point]: scalePoint,
+  [SCALE_TYPES.custom]: scaleThreshold
 };
 
 export const ALL_FIELD_TYPES = keyMirror({
@@ -586,7 +591,7 @@ export const AGGREGATION_TYPE_OPTIONS: {id: string; label: string}[] = Object.en
 }));
 
 export const linearFieldScaleFunctions = {
-  [CHANNEL_SCALES.color]: [SCALE_TYPES.quantize, SCALE_TYPES.quantile],
+  [CHANNEL_SCALES.color]: [SCALE_TYPES.quantize, SCALE_TYPES.quantile, SCALE_TYPES.custom],
   [CHANNEL_SCALES.radius]: [SCALE_TYPES.sqrt],
   [CHANNEL_SCALES.size]: [SCALE_TYPES.linear, SCALE_TYPES.sqrt, SCALE_TYPES.log]
 };

diff --git a/src/layers/src/base-layer.ts b/src/layers/src/base-layer.ts
@@ -896,11 +896,19 @@ class Layer {
         cMap.set(k, typeof v === 'string' ? hexToRgb(v) : v);
       });
 
-      const scale = SCALE_FUNC[SCALE_TYPES.ordinal]()
+      // custom threshold color scale
+      if (colorScale === SCALE_TYPES.custom) {
+        return SCALE_FUNC[SCALE_TYPES.custom]()
+          .domain(cMap.keys())
+          .range(cMap.values())
+          .unknown(cMap.get(UNKNOWN_COLOR_KEY) || NO_VALUE_COLOR);
+      }
+
+      // custom ordinal (unique values) color scale
+      return SCALE_FUNC[SCALE_TYPES.ordinal]()
         .domain(cMap.keys())
         .range(cMap.values())
         .unknown(cMap.get(UNKNOWN_COLOR_KEY) || NO_VALUE_COLOR);
-      return scale;
     }
     return this.getVisChannelScale(colorScale, colorDomain, colorRange.colors.map(hexToRgb));
   }