@dra2020/baseclient 1.0.68 → 1.0.69

package/dist/colors/colors.d.ts

@@ -6,6 +6,6 @@ export declare const EthnicFewClassicColors: string[];
 export declare const PartisanPrecinctClassicColors: string[];
 export declare function genColor(i: number, useFirstColor: boolean, palette: string): string;
 export declare function getPalette(palette: string): string[];
-export declare const defaultDistrictsPalette = "jet";
+export declare const defaultDistrictsPalette = "jet_r";
 export declare function genDRAColor(i: number, useFirstColor: boolean): string;
 export {};

package/lib/colors/colors.ts

@@ -270,29 +270,16 @@ export function genColor(i: number, useFirstColor: boolean, palette: string): st
 
 export function getPalette(palette: string): string[]
 {
-  let colors: string[] = [];
-  switch (palette)
+  if (palette === 'draclassic')
   {
-    case 'jet':
-    case 'viridis':
-    case 'magma': 
-    case 'plasma':
-    case 'bone':
-    case 'inferno':
-    case 'turbo':
-    case 'demographicsclassic':
-    case 'partisanclassic':
-    case 'allgroupsclassic':
-      return getColorTable(palette, true);
-    case 'greys': 
-      return getColorTable(palette, false);
-
-    default:
-      // return draclassic palette with only 30 colors
-      for (let i = 1; i < 30; i++)
-        colors.push(genDRAColor(i, true));
-      return colors;
+    // return draclassic palette with only 30 colors
+    let colors: string[] = [];
+    for (let i = 1; i < 30; i++)
+      colors.push(genDRAColor(i, true));
+    return colors;
   }
+
+  return getColorTable(palette);
 }
 
 const DistrictsColorOrder: number[] =
@@ -313,7 +300,7 @@ function orderedColors(palette: string): string[]
   return OrderedColorTable[palette];
 }
 
-export const defaultDistrictsPalette = 'jet';
+export const defaultDistrictsPalette = 'jet_r';
 
 // DRA classic color palette
 export function genDRAColor(i: number, useFirstColor: boolean): string
@@ -339,7 +326,7 @@ export function genDRAColor(i: number, useFirstColor: boolean): string
 }
 
 // Generate table for palette
-function getColorTable(palette: string, reverse: boolean): string[]
+function getColorTable(palette: string): string[]
 {
   if (palette === 'demographicsclassic')
   {
@@ -362,9 +349,6 @@ function getColorTable(palette: string, reverse: boolean): string[]
     return ColorTable[palette];
   }
 
-  if (reverse && !palette.endsWith('_r'))
-    palette = palette + '_r';
-  
   if (allPaletteNames.includes(palette))
   {
     if (!ColorTable[palette])
@@ -386,7 +370,7 @@ function jscolormap(name: string, shades: number): string[]
   let result: string[] = [];
   for (let i = 0; i < shades; i++)
   {
-    const rgb: number[] = partial(name)((i + 0.5) / shades);  //evaluate_cmap((i + 0.5) / shades, name, reverse);
+    const rgb: number[] = partial(name)((i + 0.5) / shades);
     result.push(toHexColor(rgb[0], rgb[1], rgb[2]));
   }
   return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.68",
+  "version": "1.0.69",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",