@dra2020/dra-types 1.8.115 → 1.8.116

package/dist/colormgr.d.ts

@@ -36,7 +36,7 @@ export declare function ethnicBackgroundColor(index: number, pd: PaletteDefaults
 export declare function ToAllEthnicColor(agg: PF.PackedFields, dc: PF.DatasetContext, pd: PaletteDefaults): number;
 export declare function ToPartisanColorStr(agg: PF.PackedFields, dc: PF.DatasetContext, pd: PaletteDefaults): string;
 export declare function ToPartisanDistrictColor(agg: PF.PackedFields, dc: PF.DatasetContext, pd: PaletteDefaults): string;
-export declare function ToPartisanShiftColor(agg: PF.PackedFields, dc: PF.DatasetContext, datasets: string[], pd: PaletteDefaults): string;
+export declare function ToPartisanShiftColor(agg: PF.PackedFields, dc: PF.DatasetContext, datasets: string[], pd: PaletteDefaults, isDistrict?: boolean): string;
 export declare function ToEthnicColorStr(agg: PF.PackedFields, dc: PF.DatasetContext, pd: PaletteDefaults, detail: string): string;
 export declare function AggregateEthnicColor(getter: PF.FieldGetter, pd: PaletteDefaults, nhAlone: boolean): number;
 export declare function AggregatePartisanColor(getter: PF.FieldGetter): number;
@@ -66,6 +66,7 @@ export interface DistrictColorParams {
     useFirstColor: boolean;
     usePalette: string;
     colorDistrictsBy: string;
+    shiftDatasets?: 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

@@ -30,7 +30,6 @@ export interface DatasetFormat {
     shortCaption: string;
     longCaption: string;
     expr: string;
-    numberFormat?: string;
 }
 export type DatasetFormats = DatasetFormat[];
 export interface DatasetMeta {

package/dist/dra-types.js

@@ -292,17 +292,18 @@ function ToPartisanColor(agg, dc, stops) {
         return AggregatePartisanColorStr(getter, stops);
     }
 }
-function ToPartisanShiftColor(agg, dc, datasets, pd) {
+function ToPartisanShiftColor(agg, dc, datasets, pd, isDistrict) {
     if (!datasets || datasets.length < 2)
         return '';
     const shift = PF.calcShift(agg, dc, datasets[0], datasets[1]);
     if (shift == null)
         return null;
+    const defaultIsDistrict = isDistrict !== null && isDistrict !== void 0 ? isDistrict : false; // make the optional isDistrict parameter to false by default
     const rep = 0.5 - (shift / 2);
     const dem = 0.5 + (shift / 2);
-    const stops = partisanStops(exports.PartisanPrecinctStops, pd);
+    const stops = partisanStops(defaultIsDistrict ? exports.PartisanDistrictStops : exports.PartisanPrecinctStops, pd);
     const color = ColorFromRGBPcts(rep, 0, dem, stops);
-    //console.log('Shift (r, d, color): (' + rep + ', ' + dem + ', ' + color + ')');
+    // console.log('Shift (r, d, color): (' + rep + ', ' + dem + ', ' + color + ')');
     return color;
 }
 exports.ToPartisanShiftColor = ToPartisanShiftColor;
@@ -649,6 +650,14 @@ function computeDistrictColors(params) {
                 dc.colorEthnic = ToEthnicColorStr(agg, params.datasetContext, params.paletteDefaults, params.colorDistrictsBy);
                 dc.colorSolid = dc.colorEthnic;
                 break;
+            case 'elecshift':
+                if (params.shiftDatasets && params.shiftDatasets.length == 2) {
+                    dc.colorSolid = ToPartisanShiftColor(agg, params.datasetContext, params.shiftDatasets, params.paletteDefaults, true);
+                }
+                else {
+                    dc.colorSolid = mapColor;
+                }
+                break;
             default:
                 if ((0, datasets_1.isColorBy)(params.colorDistrictsBy)) {
                     dc.colorExtended = ToExtendedColor(agg, params.datasetContext, params.colorDistrictsBy);