@dra2020/dra-types 1.8.120 → 1.8.122
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/datasets.d.ts +2 -1
- package/dist/dra-types.js +41 -7
- package/dist/dra-types.js.map +1 -1
- package/dist/packedfields.d.ts +4 -0
- package/lib/datasets.ts +2 -1
- package/lib/packedfields.ts +46 -6
- package/package.json +2 -2
package/dist/datasets.d.ts
CHANGED
|
@@ -50,6 +50,7 @@ export interface DatasetMeta {
|
|
|
50
50
|
colors?: DatasetColors;
|
|
51
51
|
formats?: DatasetFormats;
|
|
52
52
|
displayPercent?: boolean;
|
|
53
|
+
hideHeading?: boolean;
|
|
53
54
|
}
|
|
54
55
|
export type DatasetsMeta = {
|
|
55
56
|
[dataset: string]: DatasetMeta;
|
|
@@ -66,7 +67,7 @@ export interface Dataset {
|
|
|
66
67
|
expungeDate?: string;
|
|
67
68
|
published?: string;
|
|
68
69
|
official?: boolean;
|
|
69
|
-
builtin?:
|
|
70
|
+
builtin?: string;
|
|
70
71
|
state?: string;
|
|
71
72
|
datasource?: string;
|
|
72
73
|
dotmap?: boolean;
|
package/dist/dra-types.js
CHANGED
|
@@ -1549,7 +1549,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
|
1549
1549
|
|
|
1550
1550
|
|
|
1551
1551
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
1552
|
-
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;
|
|
1552
|
+
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.clearPackedFields = exports.computeOnePackedFields = exports.computePackedFields = exports.initPackedFields = exports.computeMetaIndex = exports.getDatasetField = 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;
|
|
1553
1553
|
const baseclient_1 = __webpack_require__(/*! @dra2020/baseclient */ "@dra2020/baseclient");
|
|
1554
1554
|
exports.AGG_DEMOGRAPHIC = 'demographic';
|
|
1555
1555
|
exports.AGG_DEMOGRAPHIC18 = 'demographic18';
|
|
@@ -1591,6 +1591,13 @@ function sortedFieldList(ds) {
|
|
|
1591
1591
|
return kv.map(kv => kv.k);
|
|
1592
1592
|
}
|
|
1593
1593
|
exports.sortedFieldList = sortedFieldList;
|
|
1594
|
+
function getDatasetField(f, dataset, field) {
|
|
1595
|
+
let pf = retrievePackedFields(f);
|
|
1596
|
+
let dxGroup = retrievePackedIndex(f);
|
|
1597
|
+
let did = toDatasetID(dataset);
|
|
1598
|
+
return getPackedField(dxGroup, pf, did, dataset, field);
|
|
1599
|
+
}
|
|
1600
|
+
exports.getDatasetField = getDatasetField;
|
|
1594
1601
|
function computeMetaIndex(datasetid, meta) {
|
|
1595
1602
|
if (meta == null)
|
|
1596
1603
|
return null;
|
|
@@ -1605,12 +1612,7 @@ function computeMetaIndex(datasetid, meta) {
|
|
|
1605
1612
|
index.fields[datasetKey] = fieldsIndex;
|
|
1606
1613
|
});
|
|
1607
1614
|
index.length = offset;
|
|
1608
|
-
index.getDatasetField =
|
|
1609
|
-
let pf = retrievePackedFields(f);
|
|
1610
|
-
let groupindex = retrievePackedIndex(f);
|
|
1611
|
-
let datasetid = toDatasetID(dataset);
|
|
1612
|
-
return getPackedField(groupindex, pf, datasetid, dataset, field);
|
|
1613
|
-
};
|
|
1615
|
+
index.getDatasetField = getDatasetField;
|
|
1614
1616
|
return index;
|
|
1615
1617
|
}
|
|
1616
1618
|
exports.computeMetaIndex = computeMetaIndex;
|
|
@@ -1622,6 +1624,14 @@ function allocPackedFieldsArray(length) {
|
|
|
1622
1624
|
//if ((nAlloc % 10000) == 0) console.log(`allocPackedFieldsArray: ${nAlloc} allocs`);
|
|
1623
1625
|
return af;
|
|
1624
1626
|
}
|
|
1627
|
+
function initPackedFields(f) {
|
|
1628
|
+
if (f.properties.packedFields !== undefined)
|
|
1629
|
+
throw 'Packed fields already set';
|
|
1630
|
+
f.properties.packedIndex = {};
|
|
1631
|
+
f.properties.packedFields = {};
|
|
1632
|
+
f.properties.getDatasetField = getDatasetField;
|
|
1633
|
+
}
|
|
1634
|
+
exports.initPackedFields = initPackedFields;
|
|
1625
1635
|
function computePackedFields(f, index) {
|
|
1626
1636
|
if (f.properties.packedFields)
|
|
1627
1637
|
return f.properties.packedFields;
|
|
@@ -1644,6 +1654,30 @@ function computePackedFields(f, index) {
|
|
|
1644
1654
|
return f.properties.packedFields;
|
|
1645
1655
|
}
|
|
1646
1656
|
exports.computePackedFields = computePackedFields;
|
|
1657
|
+
function computeOnePackedFields(f, index, did, datasetKey) {
|
|
1658
|
+
let af = allocPackedFieldsArray(index.length);
|
|
1659
|
+
af[0] = 0; // count of number of aggregates
|
|
1660
|
+
let fields = index.fields[did];
|
|
1661
|
+
Object.keys(fields).forEach((field) => {
|
|
1662
|
+
let n = fGetW(f, datasetKey, field);
|
|
1663
|
+
if (isNaN(n))
|
|
1664
|
+
n = 0;
|
|
1665
|
+
af[fields[field]] = n;
|
|
1666
|
+
});
|
|
1667
|
+
if (!f.properties.packedIndex)
|
|
1668
|
+
initPackedFields(f);
|
|
1669
|
+
f.properties.packedIndex[did] = index;
|
|
1670
|
+
f.properties.packedFields[did] = af;
|
|
1671
|
+
f.properties.getDatasetField = index.getDatasetField;
|
|
1672
|
+
return f.properties.packedFields;
|
|
1673
|
+
}
|
|
1674
|
+
exports.computeOnePackedFields = computeOnePackedFields;
|
|
1675
|
+
function clearPackedFields(f) {
|
|
1676
|
+
delete f.properties.packedIndex;
|
|
1677
|
+
delete f.properties.packedFields;
|
|
1678
|
+
delete f.properties.getDatasetField;
|
|
1679
|
+
}
|
|
1680
|
+
exports.clearPackedFields = clearPackedFields;
|
|
1647
1681
|
function hasPackedFields(f) {
|
|
1648
1682
|
return f.properties.packedFields !== undefined;
|
|
1649
1683
|
}
|