@dra2020/dra-types 1.8.115 → 1.8.117
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/colormgr.d.ts +2 -1
- package/dist/dra-types.js +12 -3
- package/dist/dra-types.js.map +1 -1
- package/lib/colormgr.ts +17 -3
- package/package.json +1 -1
package/dist/colormgr.d.ts
CHANGED
|
@@ -36,7 +36,7 @@ export declare function ethnicBackgroundColor(index: number, pd: PaletteDefaults
|
|
|
36
36
|
export declare function ToAllEthnicColor(agg: PF.PackedFields, dc: PF.DatasetContext, pd: PaletteDefaults): number;
|
|
37
37
|
export declare function ToPartisanColorStr(agg: PF.PackedFields, dc: PF.DatasetContext, pd: PaletteDefaults): string;
|
|
38
38
|
export declare function ToPartisanDistrictColor(agg: PF.PackedFields, dc: PF.DatasetContext, pd: PaletteDefaults): string;
|
|
39
|
-
export declare function ToPartisanShiftColor(agg: PF.PackedFields, dc: PF.DatasetContext, datasets: string[], pd: PaletteDefaults): string;
|
|
39
|
+
export declare function ToPartisanShiftColor(agg: PF.PackedFields, dc: PF.DatasetContext, datasets: string[], pd: PaletteDefaults, isDistrict?: boolean): string;
|
|
40
40
|
export declare function ToEthnicColorStr(agg: PF.PackedFields, dc: PF.DatasetContext, pd: PaletteDefaults, detail: string): string;
|
|
41
41
|
export declare function AggregateEthnicColor(getter: PF.FieldGetter, pd: PaletteDefaults, nhAlone: boolean): number;
|
|
42
42
|
export declare function AggregatePartisanColor(getter: PF.FieldGetter): number;
|
|
@@ -66,6 +66,7 @@ export interface DistrictColorParams {
|
|
|
66
66
|
useFirstColor: boolean;
|
|
67
67
|
usePalette: string;
|
|
68
68
|
colorDistrictsBy: string;
|
|
69
|
+
shiftDatasets?: string[];
|
|
69
70
|
}
|
|
70
71
|
export declare function ToExtendedColor(agg: PF.PackedFields, dc: PF.DatasetContext, colorBy: string): string;
|
|
71
72
|
export declare function computeDistrictColors(params: DistrictColorParams): DistrictCache[];
|
package/dist/dra-types.js
CHANGED
|
@@ -292,17 +292,18 @@ function ToPartisanColor(agg, dc, stops) {
|
|
|
292
292
|
return AggregatePartisanColorStr(getter, stops);
|
|
293
293
|
}
|
|
294
294
|
}
|
|
295
|
-
function ToPartisanShiftColor(agg, dc, datasets, pd) {
|
|
295
|
+
function ToPartisanShiftColor(agg, dc, datasets, pd, isDistrict) {
|
|
296
296
|
if (!datasets || datasets.length < 2)
|
|
297
297
|
return '';
|
|
298
298
|
const shift = PF.calcShift(agg, dc, datasets[0], datasets[1]);
|
|
299
299
|
if (shift == null)
|
|
300
300
|
return null;
|
|
301
|
+
const defaultIsDistrict = isDistrict !== null && isDistrict !== void 0 ? isDistrict : false; // make the optional isDistrict parameter to false by default
|
|
301
302
|
const rep = 0.5 - (shift / 2);
|
|
302
303
|
const dem = 0.5 + (shift / 2);
|
|
303
|
-
const stops = partisanStops(exports.PartisanPrecinctStops, pd);
|
|
304
|
+
const stops = partisanStops(defaultIsDistrict ? exports.PartisanDistrictStops : exports.PartisanPrecinctStops, pd);
|
|
304
305
|
const color = ColorFromRGBPcts(rep, 0, dem, stops);
|
|
305
|
-
//console.log('Shift (r, d, color): (' + rep + ', ' + dem + ', ' + color + ')');
|
|
306
|
+
// console.log('Shift (r, d, color): (' + rep + ', ' + dem + ', ' + color + ')');
|
|
306
307
|
return color;
|
|
307
308
|
}
|
|
308
309
|
exports.ToPartisanShiftColor = ToPartisanShiftColor;
|
|
@@ -649,6 +650,14 @@ function computeDistrictColors(params) {
|
|
|
649
650
|
dc.colorEthnic = ToEthnicColorStr(agg, params.datasetContext, params.paletteDefaults, params.colorDistrictsBy);
|
|
650
651
|
dc.colorSolid = dc.colorEthnic;
|
|
651
652
|
break;
|
|
653
|
+
case 'elecshift':
|
|
654
|
+
if (params.shiftDatasets && params.shiftDatasets.length == 2) {
|
|
655
|
+
dc.colorSolid = ToPartisanShiftColor(agg, params.datasetContext, params.shiftDatasets, params.paletteDefaults, true);
|
|
656
|
+
}
|
|
657
|
+
else {
|
|
658
|
+
dc.colorSolid = mapColor;
|
|
659
|
+
}
|
|
660
|
+
break;
|
|
652
661
|
default:
|
|
653
662
|
if ((0, datasets_1.isColorBy)(params.colorDistrictsBy)) {
|
|
654
663
|
dc.colorExtended = ToExtendedColor(agg, params.datasetContext, params.colorDistrictsBy);
|