@dra2020/dra-types 1.8.123 → 1.8.125

package/lib/datasets.ts

@@ -66,11 +66,12 @@ export interface DatasetMeta
   year: number,                         // 4 digit year
   title: string,                        // title displayed in UI
   description?: string,                 // longer description
-  office?: string,                      // pres | comp | sc | sen | con | tre | sos | ltgov | gov | ag
+  office?: string,                      // pres | comp | sc | sen | con | tre | sos | ltgov | gov | ag and more
   subtype?: string,                     // always general?
-  votingAge?: boolean,                  // Filtered demographic variant
-  nhAlone?: boolean,                    // Demographic variant
+  votingAge?: boolean,                  // true => VAP or CVAP; false => Total population (from Census or ACS or Adjusted)
+  nhAlone?: boolean,                    // Non-Hispanic Alone demographic variant
   privateKey?: string,                  // Old-style semi-private datasets
+  restrict?: { [key: string]: boolean },  // export, display, duplicate (true => function is not allowed)
   members?: { [key: number]: string },  // For composites, specifies 
   fields?: DatasetFields,
   colors?: DatasetColors,               // Optional colorby expressions
@@ -106,5 +107,12 @@ export interface Dataset
   labels?: string[],
 }
 
+export function datasetRestrict(ds: Dataset): { [key: string]: boolean }
+{
+   if (ds && ds.id && ds.meta && ds.meta[ds.id] && ds.meta[ds.id].restrict)
+    return ds.meta[ds.id].restrict;
+  return null;
+}
+
 // Index of database records
 export type DatasetIndex = { [id: string]: Dataset };

package/lib/packedfields.ts

@@ -413,8 +413,11 @@ export function aggregatePackedFields(agg: PackedFields, pf: PackedFields): Pack
 
 export function aggregateCount(agg: PackedFields): number
 {
-  if (!agg || !agg['']) return 0;
-  return agg[''][0];
+  // If we have multiple packedfieldarrays, all of them track the aggregate in zero spot.
+  // So we just pick the one that happens to be come up first.
+  if (!agg) return 0;
+  let pfa = Util.nthProperty(agg) as PackedFieldsArray;
+  return pfa ? pfa[0] : 0;
 }
 
 export function decrementPackedFields(agg: PackedFields, pf: PackedFields): PackedFields

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/dra-types",
-  "version": "1.8.123",
+  "version": "1.8.125",
   "description": "Shared types used between client, server and tools.",
   "main": "dist/dra-types.js",
   "types": "./dist/all.d.ts",