@dra2020/baseclient 1.0.68 → 1.0.69

package/dist/baseclient.js

@@ -349,27 +349,14 @@ function genColor(i, useFirstColor, palette) {
 }
 exports.genColor = genColor;
 function getPalette(palette) {
-    let colors = [];
-    switch (palette) {
-        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;
+    if (palette === 'draclassic') {
+        // return draclassic palette with only 30 colors
+        let colors = [];
+        for (let i = 1; i < 30; i++)
+            colors.push(genDRAColor(i, true));
+        return colors;
     }
+    return getColorTable(palette);
 }
 exports.getPalette = getPalette;
 const DistrictsColorOrder = [0, 49, 24, 36, 12, 42, 6, 30, 18, 45, 3, 27, 9, 33, 15, 46, 21, 39, 4, 28, 10, 34, 16, 48, 22, 40, 5, 29, 11, 35, 17, 1, 23, 41,
@@ -384,7 +371,7 @@ function orderedColors(palette) {
     }
     return OrderedColorTable[palette];
 }
-exports.defaultDistrictsPalette = 'jet';
+exports.defaultDistrictsPalette = 'jet_r';
 // DRA classic color palette
 function genDRAColor(i, useFirstColor) {
     // i is district number, 0 => District[0] (unassigned), so subtract 1 to access ColorTable
@@ -404,7 +391,7 @@ function genDRAColor(i, useFirstColor) {
 }
 exports.genDRAColor = genDRAColor;
 // Generate table for palette
-function getColorTable(palette, reverse) {
+function getColorTable(palette) {
     if (palette === 'demographicsclassic') {
         if (!ColorTable[palette]) {
             ColorTable[palette] = [];
@@ -421,8 +408,6 @@ function getColorTable(palette, reverse) {
         }
         return ColorTable[palette];
     }
-    if (reverse && !palette.endsWith('_r'))
-        palette = palette + '_r';
     if (allPaletteNames.includes(palette)) {
         if (!ColorTable[palette])
             ColorTable[palette] = jscolormap(palette, MaxColors);
@@ -438,7 +423,7 @@ function toHexColor(r, g, b) {
 function jscolormap(name, shades) {
     let result = [];
     for (let i = 0; i < shades; i++) {
-        const rgb = partial(name)((i + 0.5) / shades); //evaluate_cmap((i + 0.5) / shades, name, reverse);
+        const rgb = partial(name)((i + 0.5) / shades);
         result.push(toHexColor(rgb[0], rgb[1], rgb[2]));
     }
     return result;