@dra2020/dra-types 1.8.121 → 1.8.123

package/dist/packedfields.d.ts

@@ -69,8 +69,12 @@ export type DSLists = {
 export type PlanTypePlus = PlanType | '';
 export declare function fGet(f: any, p: string): any;
 export declare function sortedFieldList(ds: DatasetMeta): string[];
+export declare function getDatasetField(f: any, dataset: string, field: string): number;
 export declare function computeMetaIndex(datasetid: string, meta: DatasetsMeta): PackedMetaIndex;
+export declare function initPackedFields(f: any): void;
 export declare function computePackedFields(f: any, index: PackedMetaIndex): PackedFields;
+export declare function computeOnePackedFields(f: any, index: PackedMetaIndex, did: string, datasetKey: string): PackedFields;
+export declare function clearPackedFields(f: any): void;
 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;

package/lib/datasets.ts

@@ -76,6 +76,7 @@ export interface DatasetMeta
   colors?: DatasetColors,               // Optional colorby expressions
   formats?: DatasetFormats,             // Optional format expressions
   displayPercent?: boolean,             // True if details should auto include percent
+  hideHeading?: boolean,                // True if details should hide heading row
 }
 
 export type DatasetsMeta = { [dataset: string]: DatasetMeta };

package/lib/packedfields.ts

@@ -154,6 +154,14 @@ export function sortedFieldList(ds: DatasetMeta): string[]
   return kv.map(kv => kv.k);
 }
 
+export function getDatasetField(f: any, dataset: string, field: string): number
+{
+  let pf = retrievePackedFields(f);
+  let dxGroup = retrievePackedIndex(f);
+  let did = toDatasetID(dataset);
+  return getPackedField(dxGroup, pf, did, dataset, field);
+}
+
 export function computeMetaIndex(datasetid: string, meta: DatasetsMeta): PackedMetaIndex
 {
   if (meta == null) return null;
@@ -168,12 +176,7 @@ export function computeMetaIndex(datasetid: string, meta: DatasetsMeta): PackedM
       index.fields[datasetKey] = fieldsIndex;
     });
   index.length = offset;
-  index.getDatasetField = (f: any, dataset: string, field: string): number => {
-      let pf = retrievePackedFields(f);
-      let groupindex = retrievePackedIndex(f);
-      let datasetid = toDatasetID(dataset);
-      return getPackedField(groupindex, pf, datasetid, dataset, field);
-    };
+  index.getDatasetField = getDatasetField;
   return index;
 }
 
@@ -187,6 +190,15 @@ function allocPackedFieldsArray(length: number): PackedFieldsArray
   return af;
 }
 
+export function initPackedFields(f: any): void
+{
+  if (f.properties.packedFields !== undefined) throw 'Packed fields already set';
+
+  f.properties.packedIndex = {};
+  f.properties.packedFields = {};
+  f.properties.getDatasetField = getDatasetField;
+}
+
 export function computePackedFields(f: any, index: PackedMetaIndex): PackedFields
 {
   if (f.properties.packedFields) return f.properties.packedFields as PackedFields;
@@ -211,6 +223,34 @@ export function computePackedFields(f: any, index: PackedMetaIndex): PackedField
   return f.properties.packedFields;
 }
 
+export function computeOnePackedFields(f: any, index: PackedMetaIndex, did: string, datasetKey: string): PackedFields
+{
+  let af = allocPackedFieldsArray(index.length);
+  af[0] = 0;  // count of number of aggregates
+  let fields = index.fields[did];
+  Object.keys(fields).forEach((field: string) => {
+      let n = fGetW(f, datasetKey, field);
+      if (isNaN(n))
+        n = 0;
+      af[fields[field]] = n;
+    });
+
+  if (! f.properties.packedIndex)
+    initPackedFields(f);
+  f.properties.packedIndex[did] = index;
+  f.properties.packedFields[did] = af;
+  f.properties.getDatasetField = index.getDatasetField;
+
+  return f.properties.packedFields;
+}
+
+export function clearPackedFields(f: any): void
+{
+  delete f.properties.packedIndex;
+  delete f.properties.packedFields;
+  delete f.properties.getDatasetField;
+}
+
 export function hasPackedFields(f: any): boolean
 {
   return f.properties.packedFields !== undefined;
@@ -258,7 +298,7 @@ export function featurePushExtPackedFields(f: any, datasetid: string, index: Pac
           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++];
+          pfa[i] += (data[x++] << 0); // left shift by 0 to force unsigned to be interpreted as signed (used by prisoner-adjusted)
       });
   f.properties.packedFields[datasetid] = pfa;
   f.properties.packedIndex[datasetid] = index;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/dra-types",
-  "version": "1.8.121",
+  "version": "1.8.123",
   "description": "Shared types used between client, server and tools.",
   "main": "dist/dra-types.js",
   "types": "./dist/all.d.ts",
@@ -34,7 +34,7 @@
     "webpack-cli": "^5.1.4"
   },
   "dependencies": {
-    "@dra2020/baseclient": "^1.0.132",
+    "@dra2020/baseclient": "^1.0.144",
     "geojson": "^0.5.0",
     "object-hash": "^3.0.0"
   }