@dra2020/dra-types 1.8.101 → 1.8.103

package/dist/packedfields.d.ts

@@ -74,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

@@ -173,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
@@ -188,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);
@@ -200,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);
   }
 }
@@ -234,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':
@@ -252,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))

package/lib/packedfields.ts

@@ -171,7 +171,7 @@ export function computeMetaIndex(datasetid: string, meta: DatasetsMeta): PackedM
   index.getDatasetField = (f: any, dataset: string, field: string): number => {
       let pf = retrievePackedFields(f);
       let groupindex = retrievePackedIndex(f);
-      let datasetid = dataset.length > 20 ? dataset : ''; // hack - extended datasets use 26 char guids, built-in ones are short
+      let datasetid = toDatasetID(dataset);
       return getPackedField(groupindex, pf, datasetid, dataset, field);
     };
   return index;
@@ -230,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>;
 
@@ -444,16 +449,18 @@ export function ToGetterPvi20(agg: PackedFields, dc: DatasetContext): FieldGette
 
 export function calcShift(agg: PackedFields, dc: DatasetContext, datasetOld: string, datasetNew: string): number
 {
+  const didOld = toDatasetID(datasetOld);
+  const didNew = toDatasetID(datasetNew);
   const getterOld = datasetOld === DS_PVI2016 ?
     ToGetterPvi16(agg, dc, datasetOld) :
     datasetOld === DS_PVI2020 ?
       ToGetterPvi20(agg, dc) :
-      ToGetter(agg, dc, '', datasetOld);
+      ToGetter(agg, dc, didOld, datasetOld);
   const getterNew = datasetNew === DS_PVI2016 ?
     ToGetterPvi16(agg, dc, datasetNew) :
     datasetNew === DS_PVI2020 ?
       ToGetterPvi20(agg, dc) :
-      ToGetter(agg, dc, '', datasetNew);
+      ToGetter(agg, dc, didNew, datasetNew);
 
   // Calc two-party Swing
   const repOld = getterOld('R');

package/package.json

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