@dra2020/dra-types 1.8.96 → 1.8.97

package/dist/dra-types.js

@@ -1377,7 +1377,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.retrievePackedFields = exports.pushedExtPackedFields = exports.featurePushedExtPackedFields = exports.featurePushExtPackedFields = exports.isExtDataset = exports.setPackedFields = exports.hasPackedFields = exports.computePackedFields = exports.computeMetaIndex = exports.sortedFieldList = 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;
+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;
 const baseclient_1 = __webpack_require__(/*! @dra2020/baseclient */ "@dra2020/baseclient");
 exports.AGG_DEMOGRAPHIC = 'demographic';
 exports.AGG_DEMOGRAPHIC18 = 'demographic18';
@@ -1393,10 +1393,6 @@ exports.PVI2020_Title = 'PVI 2016/2020';
 exports.DS_PVI2016 = 'P16GPR';
 exports.DS_PRES2020 = 'E20GPR';
 exports.DS_PRES2016 = 'E16GPR';
-function fGetJoined(f) {
-    return (f.properties && f.properties.joined) ? f.properties.joined : undefined;
-}
-exports.fGetJoined = fGetJoined;
 function fGet(f, p) {
     return fGetW(f, null, p);
 }
@@ -1415,25 +1411,6 @@ function fGetW(f, datasetKey, p) {
         else if (pBackup && f.properties.datasets[datasetKey][pBackup] != null)
             return f.properties.datasets[datasetKey][pBackup];
     }
-    // Joined property?
-    let a = fGetJoined(f);
-    if (a) {
-        for (let i = 0; i < a.length; i++) {
-            let o = a[i];
-            if (!datasetKey) {
-                if (o[p] !== undefined)
-                    return o[p];
-            }
-            else {
-                if (o['datasets'] && o['datasets'][datasetKey] != null) {
-                    if (o['datasets'][datasetKey][p] != null)
-                        return o['datasets'][datasetKey][p];
-                    else if (pBackup && o['datasets'][datasetKey][pBackup] != null)
-                        return o['datasets'][datasetKey][pBackup];
-                }
-            }
-        }
-    }
     return undefined;
 }
 function sortedFieldList(ds) {
@@ -1455,10 +1432,11 @@ function computeMetaIndex(datasetid, meta) {
         });
         index.fields[datasetKey] = fieldsIndex;
     });
-    let groupindex = { [datasetid]: index };
     index.length = offset;
     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
         return getPackedField(groupindex, pf, datasetid, dataset, field);
     };
     return index;
@@ -1486,6 +1464,7 @@ function computePackedFields(f, index) {
             af[fields[field]] = n;
         });
     });
+    f.properties.packedIndex = { ['']: index };
     f.properties.packedFields = { ['']: af }; // cache here
     f.properties.getDatasetField = index.getDatasetField;
     // Major memory savings to delete this after packing
@@ -1500,6 +1479,7 @@ exports.hasPackedFields = hasPackedFields;
 function setPackedFields(f, pf, fIndex) {
     if (f.properties.packedFields !== undefined)
         throw 'Packed fields already set';
+    f.properties.packedIndex = fIndex.properties.packedIndex;
     f.properties.packedFields = pf;
     f.properties.getDatasetField = fIndex.properties.getDatasetField;
 }
@@ -1509,7 +1489,7 @@ function isExtDataset(did) {
     return did && reExtDataset.test(did);
 }
 exports.isExtDataset = isExtDataset;
-function featurePushExtPackedFields(f, datasetid, data, card) {
+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);
     if (!blocks)
@@ -1533,6 +1513,7 @@ function featurePushExtPackedFields(f, datasetid, data, card) {
             pfa[i] += data[x++];
     });
     f.properties.packedFields[datasetid] = pfa;
+    f.properties.packedIndex[datasetid] = index;
 }
 exports.featurePushExtPackedFields = featurePushExtPackedFields;
 function featurePushedExtPackedFields(f, datasetid, card) {
@@ -1562,6 +1543,12 @@ function retrievePackedFields(f) {
     return f.properties.packedFields;
 }
 exports.retrievePackedFields = retrievePackedFields;
+function retrievePackedIndex(f) {
+    if (f.properties.packedIndex === undefined)
+        throw 'Feature should have pre-computed packed index';
+    return f.properties.packedIndex;
+}
+exports.retrievePackedIndex = retrievePackedIndex;
 // The first entry in the PackedFields aggregate is the count of items aggregated.
 // Treat a null instance as just a single entry with no aggregates.
 let abZero = new ArrayBuffer(8);
@@ -2161,6 +2148,7 @@ function splitToGeoFeature(split, topoPrecinct, mbm) {
         if (b.properties.packedFields) {
             if (!f.properties.packedFields) {
                 f.properties.packedFields = PF.packedCopy(b.properties.packedFields);
+                f.properties.packedIndex = b.properties.packedIndex;
                 f.properties.getDatasetField = b.properties.getDatasetField;
             }
             else