@dra2020/baseclient 1.0.68 → 1.0.71

package/dist/colors/colors.d.ts

@@ -1,11 +1,20 @@
-interface ColorLookup {
+export declare const MaxOrderedColors: number;
+export declare const MaxColors: number;
+export declare const MaxClassicColors: number;
+export declare const DefaultColorNames: string[];
+export interface ColorLookup {
     [key: string]: string;
 }
 export declare const ColorValues: ColorLookup;
+export declare const CountEthnicFewClassicColors = 4;
 export declare const EthnicFewClassicColors: string[];
+export declare const CountPartisanPrecinctClassicColors = 12;
 export declare const PartisanPrecinctClassicColors: string[];
+export declare const CountPartisanDistrictClassicColors = 12;
+export declare let PartisanDistrictClassicColors: string[];
+export declare const CountEthnicBackgroundColor = 16;
+export declare const EthnicBackgroundColor: string[];
+export declare const defaultDistrictsPalette = "jet_r";
 export declare function genColor(i: number, useFirstColor: boolean, palette: string): string;
+export declare function orderedColors(palette: string): string[];
 export declare function getPalette(palette: string): string[];
-export declare const defaultDistrictsPalette = "jet";
-export declare function genDRAColor(i: number, useFirstColor: boolean): string;
-export {};

package/lib/colors/colors.ts

@@ -1,73 +1,72 @@
 import * as JsColorMapsData from './jscolormapsdata';
 import {Util} from '../all/all'
 
-const MaxOrderedColors: number = 50;
-const MaxColors: number = MaxOrderedColors * 3;
-const MaxClassicColors: number = 55;
-
-const DefaultColorNames: string[] =
-[
-'GhostWhite',
-'Blue',
-'Green',
-'DarkMagenta',
-'Red',
-'Gold',
-'Teal',
-'Chocolate',   //'DarkGray',     // 
-'SlateBlue',
-'Cyan',
-'DeepPink',
-'Chartreuse',
-'CornflowerBlue',
-'DarkSalmon',
-'Olive',
-'DarkOrange',
-'Lime',
-'DarkSlateBlue',
-'Yellow',
-'YellowGreen',
-'Pink',
-'Maroon',
-'Sienna',
-'Aquamarine',
-'Indigo',
-'PaleVioletRed',
-'Navy',   // 'Gray',       //     
-'SpringGreen',
-'Plum',
-'DarkSeaGreen',
-'LightCoral',
-'Khaki',
-'OrangeRed',
-'RoyalBlue',
-'LimeGreen',
-'DarkOrchid',
-'Orange',
-'DodgerBlue',
-'MediumAquamarine',
-'Moccasin',
-'Firebrick',
-'LightSteelBlue',
-'LawnGreen',
-'Magenta',
-'MediumVioletRed',
-'Turquoise',
-'Tomato',
-'Thistle',
-'SandyBrown',
-'IndianRed',
-'PowderBlue',
-'SaddleBrown',
-'OliveDrab',
-'Fuchsia',      // 'Gainsboro',    //
-'PeachPuff',
-'RosyBrown',
+export const MaxOrderedColors: number = 50;
+export const MaxColors: number = MaxOrderedColors * 3;    // Tied to orderedColors()
+export const MaxClassicColors: number = 55;
+
+export const DefaultColorNames: string[] = [
+  'GhostWhite',
+  'Blue',
+  'Green',
+  'DarkMagenta',
+  'Red',
+  'Gold',
+  'Teal',
+  'Chocolate',   //'DarkGray',     // 
+  'SlateBlue',
+  'Cyan',
+  'DeepPink',
+  'Chartreuse',
+  'CornflowerBlue',
+  'DarkSalmon',
+  'Olive',
+  'DarkOrange',
+  'Lime',
+  'DarkSlateBlue',
+  'Yellow',
+  'YellowGreen',
+  'Pink',
+  'Maroon',
+  'Sienna',
+  'Aquamarine',
+  'Indigo',
+  'PaleVioletRed',
+  'Navy',   // 'Gray',       //     
+  'SpringGreen',
+  'Plum',
+  'DarkSeaGreen',
+  'LightCoral',
+  'Khaki',
+  'OrangeRed',
+  'RoyalBlue',
+  'LimeGreen',
+  'DarkOrchid',
+  'Orange',
+  'DodgerBlue',
+  'MediumAquamarine',
+  'Moccasin',
+  'Firebrick',
+  'LightSteelBlue',
+  'LawnGreen',
+  'Magenta',
+  'MediumVioletRed',
+  'Turquoise',
+  'Tomato',
+  'Thistle',
+  'SandyBrown',
+  'IndianRed',
+  'PowderBlue',
+  'SaddleBrown',
+  'OliveDrab',
+  'Fuchsia',      // 'Gainsboro',    //
+  'PeachPuff',
+  'RosyBrown',
 ];
 
-interface ColorLookup
+export interface ColorLookup
 {
-    [key: string]: string;
+  [key: string]: string;
 }
 
 export const ColorValues: ColorLookup =
@@ -214,6 +213,8 @@ export const ColorValues: ColorLookup =
   'YellowGreen': '#9ACD32',
 };
 
+// For Demographics scale (4 colors)
+export const CountEthnicFewClassicColors = 4;
 export const EthnicFewClassicColors = [
   '#fafafa',  // 
   '#aaaaaa',  // 
@@ -221,6 +222,8 @@ export const EthnicFewClassicColors = [
   '#111111',  // 
 ];
 
+// For Partisan Precinct Scale (12 colors)
+export const CountPartisanPrecinctClassicColors = 12;
 export const PartisanPrecinctClassicColors = [
   '#960018',  // Carmine
   '#FF2020',  // 
@@ -236,70 +239,95 @@ export const PartisanPrecinctClassicColors = [
   '#00008B',  // Dark blue
 ];
 
+// For Partisan District Scale (12 stops)
+export const CountPartisanDistrictClassicColors = 12;
+export let PartisanDistrictClassicColors = [
+  '#960018',  // Carmine
+  '#960018',  // .00 <= .40
+  '#FF2020',  // 
+  '#FF2020',  // .40 <= .45
+  '#FF6060',  //
+  '#FFDEDE',  // .45 <= .50
+  '#DEDEFF',  // 
+  '#6060FF',  // .50 <= .55
+  '#2020FF',  // 
+  '#2020FF',  // .55 <= .60
+  '#00008B',  // 
+  '#00008B',  // .60 <= 1.0
+];
+
+// All Groups Mosaic 16 colors
+export const CountEthnicBackgroundColor = 16;
+export const EthnicBackgroundColor: string[] = [
+  '#c0392b', // solid white
+  '#3498db', // solid black
+  '#2ecc71', // solid hispanic
+  '#9b59b6', // solid asian
+  '#d98880', // mostly white
+  '#aed6f1', // mostly black
+  '#abebc6', // mostly hispanic
+  '#bb8fce', // mostly asian
+  '#f1c40f', // mostly native
+  '#aab7b8', // mix
+  '#d5f5e3', // hispanic / white
+  '#d6eaf8', // black / white
+  '#186a3b', // hispanic / black
+  '#e8daef', // asian / white
+  '#45b39d', // asian / hispanic
+  '#4a235a', // black / asian
+];
+
+export const defaultDistrictsPalette = 'jet_r';
+
+// Static color tables; lazily populated
 let ColorTable: {[key: string]: string[]} = {};
 let OrderedColorTable: {[key: string]: string[]} = {};
 
-
 export function genColor(i: number, useFirstColor: boolean, palette: string): string
 {
   // i is district number, 0 => District[0] (unassigned), so subtract 1 to access ColorTable
-
-  if (!useFirstColor || !palette)
-    return genDRAColor(i, useFirstColor);
-    
   if (i == 0)
     return ColorValues[DefaultColorNames[0]];
 
-  switch (palette)
-  {
-    case 'jet': 
-    case 'viridis': 
-    case 'magma': 
-    case 'plasma': 
-    case 'bone': 
-    case 'greys':
-    case 'inferno':
-    case 'turbo':
-    default:
-      return orderedColors(palette)[(i - 1) % MaxOrderedColors];
-
-    case 'draclassic':
-      return genDRAColor(i, useFirstColor);
-  }
+  if (!useFirstColor || !palette || palette === 'draclassic')
+    return genDRAColor(i, useFirstColor);    
+
+  const colors: string[] = orderedColors(palette);
+  if (colors.length >= MaxOrderedColors)
+    return colors[(i - 1) % MaxOrderedColors];
+
+  // Unexpected to get here, but something in case of an error
+  return genDRAColor(i, useFirstColor);
 }
 
-export function getPalette(palette: string): string[]
+// DRA classic color palette
+function genDRAColor(i: number, useFirstColor: boolean): string
 {
-  let colors: string[] = [];
-  switch (palette)
+  // i is district number, 0 => District[0] (unassigned), so subtract 1 to access ColorTable
+  function gen_table(): void
   {
-    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;
+    ColorTable['draclassic'] = [];
+    for (let i: number = 0; i < MaxClassicColors; i++)
+    {
+      // A little funky math below to skip the first (white) color
+      let j = (i % (DefaultColorNames.length - 1)) + 1;
+      ColorTable['draclassic'].push(ColorValues[DefaultColorNames[j]]);
+    }
   }
+
+  if (!ColorTable['draclassic'])
+    gen_table();
+  
+  if (i == 0)
+    return ColorValues[DefaultColorNames[0]];
+  return ColorTable['draclassic'][((i - 1) + (useFirstColor ? 0 : 1)) % MaxClassicColors];
 }
 
 const DistrictsColorOrder: number[] =
   [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,
     7, 31, 13, 37, 19, 47, 25, 43, 8, 32, 14, 38, 2, 20, 26, 44];
 
-function orderedColors(palette: string): string[]
+export function orderedColors(palette: string): string[]
 {
   const colors = getPalette(palette);
   if (!OrderedColorTable[palette])
@@ -313,40 +341,29 @@ function orderedColors(palette: string): string[]
   return OrderedColorTable[palette];
 }
 
-export const defaultDistrictsPalette = 'jet';
-
-// DRA classic color palette
-export function genDRAColor(i: number, useFirstColor: boolean): string
+export function getPalette(palette: string): string[]
 {
-  // i is district number, 0 => District[0] (unassigned), so subtract 1 to access ColorTable
-  function gen_table(): void
+  if (palette === 'draclassic')
   {
-    ColorTable['draclassic'] = [];
-    for (let i: number = 0; i < MaxClassicColors; i++)
-    {
-      // A little funky math below to skip the first (white) color
-      let j = (i % (DefaultColorNames.length - 1)) + 1;
-      ColorTable['draclassic'].push(ColorValues[DefaultColorNames[j]]);
-    }
+    // return draclassic palette with only 50 colors
+    let colors: string[] = [];
+    for (let i = 1; i < MaxOrderedColors; i++)
+      colors.push(genDRAColor(i, true));
+    return colors;
   }
 
-  if (ColorTable == null)
-    gen_table();
-  
-  if (i == 0)
-    return ColorValues[DefaultColorNames[0]];
-  return ColorTable['draclassic'][((i - 1) + (useFirstColor ? 0 : 1)) % MaxClassicColors];
+  return getColorTable(palette);
 }
 
 // Generate table for palette
-function getColorTable(palette: string, reverse: boolean): string[]
+function getColorTable(palette: string): string[]
 {
   if (palette === 'demographicsclassic')
   {
     if (!ColorTable[palette])
     {
       ColorTable[palette] = [];
-      for (let i = 0; i < 4; i++)
+      for (let i = 0; i < CountEthnicFewClassicColors; i++)
         ColorTable[palette].push(EthnicFewClassicColors[i]);
     }
     return ColorTable[palette];
@@ -356,15 +373,32 @@ function getColorTable(palette: string, reverse: boolean): string[]
     if (!ColorTable[palette])
     {
       ColorTable[palette] = [];
-      for (let i = 0; i < 12; i++)
+      for (let i = 0; i < CountPartisanPrecinctClassicColors; i++)
         ColorTable[palette].push(PartisanPrecinctClassicColors[i]);
     }
     return ColorTable[palette];
   }
+  else if (palette === 'partisandistrictsclassic')
+  {
+    if (!ColorTable[palette])
+    {
+      ColorTable[palette] = [];
+      for (let i = 0; i < CountPartisanDistrictClassicColors; i++)
+        ColorTable[palette].push(PartisanDistrictClassicColors[i]);
+    }
+    return ColorTable[palette];
+  }
+  else if (palette === 'allgroupsclassic')
+  {
+    if (!ColorTable[palette])
+    {
+      ColorTable[palette] = [];
+      for (let i = 0; i < CountEthnicBackgroundColor; i++)
+      ColorTable[palette].push(EthnicBackgroundColor[i]);
+      return ColorTable[palette];
+    }
+  }
 
-  if (reverse && !palette.endsWith('_r'))
-    palette = palette + '_r';
-  
   if (allPaletteNames.includes(palette))
   {
     if (!ColorTable[palette])
@@ -386,7 +420,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/lib/geo/geo.ts

@@ -106,7 +106,10 @@ export function geoNormalizeCollection(col: GeoFeatureCollection, options?: Norm
   options = Util.shallowAssignImmutable(NormalizeAll, options);
 
   // Normalize individual features
-  if (col && Array.isArray(col.features)) col.features.forEach((f: GeoFeature) => geoNormalizeFeature(f, options));
+  if (col && Array.isArray(col.features))
+    col.features = col.features.filter((f: any) => f.properties && f.geometry && f.geometry.coordinates);
+  if (col && Array.isArray(col.features))
+    col.features.forEach((f: GeoFeature) => geoNormalizeFeature(f, options));
 
   // Ensure ID
   if (options.ensureID)

package/lib/poly/poly.ts

@@ -749,8 +749,8 @@ export function featureRewind(f: any, options?: RewindOptions): any
   if (!f) return null;
 
   // Has to be an unpacked feature
-  if (f.type !== 'Feature') throw 'featureRewind: must be a valid GeoJSON feature';
-  if (!f.geometry || f.geometry.packed) throw 'featureRewind: only valid on unpacked features';
+  if (f.type !== 'Feature') return f;
+  if (!f.geometry || f.geometry.packed) return f;
 
   // Non polygons are simpler
   if (f.geometry.type !== 'Polygon' && f.geometry.type !== 'MultiPolygon') return canonicalPoint(f, options);

package/package.json

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