@dra2020/dra-types 1.8.92 → 1.8.93

package/dist/datasets.d.ts

@@ -1,7 +1,10 @@
 export interface DatasetField {
     shortCaption: string;
     longCaption: string;
+    order?: number;
+    isCombo?: boolean;
 }
+export declare function sortFields(f1: DatasetField, f2: DatasetField): number;
 export type DatasetFields = {
     [key: string]: DatasetField;
 };
@@ -31,7 +34,7 @@ export interface Dataset {
     createTime?: string;
     modifyTime?: string;
     deleted?: boolean;
-    published?: boolean;
+    published?: string;
     official?: boolean;
     state?: string;
     datasource?: string;

package/dist/dra-types.js

@@ -257,7 +257,7 @@ 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'));
+    return AggregateEthnicColor(PF.ToGetter(agg, dc, '', dataset), pd, dataset.endsWith('NH'));
 }
 exports.ToAllEthnicColor = ToAllEthnicColor;
 function ToPartisanColorStr(agg, dc, pd) {
@@ -270,21 +270,21 @@ function ToPartisanDistrictColor(agg, dc, pd) {
 exports.ToPartisanDistrictColor = ToPartisanDistrictColor;
 function ToPartisanColor(agg, dc, stops) {
     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, '', PF.DS_PRES2016);
+        const getter20 = PF.ToGetter(agg, dc, '', 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, '', 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, '', dc.primeEDS);
         return AggregatePartisanColorStr(getter, stops);
     }
 }
@@ -346,7 +346,7 @@ function ToEthnicColorStr(agg, dc, pd, detail) {
             break;
         default: break;
     }
-    const getter = PF.ToGetter(agg, dc, dataset);
+    const getter = PF.ToGetter(agg, dc, '', dataset);
     let den = getter(total);
     let num = getter(ethnic);
     if (den === undefined || isNaN(den) || num === undefined || isNaN(num))
@@ -1253,6 +1253,11 @@ exports.StateNameMap = {
 
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.sortFields = void 0;
+function sortFields(f1, f2) {
+    return (f1.order || 0) - (f2.order || 0);
+}
+exports.sortFields = sortFields;
 
 
 /***/ }),
@@ -1372,34 +1377,8 @@ 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.findPackedField = exports.getPackedField = exports.diffPackedFields = exports.aggregatePackedFields = exports.packedCopy = exports.zeroPackedCopy = exports.zeroPackedFields = exports.retrievePackedFields = exports.setPackedFields = exports.hasPackedFields = exports.computePackedFields = exports.computeMetaIndex = exports.fGet = exports.fGetJoined = exports.fieldGetterNotLoaded = exports.DS_PRES2016 = exports.DS_PRES2020 = exports.DS_PVI2016 = exports.PVI2020_Title = exports.DS_PVI2020 = 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.retrievePackedFields = exports.pushedExtPackedFields = exports.featurePushedExtPackedFields = exports.featurePushExtPackedFields = exports.isExtDataset = exports.setPackedFields = exports.hasPackedFields = exports.computePackedFields = exports.computeMetaIndex = exports.fGet = exports.fGetJoined = 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");
-// **** Dataset Codes Explained ****
-// Elections:
-//  EYYGCC, where YY = year and CC = contest [PR, SE, GO, AG]
-//  C16GCO = composite (spans number of years)
-//  PYYGPR = PVI, where YY is year [16, 20]
-// Census/ACS:
-//  DYYF = Census/ACS Total Pop, where YY = year [10, 18, 19, 20]
-//  DYYT = Census/ACS VAP/CVAP, where YY = year [10, 18, 19, 20]
-//  D20FA = Census 2020 Total Prisoner-Adjusted Pop
-//  D20TNH = Census 2020 VAP with Non-Hispanic Alone Race fields
-// **** Dataset Fields Explained ****
-// Elections:
-//  D: Democratic
-//  R: Republican
-//  Tot (Total R + D + Other)
-// Census/ACS/VAP/CVAP:
-//  Tot: total
-//  Wh: White alone, not Hispanic
-//  His: All Hispanics
-//  Bl: Black alone, not Hispanic;              BlC: Black combo, incl Hispanic
-//  Asn: Asian alone, not Hispanic;             AsnC: Asian combo, incl Hispanic
-//  Nat: Native alone, not Hispanic;            NatC: Native combo, incl Hispanic
-//  Pac (also PI): Pacific alone, not Hispanic; PacC: Pacific combo, incl Hispanic
-//  OthAl: Other alone, not Hispanic;           Oth: Other + Two or more races, incl Hispanic
-//  Mix: Two or more races, not Hispanic
-//  AsnPI: Asian + Pacific, not Hispanic
 exports.AGG_DEMOGRAPHIC = 'demographic';
 exports.AGG_DEMOGRAPHIC18 = 'demographic18';
 exports.AGG_pres2008 = 'pres2008';
@@ -1408,13 +1387,12 @@ exports.AGG_pvi = 'pvi';
 exports.DATASET_TYPE_DEMOGRAPHIC = 'demographic';
 exports.DATASET_TYPE_ELECTION = 'election';
 exports.DATASET_TYPE_PVI = 'pvi';
+exports.DATASET_TYPE_OTHER = 'other';
 exports.DS_PVI2020 = 'P20GPR';
 exports.PVI2020_Title = 'PVI 2016/2020';
 exports.DS_PVI2016 = 'P16GPR';
 exports.DS_PRES2020 = 'E20GPR';
 exports.DS_PRES2016 = 'E16GPR';
-function fieldGetterNotLoaded(f) { return undefined; }
-exports.fieldGetterNotLoaded = fieldGetterNotLoaded;
 function fGetJoined(f) {
     return (f.properties && f.properties.joined) ? f.properties.joined : undefined;
 }
@@ -1458,7 +1436,7 @@ function fGetW(f, datasetKey, p) {
     }
     return undefined;
 }
-function computeMetaIndex(meta) {
+function computeMetaIndex(datasetid, meta) {
     if (meta == null)
         return null;
     let offset = 1; // first entry is count of aggregates
@@ -1471,26 +1449,27 @@ function computeMetaIndex(meta) {
         });
         index.fields[datasetKey] = fieldsIndex;
     });
+    let groupindex = { [datasetid]: index };
     index.length = offset;
     index.getDatasetField = (f, dataset, field) => {
         let pf = retrievePackedFields(f);
-        return getPackedField(index, pf, dataset, field);
+        return getPackedField(groupindex, pf, datasetid, dataset, field);
     };
     return index;
 }
 exports.computeMetaIndex = computeMetaIndex;
 let nAlloc = 0;
-function allocPackedFields(length) {
+function allocPackedFieldsArray(length) {
     let ab = new ArrayBuffer(8 * length);
     let af = new Float64Array(ab);
     nAlloc++;
-    //if ((nAlloc % 10000) == 0) console.log(`allocPackedFields: ${nAlloc} allocs`);
+    //if ((nAlloc % 10000) == 0) console.log(`allocPackedFieldsArray: ${nAlloc} allocs`);
     return af;
 }
 function computePackedFields(f, index) {
     if (f.properties.packedFields)
         return f.properties.packedFields;
-    let af = allocPackedFields(index.length);
+    let af = allocPackedFieldsArray(index.length);
     af[0] = 0; // count of number of aggregates
     Object.keys(index.fields).forEach((dataset) => {
         let fields = index.fields[dataset];
@@ -1501,11 +1480,11 @@ function computePackedFields(f, index) {
             af[fields[field]] = n;
         });
     });
-    f.properties.packedFields = af; // cache here
+    f.properties.packedFields = { ['']: af }; // cache here
     f.properties.getDatasetField = index.getDatasetField;
     // Major memory savings to delete this after packing
     delete f.properties.datasets;
-    return af;
+    return f.properties.packedFields;
 }
 exports.computePackedFields = computePackedFields;
 function hasPackedFields(f) {
@@ -1519,6 +1498,58 @@ function setPackedFields(f, pf, fIndex) {
     f.properties.getDatasetField = fIndex.properties.getDatasetField;
 }
 exports.setPackedFields = setPackedFields;
+const reExtDataset = /^.*\.ds$/;
+function isExtDataset(did) {
+    return did && reExtDataset.test(did);
+}
+exports.isExtDataset = isExtDataset;
+function featurePushExtPackedFields(f, datasetid, 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);
+    if (!blocks)
+        return;
+    if (!f.properties.packedFields)
+        throw ('pushExtPackedFields: base datasets should be pushed first');
+    if (card.size != data[0])
+        throw ('pushExtPackedFields: packed fields and block cardinality do not match');
+    if (f.properties.packedFields[datasetid])
+        return; // already pushed
+    let nfields = data[1];
+    let pfa = allocPackedFieldsArray(nfields + 1); // field count
+    pfa[0] = 0;
+    for (let j = 0; j < nfields; j++)
+        pfa[j] = 0;
+    blocks.forEach((blockid) => {
+        if (!card.has(blockid))
+            throw (`pushExtPackedFields: missing blockid ${blockid} in cardinality set`);
+        let x = 2 + (nfields * card.get(blockid));
+        for (let i = 1; i <= nfields; i++)
+            pfa[i] += data[x++];
+    });
+    f.properties.packedFields[datasetid] = pfa;
+}
+exports.featurePushExtPackedFields = featurePushExtPackedFields;
+function featurePushedExtPackedFields(f, datasetid, card) {
+    var _a;
+    if (!f)
+        return true;
+    if (f.features)
+        return featurePushedExtPackedFields(f.features[0], datasetid, card);
+    if (!((_a = f === null || f === void 0 ? void 0 : f.properties) === null || _a === void 0 ? void 0 : _a.blocks) && !card.has(f.properties.id))
+        return true;
+    if (!f.properties.packedFields)
+        return true;
+    return !!f.properties.packedFields[datasetid];
+}
+exports.featurePushedExtPackedFields = featurePushedExtPackedFields;
+function pushedExtPackedFields(pf, datasetids) {
+    if (pf && datasetids)
+        for (let i = 0; i < datasetids.length; i++)
+            if (!pf[datasetids[i]])
+                return false;
+    return !!pf;
+}
+exports.pushedExtPackedFields = pushedExtPackedFields;
 function retrievePackedFields(f) {
     if (f.properties.packedFields === undefined)
         throw 'Feature should have pre-computed packed fields';
@@ -1530,84 +1561,121 @@ exports.retrievePackedFields = retrievePackedFields;
 let abZero = new ArrayBuffer(8);
 let afZero = new Float64Array(abZero);
 afZero[0] = 0;
+let pfZero = { ['']: afZero };
 function zeroPackedFields(index) {
     if (index == null)
-        return afZero;
-    let af = allocPackedFields(index.length);
-    for (let i = 0; i < af.length; i++)
-        af[i] = 0;
-    return af;
+        return pfZero;
+    let pf = {};
+    Object.keys(index).forEach(datasetid => {
+        let af = allocPackedFieldsArray(index[datasetid].length);
+        for (let i = 0; i < af.length; i++)
+            af[i] = 0;
+        pf[datasetid] = af;
+    });
+    return pf;
 }
 exports.zeroPackedFields = zeroPackedFields;
 function zeroPackedCopy(pf) {
     if (pf == null)
-        return afZero;
-    let af = allocPackedFields(pf.length);
-    for (let i = 0; i < af.length; i++)
-        af[i] = 0;
-    return af;
+        return pfZero;
+    let copy = {};
+    Object.keys(pf).forEach(datasetid => {
+        let cf = allocPackedFieldsArray(pf[datasetid].length);
+        for (let i = 0; i < cf.length; i++)
+            cf[i] = 0;
+        copy[datasetid] = cf;
+    });
+    return copy;
 }
 exports.zeroPackedCopy = zeroPackedCopy;
 function packedCopy(pf) {
     if (pf == null)
         return null;
-    let af = allocPackedFields(pf.length);
-    for (let i = 0; i < pf.length; i++)
-        af[i] = pf[i];
-    return af;
+    let copy = {};
+    Object.keys(pf).forEach(datasetid => {
+        let af = pf[datasetid];
+        let cf = allocPackedFieldsArray(af.length);
+        for (let i = 0; i < af.length; i++)
+            cf[i] = af[i];
+        copy[datasetid] = cf;
+    });
+    return copy;
 }
 exports.packedCopy = packedCopy;
 function aggregatePackedFields(agg, pf) {
     if (agg == null || pf == null)
         return agg;
-    if (agg.length != pf.length) {
-        return agg; // bug, but don't crash
-        //throw 'aggregatePackedFields: unexpected length mismatch';
-    }
-    let n = agg.length;
-    for (let i = 1; i < n; i++)
-        agg[i] += pf[i];
-    agg[0]++; // count of number of aggregates
+    Object.keys(agg).forEach(datasetid => {
+        let af = agg[datasetid];
+        let sf = pf[datasetid];
+        if (sf && sf.length == af.length) {
+            let n = af.length;
+            for (let i = 1; i < n; i++)
+                af[i] += sf[i];
+            af[0]++; // count of aggregates
+        }
+    });
     return agg;
 }
 exports.aggregatePackedFields = aggregatePackedFields;
+function aggregateCount(agg) {
+    if (!agg || !agg[''])
+        return 0;
+    return agg[''][0];
+}
+exports.aggregateCount = aggregateCount;
+function decrementPackedFields(agg, pf) {
+    if (agg == null || pf == null)
+        return agg;
+    Object.keys(agg).forEach(datasetid => {
+        let af = agg[datasetid];
+        let sf = pf[datasetid];
+        if (sf && sf.length == af.length) {
+            let n = af.length;
+            for (let i = 1; i < n; i++)
+                af[i] -= sf[i];
+            af[0]++; // count of aggregates
+        }
+    });
+    return agg;
+}
+exports.decrementPackedFields = decrementPackedFields;
 function diffPackedFields(main, parts) {
     main = packedCopy(retrievePackedFields(main));
     if (main == null || parts == null || parts.length == 0)
         return null;
     parts = parts.map(retrievePackedFields);
-    parts.forEach((pf) => {
-        for (let i = 0; i < main.length; i++)
-            main[i] -= pf[i];
-    });
+    parts.forEach((pf) => decrementPackedFields(main, pf));
     return main;
 }
 exports.diffPackedFields = diffPackedFields;
-function getPackedField(index, pf, dataset, field) {
-    if (index == null || pf == null)
+function getPackedField(index, pf, datasetid, dataset, field) {
+    if (!index || !pf || !index[datasetid] || !pf[datasetid])
         return 0;
-    let fields = index.fields[dataset];
-    return fields ? (fields[field] !== undefined ? pf[fields[field]] : 0) : 0;
+    let fields = index[datasetid].fields[dataset];
+    return fields ? (fields[field] !== undefined ? pf[datasetid][fields[field]] : 0) : 0;
 }
 exports.getPackedField = getPackedField;
-function findPackedField(index, pf, dataset, field) {
-    let fields = index.fields[dataset];
+function findPackedField(index, pf, datasetid, dataset, field) {
+    let fields = index[datasetid].fields[dataset];
     return fields ? (fields[field] !== undefined ? fields[field] : -1) : -1;
 }
 exports.findPackedField = findPackedField;
-function ToGetter(agg, dc, datasetKey) {
-    return (field) => { return getPackedField(dc.dsIndex, agg, datasetKey, field); };
+function fieldGetterNotLoaded(f) { return undefined; }
+exports.fieldGetterNotLoaded = fieldGetterNotLoaded;
+function ToGetter(agg, dc, datasetid, datasetKey) {
+    return (field) => { return getPackedField(dc.dsIndex, agg, datasetid, datasetKey, field); };
 }
 exports.ToGetter = ToGetter;
 function ToGetterPvi16(agg, dc, datasetKey) {
     return (field) => {
         if (field === 'R')
-            return Math.round((getPackedField(dc.dsIndex, agg, datasetKey, 'R12') + getPackedField(dc.dsIndex, agg, datasetKey, 'R16')) / 2);
+            return Math.round((getPackedField(dc.dsIndex, agg, '', datasetKey, 'R12') + getPackedField(dc.dsIndex, agg, '', datasetKey, 'R16')) / 2);
         if (field === 'D')
-            return Math.round((getPackedField(dc.dsIndex, agg, datasetKey, 'D12') + getPackedField(dc.dsIndex, agg, datasetKey, 'D16')) / 2);
+            return Math.round((getPackedField(dc.dsIndex, agg, '', datasetKey, 'D12') + getPackedField(dc.dsIndex, agg, '', datasetKey, 'D16')) / 2);
         if (field === 'Tot')
-            return Math.round((getPackedField(dc.dsIndex, agg, datasetKey, 'R12') + getPackedField(dc.dsIndex, agg, datasetKey, 'R16') +
-                getPackedField(dc.dsIndex, agg, datasetKey, 'D12') + getPackedField(dc.dsIndex, agg, datasetKey, 'D16')) / 2);
+            return Math.round((getPackedField(dc.dsIndex, agg, '', datasetKey, 'R12') + getPackedField(dc.dsIndex, agg, '', datasetKey, 'R16') +
+                getPackedField(dc.dsIndex, agg, '', datasetKey, 'D12') + getPackedField(dc.dsIndex, agg, '', datasetKey, 'D16')) / 2);
         return 0;
     };
 }
@@ -1615,12 +1683,12 @@ exports.ToGetterPvi16 = ToGetterPvi16;
 function ToGetterPvi20(agg, dc) {
     return (field) => {
         if (field === 'R')
-            return Math.round((getPackedField(dc.dsIndex, agg, exports.DS_PRES2016, 'R') + getPackedField(dc.dsIndex, agg, exports.DS_PRES2020, 'R')) / 2);
+            return Math.round((getPackedField(dc.dsIndex, agg, '', exports.DS_PRES2016, 'R') + getPackedField(dc.dsIndex, agg, '', exports.DS_PRES2020, 'R')) / 2);
         if (field === 'D')
-            return Math.round((getPackedField(dc.dsIndex, agg, exports.DS_PRES2016, 'D') + getPackedField(dc.dsIndex, agg, exports.DS_PRES2020, 'D')) / 2);
+            return Math.round((getPackedField(dc.dsIndex, agg, '', exports.DS_PRES2016, 'D') + getPackedField(dc.dsIndex, agg, '', exports.DS_PRES2020, 'D')) / 2);
         if (field === 'Tot')
-            return Math.round((getPackedField(dc.dsIndex, agg, exports.DS_PRES2016, 'R') + getPackedField(dc.dsIndex, agg, exports.DS_PRES2020, 'R') +
-                getPackedField(dc.dsIndex, agg, exports.DS_PRES2016, 'D') + getPackedField(dc.dsIndex, agg, exports.DS_PRES2020, 'D')) / 2);
+            return Math.round((getPackedField(dc.dsIndex, agg, '', exports.DS_PRES2016, 'R') + getPackedField(dc.dsIndex, agg, '', exports.DS_PRES2020, 'R') +
+                getPackedField(dc.dsIndex, agg, '', exports.DS_PRES2016, 'D') + getPackedField(dc.dsIndex, agg, '', exports.DS_PRES2020, 'D')) / 2);
         return 0;
     };
 }
@@ -1630,12 +1698,12 @@ function calcShift(agg, dc, datasetOld, datasetNew) {
         ToGetterPvi16(agg, dc, datasetOld) :
         datasetOld === exports.DS_PVI2020 ?
             ToGetterPvi20(agg, dc) :
-            ToGetter(agg, dc, datasetOld);
+            ToGetter(agg, dc, '', 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, '', datasetNew);
     // Calc two-party Swing
     const repOld = getterOld('R');
     const demOld = getterOld('D');