@dra2020/dra-types 1.8.109 → 1.8.111

package/lib/colormgr.ts

@@ -1,7 +1,7 @@
 // App libraries
 import * as PF from "./packedfields";
-import {isColorBy, parseColorBy} from './datasets';
-import {Util, Colors} from '@dra2020/baseclient'
+import {isColorBy, parseColorBy, DatasetColor, DatasetFormat} from './datasets';
+import {Util, Colors, Detail} from '@dra2020/baseclient'
 
 // All Groups Mosaic has 16 colors
 // Index values into the 16 colors
@@ -531,39 +531,63 @@ export interface DistrictColorParams
   colorDistrictsBy: string,
 }
 
+function safeNumber(n: any): number { n = Number(n); return typeof n !== 'number' || isNaN(n) ? 0 : n }
+function safeStops(s: string): number[]
+{
+  if (!s) return EthnicFewStops;
+  return s.split(',').map(safeNumber);
+}
+function safeColors(s: string): string[]
+{
+  if (!s) return ['#fafafa', '#aaaaaa', '#666666', '#111111'];
+  return s.split(',').map(s => s.trim());
+}
+
 export function ToExtendedColor(agg: PF.PackedFields, dc: PF.DatasetContext, colorBy: string): string
 {
   // compute pct
   const {datasetid, field} = parseColorBy(colorBy);
-  if (!datasetid || !field || !dc.dsMeta || !dc.dsMeta[datasetid] || !dc.dsMeta[datasetid]?.fields[field]) return '#ffffff';
+  if (!datasetid || !field || !dc.dsMeta || !dc.dsMeta[datasetid])
+    return '#ffffff';
   const meta = dc.dsMeta[datasetid];
-  let getter = PF.ToGetter(agg, dc, datasetid, datasetid);
-  let fields = PF.sortedFieldList(meta);
-  let den = 0;
-  if (meta.fields['Tot'])
-    den = getter('Tot');
-  else
-    fields.forEach(f => { den += getter(f) });
-  let num = 0;
-  let dfield = meta.fields[field];
-  if (dfield.colorBySum)
-    for (let i = 0; i < fields.length; i++)
+  const dsfield = meta.fields ? meta.fields[field] : null;
+  const dscolor = meta.colors ? meta.colors.find((c: DatasetColor) => c.shortCaption === field) : null;
+  if (!dsfield && !dscolor)
+    return '#ffffff';
+  if (dscolor)
+  {
+    let stops = safeStops(dscolor.stops);
+    let colors = safeColors(dscolor.colors);
+    if (stops.length != colors.length)
     {
-      num += getter(fields[i]);
-      if (fields[i] === field)
-        break;
+      stops = EthnicFewStops;
+      colors = safeColors('');
     }
+    let o: any = {};
+    let getter = PF.ToGetter(agg, dc, datasetid, datasetid);
+    Object.keys(meta.fields).forEach(f => o[f] = getter(f));
+    let formatter = new Detail.FormatDetail(dscolor.expr);
+    let result = formatter.format(Detail.FormatDetail.prepare(o));
+    let intensity = Math.min(Math.max(result.n || 0, 0), 1);
+    return Util.execGradient(makeStops(stops, colors), intensity);
+  }
   else
-    num = getter(field);
-
-  // Careful...
-  if (den == 0 || den === undefined || isNaN(den) || num === undefined || isNaN(num))
-    return '#ffffff';
-
-  const pct = dfield.invert ? 1 - (num / den) : num / den;
-  const color = Util.execGradient(makeStops(EthnicFewStops, Colors.EthnicFewClassicColors), pct);
-
-  return color;
+  {
+    let getter = PF.ToGetter(agg, dc, datasetid, datasetid);
+    let fields = PF.sortedFieldList(meta);
+    let den = 0;
+    if (meta.fields['Tot'])
+      den = getter('Tot');
+    else
+      fields.forEach(f => { den += getter(f) });
+    let num = getter(field);
+
+    // Careful...
+    if (den == 0 || den === undefined || isNaN(den) || num === undefined || isNaN(num))
+      return '#ffffff';
+
+    return Util.execGradient(makeStops(EthnicFewStops, Colors.EthnicFewClassicColors), num / den);
+  }
 }
 
 export function computeDistrictColors(params: DistrictColorParams): DistrictCache[]

package/lib/datasets.ts

@@ -8,9 +8,6 @@ export interface DatasetField
   order?: number,        // For ordering fields in UI
   isCombo?: boolean,     // Built-in, for census combos
   colorBy?: boolean,     // For extended datasets, display in UI
-  invert?: boolean,      // For extended datasets, colorby intensity inverted
-  colorBySum?: boolean,  // For extended datasets, colorby sums up all fields up to this one (e.g. to show "Poverty Level")
-  colorLabel?: string,   // For extended datasets, provides label for coloring dropdown
   sumOf?: string[],      // Only for import processing
 }
 export function sortFields(f1: DatasetField, f2: DatasetField): number
@@ -45,8 +42,21 @@ export function isColorBy(colorby: string): boolean
 //  'Asn', 'Pac', 'OthAl', 'Mix', 'BlC', 'NatC', 'AsnC', 'PacC', 
 export type DatasetFields = { [key: string]: DatasetField };
 
-export type DatasetColor = { intensity: string, colors: string, stops: string };
-export type DatasetColors = { [key: string]: DatasetColor };
+export interface DatasetColor {
+  shortCaption: string,
+  longCaption: string,
+  expr: string,
+  colors: string,
+  stops: string,
+  };
+export type DatasetColors = DatasetColor[];
+
+export interface DatasetFormat {
+  shortCaption: string,
+  longCaption: string,
+  expr: string,
+  };
+export type DatasetFormats = DatasetFormat[];
 
 export interface DatasetMeta
 {
@@ -61,9 +71,8 @@ export interface DatasetMeta
   privateKey?: string,                  // Old-style semi-private datasets
   members?: { [key: number]: string },  // For composites, specifies 
   fields?: DatasetFields,
-  detailFormat?: string,                // Optional formatting string for detail results
-  detailTooltip?: string,               // Optional tooltips for detailFormat results, separated by newline or ';'
   colors?: DatasetColors,               // Optional colorby expressions
+  formats?: DatasetFormats,             // Optional format expressions
 }
 
 export type DatasetsMeta = { [dataset: string]: DatasetMeta };
@@ -84,6 +93,7 @@ export interface Dataset
   datasource?: string,
   dotmap?: boolean,
   blobid?: string,
+  dataid?: string,
   meta?: DatasetsMeta,
   groups?: G.GroupMapIndex,
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/dra-types",
-  "version": "1.8.109",
+  "version": "1.8.111",
   "description": "Shared types used between client, server and tools.",
   "main": "dist/dra-types.js",
   "types": "./dist/all.d.ts",
@@ -34,7 +34,7 @@
     "webpack-cli": "^5.1.4"
   },
   "dependencies": {
-    "@dra2020/baseclient": "^1.0.127",
+    "@dra2020/baseclient": "^1.0.132",
     "geojson": "^0.5.0",
     "object-hash": "^3.0.0"
   }