@dra2020/dra-types 1.8.101 → 1.8.103

package/dist/dra-types.js

@@ -258,7 +258,8 @@ exports.ethnicBackgroundColor = ethnicBackgroundColor;
 function ToAllEthnicColor(agg, dc, pd) {
     // Use VAP/CVAP if it exists
     const dataset = 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'));
 }
 exports.ToAllEthnicColor = ToAllEthnicColor;
 function ToPartisanColorStr(agg, dc, pd) {
@@ -270,22 +271,23 @@ function ToPartisanDistrictColor(agg, dc, pd) {
 }
 exports.ToPartisanDistrictColor = ToPartisanDistrictColor;
 function ToPartisanColor(agg, dc, stops) {
+    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 = ColorFromRGBPcts((1 - pviRaw / 100), 0, pviRaw / 100, stops);
         //console.log('Pvi (r, d, color): (' + (1 - pviRaw/100) + ', ' + pviRaw/100 + ', ' + color + ')');
         return color;
     }
     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 = 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);
     }
 }
@@ -308,6 +310,7 @@ function ToEthnicColorStr(agg, dc, pd, detail) {
     let total = 'Tot';
     let bInvert = false;
     const dataset = dc.primeVDS ? dc.primeVDS : dc.primeDDS;
+    const did = PF.toDatasetID(dataset);
     switch (detail) {
         case null:
         case '':
@@ -347,7 +350,7 @@ function ToEthnicColorStr(agg, dc, pd, detail) {
             break;
         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))
@@ -1433,7 +1436,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.pvi2020Str = exports.calcRaw2020Pvi = exports.pviStr = exports.calcRawPvi = exports.calcShift = exports.ToGetterPvi20 = exports.ToGetterPvi16 = exports.ToGetter = exports.fieldGetterNotLoaded = exports.findPackedField = exports.getPackedField = exports.diffPackedFields = exports.decrementPackedFields = exports.aggregateCount = exports.aggregatePackedFields = exports.packedCopy = exports.zeroPackedCopy = exports.zeroPackedFields = exports.retrievePackedIndex = exports.retrievePackedFields = exports.pushedExtPackedFields = exports.featurePushedExtPackedFields = exports.featurePushExtPackedFields = exports.isExtDataset = exports.setPackedFields = exports.hasPackedFields = exports.computePackedFields = exports.computeMetaIndex = exports.sortedFieldList = exports.fGet = exports.DS_PRES2016 = exports.DS_PRES2020 = exports.DS_PVI2016 = exports.PVI2020_Title = exports.DS_PVI2020 = exports.DATASET_TYPE_OTHER = exports.DATASET_TYPE_PVI = exports.DATASET_TYPE_ELECTION = exports.DATASET_TYPE_DEMOGRAPHIC = exports.AGG_pvi = exports.AGG_pres2016 = exports.AGG_pres2008 = exports.AGG_DEMOGRAPHIC18 = exports.AGG_DEMOGRAPHIC = void 0;
+exports.pvi2020Str = exports.calcRaw2020Pvi = exports.pviStr = exports.calcRawPvi = exports.calcShift = exports.ToGetterPvi20 = exports.ToGetterPvi16 = exports.ToGetter = exports.fieldGetterNotLoaded = exports.findPackedField = exports.getPackedField = exports.diffPackedFields = exports.decrementPackedFields = exports.aggregateCount = exports.aggregatePackedFields = exports.packedCopy = exports.zeroPackedCopy = exports.zeroPackedFields = exports.retrievePackedIndex = exports.retrievePackedFields = exports.pushedExtPackedFields = exports.featurePushedExtPackedFields = exports.featurePushExtPackedFields = exports.toDatasetID = exports.isExtDataset = exports.setPackedFields = exports.hasPackedFields = exports.computePackedFields = exports.computeMetaIndex = exports.sortedFieldList = exports.fGet = exports.DS_PRES2016 = exports.DS_PRES2020 = exports.DS_PVI2016 = exports.PVI2020_Title = exports.DS_PVI2020 = exports.DATASET_TYPE_OTHER = exports.DATASET_TYPE_PVI = exports.DATASET_TYPE_ELECTION = exports.DATASET_TYPE_DEMOGRAPHIC = exports.AGG_pvi = exports.AGG_pres2016 = exports.AGG_pres2008 = exports.AGG_DEMOGRAPHIC18 = exports.AGG_DEMOGRAPHIC = void 0;
 const baseclient_1 = __webpack_require__(/*! @dra2020/baseclient */ "@dra2020/baseclient");
 exports.AGG_DEMOGRAPHIC = 'demographic';
 exports.AGG_DEMOGRAPHIC18 = 'demographic18';
@@ -1492,7 +1495,7 @@ function computeMetaIndex(datasetid, meta) {
     index.getDatasetField = (f, dataset, field) => {
         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;
@@ -1545,6 +1548,10 @@ function isExtDataset(did) {
     return did && reExtDataset.test(did);
 }
 exports.isExtDataset = isExtDataset;
+function toDatasetID(datasetKey) {
+    return isExtDataset(datasetKey) ? datasetKey : '';
+}
+exports.toDatasetID = toDatasetID;
 function featurePushExtPackedFields(f, datasetid, index, data, card) {
     var _a;
     let blocks = ((_a = f === null || f === void 0 ? void 0 : f.properties) === null || _a === void 0 ? void 0 : _a.blocks) || (card.has(f.properties.id) ? [f.properties.id] : null);
@@ -1743,16 +1750,18 @@ function ToGetterPvi20(agg, dc) {
 }
 exports.ToGetterPvi20 = ToGetterPvi20;
 function calcShift(agg, dc, datasetOld, datasetNew) {
+    const didOld = toDatasetID(datasetOld);
+    const didNew = toDatasetID(datasetNew);
     const getterOld = datasetOld === exports.DS_PVI2016 ?
         ToGetterPvi16(agg, dc, datasetOld) :
         datasetOld === exports.DS_PVI2020 ?
             ToGetterPvi20(agg, dc) :
-            ToGetter(agg, dc, '', datasetOld);
+            ToGetter(agg, dc, didOld, datasetOld);
     const getterNew = datasetNew === exports.DS_PVI2016 ?
         ToGetterPvi16(agg, dc, datasetNew) :
         datasetNew === exports.DS_PVI2020 ?
             ToGetterPvi20(agg, dc) :
-            ToGetter(agg, dc, '', datasetNew);
+            ToGetter(agg, dc, didNew, datasetNew);
     // Calc two-party Swing
     const repOld = getterOld('R');
     const demOld = getterOld('D');