@dra2020/dra-types 1.8.127 → 1.8.129

package/lib/colormgr.ts

@@ -174,7 +174,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
   const did = PF.toDatasetID(dataset);
-  return AggregateEthnicColor(PF.ToGetter(agg, dc, did, dataset), pd, dataset.endsWith('NH'));
+  const builtin = dc.dsMeta[did]?.builtin || dataset;
+  return AggregateEthnicColor(PF.ToGetter(agg, dc, did, dataset), pd, builtin.endsWith('NH'));
 }
 
 export function ToPartisanColorStr(agg: PF.PackedFields, dc: PF.DatasetContext, pd: PaletteDefaults): string
@@ -241,6 +242,7 @@ export function ToEthnicColorStr(agg: PF.PackedFields, dc: PF.DatasetContext, pd
   let bInvert: boolean = false;
   const dataset = dc.primeVDS ? dc.primeVDS : dc.primeDDS;
   const did = PF.toDatasetID(dataset);
+  const builtin = dc.dsMeta[did]?.builtin || dataset;
   switch (detail)
   {
     case null: case '': case 'all':
@@ -248,12 +250,12 @@ export function ToEthnicColorStr(agg: PF.PackedFields, dc: PF.DatasetContext, pd
       return c >= 0 ? ethnicBackgroundColor(c, pd) : '#ffffff';
     case 'white': ethnic = 'Wh'; break;
     case 'nonwhite': ethnic = 'Wh'; bInvert = true; break;
-    case 'black': ethnic = dataset.endsWith('NH') ? 'Bl' : 'BlC'; break;
+    case 'black': ethnic = builtin.endsWith('NH') ? 'Bl' : 'BlC'; break;
     case 'hisp': ethnic = 'His'; break;
-    case 'native': ethnic = dataset.endsWith('NH') ? 'Nat' : 'NatC'; break;
+    case 'native': ethnic = builtin.endsWith('NH') ? 'Nat' : 'NatC'; break;
     case 'asianpi': ethnic = 'AsnPI'; break;
-    case 'asian': ethnic = dataset.endsWith('NH') ? 'Asn' : 'AsnC'; break;
-    case 'pac': ethnic = dataset.endsWith('NH') ? 'Pac' : 'PacC'; break;
+    case 'asian': ethnic = builtin.endsWith('NH') ? 'Asn' : 'AsnC'; break;
+    case 'pac': ethnic = builtin.endsWith('NH') ? 'Pac' : 'PacC'; break;
     case 'other': ethnic = 'OthAl'; break;
     case 'mix': ethnic = 'Mix'; break;
     default: break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/dra-types",
-  "version": "1.8.127",
+  "version": "1.8.129",
   "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.146",
+    "@dra2020/baseclient": "^1.0.147",
     "geojson": "^0.5.0",
     "object-hash": "^3.0.0"
   }

package/dist/colordata.d.ts

@@ -1,35 +0,0 @@
-export declare const DefaultColorNames: string[];
-export interface ColorLookup {
-    [key: string]: string;
-}
-export declare const ColorValues: ColorLookup;
-export declare const ColorBySolidWhite = 0;
-export declare const ColorBySolidBlack = 1;
-export declare const ColorBySolidHispanic = 2;
-export declare const ColorBySolidAsian = 3;
-export declare const ColorByMostlyWhite = 4;
-export declare const ColorByMostlyBlack = 5;
-export declare const ColorByMostlyHispanic = 6;
-export declare const ColorByMostlyAsian = 7;
-export declare const ColorByMostlyNative = 8;
-export declare const ColorByMix = 9;
-export declare const ColorByHispanicWhite = 10;
-export declare const ColorByBlackWhite = 11;
-export declare const ColorByHispanicBlack = 12;
-export declare const ColorByAsianWhite = 13;
-export declare const ColorByAsianHispanic = 14;
-export declare const ColorByBlackAsian = 15;
-export declare const EthnicBackgroundColor: string[];
-export declare const EthnicTextColor: string[];
-export declare const EthnicLabel: string[];
-export declare const ColorByGreatR = 0;
-export declare const ColorByGoodR = 1;
-export declare const ColorByFairR = 2;
-export declare const ColorByEven = 3;
-export declare const ColorByFairD = 4;
-export declare const ColorByGoodD = 5;
-export declare const ColorByGreatD = 6;
-export declare const ElectionBackgroundColor: string[];
-export declare const ElectionTextColor: string[];
-export declare const ElectionLabel: string[];
-export declare let IntensityBackgroundColor: string[];

package/dist/gencolor.d.ts

@@ -1 +0,0 @@
-export declare function genColor(i: number, useFirstColor: boolean): string;