@dra2020/dra-types 1.8.115 → 1.8.116

package/lib/colormgr.ts

@@ -215,7 +215,7 @@ function ToPartisanColor(agg: PF.PackedFields, dc: PF.DatasetContext, stops: Uti
   }
 }
 
-export function ToPartisanShiftColor(agg: PF.PackedFields, dc: PF.DatasetContext, datasets: string[], pd: PaletteDefaults): string
+export function ToPartisanShiftColor(agg: PF.PackedFields, dc: PF.DatasetContext, datasets: string[], pd: PaletteDefaults, isDistrict?: boolean): string
 {
   if (!datasets || datasets.length < 2)
     return '';
@@ -223,11 +223,14 @@ export function ToPartisanShiftColor(agg: PF.PackedFields, dc: PF.DatasetContext
   const shift: number = PF.calcShift(agg, dc, datasets[0], datasets[1]);
   if (shift == null)
     return null;
+
+  const defaultIsDistrict = isDistrict ?? false; // make the optional isDistrict parameter to false by default
+  
   const rep: number = 0.5 - (shift / 2);
   const dem: number = 0.5 + (shift / 2);
-  const stops: Util.GradientStops = partisanStops(PartisanPrecinctStops, pd);
+  const stops: Util.GradientStops = partisanStops(defaultIsDistrict ? PartisanDistrictStops : PartisanPrecinctStops, pd);
   const color: string = 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;
 }
 
@@ -529,6 +532,7 @@ export interface DistrictColorParams
   useFirstColor: boolean,
   usePalette: string,
   colorDistrictsBy: string,
+  shiftDatasets?: string[],
 }
 
 function safeNumber(n: any): number { n = Number(n); return typeof n !== 'number' || isNaN(n) ? 0 : n }
@@ -618,6 +622,16 @@ export function computeDistrictColors(params: DistrictColorParams): DistrictCach
         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 (isColorBy(params.colorDistrictsBy))
         {

package/lib/datasets.ts

@@ -56,7 +56,6 @@ export interface DatasetFormat {
   shortCaption: string,
   longCaption: string,
   expr: string,
-  numberFormat?: string,  // (locale|integer|general|currency).precision
   };
 export type DatasetFormats = DatasetFormat[];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/dra-types",
-  "version": "1.8.115",
+  "version": "1.8.116",
   "description": "Shared types used between client, server and tools.",
   "main": "dist/dra-types.js",
   "types": "./dist/all.d.ts",