@dra2020/dra-types 1.8.99 → 1.8.101

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/datasets.d.ts

@@ -14,6 +14,7 @@ export declare function parseColorBy(colorby: string): {
     datasetid: string;
     field: string;
 };
+export declare function isColorBy(colorby: string): boolean;
 export type DatasetFields = {
     [key: string]: DatasetField;
 };

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
@@ -569,6 +570,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 +626,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);
@@ -1253,7 +1291,7 @@ exports.StateNameMap = {
 
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.parseColorBy = exports.formColorBy = exports.sortFields = void 0;
+exports.isColorBy = exports.parseColorBy = exports.formColorBy = exports.sortFields = void 0;
 function sortFields(f1, f2) {
     return (f1.order || 0) - (f2.order || 0);
 }
@@ -1271,6 +1309,11 @@ function parseColorBy(colorby) {
     return { datasetid: '', field: '' };
 }
 exports.parseColorBy = parseColorBy;
+function isColorBy(colorby) {
+    let { datasetid, field } = parseColorBy(colorby);
+    return !!datasetid && !!field;
+}
+exports.isColorBy = isColorBy;
 
 
 /***/ }),