@dra2020/dra-types 1.8.100 → 1.8.102

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;
@@ -76,6 +74,7 @@ export declare function computePackedFields(f: any, index: PackedMetaIndex): Pac
 export declare function hasPackedFields(f: any): boolean;
 export declare function setPackedFields(f: any, pf: PackedFields, fIndex: any): void;
 export declare function isExtDataset(did: string): boolean;
+export declare function toDatasetID(datasetKey: string): string;
 export type ExtPackedFields = Uint32Array;
 export type ExtBlockCardinality = Map<string, number>;
 export declare function featurePushExtPackedFields(f: any, datasetid: string, index: PackedMetaIndex, data: ExtPackedFields, card: ExtBlockCardinality): void;

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
@@ -172,7 +173,8 @@ export function ToAllEthnicColor(agg: PF.PackedFields, dc: PF.DatasetContext, pd
 {
   // Use VAP/CVAP if it exists
   const dataset: string = dc.primeVDS ? dc.primeVDS : dc.primeDDS
-  return AggregateEthnicColor(PF.ToGetter(agg, dc, '', dataset), pd, dataset.endsWith('NH'));
+  const did = PF.toDatasetID(dataset);
+  return AggregateEthnicColor(PF.ToGetter(agg, dc, did, dataset), pd, dataset.endsWith('NH'));
 }
 
 export function ToPartisanColorStr(agg: PF.PackedFields, dc: PF.DatasetContext, pd: PaletteDefaults): string
@@ -187,10 +189,12 @@ export function ToPartisanDistrictColor(agg: PF.PackedFields, dc: PF.DatasetCont
 
 function ToPartisanColor(agg: PF.PackedFields, dc: PF.DatasetContext, stops: Util.GradientStops): string
 {
+  const did = PF.toDatasetID(dc.primeEDS);
+
   if (dc.primeEDS === PF.DS_PVI2020)
   {
-    const getter16 = PF.ToGetter(agg, dc, '', PF.DS_PRES2016);
-    const getter20 = PF.ToGetter(agg, dc, '', PF.DS_PRES2020);
+    const getter16 = PF.ToGetter(agg, dc, did, PF.DS_PRES2016);
+    const getter20 = PF.ToGetter(agg, dc, did, PF.DS_PRES2020);
 
     const pviRaw = PF.calcRaw2020Pvi(getter16, getter20);
     const color: string = ColorFromRGBPcts((1 - pviRaw / 100), 0, pviRaw / 100, stops);
@@ -199,14 +203,14 @@ function ToPartisanColor(agg: PF.PackedFields, dc: PF.DatasetContext, stops: Uti
   }
   else if (dc.primeEDS === PF.DS_PVI2016)
   {
-    const getter = PF.ToGetter(agg, dc, '', dc.primeEDS);
+    const getter = PF.ToGetter(agg, dc, did, dc.primeEDS);
     const pviRaw = PF.calcRawPvi(getter);
     const color: string = ColorFromRGBPcts((1 - pviRaw/100), 0, pviRaw/100, stops);
     return color;
   }
   else
   {
-    const getter = PF.ToGetter(agg, dc, '', dc.primeEDS);
+    const getter = PF.ToGetter(agg, dc, did, dc.primeEDS);
     return AggregatePartisanColorStr(getter, stops);
   }
 }
@@ -233,6 +237,7 @@ export function ToEthnicColorStr(agg: PF.PackedFields, dc: PF.DatasetContext, pd
   let total: string = 'Tot';
   let bInvert: boolean = false;
   const dataset = dc.primeVDS ? dc.primeVDS : dc.primeDDS;
+  const did = PF.toDatasetID(dataset);
   switch (detail)
   {
     case null: case '': case 'all':
@@ -251,7 +256,7 @@ export function ToEthnicColorStr(agg: PF.PackedFields, dc: PF.DatasetContext, pd
     default: break;
   }
 
-  const getter = PF.ToGetter(agg, dc, '', dataset);
+  const getter = PF.ToGetter(agg, dc, did, dataset);
   let den = getter(total);
   let num = getter(ethnic);
   if (den === undefined || isNaN(den) || num === undefined || isNaN(num))
@@ -504,6 +509,7 @@ export interface DistrictCache
 {
   colorElection?: string;
   colorEthnic?: string;
+  colorExtended?: string;
   colorSolid?: string;
 }
 
@@ -525,6 +531,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 +595,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/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
@@ -229,6 +230,11 @@ export function isExtDataset(did: string): boolean
   return did && reExtDataset.test(did);
 }
 
+export function toDatasetID(datasetKey: string): string
+{
+  return isExtDataset(datasetKey) ? datasetKey : '';
+}
+
 export type ExtPackedFields = Uint32Array; // [nblocks][nfields][fields]...
 export type ExtBlockCardinality = Map<string, number>;
 

package/package.json

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