@dra2020/dra-types 1.8.55 → 1.8.58

package/dist/all.d.ts

@@ -1,8 +1,6 @@
 export * from './dra-types';
 export * from './schemas';
 export * from './bucketmap';
-export * from './colordata';
-export * from './gencolor';
 export * from './vfeature';
 export * from './csv';
 export * from './stats';

package/dist/csv.d.ts

@@ -1,3 +1,4 @@
+import { Util } from '@dra2020/baseclient';
 import * as VF from './vfeature';
 export declare type BlockMap = {
     [id: string]: number;
@@ -27,6 +28,7 @@ export interface OneCSVLine {
     districtID: string;
 }
 export declare function parseCSVLine(line: string): OneCSVLine;
+export declare function csvLine(coder: Util.Coder, line: string): OneCSVLine;
 export interface ConvertResult {
     inBlockMap: BlockMapping;
     inStateMap: BlockMapping;

package/dist/dra-types.js

@@ -33,8 +33,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 __exportStar(__webpack_require__(/*! ./dra-types */ "./lib/dra-types.ts"), exports);
 __exportStar(__webpack_require__(/*! ./schemas */ "./lib/schemas.ts"), exports);
 __exportStar(__webpack_require__(/*! ./bucketmap */ "./lib/bucketmap.ts"), exports);
-__exportStar(__webpack_require__(/*! ./colordata */ "./lib/colordata.ts"), exports);
-__exportStar(__webpack_require__(/*! ./gencolor */ "./lib/gencolor.ts"), exports);
 __exportStar(__webpack_require__(/*! ./vfeature */ "./lib/vfeature.ts"), exports);
 __exportStar(__webpack_require__(/*! ./csv */ "./lib/csv.ts"), exports);
 __exportStar(__webpack_require__(/*! ./stats */ "./lib/stats.ts"), exports);
@@ -89,326 +87,6 @@ exports.BucketMap = {
 };
 
 
-/***/ }),
-
-/***/ "./lib/colordata.ts":
-/*!**************************!*\
-  !*** ./lib/colordata.ts ***!
-  \**************************/
-/***/ ((__unused_webpack_module, exports) => {
-
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.IntensityBackgroundColor = exports.ElectionLabel = exports.ElectionTextColor = exports.ElectionBackgroundColor = exports.ColorByGreatD = exports.ColorByGoodD = exports.ColorByFairD = exports.ColorByEven = exports.ColorByFairR = exports.ColorByGoodR = exports.ColorByGreatR = exports.EthnicLabel = exports.EthnicTextColor = exports.EthnicBackgroundColor = exports.ColorByBlackAsian = exports.ColorByAsianHispanic = exports.ColorByAsianWhite = exports.ColorByHispanicBlack = exports.ColorByBlackWhite = exports.ColorByHispanicWhite = exports.ColorByMix = exports.ColorByMostlyNative = exports.ColorByMostlyAsian = exports.ColorByMostlyHispanic = exports.ColorByMostlyBlack = exports.ColorByMostlyWhite = exports.ColorBySolidAsian = exports.ColorBySolidHispanic = exports.ColorBySolidBlack = exports.ColorBySolidWhite = exports.ColorValues = exports.DefaultColorNames = void 0;
-exports.DefaultColorNames = [
-    'GhostWhite',
-    'Blue',
-    'Green',
-    'DarkMagenta',
-    'Red',
-    'Gold',
-    'Teal',
-    'Chocolate',
-    'SlateBlue',
-    'Cyan',
-    'DeepPink',
-    'Chartreuse',
-    'CornflowerBlue',
-    'DarkSalmon',
-    'Olive',
-    'DarkOrange',
-    'Lime',
-    'DarkSlateBlue',
-    'Yellow',
-    'YellowGreen',
-    'Pink',
-    'Maroon',
-    'Sienna',
-    'Aquamarine',
-    'Indigo',
-    'PaleVioletRed',
-    'Navy',
-    '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',
-    'PeachPuff',
-    'RosyBrown',
-];
-exports.ColorValues = {
-    'AliceBlue': '#F0F8FF',
-    'AntiqueWhite': '#FAEBD7',
-    'Aqua': '#00FFFF',
-    'Aquamarine': '#7FFFD4',
-    'Azure': '#F0FFFF',
-    'Beige': '#F5F5DC',
-    'Bisque': '#FFE4C4',
-    'Black': '#000000',
-    'BlanchedAlmond': '#FFEBCD',
-    'Blue': '#0000FF',
-    'BlueViolet': '#8A2BE2',
-    'Brown': '#A52A2A',
-    'BurlyWood': '#DEB887',
-    'CadetBlue': '#5F9EA0',
-    'Chartreuse': '#7FFF00',
-    'Chocolate': '#D2691E',
-    'Coral': '#FF7F50',
-    'CornflowerBlue': '#6495ED',
-    'Cornsilk': '#FFF8DC',
-    'Crimson': '#DC143C',
-    'Cyan': '#00FFFF',
-    'DarkBlue': '#00008B',
-    'DarkCyan': '#008B8B',
-    'DarkGoldenrod': '#B8860B',
-    'DarkGray': '#A9A9A9',
-    'DarkGreen': '#006400',
-    'DarkKhaki': '#BDB76B',
-    'DarkMagenta': '#8B008B',
-    'DarkOliveGreen': '#556B2F',
-    'DarkOrange': '#FF8C00',
-    'DarkOrchid': '#9932CC',
-    'DarkRed': '#8B0000',
-    'DarkSalmon': '#E9967A',
-    'DarkSeaGreen': '#8FBC8F',
-    'DarkSlateBlue': '#483D8B',
-    'DarkSlateGray': '#2F4F4F',
-    'DarkTurquoise': '#00CED1',
-    'DarkViolet': '#9400D3',
-    'DeepPink': '#FF1493',
-    'DeepSkyBlue': '#00BFFF',
-    'DimGray': '#696969',
-    'DodgerBlue': '#1E90FF',
-    'Firebrick': '#B22222',
-    'FloralWhite': '#FFFAF0',
-    'ForestGreen': '#228B22',
-    'Fuchsia': '#FF00FF',
-    'Gainsboro': '#DCDCDC',
-    'GhostWhite': '#F8F8FF',
-    'Gold': '#FFD700',
-    'Goldenrod': '#DAA520',
-    'Gray': '#808080',
-    'Green': '#008000',
-    'GreenYellow': '#ADFF2F',
-    'Honeydew': '#F0FFF0',
-    'HotPink': '#FF69B4',
-    'IndianRed': '#CD5C5C',
-    'Indigo': '#4B0082',
-    'Ivory': '#FFFFF0',
-    'Khaki': '#F0E68C',
-    'Lavender': '#E6E6FA',
-    'LavenderBlush': '#FFF0F5',
-    'LawnGreen': '#7CFC00',
-    'LemonChiffon': '#FFFACD',
-    'LightBlue': '#ADD8E6',
-    'LightCoral': '#F08080',
-    'LightCyan': '#E0FFFF',
-    'LightGoldenrodYellow': '#FAFAD2',
-    'LightGray': '#D3D3D3',
-    'LightGreen': '#90EE90',
-    'LightPink': '#FFB6C1',
-    'LightSalmon': '#FFA07A',
-    'LightSeaGreen': '#20B2AA',
-    'LightSkyBlue': '#87CEFA',
-    'LightSlateGray': '#778899',
-    'LightSteelBlue': '#B0C4DE',
-    'LightYellow': '#FFFFE0',
-    'Lime': '#00FF00',
-    'LimeGreen': '#32CD32',
-    'Linen': '#FAF0E6',
-    'Magenta': '#FF00FF',
-    'Maroon': '#800000',
-    'MediumAquamarine': '#66CDAA',
-    'MediumBlue': '#0000CD',
-    'MediumOrchid': '#BA55D3',
-    'MediumPurple': '#9370DB',
-    'MediumSeaGreen': '#3CB371',
-    'MediumSlateBlue': '#7B68EE',
-    'MediumSpringGreen': '#00FA9A',
-    'MediumTurquoise': '#48D1CC',
-    'MediumVioletRed': '#C71585',
-    'MidnightBlue': '#191970',
-    'MintCream': '#F5FFFA',
-    'MistyRose': '#FFE4E1',
-    'Moccasin': '#FFE4B5',
-    'NavajoWhite': '#FFDEAD',
-    'Navy': '#000080',
-    'OldLace': '#FDF5E6',
-    'Olive': '#808000',
-    'OliveDrab': '#6B8E23',
-    'Orange': '#FFA500',
-    'OrangeRed': '#FF4500',
-    'Orchid': '#DA70D6',
-    'PaleGoldenrod': '#EEE8AA',
-    'PaleGreen': '#98FB98',
-    'PaleTurquoise': '#AFEEEE',
-    'PaleVioletRed': '#DB7093',
-    'PapayaWhip': '#FFEFD5',
-    'PeachPuff': '#FFDAB9',
-    'Peru': '#CD853F',
-    'Pink': '#FFC0CB',
-    'Plum': '#DDA0DD',
-    'PowderBlue': '#B0E0E6',
-    'Purple': '#800080',
-    'Red': '#FF0000',
-    'RosyBrown': '#BC8F8F',
-    'RoyalBlue': '#4169E1',
-    'SaddleBrown': '#8B4513',
-    'Salmon': '#FA8072',
-    'SandyBrown': '#F4A460',
-    'SeaGreen': '#2E8B57',
-    'SeaShell': '#FFF5EE',
-    'Sienna': '#A0522D',
-    'Silver': '#C0C0C0',
-    'SkyBlue': '#87CEEB',
-    'SlateBlue': '#6A5ACD',
-    'SlateGray': '#708090',
-    'Snow': '#FFFAFA',
-    'SpringGreen': '#00FF7F',
-    'SteelBlue': '#4682B4',
-    'Tan': '#D2B48C',
-    'Teal': '#008080',
-    'Thistle': '#D8BFD8',
-    'Tomato': '#FF6347',
-    'Turquoise': '#40E0D0',
-    'Violet': '#EE82EE',
-    'Wheat': '#F5DEB3',
-    'White': '#FFFFFF',
-    'WhiteSmoke': '#F5F5F5',
-    'Yellow': '#FFFF00',
-    'YellowGreen': '#9ACD32',
-};
-exports.ColorBySolidWhite = 0;
-exports.ColorBySolidBlack = 1;
-exports.ColorBySolidHispanic = 2;
-exports.ColorBySolidAsian = 3;
-exports.ColorByMostlyWhite = 4;
-exports.ColorByMostlyBlack = 5;
-exports.ColorByMostlyHispanic = 6;
-exports.ColorByMostlyAsian = 7;
-exports.ColorByMostlyNative = 8;
-exports.ColorByMix = 9;
-exports.ColorByHispanicWhite = 10;
-exports.ColorByBlackWhite = 11;
-exports.ColorByHispanicBlack = 12;
-exports.ColorByAsianWhite = 13;
-exports.ColorByAsianHispanic = 14;
-exports.ColorByBlackAsian = 15;
-exports.EthnicBackgroundColor = [
-    '#c0392b',
-    '#3498db',
-    '#2ecc71',
-    '#9b59b6',
-    '#d98880',
-    '#aed6f1',
-    '#abebc6',
-    '#bb8fce',
-    '#f1c40f',
-    '#aab7b8',
-    '#d5f5e3',
-    '#d6eaf8',
-    '#186a3b',
-    '#e8daef',
-    '#45b39d',
-    '#4a235a',
-];
-exports.EthnicTextColor = [
-    '#ffffff',
-    '#ffffff',
-    '#ffffff',
-    '#ffffff',
-    '#000000',
-    '#000000',
-    '#000000',
-    '#000000',
-    '#000000',
-    '#000000',
-    '#000000',
-    '#000000',
-    '#ffffff',
-    '#000000',
-    '#000000',
-    '#ffffff',
-];
-exports.EthnicLabel = [
-    'Solid White',
-    'Solid Black',
-    'Solid Hispanic',
-    'Solid Asian',
-    'Mostly White',
-    'Mostly Black',
-    'Mostly Hispanic',
-    'Mostly Asian',
-    'Mostly Native',
-    'Mixed',
-    'Hispanic / White Mix',
-    'Black / White Mix',
-    'Hispanic / Black Mix',
-    'Asian / White Mix',
-    'Asian / Hispanic Mix',
-    'Black / Asian Mix'
-];
-exports.ColorByGreatR = 0;
-exports.ColorByGoodR = 1;
-exports.ColorByFairR = 2;
-exports.ColorByEven = 3;
-exports.ColorByFairD = 4;
-exports.ColorByGoodD = 5;
-exports.ColorByGreatD = 6;
-exports.ElectionBackgroundColor = [
-    '#CF0000',
-    '#FF4555',
-    '#FFB0CB',
-    '#9932CC',
-    '#87CEEB',
-    '#1E90FF',
-    '#0000CF',
-];
-exports.ElectionTextColor = [
-    '#ffffff',
-    '#000000',
-    '#000000',
-    '#ffffff',
-    '#000000',
-    '#000000',
-    '#ffffff',
-];
-exports.ElectionLabel = [
-    'Great Republican',
-    'Good Republican',
-    'Fair Republican',
-    'Even',
-    'Fair Democrat',
-    'Good Democrat',
-    'Great Democrat'
-];
-const lum = [0, 25, 50, 75, 100, 125, 150, 175, 200, 225, 255];
-exports.IntensityBackgroundColor = [];
-lum.forEach((n) => { exports.IntensityBackgroundColor.push(`rgba(${n}, ${n}, ${n}, 1.0)`); });
-
-
 /***/ }),
 
 /***/ "./lib/csv.ts":
@@ -419,7 +97,7 @@ lum.forEach((n) => { exports.IntensityBackgroundColor.push(`rgba(${n}, ${n}, ${n
 
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.StateNameMap = exports.StateCodesOrdered = exports.isValidStateNameForUrl = exports.geoidToState = exports.StateCodeToStateId = exports.StateIdToStateCode = exports.blockmapToVTDmap = exports.blockmapToState = exports.parseCSVLine = exports.canonicalDistrictIDOrdering = exports.canonicalDistrictIDGapFill = exports.canonicalDistrictIDFromNumber = exports.canonicalNumericFromDistrictID = exports.canonicalSortingDistrictID = exports.canonicalDistrictID = void 0;
+exports.StateNameMap = exports.StateCodesOrdered = exports.isValidStateNameForUrl = exports.geoidToState = exports.StateCodeToStateId = exports.StateIdToStateCode = exports.blockmapToVTDmap = exports.blockmapToState = exports.csvLine = exports.parseCSVLine = exports.canonicalDistrictIDOrdering = exports.canonicalDistrictIDGapFill = exports.canonicalDistrictIDFromNumber = exports.canonicalNumericFromDistrictID = exports.canonicalSortingDistrictID = exports.canonicalDistrictID = void 0;
 // Public libraries
 const baseclient_1 = __webpack_require__(/*! @dra2020/baseclient */ "@dra2020/baseclient");
 const reverse_1 = __webpack_require__(/*! ./reverse */ "./lib/reverse.ts");
@@ -570,6 +248,18 @@ function parseCSVLine(line) {
     return null;
 }
 exports.parseCSVLine = parseCSVLine;
+function csvLine(coder, line) {
+    if (!coder || !line)
+        return null;
+    let parse = new baseclient_1.CSV.ParseOne(coder, line);
+    if (parse.length != 2)
+        return null;
+    let re = /^\d\d/;
+    if (!re.exec(parse.fields[0]))
+        return null;
+    return { geoid: parse.fields[0], districtID: parse.fields[1] };
+}
+exports.csvLine = csvLine;
 function blockmapToState(blockMap) {
     for (var id in blockMap)
         if (blockMap.hasOwnProperty(id))
@@ -602,7 +292,7 @@ function blockmapToVTDmap(revMap, blockMap, stateMap, altBlocks) {
         nSplitBlocks: 0,
     };
     let bmGather = {};
-    revMap = revMap || reverse_1.reverseBlockMapping(stateMap);
+    revMap = revMap || (0, reverse_1.reverseBlockMapping)(stateMap);
     let revBG; // lazy create on demand
     if (altBlocks) {
         // Create reverse of altBlocks if they exist   {altBlockid: {stdBlockid, pop}, ...}
@@ -665,7 +355,7 @@ function blockmapToVTDmap(revMap, blockMap, stateMap, altBlocks) {
             }
             else if (n == 12) {
                 if (!revBG)
-                    revBG = reverse_1.reverseBlockgroupMapping(stateMap);
+                    revBG = (0, reverse_1.reverseBlockgroupMapping)(stateMap);
                 if (revBG[id]) {
                     ids = revBG[id];
                     geoids = ids.map(id => stateMap[id]);
@@ -1026,39 +716,6 @@ exports.StateNameMap = {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 
 
-/***/ }),
-
-/***/ "./lib/gencolor.ts":
-/*!*************************!*\
-  !*** ./lib/gencolor.ts ***!
-  \*************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.genColor = void 0;
-const ColorData = __webpack_require__(/*! ./colordata */ "./lib/colordata.ts");
-let ColorTable = null;
-const MaxColors = 100;
-function genColor(i, useFirstColor) {
-    // i is district number, 0 => District[0] (unassigned), so subtract 1 to access ColorTable
-    function gen_table() {
-        ColorTable = [];
-        for (let i = 0; i < MaxColors; i++) {
-            // A little funky math below to skip the first (white) color
-            let j = (i % (ColorData.DefaultColorNames.length - 1)) + 1;
-            ColorTable.push(ColorData.ColorValues[ColorData.DefaultColorNames[j]]);
-        }
-    }
-    if (ColorTable == null)
-        gen_table();
-    if (i == 0)
-        return ColorData.ColorValues[ColorData.DefaultColorNames[0]];
-    return ColorTable[((i - 1) + (useFirstColor ? 0 : 1)) % MaxColors];
-}
-exports.genColor = genColor;
-
-
 /***/ }),
 
 /***/ "./lib/groups.ts":
@@ -1265,7 +922,7 @@ exports.Schemas = {
             { published: 'HASH' },
             { xid: 'HASH' },
             { id: 'HASH' }
-        ],
+        ], // sparse
     },
     'expungestate': {
         FileOptions: { version: 7, name: 'sessions', map: true },
@@ -1346,6 +1003,7 @@ exports.Schemas = {
         Schema: {
             id: 'S',
             lastModified: 'S',
+            /* ... others */
         },
         KeySchema: { id: 'HASH' }
     },
@@ -1405,7 +1063,7 @@ exports.Schemas = {
         GlobalSecondaryIndexes: [
             { published: 'HASH' },
             { id: 'HASH' }
-        ],
+        ], // sparse
     },
     'groups': {
         FileOptions: { map: true },
@@ -1787,7 +1445,7 @@ const Hash = __webpack_require__(/*! object-hash */ "object-hash");
 function vhash(o) {
     return Hash(o, { respectType: false,
         unorderedArrays: true,
-        unorderedObjects: true, 
+        unorderedObjects: true,
         // basically, include (state,datasource,geoid,blocks[])
         excludeKeys: (k) => (k === 'id' || k === 'chunk' || k === 'chunkList' || k === 'chunkKey')
     });
@@ -1925,7 +1583,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
   \**************************************/
 /***/ ((module) => {
 
-module.exports = require("@dra2020/baseclient");;
+module.exports = require("@dra2020/baseclient");
 
 /***/ }),
 
@@ -1935,7 +1593,7 @@ module.exports = require("@dra2020/baseclient");;
   \******************************/
 /***/ ((module) => {
 
-module.exports = require("object-hash");;
+module.exports = require("object-hash");
 
 /***/ })
 
@@ -1947,8 +1605,9 @@ module.exports = require("object-hash");;
 /******/ 	// The require function
 /******/ 	function __webpack_require__(moduleId) {
 /******/ 		// Check if module is in cache
-/******/ 		if(__webpack_module_cache__[moduleId]) {
-/******/ 			return __webpack_module_cache__[moduleId].exports;
+/******/ 		var cachedModule = __webpack_module_cache__[moduleId];
+/******/ 		if (cachedModule !== undefined) {
+/******/ 			return cachedModule.exports;
 /******/ 		}
 /******/ 		// Create a new module (and put it into the cache)
 /******/ 		var module = __webpack_module_cache__[moduleId] = {
@@ -1965,10 +1624,13 @@ module.exports = require("object-hash");;
 /******/ 	}
 /******/ 	
 /************************************************************************/
-/******/ 	// module exports must be returned from runtime so entry inlining is disabled
+/******/ 	
 /******/ 	// startup
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__("./lib/all.ts");
+/******/ 	// This entry module is referenced by other modules so it can't be inlined
+/******/ 	var __webpack_exports__ = __webpack_require__("./lib/all.ts");
+/******/ 	
+/******/ 	return __webpack_exports__;
 /******/ })()
 ;
 });