@dra2020/dra-types 1.8.99 → 1.8.101

package/dist/packedfields.d.ts

@@ -50,12 +50,10 @@ export interface PrimaryDatasetKeys {
 }
 export interface DatasetContext {
     dsIndex: GroupPackedMetaIndex;
+    dsMeta: DatasetsMeta;
     primeDDS: string;
     primeVDS: string;
     primeEDS: string;
-    datasetMetaDDS: DatasetMeta;
-    datasetMetaVDS: DatasetMeta;
-    datasetMetaEDS: DatasetMeta;
 }
 export type DSListItem = {
     key: string;

package/lib/colormgr.ts

@@ -1,5 +1,6 @@
 // App libraries
 import * as PF from "./packedfields";
+import {isColorBy, parseColorBy} from './datasets';
 import {Util, Colors} from '@dra2020/baseclient'
 
 // All Groups Mosaic has 16 colors
@@ -504,6 +505,7 @@ export interface DistrictCache
 {
   colorElection?: string;
   colorEthnic?: string;
+  colorExtended?: string;
   colorSolid?: string;
 }
 
@@ -525,6 +527,41 @@ export interface DistrictColorParams
   colorDistrictsBy: string,
 }
 
+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';
+  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++)
+    {
+      num += getter(fields[i]);
+      if (fields[i] === field)
+        break;
+    }
+  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;
+}
+
 export function computeDistrictColors(params: DistrictColorParams): DistrictCache[]
 {
   let dcNew: DistrictCache[] = [];
@@ -554,7 +591,13 @@ export function computeDistrictColors(params: DistrictColorParams): DistrictCach
         dc.colorSolid = dc.colorEthnic;
         break;
       default:
-        dc.colorSolid = mapColor;
+        if (isColorBy(params.colorDistrictsBy))
+        {
+          dc.colorExtended = ToExtendedColor(agg, params.datasetContext, params.colorDistrictsBy);
+          dc.colorSolid = dc.colorExtended;
+        }
+        else
+          dc.colorSolid = mapColor;
         break;
     }
     dcNew.push(dc);

package/lib/datasets.ts

@@ -31,6 +31,12 @@ export function parseColorBy(colorby: string): { datasetid: string, field: strin
   return { datasetid: '', field: '' };
 }
 
+export function isColorBy(colorby: string): boolean
+{
+  let {datasetid, field} = parseColorBy(colorby);
+  return !!datasetid && !!field;
+}
+
 // For Partisan fields, expect keys of 'D', 'R' and 'Tot'
 // For Demographic Fields, expect keys of 'Tot', 'Wh', 'Bl', 'His', 'AsnPI', 'Nat', 'Oth',
 //  'Asn', 'Pac', 'OthAl', 'Mix', 'BlC', 'NatC', 'AsnC', 'PacC', 

package/lib/packedfields.ts

@@ -95,12 +95,13 @@ export interface PrimaryDatasetKeys
 export interface DatasetContext
 {
   dsIndex: GroupPackedMetaIndex;
+  dsMeta: DatasetsMeta;
   primeDDS: string;     // Demographic (Census)
   primeVDS: string;     // VAP/CVAP
   primeEDS: string;     // Election
-  datasetMetaDDS: DatasetMeta;
-  datasetMetaVDS: DatasetMeta;
-  datasetMetaEDS: DatasetMeta;
+  //datasetMetaDDS: DatasetMeta;
+  //datasetMetaVDS: DatasetMeta;
+  //datasetMetaEDS: DatasetMeta;
 }
 
 // Dataset Lists

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/dra-types",
-  "version": "1.8.99",
+  "version": "1.8.101",
   "description": "Shared types used between client, server and tools.",
   "main": "dist/dra-types.js",
   "types": "./dist/all.d.ts",