@dra2020/baseclient 1.0.68 → 1.0.71

package/dist/baseclient.js

@@ -98,13 +98,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.genDRAColor = exports.defaultDistrictsPalette = exports.getPalette = exports.genColor = exports.PartisanPrecinctClassicColors = exports.EthnicFewClassicColors = exports.ColorValues = void 0;
+exports.getPalette = exports.orderedColors = exports.genColor = exports.defaultDistrictsPalette = exports.EthnicBackgroundColor = exports.CountEthnicBackgroundColor = exports.PartisanDistrictClassicColors = exports.CountPartisanDistrictClassicColors = exports.PartisanPrecinctClassicColors = exports.CountPartisanPrecinctClassicColors = exports.EthnicFewClassicColors = exports.CountEthnicFewClassicColors = exports.ColorValues = exports.DefaultColorNames = exports.MaxClassicColors = exports.MaxColors = exports.MaxOrderedColors = void 0;
 const JsColorMapsData = __importStar(__webpack_require__(/*! ./jscolormapsdata */ "./lib/colors/jscolormapsdata.ts"));
 const all_1 = __webpack_require__(/*! ../all/all */ "./lib/all/all.ts");
-const MaxOrderedColors = 50;
-const MaxColors = MaxOrderedColors * 3;
-const MaxClassicColors = 55;
-const DefaultColorNames = [
+exports.MaxOrderedColors = 50;
+exports.MaxColors = exports.MaxOrderedColors * 3; // Tied to orderedColors()
+exports.MaxClassicColors = 55;
+exports.DefaultColorNames = [
     'GhostWhite',
     'Blue',
     'Green',
@@ -304,12 +304,16 @@ exports.ColorValues = {
     'Yellow': '#FFFF00',
     'YellowGreen': '#9ACD32',
 };
+// For Demographics scale (4 colors)
+exports.CountEthnicFewClassicColors = 4;
 exports.EthnicFewClassicColors = [
     '#fafafa',
     '#aaaaaa',
     '#666666',
     '#111111', // 
 ];
+// For Partisan Precinct Scale (12 colors)
+exports.CountPartisanPrecinctClassicColors = 12;
 exports.PartisanPrecinctClassicColors = [
     '#960018',
     '#FF2020',
@@ -324,91 +328,106 @@ exports.PartisanPrecinctClassicColors = [
     '#2020FF',
     '#00008B', // Dark blue
 ];
+// For Partisan District Scale (12 stops)
+exports.CountPartisanDistrictClassicColors = 12;
+exports.PartisanDistrictClassicColors = [
+    '#960018',
+    '#960018',
+    '#FF2020',
+    '#FF2020',
+    '#FF6060',
+    '#FFDEDE',
+    '#DEDEFF',
+    '#6060FF',
+    '#2020FF',
+    '#2020FF',
+    '#00008B',
+    '#00008B', // .60 <= 1.0
+];
+// All Groups Mosaic 16 colors
+exports.CountEthnicBackgroundColor = 16;
+exports.EthnicBackgroundColor = [
+    '#c0392b',
+    '#3498db',
+    '#2ecc71',
+    '#9b59b6',
+    '#d98880',
+    '#aed6f1',
+    '#abebc6',
+    '#bb8fce',
+    '#f1c40f',
+    '#aab7b8',
+    '#d5f5e3',
+    '#d6eaf8',
+    '#186a3b',
+    '#e8daef',
+    '#45b39d',
+    '#4a235a', // black / asian
+];
+exports.defaultDistrictsPalette = 'jet_r';
+// Static color tables; lazily populated
 let ColorTable = {};
 let OrderedColorTable = {};
 function genColor(i, useFirstColor, palette) {
     // 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 exports.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);
-    }
+        return exports.ColorValues[exports.DefaultColorNames[0]];
+    if (!useFirstColor || !palette || palette === 'draclassic')
+        return genDRAColor(i, useFirstColor);
+    const colors = orderedColors(palette);
+    if (colors.length >= exports.MaxOrderedColors)
+        return colors[(i - 1) % exports.MaxOrderedColors];
+    // Unexpected to get here, but something in case of an error
+    return genDRAColor(i, useFirstColor);
 }
 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;
+// DRA classic color palette
+function genDRAColor(i, useFirstColor) {
+    // i is district number, 0 => District[0] (unassigned), so subtract 1 to access ColorTable
+    function gen_table() {
+        ColorTable['draclassic'] = [];
+        for (let i = 0; i < exports.MaxClassicColors; i++) {
+            // A little funky math below to skip the first (white) color
+            let j = (i % (exports.DefaultColorNames.length - 1)) + 1;
+            ColorTable['draclassic'].push(exports.ColorValues[exports.DefaultColorNames[j]]);
+        }
     }
+    if (!ColorTable['draclassic'])
+        gen_table();
+    if (i == 0)
+        return exports.ColorValues[exports.DefaultColorNames[0]];
+    return ColorTable['draclassic'][((i - 1) + (useFirstColor ? 0 : 1)) % exports.MaxClassicColors];
 }
-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,
     7, 31, 13, 37, 19, 47, 25, 43, 8, 32, 14, 38, 2, 20, 26, 44];
 function orderedColors(palette) {
     const colors = getPalette(palette);
     if (!OrderedColorTable[palette]) {
         OrderedColorTable[palette] = [];
-        for (let i = 0; i < MaxColors; i++) {
+        for (let i = 0; i < exports.MaxColors; i++) {
             OrderedColorTable[palette].push(colors[DistrictsColorOrder[i] * 3]);
         }
     }
     return OrderedColorTable[palette];
 }
-exports.defaultDistrictsPalette = 'jet';
-// DRA classic color palette
-function genDRAColor(i, useFirstColor) {
-    // i is district number, 0 => District[0] (unassigned), so subtract 1 to access ColorTable
-    function gen_table() {
-        ColorTable['draclassic'] = [];
-        for (let i = 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(exports.ColorValues[DefaultColorNames[j]]);
-        }
+exports.orderedColors = orderedColors;
+function getPalette(palette) {
+    if (palette === 'draclassic') {
+        // return draclassic palette with only 50 colors
+        let colors = [];
+        for (let i = 1; i < exports.MaxOrderedColors; i++)
+            colors.push(genDRAColor(i, true));
+        return colors;
     }
-    if (ColorTable == null)
-        gen_table();
-    if (i == 0)
-        return exports.ColorValues[DefaultColorNames[0]];
-    return ColorTable['draclassic'][((i - 1) + (useFirstColor ? 0 : 1)) % MaxClassicColors];
+    return getColorTable(palette);
 }
-exports.genDRAColor = genDRAColor;
+exports.getPalette = getPalette;
 // Generate table for palette
-function getColorTable(palette, reverse) {
+function getColorTable(palette) {
     if (palette === 'demographicsclassic') {
         if (!ColorTable[palette]) {
             ColorTable[palette] = [];
-            for (let i = 0; i < 4; i++)
+            for (let i = 0; i < exports.CountEthnicFewClassicColors; i++)
                 ColorTable[palette].push(exports.EthnicFewClassicColors[i]);
         }
         return ColorTable[palette];
@@ -416,16 +435,30 @@ function getColorTable(palette, reverse) {
     else if (palette === 'partisanclassic') {
         if (!ColorTable[palette]) {
             ColorTable[palette] = [];
-            for (let i = 0; i < 12; i++)
+            for (let i = 0; i < exports.CountPartisanPrecinctClassicColors; i++)
                 ColorTable[palette].push(exports.PartisanPrecinctClassicColors[i]);
         }
         return ColorTable[palette];
     }
-    if (reverse && !palette.endsWith('_r'))
-        palette = palette + '_r';
+    else if (palette === 'partisandistrictsclassic') {
+        if (!ColorTable[palette]) {
+            ColorTable[palette] = [];
+            for (let i = 0; i < exports.CountPartisanDistrictClassicColors; i++)
+                ColorTable[palette].push(exports.PartisanDistrictClassicColors[i]);
+        }
+        return ColorTable[palette];
+    }
+    else if (palette === 'allgroupsclassic') {
+        if (!ColorTable[palette]) {
+            ColorTable[palette] = [];
+            for (let i = 0; i < exports.CountEthnicBackgroundColor; i++)
+                ColorTable[palette].push(exports.EthnicBackgroundColor[i]);
+            return ColorTable[palette];
+        }
+    }
     if (allPaletteNames.includes(palette)) {
         if (!ColorTable[palette])
-            ColorTable[palette] = jscolormap(palette, MaxColors);
+            ColorTable[palette] = jscolormap(palette, exports.MaxColors);
         return ColorTable[palette];
     }
     else
@@ -438,7 +471,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;
@@ -2233,6 +2266,8 @@ function mergePolygon(f1, f2) {
 function geoNormalizeCollection(col, options) {
     options = Util.shallowAssignImmutable(NormalizeAll, options);
     // Normalize individual features
+    if (col && Array.isArray(col.features))
+        col.features = col.features.filter((f) => f.properties && f.geometry && f.geometry.coordinates);
     if (col && Array.isArray(col.features))
         col.features.forEach((f) => geoNormalizeFeature(f, options));
     // Ensure ID
@@ -7428,9 +7463,9 @@ function featureRewind(f, options) {
         return null;
     // Has to be an unpacked feature
     if (f.type !== 'Feature')
-        throw 'featureRewind: must be a valid GeoJSON feature';
+        return f;
     if (!f.geometry || f.geometry.packed)
-        throw 'featureRewind: only valid on unpacked features';
+        return f;
     // Non polygons are simpler
     if (f.geometry.type !== 'Polygon' && f.geometry.type !== 'MultiPolygon')
         return canonicalPoint(f, options);