@dra2020/dra-types 1.8.102 → 1.8.104

package/dist/colormgr.d.ts

@@ -69,3 +69,33 @@ export interface DistrictColorParams {
 }
 export declare function ToExtendedColor(agg: PF.PackedFields, dc: PF.DatasetContext, colorBy: string): string;
 export declare function computeDistrictColors(params: DistrictColorParams): DistrictCache[];
+export interface RGB {
+    r: number;
+    g: number;
+    b: number;
+}
+export declare const BinRed = 0;
+export declare const BinOrangeRed = 1;
+export declare const BinBrown = 2;
+export declare const BinOrange = 3;
+export declare const BinGold = 4;
+export declare const BinYellow = 5;
+export declare const BinGreenish = 6;
+export declare const BinChartreuse = 7;
+export declare const BinLime = 8;
+export declare const BinMediumSpringGreen = 9;
+export declare const BinCyan = 10;
+export declare const BinLightBlue = 11;
+export declare const BinBlue = 12;
+export declare const BinBlueViolet = 13;
+export declare const BinDarkViolet = 14;
+export declare const BinMagenta = 15;
+export declare const BinDeepPink = 16;
+export declare const BinColorLookup: RGB[];
+export declare const FieldCountToColors: {
+    [nfields: number]: number[];
+};
+export declare function colorindexToRGB(colorindex: number): RGB;
+export declare const ColorFlags = "abcdefghijklmnopqrstuvwxyz";
+export declare function colorflagToColorindex(nfields: number, colorflag: string): number;
+export declare function colororderToColorindex(nfields: number, order: number): number;

package/dist/dra-types.js

@@ -107,7 +107,8 @@ exports.BucketMap = {
 
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.computeDistrictColors = exports.ToExtendedColor = exports.allGroups16Colors = exports.colorsFromStopsPartisan = exports.colorsFromStops = exports.PaletteNames = exports.ColorFromRGBPcts = exports.AggregatePartisanColorStr = exports.AggregatePartisanColor = exports.AggregateEthnicColor = exports.ToEthnicColorStr = exports.ToPartisanShiftColor = exports.ToPartisanDistrictColor = exports.ToPartisanColorStr = exports.ToAllEthnicColor = exports.ethnicBackgroundColor = exports.makeStops = exports.DefaultPaletteDefaults = exports.EthnicFewStops = exports.PartisanPrecinctStops = exports.PartisanDistrictStops = exports.ColorByGreatD = exports.ColorByGoodD = exports.ColorByFairD = exports.ColorByEven = exports.ColorByFairR = exports.ColorByGoodR = exports.ColorByGreatR = exports.EthnicTextColor = exports.ColorByBlackAsian = exports.ColorByAsianHispanic = exports.ColorByAsianWhite = exports.ColorByHispanicBlack = exports.ColorByBlackWhite = exports.ColorByHispanicWhite = exports.ColorByMix = exports.ColorByMostlyNative = exports.ColorByMostlyAsian = exports.ColorByMostlyHispanic = exports.ColorByMostlyBlack = exports.ColorByMostlyWhite = exports.ColorBySolidAsian = exports.ColorBySolidHispanic = exports.ColorBySolidBlack = exports.ColorBySolidWhite = void 0;
+exports.BinGold = exports.BinOrange = exports.BinBrown = exports.BinOrangeRed = exports.BinRed = exports.computeDistrictColors = exports.ToExtendedColor = exports.allGroups16Colors = exports.colorsFromStopsPartisan = exports.colorsFromStops = exports.PaletteNames = exports.ColorFromRGBPcts = exports.AggregatePartisanColorStr = exports.AggregatePartisanColor = exports.AggregateEthnicColor = exports.ToEthnicColorStr = exports.ToPartisanShiftColor = exports.ToPartisanDistrictColor = exports.ToPartisanColorStr = exports.ToAllEthnicColor = exports.ethnicBackgroundColor = exports.makeStops = exports.DefaultPaletteDefaults = exports.EthnicFewStops = exports.PartisanPrecinctStops = exports.PartisanDistrictStops = exports.ColorByGreatD = exports.ColorByGoodD = exports.ColorByFairD = exports.ColorByEven = exports.ColorByFairR = exports.ColorByGoodR = exports.ColorByGreatR = exports.EthnicTextColor = exports.ColorByBlackAsian = exports.ColorByAsianHispanic = exports.ColorByAsianWhite = exports.ColorByHispanicBlack = exports.ColorByBlackWhite = exports.ColorByHispanicWhite = exports.ColorByMix = exports.ColorByMostlyNative = exports.ColorByMostlyAsian = exports.ColorByMostlyHispanic = exports.ColorByMostlyBlack = exports.ColorByMostlyWhite = exports.ColorBySolidAsian = exports.ColorBySolidHispanic = exports.ColorBySolidBlack = exports.ColorBySolidWhite = void 0;
+exports.colororderToColorindex = exports.colorflagToColorindex = exports.ColorFlags = exports.colorindexToRGB = exports.FieldCountToColors = exports.BinColorLookup = exports.BinDeepPink = exports.BinMagenta = exports.BinDarkViolet = exports.BinBlueViolet = exports.BinBlue = exports.BinLightBlue = exports.BinCyan = exports.BinMediumSpringGreen = exports.BinLime = exports.BinChartreuse = exports.BinGreenish = exports.BinYellow = void 0;
 // App libraries
 const PF = __webpack_require__(/*! ./packedfields */ "./lib/packedfields.ts");
 const datasets_1 = __webpack_require__(/*! ./datasets */ "./lib/datasets.ts");
@@ -642,6 +643,79 @@ function computeDistrictColors(params) {
     return dcNew;
 }
 exports.computeDistrictColors = computeDistrictColors;
+;
+exports.BinRed = 0;
+exports.BinOrangeRed = 1;
+exports.BinBrown = 2;
+exports.BinOrange = 3;
+exports.BinGold = 4;
+exports.BinYellow = 5;
+exports.BinGreenish = 6;
+exports.BinChartreuse = 7;
+exports.BinLime = 8;
+exports.BinMediumSpringGreen = 9;
+exports.BinCyan = 10;
+exports.BinLightBlue = 11;
+exports.BinBlue = 12;
+exports.BinBlueViolet = 13;
+exports.BinDarkViolet = 14;
+exports.BinMagenta = 15;
+exports.BinDeepPink = 16;
+exports.BinColorLookup = [
+    { r: 0xff, g: 0x00, b: 0x00 },
+    { r: 0xff, g: 0x45, b: 0x00 },
+    { r: 0x99, g: 0x66, b: 0x33 },
+    { r: 0xff, g: 0xaa, b: 0x00 },
+    { r: 0xff, g: 0xd7, b: 0x00 },
+    { r: 0xff, g: 0xd7, b: 0x00 },
+    { r: 0x9f, g: 0xd4, b: 0x00 },
+    { r: 0x7f, g: 0xff, b: 0x00 },
+    { r: 0x00, g: 0xff, b: 0x00 },
+    { r: 0x00, g: 0xfa, b: 0x9a },
+    { r: 0x00, g: 0xff, b: 0xff },
+    { r: 0x73, g: 0xb2, b: 0xff },
+    { r: 0x00, g: 0x00, b: 0xff },
+    { r: 0x8a, g: 0x2b, b: 0xe2 },
+    { r: 0x94, g: 0x00, b: 0xd3 },
+    { r: 0xff, g: 0x00, b: 0xff },
+    { r: 0xff, g: 0x14, b: 0x93 }, // 16 - deep pink
+];
+// Map ordering to Bin* lookup values
+const ColorOrderEthnic = 'wbaho'; // abcde
+// Map number of fields to color selection
+exports.FieldCountToColors = {
+    [1]: [exports.BinBrown],
+    [2]: [exports.BinRed, exports.BinBlue],
+    [3]: [exports.BinRed, exports.BinBlue, exports.BinBrown],
+    [4]: [exports.BinRed, exports.BinBlue, exports.BinBrown, exports.BinGreenish],
+    [5]: [exports.BinLightBlue, exports.BinGreenish, exports.BinRed, exports.BinOrange, exports.BinBrown],
+    [6]: [exports.BinRed, exports.BinBrown, exports.BinGold, exports.BinGreenish, exports.BinLightBlue, exports.BinBlueViolet],
+    [7]: [exports.BinRed, exports.BinBrown, exports.BinGold, exports.BinGreenish, exports.BinLightBlue, exports.BinBlueViolet, exports.BinMagenta],
+    [8]: [exports.BinRed, exports.BinBrown, exports.BinGold, exports.BinGreenish, exports.BinLightBlue, exports.BinBlueViolet, exports.BinMagenta, exports.BinDeepPink],
+    [9]: [exports.BinRed, exports.BinBrown, exports.BinGold, exports.BinGreenish, exports.BinLightBlue, exports.BinBlue, exports.BinBlueViolet, exports.BinMagenta, exports.BinDeepPink],
+    [10]: [exports.BinRed, exports.BinBrown, exports.BinGold, exports.BinGreenish, exports.BinCyan, exports.BinLightBlue, exports.BinBlue, exports.BinBlueViolet, exports.BinMagenta, exports.BinDeepPink],
+    [11]: [exports.BinRed, exports.BinBrown, exports.BinGold, exports.BinGreenish, exports.BinLime, exports.BinCyan, exports.BinLightBlue, exports.BinBlue, exports.BinBlueViolet, exports.BinMagenta, exports.BinDeepPink],
+    [12]: [exports.BinRed, exports.BinBrown, exports.BinOrange, exports.BinGold, exports.BinGreenish, exports.BinLime, exports.BinCyan, exports.BinLightBlue, exports.BinBlue, exports.BinBlueViolet, exports.BinMagenta, exports.BinDeepPink],
+    [13]: [exports.BinRed, exports.BinBrown, exports.BinOrange, exports.BinGold, exports.BinGreenish, exports.BinLime, exports.BinMediumSpringGreen, exports.BinCyan, exports.BinLightBlue, exports.BinBlue, exports.BinBlueViolet, exports.BinMagenta, exports.BinDeepPink],
+    [14]: [exports.BinRed, exports.BinOrangeRed, exports.BinBrown, exports.BinOrange, exports.BinGold, exports.BinGreenish, exports.BinLime, exports.BinMediumSpringGreen, exports.BinCyan, exports.BinLightBlue, exports.BinBlue, exports.BinBlueViolet, exports.BinMagenta, exports.BinDeepPink],
+    [15]: [exports.BinRed, exports.BinOrangeRed, exports.BinBrown, exports.BinOrange, exports.BinGold, exports.BinGreenish, exports.BinLime, exports.BinMediumSpringGreen, exports.BinCyan, exports.BinLightBlue, exports.BinBlue, exports.BinBlueViolet, exports.BinDarkViolet, exports.BinMagenta, exports.BinDeepPink],
+    [16]: [exports.BinRed, exports.BinOrangeRed, exports.BinBrown, exports.BinOrange, exports.BinGold, exports.BinYellow, exports.BinGreenish, exports.BinLime, exports.BinMediumSpringGreen, exports.BinCyan, exports.BinLightBlue, exports.BinBlue, exports.BinBlueViolet, exports.BinDarkViolet, exports.BinMagenta, exports.BinDeepPink],
+};
+const MaxFields = 16;
+function colorindexToRGB(colorindex) {
+    return exports.BinColorLookup[colorindex] || exports.BinColorLookup[exports.BinBrown];
+}
+exports.colorindexToRGB = colorindexToRGB;
+exports.ColorFlags = 'abcdefghijklmnopqrstuvwxyz';
+function colorflagToColorindex(nfields, colorflag) {
+    let i = exports.ColorFlags.indexOf(colorflag);
+    return i >= 0 && nfields > 0 && nfields <= MaxFields ? exports.FieldCountToColors[nfields][i] : exports.BinBrown;
+}
+exports.colorflagToColorindex = colorflagToColorindex;
+function colororderToColorindex(nfields, order) {
+    return order >= 0 && nfields > 0 && nfields <= MaxFields ? exports.FieldCountToColors[nfields][order] : exports.BinBrown;
+}
+exports.colororderToColorindex = colororderToColorindex;
 
 
 /***/ }),
@@ -1495,7 +1569,7 @@ function computeMetaIndex(datasetid, meta) {
     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
+        let datasetid = toDatasetID(dataset);
         return getPackedField(groupindex, pf, datasetid, dataset, field);
     };
     return index;
@@ -1750,16 +1824,18 @@ function ToGetterPvi20(agg, dc) {
 }
 exports.ToGetterPvi20 = ToGetterPvi20;
 function calcShift(agg, dc, datasetOld, datasetNew) {
+    const didOld = toDatasetID(datasetOld);
+    const didNew = toDatasetID(datasetNew);
     const getterOld = datasetOld === exports.DS_PVI2016 ?
         ToGetterPvi16(agg, dc, datasetOld) :
         datasetOld === exports.DS_PVI2020 ?
             ToGetterPvi20(agg, dc) :
-            ToGetter(agg, dc, '', datasetOld);
+            ToGetter(agg, dc, didOld, 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, didNew, datasetNew);
     // Calc two-party Swing
     const repOld = getterOld('R');
     const demOld = getterOld('D');
@@ -2099,6 +2175,7 @@ exports.Schemas = {
             official: 'BOOL',
             state: 'S',
             datasource: 'S',
+            groups: 'M',
             // meta: { dataset metadata structure },
             // dotmap: 'BOOL',
         },
@@ -2135,6 +2212,15 @@ exports.Schemas = {
         },
         KeySchema: { id: 'HASH', sid: 'RANGE' },
     },
+    'groupsdatasets': {
+        FileOptions: { map: true },
+        Schema: {
+            id: 'S',
+            sid: 'S',
+            permission: 'N',
+        },
+        KeySchema: { id: 'HASH', sid: 'RANGE' },
+    },
     'notifications': {
         FileOptions: { map: true },
         Schema: {