@dra2020/dra-types 1.8.100 → 1.8.102

package/dist/colormgr.d.ts

@@ -51,6 +51,7 @@ export declare function allGroups16Colors(palette: PaletteName, colors: string[]
 export interface DistrictCache {
     colorElection?: string;
     colorEthnic?: string;
+    colorExtended?: string;
     colorSolid?: string;
 }
 export interface ColorProp {
@@ -66,4 +67,5 @@ export interface DistrictColorParams {
     usePalette: string;
     colorDistrictsBy: string;
 }
+export declare function ToExtendedColor(agg: PF.PackedFields, dc: PF.DatasetContext, colorBy: string): string;
 export declare function computeDistrictColors(params: DistrictColorParams): DistrictCache[];

package/dist/dra-types.js

@@ -107,9 +107,10 @@ exports.BucketMap = {
 
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.computeDistrictColors = 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.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;
 // App libraries
 const PF = __webpack_require__(/*! ./packedfields */ "./lib/packedfields.ts");
+const datasets_1 = __webpack_require__(/*! ./datasets */ "./lib/datasets.ts");
 const baseclient_1 = __webpack_require__(/*! @dra2020/baseclient */ "@dra2020/baseclient");
 // All Groups Mosaic has 16 colors
 // Index values into the 16 colors
@@ -257,7 +258,8 @@ exports.ethnicBackgroundColor = ethnicBackgroundColor;
 function ToAllEthnicColor(agg, dc, pd) {
     // Use VAP/CVAP if it exists
     const dataset = dc.primeVDS ? dc.primeVDS : dc.primeDDS;
-    return AggregateEthnicColor(PF.ToGetter(agg, dc, '', dataset), pd, dataset.endsWith('NH'));
+    const did = PF.toDatasetID(dataset);
+    return AggregateEthnicColor(PF.ToGetter(agg, dc, did, dataset), pd, dataset.endsWith('NH'));
 }
 exports.ToAllEthnicColor = ToAllEthnicColor;
 function ToPartisanColorStr(agg, dc, pd) {
@@ -269,22 +271,23 @@ function ToPartisanDistrictColor(agg, dc, pd) {
 }
 exports.ToPartisanDistrictColor = ToPartisanDistrictColor;
 function ToPartisanColor(agg, dc, stops) {
+    const did = PF.toDatasetID(dc.primeEDS);
     if (dc.primeEDS === PF.DS_PVI2020) {
-        const getter16 = PF.ToGetter(agg, dc, '', PF.DS_PRES2016);
-        const getter20 = PF.ToGetter(agg, dc, '', PF.DS_PRES2020);
+        const getter16 = PF.ToGetter(agg, dc, did, PF.DS_PRES2016);
+        const getter20 = PF.ToGetter(agg, dc, did, PF.DS_PRES2020);
         const pviRaw = PF.calcRaw2020Pvi(getter16, getter20);
         const color = ColorFromRGBPcts((1 - pviRaw / 100), 0, pviRaw / 100, stops);
         //console.log('Pvi (r, d, color): (' + (1 - pviRaw/100) + ', ' + pviRaw/100 + ', ' + color + ')');
         return color;
     }
     else if (dc.primeEDS === PF.DS_PVI2016) {
-        const getter = PF.ToGetter(agg, dc, '', dc.primeEDS);
+        const getter = PF.ToGetter(agg, dc, did, dc.primeEDS);
         const pviRaw = PF.calcRawPvi(getter);
         const color = ColorFromRGBPcts((1 - pviRaw / 100), 0, pviRaw / 100, stops);
         return color;
     }
     else {
-        const getter = PF.ToGetter(agg, dc, '', dc.primeEDS);
+        const getter = PF.ToGetter(agg, dc, did, dc.primeEDS);
         return AggregatePartisanColorStr(getter, stops);
     }
 }
@@ -307,6 +310,7 @@ function ToEthnicColorStr(agg, dc, pd, detail) {
     let total = 'Tot';
     let bInvert = false;
     const dataset = dc.primeVDS ? dc.primeVDS : dc.primeDDS;
+    const did = PF.toDatasetID(dataset);
     switch (detail) {
         case null:
         case '':
@@ -346,7 +350,7 @@ function ToEthnicColorStr(agg, dc, pd, detail) {
             break;
         default: break;
     }
-    const getter = PF.ToGetter(agg, dc, '', dataset);
+    const getter = PF.ToGetter(agg, dc, did, dataset);
     let den = getter(total);
     let num = getter(ethnic);
     if (den === undefined || isNaN(den) || num === undefined || isNaN(num))
@@ -569,6 +573,38 @@ function allGroups16Colors(palette, colors) {
     return modColors;
 }
 exports.allGroups16Colors = allGroups16Colors;
+function ToExtendedColor(agg, dc, colorBy) {
+    var _a;
+    // compute pct
+    const { datasetid, field } = (0, datasets_1.parseColorBy)(colorBy);
+    if (!datasetid || !field || !dc.dsMeta || !dc.dsMeta[datasetid] || !((_a = dc.dsMeta[datasetid]) === null || _a === void 0 ? void 0 : _a.fields[field]))
+        return '#ffffff';
+    const meta = dc.dsMeta[datasetid];
+    let getter = PF.ToGetter(agg, dc, datasetid, datasetid);
+    let fields = PF.sortedFieldList(meta);
+    let den = 0;
+    if (meta.fields['Tot'])
+        den = getter('Tot');
+    else
+        fields.forEach(f => { den += getter(f); });
+    let num = 0;
+    let dfield = meta.fields[field];
+    if (dfield.colorBySum)
+        for (let i = 0; i < fields.length; i++) {
+            num += getter(fields[i]);
+            if (fields[i] === field)
+                break;
+        }
+    else
+        num = getter(field);
+    // Careful...
+    if (den == 0 || den === undefined || isNaN(den) || num === undefined || isNaN(num))
+        return '#ffffff';
+    const pct = dfield.invert ? 1 - (num / den) : num / den;
+    const color = baseclient_1.Util.execGradient(makeStops(exports.EthnicFewStops, baseclient_1.Colors.EthnicFewClassicColors), pct);
+    return color;
+}
+exports.ToExtendedColor = ToExtendedColor;
 function computeDistrictColors(params) {
     let dcNew = [];
     for (let i = 0; i < params.aggregates.length; i++) {
@@ -593,7 +629,12 @@ function computeDistrictColors(params) {
                 dc.colorSolid = dc.colorEthnic;
                 break;
             default:
-                dc.colorSolid = mapColor;
+                if ((0, datasets_1.isColorBy)(params.colorDistrictsBy)) {
+                    dc.colorExtended = ToExtendedColor(agg, params.datasetContext, params.colorDistrictsBy);
+                    dc.colorSolid = dc.colorExtended;
+                }
+                else
+                    dc.colorSolid = mapColor;
                 break;
         }
         dcNew.push(dc);
@@ -1395,7 +1436,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.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;
+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;
 const baseclient_1 = __webpack_require__(/*! @dra2020/baseclient */ "@dra2020/baseclient");
 exports.AGG_DEMOGRAPHIC = 'demographic';
 exports.AGG_DEMOGRAPHIC18 = 'demographic18';
@@ -1507,6 +1548,10 @@ function isExtDataset(did) {
     return did && reExtDataset.test(did);
 }
 exports.isExtDataset = isExtDataset;
+function toDatasetID(datasetKey) {
+    return isExtDataset(datasetKey) ? datasetKey : '';
+}
+exports.toDatasetID = toDatasetID;
 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);