@dra2020/district-analytics 3.0.1 → 3.1.0

package/dist/cli.js

@@ -86,10 +86,10 @@
 /************************************************************************/
 /******/ ({
 
-/***/ "./node_modules/@dra2020/dra-score/dist/dra-score.bundle.js":
-/*!******************************************************************!*\
-  !*** ./node_modules/@dra2020/dra-score/dist/dra-score.bundle.js ***!
-  \******************************************************************/
+/***/ "../dra-score/dist/dra-score.bundle.js":
+/*!*********************************************!*\
+  !*** ../dra-score/dist/dra-score.bundle.js ***!
+  \*********************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -89814,7 +89814,11 @@ function doPopulationDeviation(e, targetSize, bLegislative, bLog = false) {
     // Round the raw value to the desired level of precision
     const popDev = U.trim((max - min) / targetSize);
     const score = scorePopulationDeviation(popDev, bLegislative);
-    const notes = { 'maxDeviation': max - min };
+    const threshold = bLegislative ? S.POPDEV_WORST_LD : S.POPDEV_WORST;
+    const notes = {
+        'maxDeviation': max - min,
+        'threshold': threshold
+    };
     // Populate the measurement
     const m = {
         raw: popDev,
@@ -90349,7 +90353,7 @@ const cohesive_1 = __webpack_require__(/*! ./cohesive */ "./src/cohesive.ts");
 const equal_1 = __webpack_require__(/*! ./equal */ "./src/equal.ts");
 const fair_1 = __webpack_require__(/*! ./fair */ "./src/fair.ts");
 // TODO - Score opportunity for minority representation
-function scorePlan(p) {
+function scorePlan(p, overridesJSON = undefined) {
     // BEST subcategories - compactness, splitting, population deviation
     // Compactness
     const reockM = compact_1.doReock(p.compactnessProfile.GeometryByDistrict);
@@ -90636,10 +90640,10 @@ module.exports = JSON.parse("{\"score\":5,\"best\":{\"BestScore\":18,\"compactne
 
 /***/ }),
 
-/***/ "./node_modules/@dra2020/poly/dist/poly.js":
-/*!*************************************************!*\
-  !*** ./node_modules/@dra2020/poly/dist/poly.js ***!
-  \*************************************************/
+/***/ "./node_modules/@dra2020/dra-types/dist/dra-types.js":
+/*!***********************************************************!*\
+  !*** ./node_modules/@dra2020/dra-types/dist/dra-types.js ***!
+  \***********************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -90749,334 +90753,2145 @@ function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
 Object.defineProperty(exports, "__esModule", { value: true });
-__export(__webpack_require__(/*! ./poly */ "./lib/poly.ts"));
-__export(__webpack_require__(/*! ./union */ "./lib/union.ts"));
+__export(__webpack_require__(/*! ./dra-types */ "./lib/dra-types.ts"));
 
 
 /***/ }),
 
-/***/ "./lib/poly.ts":
-/*!*********************!*\
-  !*** ./lib/poly.ts ***!
-  \*********************/
+/***/ "./lib/dra-types.ts":
+/*!**************************!*\
+  !*** ./lib/dra-types.ts ***!
+  \**************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
+// Public libraries
+const Hash = __webpack_require__(/*! object-hash */ "object-hash");
 const Util = __webpack_require__(/*! @dra2020/util */ "@dra2020/util");
-// Internal utilities
-exports.EARTH_RADIUS = 6371000; // Radius of earth in meters
-const DefaultOptions = {};
-// Return geographic polygon area in meters^2
-function polySimpleArea(p, options) {
-    if (options === undefined)
-        options = DefaultOptions;
-    let p1;
-    let p2;
-    let p3;
-    let dx;
-    let l;
-    let m;
-    let u;
-    let i;
-    let total = 0;
-    let n = p.length;
-    if (n > 2) {
-        for (i = 0; i < n; i++) {
-            if (i === n - 2) {
-                l = n - 2;
-                m = n - 1;
-                u = 0;
-            }
-            else if (i === n - 1) {
-                l = n - 1;
-                m = 0;
-                u = 1;
-            }
-            else {
-                l = i;
-                m = i + 1;
-                u = i + 2;
-            }
-            p1 = p[l];
-            p2 = p[m];
-            p3 = p[u];
-            dx = (Util.deg2rad(p3[0]) - Util.deg2rad(p1[0]));
-            dx *= Math.sin(Util.deg2rad(p2[1]));
-            total += dx;
-        }
-        total *= exports.EARTH_RADIUS * exports.EARTH_RADIUS / 2;
-    }
-    return Math.abs(total);
-}
-// Allow bare polygon coordinates array or GeoJSON feature.
-// Normalize to multipolygon points array.
-function polyNormalize(poly, options) {
-    if (options === undefined)
-        options = DefaultOptions;
-    // Convert a GeoJSON polygon or multipolygon to the raw list of points
-    if (poly && poly.geometry && poly.geometry.coordinates)
-        poly = poly.geometry.coordinates;
-    // This is really an invalid specification but used internally to represent null polygon
-    if (poly && poly.length == 0)
-        return null;
-    if (Util.depthof(poly) == 4)
-        poly = [poly];
-    return poly;
+// Canonical hashing of splitblock data
+function hash(o) {
+    return Hash(o, { respectType: false,
+        unorderedArrays: true,
+        unorderedObjects: true,
+        excludeKeys: (k) => (k === 'id' || k === 'chunk')
+    });
 }
-exports.polyNormalize = polyNormalize;
-// Area of geographic polygon
-function polyArea(poly, options) {
-    if (options === undefined)
-        options = DefaultOptions;
-    poly = polyNormalize(poly, options);
-    let a = 0;
-    // MultiPolygon is a set of polygons
-    for (let i = 0; poly && i < poly.length; i++) {
-        // Single polygon is exterior ring with interior holes. Holes are subtracted.
-        let p = poly[i];
-        for (let j = 0; j < p.length; j++) {
-            let sp = p[j];
-            a += polySimpleArea(sp, options) * (j == 0 ? 1 : -1);
+function vgeoidToGeoid(vgeoid) {
+    let re = /vfeature_([^_]*)_.*/;
+    let a = re.exec(vgeoid);
+    if (a == null || a.length != 2)
+        return '';
+    else
+        return a[1];
+}
+exports.vgeoidToGeoid = vgeoidToGeoid;
+function vgeoidToChunk(vgeoid) {
+    // vgeoid is string of form: "vfeature_[geoid]_[chunkid]_[hash]"
+    // the contents are chunked into a file of form "vfeature_chunk_[chunkid]"
+    // So extract the chunk ID and download that.
+    let re = /vfeature_([^_]*)_([^_*])_(.*)/;
+    let a = re.exec(vgeoid);
+    if (a && a.length == 4)
+        vgeoid = `vfeature_chunk_${a[2]}`;
+    else
+        vgeoid = null;
+    return vgeoid;
+}
+exports.vgeoidToChunk = vgeoidToChunk;
+function vgeoidToHash(vgeoid) {
+    // vgeoid is string of form: "vfeature_[geoid]_[chunkid]_[hash]"
+    let re = /vfeature_([^_]*)_([^_*])_(.*)/;
+    let a = re.exec(vgeoid);
+    if (a && a.length == 4)
+        vgeoid = a[3];
+    else
+        vgeoid = null;
+    return vgeoid;
+}
+exports.vgeoidToHash = vgeoidToHash;
+function isVfeature(geoid) {
+    return geoid.indexOf('vfeature') === 0;
+}
+exports.isVfeature = isVfeature;
+function splitToCacheKey(s) {
+    if (s.id === undefined)
+        s.id = hash(s);
+    if (s.chunk === undefined)
+        s.chunk = "0";
+    return `_${s.state}_${s.datasource}_vfeature_${s.geoid}_${s.chunk}_${s.id}.geojson`;
+}
+exports.splitToCacheKey = splitToCacheKey;
+function splitToChunkKey(s) {
+    if (s.chunk === undefined)
+        s.chunk = "0";
+    return `_${s.state}_${s.datasource}_vfeature_chunk_${s.chunk}.geojson`;
+}
+exports.splitToChunkKey = splitToChunkKey;
+function splitToPrefix(s) {
+    if (s.blocks === undefined) {
+        let re = /_([^_]*)_(.*)_vfeature.*\.geojson$/;
+        let a = re.exec(s.id);
+        if (a && a.length == 3)
+            return `_${a[1]}_${a[2]}`;
+        return s.id;
+    }
+    return `_${s.state}_${s.datasource}`;
+}
+exports.splitToPrefix = splitToPrefix;
+function cacheKeysToChunkHash(keys) {
+    return hash(keys);
+}
+exports.cacheKeysToChunkHash = cacheKeysToChunkHash;
+let reNumeric = /^(\D*)(\d*)(\D*)$/;
+let reDistrictNumber = /^\d+$/;
+let reDistrictNumeric = /^\d/;
+// Normalize any numeric part to have no padded leading zeros
+function canonicalDistrictID(districtID) {
+    let a = reNumeric.exec(districtID);
+    if (a && a.length == 4) {
+        if (a[2].length > 0)
+            a[2] = String(Number(a[2]));
+        districtID = `${a[1]}${a[2]}${a[3]}`;
+    }
+    return districtID;
+}
+exports.canonicalDistrictID = canonicalDistrictID;
+// Normalize any numeric part to have four digits with padded leading zeros
+function canonicalSortingDistrictID(districtID) {
+    let a = reNumeric.exec(districtID);
+    if (a && a.length == 4) {
+        let s = a[2];
+        if (s.length > 0) {
+            switch (s.length) {
+                case 1:
+                    s = `000${s}`;
+                    break;
+                case 2:
+                    s = `00${s}`;
+                    break;
+                case 3:
+                    s = `0${s}`;
+                    break;
+            }
+            a[2] = s;
         }
+        districtID = `${a[1]}${a[2]}${a[3]}`;
     }
-    return a;
-}
-exports.polyArea = polyArea;
-// Return distance in meters given two lat/lon points
-function haversine(x1, y1, x2, y2, options) {
-    let dLat = Util.deg2rad(y2 - y1);
-    let dLon = Util.deg2rad(x2 - x1);
-    let c;
-    // Short circuit for using simple cartesian algorithm instead of haversine
-    if (options.noLatitudeCorrection)
-        c = Math.sqrt((dLat * dLat) + (dLon * dLon));
-    else {
-        let lat1 = Util.deg2rad(y1);
-        let lat2 = Util.deg2rad(y2);
-        let a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
-            Math.sin(dLon / 2) * Math.sin(dLon / 2) * Math.cos(lat1) * Math.cos(lat2);
-        c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-    }
-    return exports.EARTH_RADIUS * c;
+    return districtID;
 }
-// Perimeter of geographic polygon in meters
-function polyPerimeter(poly, options) {
-    if (options === undefined)
-        options = DefaultOptions;
-    poly = polyNormalize(poly, options);
-    let perimeter = 0;
-    for (let i = 0; poly && i < poly.length; i++) {
-        // Ignore holes so only look at first polyline
-        let p = poly[i][0];
-        for (let j = 0; j < p.length - 1; j++)
-            perimeter += haversine(p[j][0], p[j][1], p[j + 1][0], p[j + 1][1], options);
-        if (p.length > 2 && (p[0][0] != p[p.length - 1][0] || p[0][1] != p[p.length - 1][1]))
-            perimeter += haversine(p[0][0], p[0][1], p[p.length - 1][0], p[p.length - 1][1], options);
+exports.canonicalSortingDistrictID = canonicalSortingDistrictID;
+// Return numeric part of districtID (or -1 if there is none)
+function canonicalNumericFromDistrictID(districtID) {
+    let a = reNumeric.exec(districtID);
+    if (a && a.length == 4) {
+        let s = a[2];
+        if (s.length > 0)
+            return Number(s);
     }
-    return perimeter;
+    return -1;
 }
-exports.polyPerimeter = polyPerimeter;
-class Point {
-    constructor(x, y) {
-        this.x = x;
-        this.y = y;
+exports.canonicalNumericFromDistrictID = canonicalNumericFromDistrictID;
+function canonicalDistrictIDFromNumber(districtID, n) {
+    let a = reNumeric.exec(districtID);
+    if (a && a.length == 4) {
+        a[2] = String(n);
+        districtID = `${a[1]}${a[2]}${a[3]}`;
     }
+    else
+        districtID = String(n);
+    return districtID;
 }
-class Circle {
-    constructor(x, y, r) {
-        this.x = x;
-        this.y = y;
-        this.r = r;
+exports.canonicalDistrictIDFromNumber = canonicalDistrictIDFromNumber;
+function canonicalDistrictIDOrdering(order) {
+    let keys = Object.keys(order);
+    let i;
+    let a = [];
+    let template = undefined;
+    keys = keys.map((s) => canonicalSortingDistrictID(s));
+    keys.sort();
+    order = {};
+    for (i = 0; i < keys.length; i++)
+        order[canonicalDistrictID(keys[i])] = i + 1;
+    // Remove water districts
+    if (order['ZZZ'])
+        delete order['ZZZ'];
+    if (order['ZZ'])
+        delete order['ZZ'];
+    return order;
+}
+exports.canonicalDistrictIDOrdering = canonicalDistrictIDOrdering;
+let reArray = [
+    /^(\d\d[^\s,"']*)[\s]*,[\s]*([^\s'"]+)[\s]*$/,
+    /^["'](\d\d[^"']*)["'][\s]*,[\s]*["']([^"']*)["'][\s]*$/,
+    /^(\d\d[^\s,]*)[\s]*,[\s]*["']([^"']*)["'][\s]*$/,
+    /^["'](\d\d[^"']*)["'][\s]*,[\s]*([^\s]+)[\s]*$/,
+];
+function parseCSVLine(line) {
+    if (line == null || line == '')
+        return null;
+    for (let i = 0; i < reArray.length; i++) {
+        let a = reArray[i].exec(line);
+        if (a && a.length === 3)
+            return { geoid: a[1], districtID: a[2] };
     }
+    return null;
 }
-exports.Circle = Circle;
-//
-// Returns the smallest circle that encloses the given polygon.
-// Runs in expected O(n) time, randomized.
-// Note: If 0 points are given, null is returned.
-// If 1 point is given, a circle of radius 0 is returned.
-//
-function polyToCircle(poly, options) {
-    if (options === undefined)
-        options = DefaultOptions;
-    return makeCircle(polyToExteriorPoints(poly));
+exports.parseCSVLine = parseCSVLine;
+function blockmapToState(blockMap) {
+    for (var id in blockMap)
+        if (blockMap.hasOwnProperty(id))
+            return geoidToState(id);
+    return null;
 }
-exports.polyToCircle = polyToCircle;
+exports.blockmapToState = blockmapToState;
+// blockToVTD:
+//  Take BlockMapping (simple map of GEOID to districtID) and a per-state map of block-level GEOID to VTD
+//  and return the output mapping of VTD to districtID, as well a data structure that describes any VTD's
+//  that need to be split between districtIDs. Also returns the DistrictOrder structure that defines the
+//  districtIDs that were used by the file.
 //
-// Returns the circle whose perimeter is equal to the perimeter of the bounding perimeter
-// of the polygon. Use binary search to find an approximation.
+//  The state (as specified by the first two digits of the GEOID) is also determined. If the GEOID's do
+//  not all specify the same state, the mapping is considered invalid and the outValid flag is set to false.
 //
-function polyToPolsbyPopperCircle(poly, options) {
-    if (options === undefined)
-        options = DefaultOptions;
-    let c = polyToCircle(poly, options);
-    if (c == null)
-        return c;
-    let p = polyPerimeter(poly, options);
-    c.r = (p / (2 * Math.PI)) / 111139;
-    return c;
-}
-exports.polyToPolsbyPopperCircle = polyToPolsbyPopperCircle;
-function makeCircle(points) {
-    if (points == null)
-        return null;
-    // Clone list to preserve the caller's data, do Durstenfeld shuffle
-    let shuffled = points.slice();
-    for (let i = points.length - 1; i >= 0; i--) {
-        let j = Math.floor(Math.random() * (i + 1));
-        j = Math.max(Math.min(j, i), 0);
-        const temp = shuffled[i];
-        shuffled[i] = shuffled[j];
-        shuffled[j] = temp;
-    }
-    // Progressively add points to circle or recompute circle
-    let c = null;
-    shuffled.forEach((p, i) => {
-        if (c === null || !isInCircle(c, p))
-            c = makeCircleOnePoint(shuffled.slice(0, i + 1), p);
-    });
-    return c;
-}
-// One boundary point known
-function makeCircleOnePoint(points, p) {
-    let c = new Circle(p.x, p.y, 0);
-    points.forEach((q, i) => {
-        if (!isInCircle(c, q)) {
-            if (c.r == 0)
-                c = makeDiameter(p, q);
+function blockmapToVTDmap(blockMap, stateMap) {
+    let res = {
+        inBlockMap: blockMap,
+        inStateMap: stateMap,
+        outValid: true,
+        outState: null,
+        outMap: {},
+        outOrder: {},
+        outDistrictToSplit: {}
+    };
+    let bmGather = {};
+    let revMap = {};
+    let id;
+    if (stateMap)
+        for (id in stateMap)
+            if (stateMap.hasOwnProperty(id))
+                revMap[stateMap[id]] = null;
+    // First aggregate into features across all the blocks
+    for (id in blockMap)
+        if (blockMap.hasOwnProperty(id)) {
+            let state = geoidToState(id);
+            if (res.outState == null)
+                res.outState = state;
+            else if (res.outState !== state) {
+                res.outValid = false;
+                break;
+            }
+            let districtID = canonicalDistrictID(blockMap[id]);
+            // Just ignore ZZZ (water) blocks
+            if (districtID === 'ZZZ')
+                continue;
+            let n = id.length;
+            let geoid;
+            // Simple test for block id (vs. voting district or block group) id
+            if (n >= 15) {
+                if (stateMap && stateMap[id] !== undefined)
+                    geoid = stateMap[id];
+                else {
+                    geoid = id.substr(0, 12); // heuristic for mapping blockID to blockgroupID
+                    if (revMap[geoid] === undefined) {
+                        res.outValid = false;
+                        break;
+                    }
+                }
+            }
             else
-                c = makeCircleTwoPoints(points.slice(0, i + 1), p, q);
+                geoid = id;
+            if (res.outOrder[districtID] === undefined)
+                res.outOrder[districtID] = 0;
+            let districtToBlocks = bmGather[geoid];
+            if (districtToBlocks === undefined)
+                bmGather[geoid] = { [districtID]: { [id]: true } };
+            else {
+                let thisDistrict = districtToBlocks[districtID];
+                if (thisDistrict === undefined) {
+                    thisDistrict = {};
+                    districtToBlocks[districtID] = thisDistrict;
+                }
+                thisDistrict[id] = true;
+            }
         }
-    });
-    return c;
-}
-// Two boundary points known
-function makeCircleTwoPoints(points, p, q) {
-    const circ = makeDiameter(p, q);
-    let left = null;
-    let right = null;
-    // For each point not in the two-point circle
-    for (const r of points) {
-        if (isInCircle(circ, r))
-            continue;
-        // Form a circumcircle and classify it on left or right side
-        const cross = crossProduct(p.x, p.y, q.x, q.y, r.x, r.y);
-        const c = makeCircumcircle(p, q, r);
-        if (c === null)
-            continue;
-        else if (cross > 0 && (left === null || crossProduct(p.x, p.y, q.x, q.y, c.x, c.y) > crossProduct(p.x, p.y, q.x, q.y, left.x, left.y)))
-            left = c;
-        else if (cross < 0 && (right === null || crossProduct(p.x, p.y, q.x, q.y, c.x, c.y) < crossProduct(p.x, p.y, q.x, q.y, right.x, right.y)))
-            right = c;
-    }
-    // Select which circle to return
-    if (left === null && right === null)
-        return circ;
-    else if (left === null && right !== null)
-        return right;
-    else if (left !== null && right === null)
-        return left;
-    else if (left !== null && right !== null)
-        return left.r <= right.r ? left : right;
-    else
-        throw "Assertion error";
-}
-function makeDiameter(a, b) {
-    const cx = (a.x + b.x) / 2;
-    const cy = (a.y + b.y) / 2;
-    const r0 = Util.distance(cx, cy, a.x, a.y);
-    const r1 = Util.distance(cx, cy, b.x, b.y);
-    return new Circle(cx, cy, Math.max(r0, r1));
+    // Now determine actual mapping of blocks to features, looking for split features
+    for (let geoid in bmGather)
+        if (bmGather.hasOwnProperty(geoid)) {
+            let districtToBlocks = bmGather[geoid];
+            if (Util.countKeys(districtToBlocks) == 1) {
+                res.outMap[geoid] = Util.nthKey(districtToBlocks);
+            }
+            else {
+                for (let districtID in districtToBlocks)
+                    if (districtToBlocks.hasOwnProperty(districtID)) {
+                        let split = { state: '', datasource: '', geoid: geoid, blocks: Object.keys(districtToBlocks[districtID]) };
+                        let splits = res.outDistrictToSplit[districtID];
+                        if (splits === undefined) {
+                            splits = [];
+                            res.outDistrictToSplit[districtID] = splits;
+                        }
+                        splits.push(split);
+                    }
+            }
+        }
+    res.outOrder = canonicalDistrictIDOrdering(res.outOrder);
+    return res;
 }
-function makeCircumcircle(a, b, c) {
-    // Mathematical algorithm from Wikipedia: Circumscribed circle
-    const ox = (Math.min(a.x, b.x, c.x) + Math.max(a.x, b.x, c.x)) / 2;
-    const oy = (Math.min(a.y, b.y, c.y) + Math.max(a.y, b.y, c.y)) / 2;
-    const ax = a.x - ox;
-    const ay = a.y - oy;
-    const bx = b.x - ox;
-    const by = b.y - oy;
-    const cx = c.x - ox;
-    const cy = c.y - oy;
-    const d = (ax * (by - cy) + bx * (cy - ay) + cx * (ay - by)) * 2;
-    if (d == 0)
+exports.blockmapToVTDmap = blockmapToVTDmap;
+exports.GEOIDToState = {
+    '01': 'AL',
+    '02': 'AK',
+    '04': 'AZ',
+    '05': 'AR',
+    '06': 'CA',
+    '08': 'CO',
+    '09': 'CT',
+    '10': 'DE',
+    '12': 'FL',
+    '13': 'GA',
+    '15': 'HI',
+    '16': 'ID',
+    '17': 'IL',
+    '18': 'IN',
+    '19': 'IA',
+    '20': 'KS',
+    '21': 'KY',
+    '22': 'LA',
+    '23': 'ME',
+    '24': 'MD',
+    '25': 'MA',
+    '26': 'MI',
+    '27': 'MN',
+    '28': 'MS',
+    '29': 'MO',
+    '30': 'MT',
+    '31': 'NE',
+    '32': 'NV',
+    '33': 'NH',
+    '34': 'NJ',
+    '35': 'NM',
+    '36': 'NY',
+    '37': 'NC',
+    '38': 'ND',
+    '39': 'OH',
+    '40': 'OK',
+    '41': 'OR',
+    '42': 'PA',
+    '44': 'RI',
+    '45': 'SC',
+    '46': 'SD',
+    '47': 'TN',
+    '48': 'TX',
+    '49': 'UT',
+    '50': 'VT',
+    '51': 'VA',
+    '53': 'WA',
+    '54': 'WV',
+    '55': 'WI',
+    '56': 'WY',
+};
+exports.StateToGEOID = {
+    'AL': '01',
+    'AK': '02',
+    'AZ': '04',
+    'AR': '05',
+    'CA': '06',
+    'CO': '08',
+    'CT': '09',
+    'DE': '10',
+    'FL': '12',
+    'GA': '13',
+    'HI': '15',
+    'ID': '16',
+    'IL': '17',
+    'IN': '18',
+    'IA': '19',
+    'KS': '20',
+    'KY': '21',
+    'LA': '22',
+    'ME': '23',
+    'MD': '24',
+    'MA': '25',
+    'MI': '26',
+    'MN': '27',
+    'MS': '28',
+    'MO': '29',
+    'MT': '30',
+    'NE': '31',
+    'NV': '32',
+    'NH': '33',
+    'NJ': '34',
+    'NM': '35',
+    'NY': '36',
+    'NC': '37',
+    'ND': '38',
+    'OH': '39',
+    'OK': '40',
+    'OR': '41',
+    'PA': '42',
+    'RI': '44',
+    'SC': '45',
+    'SD': '46',
+    'TN': '47',
+    'TX': '48',
+    'UT': '49',
+    'VT': '50',
+    'VA': '51',
+    'WA': '53',
+    'WV': '54',
+    'WI': '55',
+    'WY': '56',
+};
+function geoidToState(geoid) {
+    let re = /^(..).*$/;
+    let a = re.exec(geoid);
+    if (a == null || a.length != 2)
         return null;
-    const x = ox + ((ax * ax + ay * ay) * (by - cy) + (bx * bx + by * by) * (cy - ay) + (cx * cx + cy * cy) * (ay - by)) / d;
-    const y = oy + ((ax * ax + ay * ay) * (cx - bx) + (bx * bx + by * by) * (ax - cx) + (cx * cx + cy * cy) * (bx - ax)) / d;
-    const ra = Util.distance(x, y, a.x, a.y);
-    const rb = Util.distance(x, y, b.x, b.y);
-    const rc = Util.distance(x, y, c.x, c.y);
-    return new Circle(x, y, Math.max(ra, rb, rc));
-}
-/* Simple mathematical functions */
-const MULTIPLICATIVE_EPSILON = 1 + 1e-14;
-function isInCircle(c, p) {
-    return c !== null && Util.distance(p.x, p.y, c.x, c.y) <= c.r * MULTIPLICATIVE_EPSILON;
+    return exports.GEOIDToState[a[1]];
 }
-// Returns twice the signed area of the triangle defined by (x0, y0), (x1, y1), (x2, y2).
-function crossProduct(x0, y0, x1, y1, x2, y2) {
-    return (x1 - x0) * (y2 - y0) - (y1 - y0) * (x2 - x0);
+exports.geoidToState = geoidToState;
+
+
+/***/ }),
+
+/***/ "@dra2020/util":
+/*!********************************!*\
+  !*** external "@dra2020/util" ***!
+  \********************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+module.exports = __webpack_require__(/*! @dra2020/util */ "./node_modules/@dra2020/dra-types/node_modules/@dra2020/util/dist/util.js");
+
+/***/ }),
+
+/***/ "object-hash":
+/*!******************************!*\
+  !*** external "object-hash" ***!
+  \******************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+module.exports = __webpack_require__(/*! object-hash */ "./node_modules/@dra2020/dra-types/node_modules/object-hash/index.js");
+
+/***/ })
+
+/******/ });
+});
+
+
+/***/ }),
+
+/***/ "./node_modules/@dra2020/dra-types/node_modules/@dra2020/util/dist/util.js":
+/*!*********************************************************************************!*\
+  !*** ./node_modules/@dra2020/dra-types/node_modules/@dra2020/util/dist/util.js ***!
+  \*********************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+(function webpackUniversalModuleDefinition(root, factory) {
+	if(true)
+		module.exports = factory();
+	else {}
+})(global, function() {
+return /******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = "./lib/all.ts");
+/******/ })
+/************************************************************************/
+/******/ ({
+
+/***/ "./lib/all.ts":
+/*!********************!*\
+  !*** ./lib/all.ts ***!
+  \********************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+function __export(m) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
-// cache x,y circle offsets for one quadrant indexed by number of segments
-let circleOffsets = {};
-function getCircleOffsets(n) {
-    if (circleOffsets[n] === undefined) {
-        let a = [];
-        let incr = (Math.PI / 2) / n;
-        let theta = 0;
-        let i, j;
-        // Compute NE quadrant
-        for (i = 0; i < n; i++, theta += incr) {
-            a.push(Math.sin(theta));
-            a.push(Math.cos(theta));
-        }
-        // Add top of circle
-        a.push(0);
-        a.push(1);
-        // Now flip X and replicate to NW quadrant
-        for (i = 0; i < n; i++) {
-            j = (n - i) * 2;
-            a.push(-a[j - 1]);
-            a.push(a[j - 2]);
-        }
-        // Now flip X and Y and replicate to SW quadrant
-        for (i = 0; i < n; i++) {
-            j = (n - i) * 2;
-            a.push(-a[j - 1]);
-            a.push(-a[j - 2]);
+Object.defineProperty(exports, "__esModule", { value: true });
+__export(__webpack_require__(/*! ./util */ "./lib/util.ts"));
+__export(__webpack_require__(/*! ./countedhash */ "./lib/countedhash.ts"));
+__export(__webpack_require__(/*! ./indexedarray */ "./lib/indexedarray.ts"));
+
+
+/***/ }),
+
+/***/ "./lib/countedhash.ts":
+/*!****************************!*\
+  !*** ./lib/countedhash.ts ***!
+  \****************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+class CountedHash {
+    constructor() {
+        this.n = 0;
+        this.val = {};
+    }
+    get length() { return this.n; }
+    test(id) {
+        return id != '' && this.val[id] !== undefined;
+    }
+    set(id) {
+        if (id != '' && !this.test(id)) {
+            this.n++;
+            this.val[id] = true;
         }
-        // Add bottom of circle
-        a.push(0);
-        a.push(-1);
-        // Now flip Y and replicate to SE quadrant
-        for (i = 0; i < n; i++) {
-            j = (n - i) * 2;
-            a.push(a[j - 1]);
-            a.push(-a[j - 2]);
+    }
+    clear(id) {
+        if (this.test(id)) {
+            this.n--;
+            delete this.val[id];
         }
-        // Duplicate final point per GeoJSON spec
-        a.push(a[0]);
-        a.push(a[1]);
-        circleOffsets[n] = a;
     }
-    return circleOffsets[n];
-}
-// Note that this is essentially an inversion of polyToCircle which computes a mathematical
-// circle given the point values, ignoring latitude correction. This inversion also
-// ignores that correction which means when plotted on a 2D map looks circular but the edge of
-// the circle is not a fixed distance (in physical units, e.g. meters) from the center.
-//
-function polyFromCircle(c, nSegments, options) {
-    if (options === undefined)
-        options = DefaultOptions;
-    if (c === null || c.r == 0)
-        return null;
-    if (!nSegments || nSegments < 8)
-        nSegments = 8;
-    let poly = [];
+    empty() {
+        this.n = 0;
+        this.val = {};
+    }
+    asArray() {
+        let a = [];
+        this.forEach(id => { a.push(id); });
+        return a;
+    }
+    asString() {
+        for (var id in this.val)
+            if (this.val.hasOwnProperty(id))
+                return id;
+        return '';
+    }
+    forEach(f) {
+        for (var id in this.val)
+            if (this.val.hasOwnProperty(id))
+                f(id);
+    }
+}
+exports.CountedHash = CountedHash;
+
+
+/***/ }),
+
+/***/ "./lib/indexedarray.ts":
+/*!*****************************!*\
+  !*** ./lib/indexedarray.ts ***!
+  \*****************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+class IndexedArray {
+    constructor() {
+        this.o = {};
+        this.a = null;
+    }
+    ensure() {
+        if (this.a === null) {
+            this.a = [];
+            for (let p in this.o)
+                if (this.o.hasOwnProperty(p))
+                    this.a.push(p);
+            this.a.sort((a, b) => { a = a.toUpperCase(); b = b.toUpperCase(); return a < b ? -1 : (a > b ? 1 : 0); });
+        }
+    }
+    asArray() {
+        this.ensure();
+        return this.a;
+    }
+    get length() { this.ensure(); return this.a.length; }
+    test(s) {
+        return !!s && this.o[s] !== undefined;
+    }
+    set(s) {
+        if (!!s && !this.test(s)) {
+            this.o[s] = true;
+            this.a = null;
+        }
+    }
+    setAll(a) {
+        if (a && a.length)
+            for (let i = 0; i < a.length; i++)
+                this.set(a[i]);
+    }
+    clear(s) {
+        if (this.test(s)) {
+            delete this.o[s];
+            this.a = null;
+        }
+    }
+    at(i) {
+        this.ensure();
+        if (i < 0 || i >= this.a.length)
+            return undefined;
+        return this.a[i];
+    }
+    empty() {
+        this.o = {};
+        this.a = null;
+    }
+    forEach(f) {
+        for (var s in this.o)
+            if (this.o.hasOwnProperty(s))
+                f(s);
+    }
+}
+exports.IndexedArray = IndexedArray;
+
+
+/***/ }),
+
+/***/ "./lib/util.ts":
+/*!*********************!*\
+  !*** ./lib/util.ts ***!
+  \*********************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+function Now() { return (new Date()).toJSON(); }
+exports.Now = Now;
+class Elapsed {
+    constructor(bStart = true) {
+        this.tStart = undefined;
+        this.tDur = undefined;
+        if (bStart)
+            this.start();
+    }
+    start() {
+        if (process && process.hrtime)
+            this.tStart = process.hrtime();
+        else
+            this.tStart = performance.now();
+        if (this.tDur)
+            this.tDur = undefined;
+    }
+    end() {
+        if (this.tStart === undefined)
+            this.start();
+        if (process && process.hrtime)
+            this.tDur = process.hrtime(this.tStart);
+        else
+            this.tDur = performance.now() - this.tStart;
+    }
+    ms() {
+        if (this.tDur === undefined)
+            this.end();
+        if (process && process.hrtime)
+            return Math.round((this.tDur[0] * 1000) + (this.tDur[1] / 1000000));
+        else
+            return this.tDur;
+    }
+    nano() {
+        if (this.tDur === undefined)
+            this.end();
+        if (process && process.hrtime)
+            return (this.tDur[0] * 1000000000) + this.tDur[1];
+        else
+            return this.tDur * 1000000;
+    }
+}
+exports.Elapsed = Elapsed;
+class Deadline {
+    constructor(msDelta) {
+        this.msDelta = msDelta;
+        this.elapsed = new Elapsed();
+    }
+    done() {
+        this.elapsed.end();
+        return this.elapsed.ms() > this.msDelta;
+    }
+}
+exports.Deadline = Deadline;
+function createGuid() {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        var r = Math.random() * 16 | 0, v = c === 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+    });
+}
+exports.createGuid = createGuid;
+function _sizeof(a, loops) {
+    if (a === null || a === undefined)
+        return 0;
+    switch (typeof a) {
+        default: return 0;
+        case 'number': return 8;
+        case 'boolean': return 4;
+        case 'string': return a.length * 2;
+        case 'object':
+            {
+                if (loops.has(a))
+                    return 0;
+                else
+                    loops.set(a, true);
+                let t = 0;
+                if (Array.isArray(a)) {
+                    for (let i = 0; i < a.length; i++)
+                        t += _sizeof(a[i], loops);
+                    t += 8; // length
+                }
+                else if (Buffer.isBuffer(a)) {
+                    t = a.length;
+                }
+                else if (a.hasOwnProperty === undefined)
+                    return t;
+                else {
+                    for (var key in a)
+                        if (a.hasOwnProperty && a.hasOwnProperty(key)) {
+                            t += _sizeof(key, loops); // this is a good estimate of download size, but poor estimate of internal size
+                            // because of JS object templating vs. naive hashtables
+                            t += _sizeof(a[key], loops);
+                        }
+                }
+                return t;
+            }
+    }
+}
+function sizeof(a) {
+    let loops = new WeakMap();
+    let n = _sizeof(a, loops);
+    return n;
+}
+exports.sizeof = sizeof;
+function depthof(a) {
+    if (a === null || a === undefined)
+        return 1;
+    switch (typeof a) {
+        default: return 1;
+        case 'number': return 1;
+        case 'boolean': return 1;
+        case 'string': return 1;
+        case 'object':
+            {
+                let d = 0;
+                if (Array.isArray(a))
+                    return a.length > 0 ? (1 + depthof(a[0])) : 2; // still return 2 for empty array
+                else if (Buffer.isBuffer(a))
+                    return 2;
+                else if (a.hasOwnProperty === undefined)
+                    return 1;
+                else {
+                    for (var key in a)
+                        if (a.hasOwnProperty(key))
+                            return 1 + depthof(a[key]);
+                    return 2; // or 2 for empty object
+                }
+            }
+    }
+}
+exports.depthof = depthof;
+function isEmpty(o) {
+    if (o === null || o === undefined)
+        return true;
+    for (var p in o)
+        if (o.hasOwnProperty(p))
+            return false;
+    return true;
+}
+exports.isEmpty = isEmpty;
+function countKeys(o) {
+    if (o === undefined || typeof o !== 'object')
+        return -1;
+    let count = 0;
+    for (let p in o)
+        if (o.hasOwnProperty(p))
+            count++;
+    return count;
+}
+exports.countKeys = countKeys;
+function nthProperty(o, n = 0) {
+    for (let p in o)
+        if (o.hasOwnProperty(p)) {
+            if (n <= 0)
+                return o[p];
+            n--;
+        }
+    return undefined;
+}
+exports.nthProperty = nthProperty;
+function nthKey(o, n = 0) {
+    for (let p in o)
+        if (o.hasOwnProperty(p)) {
+            if (n <= 0)
+                return p;
+            n--;
+        }
+    return undefined;
+}
+exports.nthKey = nthKey;
+function partialEqual(o, subset) {
+    for (let p in subset)
+        if (subset.hasOwnProperty(p))
+            if (o[p] !== subset[p])
+                return false;
+    return true;
+}
+exports.partialEqual = partialEqual;
+function deepEqual(o1, o2, options) {
+    if (typeof o1 !== typeof o2)
+        return false;
+    if (typeof o1 !== 'object')
+        return o1 === o2;
+    // Special case array
+    if (Array.isArray(o1)) {
+        if (!Array.isArray(o2))
+            return false;
+        if (o1.length != o2.length)
+            return false;
+        if (options && options.unorderedArrays) {
+            o1 = o1.sort();
+            o2 = o2.sort();
+        }
+        for (let i = 0; i < o1.length; i++)
+            if (!deepEqual(o1[i], o2[i], options))
+                return false;
+        return true;
+    }
+    // Special case object
+    if (o1.hasOwnProperty === undefined || o2.hasOwnProperty === undefined)
+        return o1 === o2;
+    for (let p in o1)
+        if (o1.hasOwnProperty(p)) {
+            if (options && options.omitKey[p])
+                continue;
+            if (o2[p] === undefined)
+                return false;
+            if (!deepEqual(o1[p], o2[p], options))
+                return false;
+        }
+    // If any properties in o2 aren't in o1, not equal
+    for (let p in o2)
+        if (o2.hasOwnProperty(p)) {
+            if (options && options.omitKey[p])
+                continue;
+            if (o1[p] === undefined)
+                return false;
+        }
+    return true;
+}
+exports.deepEqual = deepEqual;
+const Months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+function prettyDate(d) {
+    if (d == null)
+        return 'unknown';
+    let mmm = Months[d.getMonth()];
+    let dd = d.getDate();
+    let yyyy = d.getFullYear();
+    let hh = d.getHours();
+    let m = d.getMinutes();
+    let mm = m < 10 ? `0${m}` : String(m);
+    let ampm = hh >= 12 ? 'PM' : 'AM';
+    if (hh > 12)
+        hh -= 12;
+    return `${mmm} ${dd}, ${yyyy} at ${hh}:${mm} ${ampm}`;
+}
+exports.prettyDate = prettyDate;
+function relativeDate(d) {
+    if (d == null)
+        return 'unknown';
+    let now = new Date();
+    let yyyyNow = now.getFullYear();
+    let mmmNow = Months[now.getMonth()];
+    let ddNow = now.getDate();
+    let mmm = Months[d.getMonth()];
+    let dd = d.getDate();
+    let yyyy = d.getFullYear();
+    let hh = d.getHours();
+    let m = d.getMinutes();
+    let mm = m < 10 ? `0${m}` : String(m);
+    let ampm = hh >= 12 ? 'PM' : 'AM';
+    if (hh > 12)
+        hh -= 12;
+    if (yyyyNow === yyyy && mmmNow === mmm && ddNow === dd)
+        return `Today at ${hh}:${mm} ${ampm}`;
+    else if (yyyyNow === yyyy)
+        return `${mmm} ${dd}`;
+    else
+        return `${mmm} ${dd}, ${yyyy}`;
+}
+exports.relativeDate = relativeDate;
+const OneMinute = 1000 * 60;
+const OneHour = OneMinute * 60;
+const OneDay = OneHour * 24;
+function recentDate(d) {
+    if (d == null)
+        return 'u';
+    let now = new Date();
+    let msNow = now.getTime();
+    let msThen = d.getTime();
+    let msDelta = msNow - msThen;
+    // Within the hour, display in minutes
+    if (msDelta < OneHour)
+        return `${Math.round(msDelta / OneMinute) + 1}m`;
+    // Within the day, display in hours
+    else if (msDelta < OneDay)
+        return `${Math.round(msDelta / OneHour) + 1}h`;
+    // Otherwise, display using relativeDate
+    else
+        return relativeDate(d);
+}
+exports.recentDate = recentDate;
+function textToHtml(sText) {
+    let lines = sText.split('\n');
+    let aHtml = [];
+    let inTable = false;
+    aHtml.push('<body>');
+    for (let i = 0; i < lines.length; i++) {
+        let line = lines[i];
+        let isRow = line.indexOf('|') === 0;
+        if (inTable && !isRow) {
+            aHtml.push('</tbody></table>');
+            inTable = false;
+        }
+        if (isRow && !inTable) {
+            inTable = true;
+            aHtml.push('<table border="1" cellspacing="0" cellpadding="2"><tbody>');
+        }
+        if (isRow) {
+            let cells = line.split('|');
+            if (cells.length > 2) {
+                aHtml.push('<tr>');
+                for (let j = 1; j < cells.length - 1; j++)
+                    aHtml.push(`<td>${cells[j]}</td>`);
+                aHtml.push('</tr>');
+            }
+        }
+        else
+            aHtml.push(`<div>${line}&nbsp;</div>`);
+    }
+    if (inTable)
+        aHtml.push('</tbody></table>');
+    aHtml.push('</body>');
+    return aHtml.join('');
+}
+exports.textToHtml = textToHtml;
+function shallowCopy(src) {
+    if (src === null || src === undefined)
+        return src;
+    switch (typeof src) {
+        case 'boolean':
+        case 'number':
+        case 'string':
+        case 'symbol':
+        case 'function':
+        default:
+            return src;
+        case 'object':
+            if (Array.isArray(src))
+                return src.slice();
+            else {
+                let copy = {};
+                for (var p in src)
+                    if (src.hasOwnProperty(p))
+                        copy[p] = src[p];
+                return copy;
+            }
+    }
+}
+exports.shallowCopy = shallowCopy;
+function shallowAssign(o1, o2) {
+    if (o1 === null || o1 === undefined)
+        o1 = {};
+    if (o2 === null || o2 === undefined)
+        return o1;
+    if (typeof o2 !== 'object' || typeof o1 !== 'object')
+        return o1;
+    for (var p in o2)
+        if (o2.hasOwnProperty(p))
+            o1[p] = o2[p];
+    return o1;
+}
+exports.shallowAssign = shallowAssign;
+function shallowDelete(o1, o2) {
+    if (o1 == null || o2 == null)
+        return o1;
+    if (typeof o2 !== 'object' || typeof o1 !== 'object')
+        return o1;
+    for (var p in o2)
+        if (o2.hasOwnProperty(p))
+            delete o1[p];
+    return o1;
+}
+exports.shallowDelete = shallowDelete;
+function shallowAssignImmutable(o1, o2) {
+    if (o1 === null || o1 === undefined)
+        o1 = {};
+    if (o2 === null || o2 === undefined)
+        return o1;
+    if (typeof o2 !== 'object' || typeof o1 !== 'object')
+        return o1;
+    // First determine whether o2 changes any properties, if it has, make new instance
+    let oNew = o1;
+    for (let p in o2)
+        if (o2.hasOwnProperty(p)) {
+            if (o1[p] != o2[p]) {
+                oNew = shallowCopy(o1);
+                break;
+            }
+        }
+    if (oNew !== o1)
+        shallowAssign(oNew, o2);
+    return oNew;
+}
+exports.shallowAssignImmutable = shallowAssignImmutable;
+function shallowEqual(o1, o2) {
+    if (o1 === undefined || o2 === undefined || typeof o1 !== 'object' || typeof o2 !== 'object')
+        return o1 === o2;
+    if (Array.isArray(o1) && Array.isArray(o2)) {
+        if (o1.length != o2.length)
+            return false;
+        for (let i = 0; i < o1.length; i++)
+            if (o1[i] !== o2[i])
+                return false;
+        return true;
+    }
+    else {
+        let p;
+        for (p in o1)
+            if (o1.hasOwnProperty(p))
+                if (o1[p] !== o2[p])
+                    return false;
+        for (p in o2)
+            if (o2.hasOwnProperty(p))
+                if (o1[p] === undefined)
+                    return false;
+        return true;
+    }
+}
+exports.shallowEqual = shallowEqual;
+function deepCopy(src) {
+    // Beware typeof oddities
+    if (src === null || src === undefined)
+        return src;
+    if (typeof src === 'object') {
+        if (Array.isArray(src)) {
+            let dst = [];
+            for (let i = 0; i < src.length; i++)
+                dst.push(deepCopy(src[i]));
+            return dst;
+        }
+        else {
+            if (src.hasOwnProperty === undefined)
+                return src;
+            let dst = {};
+            for (var p in src)
+                if (src.hasOwnProperty(p))
+                    dst[p] = deepCopy(src[p]);
+            return dst;
+        }
+    }
+    else
+        return src;
+}
+exports.deepCopy = deepCopy;
+function deepAccum(accum, o) {
+    if (accum == null)
+        accum = {};
+    if (o == null)
+        return accum;
+    for (let p in o)
+        if (o.hasOwnProperty(p)) {
+            let vs = o[p];
+            let vd = accum[p];
+            if (typeof vs === 'number') {
+                if (vd !== undefined && typeof vd !== 'number')
+                    throw 'deepAccum: unexpected type mismatch';
+                accum[p] = (vd === undefined ? 0 : vd) + vs;
+            }
+            else if (typeof vs === 'object') {
+                if (vd === undefined) {
+                    vd = {};
+                    accum[p] = vd;
+                }
+                else if (typeof vd !== 'object')
+                    throw 'deepAccum: unexpected type mismatch';
+                deepAccum(vd, vs);
+            }
+        }
+}
+exports.deepAccum = deepAccum;
+function precisionRound(n, p) {
+    let f = Math.pow(10, p);
+    return Math.round(n * f) / f;
+}
+exports.precisionRound = precisionRound;
+function percentString(num, den, precision = 0) {
+    if (den == 0)
+        return '(-)';
+    let p = precisionRound((num / den) * 100, precision);
+    return String(p) + '%';
+}
+exports.percentString = percentString;
+function hash(s) {
+    let hash = 5381;
+    let i = s.length;
+    while (i)
+        hash = (hash * 33) ^ s.charCodeAt(--i);
+    /* JavaScript does bitwise operations (like XOR, above) on 32-bit signed
+     * integers. Since we want the results to be always positive, convert the
+     * signed int to an unsigned by doing an unsigned bitshift. */
+    return hash >>> 0;
+}
+exports.hash = hash;
+function hashObject(o) {
+    return hash(o ? JSON.stringify(o) : '');
+}
+exports.hashObject = hashObject;
+const HexTable = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'];
+function toHex(n) {
+    if (n < 0 || n > 255)
+        throw ('only 0 to 255 supported now');
+    n = Math.floor(n);
+    return HexTable[n >> 4] + HexTable[n & 15];
+}
+exports.toHex = toHex;
+function toRGBA(color, alpha) {
+    let r;
+    let g;
+    let b;
+    switch (color) {
+        case 'white':
+            r = 255;
+            g = 255;
+            b = 255;
+            break;
+        case 'black':
+            r = 0;
+            g = 0;
+            b = 0;
+            break;
+        default:
+            r = parseInt(color.substr(1, 2), 16);
+            g = parseInt(color.substr(3, 2), 16);
+            b = parseInt(color.substr(5, 2), 16);
+            break;
+    }
+    return `rgba(${String(r)}, ${String(g)}, ${String(b)}, ${String(alpha)})`;
+}
+exports.toRGBA = toRGBA;
+function toRGBAIntensity(color, intensity, alpha) {
+    // for now assume color is black
+    let g = precisionRound(255 * intensity, 0);
+    return `rgba(${String(g)}, ${String(g)}, ${String(g)}, ${String(alpha)})`;
+}
+exports.toRGBAIntensity = toRGBAIntensity;
+// Geo functions
+function distance(x0, y0, x1, y1) {
+    return Math.hypot(x0 - x1, y0 - y1);
+}
+exports.distance = distance;
+function deg2rad(num) { return num * Math.PI / 180; }
+exports.deg2rad = deg2rad;
+function rad2deg(num) { return num / Math.PI * 180; }
+exports.rad2deg = rad2deg;
+// Restricts lon to range [-180..180]
+function wrapLon(lon) {
+    let worlds = Math.floor((lon + 180) / 360);
+    return lon - (worlds * 360);
+}
+exports.wrapLon = wrapLon;
+
+
+/***/ })
+
+/******/ });
+});
+
+
+/***/ }),
+
+/***/ "./node_modules/@dra2020/dra-types/node_modules/object-hash/index.js":
+/*!***************************************************************************!*\
+  !*** ./node_modules/@dra2020/dra-types/node_modules/object-hash/index.js ***!
+  \***************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var crypto = __webpack_require__(/*! crypto */ "crypto");
+
+/**
+ * Exported function
+ *
+ * Options:
+ *
+ *  - `algorithm` hash algo to be used by this instance: *'sha1', 'md5'
+ *  - `excludeValues` {true|*false} hash object keys, values ignored
+ *  - `encoding` hash encoding, supports 'buffer', '*hex', 'binary', 'base64'
+ *  - `ignoreUnknown` {true|*false} ignore unknown object types
+ *  - `replacer` optional function that replaces values before hashing
+ *  - `respectFunctionProperties` {*true|false} consider function properties when hashing
+ *  - `respectFunctionNames` {*true|false} consider 'name' property of functions for hashing
+ *  - `respectType` {*true|false} Respect special properties (prototype, constructor)
+ *    when hashing to distinguish between types
+ *  - `unorderedArrays` {true|*false} Sort all arrays before hashing
+ *  - `unorderedSets` {*true|false} Sort `Set` and `Map` instances before hashing
+ *  * = default
+ *
+ * @param {object} object value to hash
+ * @param {object} options hashing options
+ * @return {string} hash value
+ * @api public
+ */
+exports = module.exports = objectHash;
+
+function objectHash(object, options){
+  options = applyDefaults(object, options);
+
+  return hash(object, options);
+}
+
+/**
+ * Exported sugar methods
+ *
+ * @param {object} object value to hash
+ * @return {string} hash value
+ * @api public
+ */
+exports.sha1 = function(object){
+  return objectHash(object);
+};
+exports.keys = function(object){
+  return objectHash(object, {excludeValues: true, algorithm: 'sha1', encoding: 'hex'});
+};
+exports.MD5 = function(object){
+  return objectHash(object, {algorithm: 'md5', encoding: 'hex'});
+};
+exports.keysMD5 = function(object){
+  return objectHash(object, {algorithm: 'md5', encoding: 'hex', excludeValues: true});
+};
+
+// Internals
+var hashes = crypto.getHashes ? crypto.getHashes().slice() : ['sha1', 'md5'];
+hashes.push('passthrough');
+var encodings = ['buffer', 'hex', 'binary', 'base64'];
+
+function applyDefaults(object, sourceOptions){
+  sourceOptions = sourceOptions || {};
+
+  // create a copy rather than mutating
+  var options = {};
+  options.algorithm = sourceOptions.algorithm || 'sha1';
+  options.encoding = sourceOptions.encoding || 'hex';
+  options.excludeValues = sourceOptions.excludeValues ? true : false;
+  options.algorithm = options.algorithm.toLowerCase();
+  options.encoding = options.encoding.toLowerCase();
+  options.ignoreUnknown = sourceOptions.ignoreUnknown !== true ? false : true; // default to false
+  options.respectType = sourceOptions.respectType === false ? false : true; // default to true
+  options.respectFunctionNames = sourceOptions.respectFunctionNames === false ? false : true;
+  options.respectFunctionProperties = sourceOptions.respectFunctionProperties === false ? false : true;
+  options.unorderedArrays = sourceOptions.unorderedArrays !== true ? false : true; // default to false
+  options.unorderedSets = sourceOptions.unorderedSets === false ? false : true; // default to false
+  options.unorderedObjects = sourceOptions.unorderedObjects === false ? false : true; // default to true
+  options.replacer = sourceOptions.replacer || undefined;
+  options.excludeKeys = sourceOptions.excludeKeys || undefined;
+
+  if(typeof object === 'undefined') {
+    throw new Error('Object argument required.');
+  }
+
+  // if there is a case-insensitive match in the hashes list, accept it
+  // (i.e. SHA256 for sha256)
+  for (var i = 0; i < hashes.length; ++i) {
+    if (hashes[i].toLowerCase() === options.algorithm.toLowerCase()) {
+      options.algorithm = hashes[i];
+    }
+  }
+
+  if(hashes.indexOf(options.algorithm) === -1){
+    throw new Error('Algorithm "' + options.algorithm + '"  not supported. ' +
+      'supported values: ' + hashes.join(', '));
+  }
+
+  if(encodings.indexOf(options.encoding) === -1 &&
+     options.algorithm !== 'passthrough'){
+    throw new Error('Encoding "' + options.encoding + '"  not supported. ' +
+      'supported values: ' + encodings.join(', '));
+  }
+
+  return options;
+}
+
+/** Check if the given function is a native function */
+function isNativeFunction(f) {
+  if ((typeof f) !== 'function') {
+    return false;
+  }
+  var exp = /^function\s+\w*\s*\(\s*\)\s*{\s+\[native code\]\s+}$/i;
+  return exp.exec(Function.prototype.toString.call(f)) != null;
+}
+
+function hash(object, options) {
+  var hashingStream;
+
+  if (options.algorithm !== 'passthrough') {
+    hashingStream = crypto.createHash(options.algorithm);
+  } else {
+    hashingStream = new PassThrough();
+  }
+
+  if (typeof hashingStream.write === 'undefined') {
+    hashingStream.write = hashingStream.update;
+    hashingStream.end   = hashingStream.update;
+  }
+
+  var hasher = typeHasher(options, hashingStream);
+  hasher.dispatch(object);
+  if (!hashingStream.update) {
+    hashingStream.end('');
+  }
+
+  if (hashingStream.digest) {
+    return hashingStream.digest(options.encoding === 'buffer' ? undefined : options.encoding);
+  }
+
+  var buf = hashingStream.read();
+  if (options.encoding === 'buffer') {
+    return buf;
+  }
+
+  return buf.toString(options.encoding);
+}
+
+/**
+ * Expose streaming API
+ *
+ * @param {object} object  Value to serialize
+ * @param {object} options  Options, as for hash()
+ * @param {object} stream  A stream to write the serializiation to
+ * @api public
+ */
+exports.writeToStream = function(object, options, stream) {
+  if (typeof stream === 'undefined') {
+    stream = options;
+    options = {};
+  }
+
+  options = applyDefaults(object, options);
+
+  return typeHasher(options, stream).dispatch(object);
+};
+
+function typeHasher(options, writeTo, context){
+  context = context || [];
+  var write = function(str) {
+    if (writeTo.update) {
+      return writeTo.update(str, 'utf8');
+    } else {
+      return writeTo.write(str, 'utf8');
+    }
+  };
+
+  return {
+    dispatch: function(value){
+      if (options.replacer) {
+        value = options.replacer(value);
+      }
+
+      var type = typeof value;
+      if (value === null) {
+        type = 'null';
+      }
+
+      //console.log("[DEBUG] Dispatch: ", value, "->", type, " -> ", "_" + type);
+
+      return this['_' + type](value);
+    },
+    _object: function(object) {
+      var pattern = (/\[object (.*)\]/i);
+      var objString = Object.prototype.toString.call(object);
+      var objType = pattern.exec(objString);
+      if (!objType) { // object type did not match [object ...]
+        objType = 'unknown:[' + objString + ']';
+      } else {
+        objType = objType[1]; // take only the class name
+      }
+
+      objType = objType.toLowerCase();
+
+      var objectNumber = null;
+
+      if ((objectNumber = context.indexOf(object)) >= 0) {
+        return this.dispatch('[CIRCULAR:' + objectNumber + ']');
+      } else {
+        context.push(object);
+      }
+
+      if (typeof Buffer !== 'undefined' && Buffer.isBuffer && Buffer.isBuffer(object)) {
+        write('buffer:');
+        return write(object);
+      }
+
+      if(objType !== 'object' && objType !== 'function') {
+        if(this['_' + objType]) {
+          this['_' + objType](object);
+        } else if (options.ignoreUnknown) {
+          return write('[' + objType + ']');
+        } else {
+          throw new Error('Unknown object type "' + objType + '"');
+        }
+      }else{
+        var keys = Object.keys(object);
+        if (options.unorderedObjects) {
+          keys = keys.sort();
+        }
+        // Make sure to incorporate special properties, so
+        // Types with different prototypes will produce
+        // a different hash and objects derived from
+        // different functions (`new Foo`, `new Bar`) will
+        // produce different hashes.
+        // We never do this for native functions since some
+        // seem to break because of that.
+        if (options.respectType !== false && !isNativeFunction(object)) {
+          keys.splice(0, 0, 'prototype', '__proto__', 'constructor');
+        }
+
+        if (options.excludeKeys) {
+          keys = keys.filter(function(key) { return !options.excludeKeys(key); });
+        }
+
+        write('object:' + keys.length + ':');
+        var self = this;
+        return keys.forEach(function(key){
+          self.dispatch(key);
+          write(':');
+          if(!options.excludeValues) {
+            self.dispatch(object[key]);
+          }
+          write(',');
+        });
+      }
+    },
+    _array: function(arr, unordered){
+      unordered = typeof unordered !== 'undefined' ? unordered :
+        options.unorderedArrays !== false; // default to options.unorderedArrays
+
+      var self = this;
+      write('array:' + arr.length + ':');
+      if (!unordered || arr.length <= 1) {
+        return arr.forEach(function(entry) {
+          return self.dispatch(entry);
+        });
+      }
+
+      // the unordered case is a little more complicated:
+      // since there is no canonical ordering on objects,
+      // i.e. {a:1} < {a:2} and {a:1} > {a:2} are both false,
+      // we first serialize each entry using a PassThrough stream
+      // before sorting.
+      // also: we can’t use the same context array for all entries
+      // since the order of hashing should *not* matter. instead,
+      // we keep track of the additions to a copy of the context array
+      // and add all of them to the global context array when we’re done
+      var contextAdditions = [];
+      var entries = arr.map(function(entry) {
+        var strm = new PassThrough();
+        var localContext = context.slice(); // make copy
+        var hasher = typeHasher(options, strm, localContext);
+        hasher.dispatch(entry);
+        // take only what was added to localContext and append it to contextAdditions
+        contextAdditions = contextAdditions.concat(localContext.slice(context.length));
+        return strm.read().toString();
+      });
+      context = context.concat(contextAdditions);
+      entries.sort();
+      return this._array(entries, false);
+    },
+    _date: function(date){
+      return write('date:' + date.toJSON());
+    },
+    _symbol: function(sym){
+      return write('symbol:' + sym.toString());
+    },
+    _error: function(err){
+      return write('error:' + err.toString());
+    },
+    _boolean: function(bool){
+      return write('bool:' + bool.toString());
+    },
+    _string: function(string){
+      write('string:' + string.length + ':');
+      write(string.toString());
+    },
+    _function: function(fn){
+      write('fn:');
+      if (isNativeFunction(fn)) {
+        this.dispatch('[native]');
+      } else {
+        this.dispatch(fn.toString());
+      }
+
+      if (options.respectFunctionNames !== false) {
+        // Make sure we can still distinguish native functions
+        // by their name, otherwise String and Function will
+        // have the same hash
+        this.dispatch("function-name:" + String(fn.name));
+      }
+
+      if (options.respectFunctionProperties) {
+        this._object(fn);
+      }
+    },
+    _number: function(number){
+      return write('number:' + number.toString());
+    },
+    _xml: function(xml){
+      return write('xml:' + xml.toString());
+    },
+    _null: function() {
+      return write('Null');
+    },
+    _undefined: function() {
+      return write('Undefined');
+    },
+    _regexp: function(regex){
+      return write('regex:' + regex.toString());
+    },
+    _uint8array: function(arr){
+      write('uint8array:');
+      return this.dispatch(Array.prototype.slice.call(arr));
+    },
+    _uint8clampedarray: function(arr){
+      write('uint8clampedarray:');
+      return this.dispatch(Array.prototype.slice.call(arr));
+    },
+    _int8array: function(arr){
+      write('uint8array:');
+      return this.dispatch(Array.prototype.slice.call(arr));
+    },
+    _uint16array: function(arr){
+      write('uint16array:');
+      return this.dispatch(Array.prototype.slice.call(arr));
+    },
+    _int16array: function(arr){
+      write('uint16array:');
+      return this.dispatch(Array.prototype.slice.call(arr));
+    },
+    _uint32array: function(arr){
+      write('uint32array:');
+      return this.dispatch(Array.prototype.slice.call(arr));
+    },
+    _int32array: function(arr){
+      write('uint32array:');
+      return this.dispatch(Array.prototype.slice.call(arr));
+    },
+    _float32array: function(arr){
+      write('float32array:');
+      return this.dispatch(Array.prototype.slice.call(arr));
+    },
+    _float64array: function(arr){
+      write('float64array:');
+      return this.dispatch(Array.prototype.slice.call(arr));
+    },
+    _arraybuffer: function(arr){
+      write('arraybuffer:');
+      return this.dispatch(new Uint8Array(arr));
+    },
+    _url: function(url) {
+      return write('url:' + url.toString(), 'utf8');
+    },
+    _map: function(map) {
+      write('map:');
+      var arr = Array.from(map);
+      return this._array(arr, options.unorderedSets !== false);
+    },
+    _set: function(set) {
+      write('set:');
+      var arr = Array.from(set);
+      return this._array(arr, options.unorderedSets !== false);
+    },
+    _blob: function() {
+      if (options.ignoreUnknown) {
+        return write('[blob]');
+      }
+
+      throw Error('Hashing Blob objects is currently not supported\n' +
+        '(see https://github.com/puleos/object-hash/issues/26)\n' +
+        'Use "options.replacer" or "options.ignoreUnknown"\n');
+    },
+    _domwindow: function() { return write('domwindow'); },
+    /* Node.js standard native objects */
+    _process: function() { return write('process'); },
+    _timer: function() { return write('timer'); },
+    _pipe: function() { return write('pipe'); },
+    _tcp: function() { return write('tcp'); },
+    _udp: function() { return write('udp'); },
+    _tty: function() { return write('tty'); },
+    _statwatcher: function() { return write('statwatcher'); },
+    _securecontext: function() { return write('securecontext'); },
+    _connection: function() { return write('connection'); },
+    _zlib: function() { return write('zlib'); },
+    _context: function() { return write('context'); },
+    _nodescript: function() { return write('nodescript'); },
+    _httpparser: function() { return write('httpparser'); },
+    _dataview: function() { return write('dataview'); },
+    _signal: function() { return write('signal'); },
+    _fsevent: function() { return write('fsevent'); },
+    _tlswrap: function() { return write('tlswrap'); }
+  };
+}
+
+// Mini-implementation of stream.PassThrough
+// We are far from having need for the full implementation, and we can
+// make assumptions like "many writes, then only one final read"
+// and we can ignore encoding specifics
+function PassThrough() {
+  return {
+    buf: '',
+
+    write: function(b) {
+      this.buf += b;
+    },
+
+    end: function(b) {
+      this.buf += b;
+    },
+
+    read: function() {
+      return this.buf;
+    }
+  };
+}
+
+
+/***/ }),
+
+/***/ "./node_modules/@dra2020/poly/dist/poly.js":
+/*!*************************************************!*\
+  !*** ./node_modules/@dra2020/poly/dist/poly.js ***!
+  \*************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+(function webpackUniversalModuleDefinition(root, factory) {
+	if(true)
+		module.exports = factory();
+	else {}
+})(global, function() {
+return /******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = "./lib/all.ts");
+/******/ })
+/************************************************************************/
+/******/ ({
+
+/***/ "./lib/all.ts":
+/*!********************!*\
+  !*** ./lib/all.ts ***!
+  \********************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+function __export(m) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+__export(__webpack_require__(/*! ./poly */ "./lib/poly.ts"));
+__export(__webpack_require__(/*! ./union */ "./lib/union.ts"));
+
+
+/***/ }),
+
+/***/ "./lib/poly.ts":
+/*!*********************!*\
+  !*** ./lib/poly.ts ***!
+  \*********************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const Util = __webpack_require__(/*! @dra2020/util */ "@dra2020/util");
+// Internal utilities
+exports.EARTH_RADIUS = 6371000; // Radius of earth in meters
+const DefaultOptions = {};
+// Return geographic polygon area in meters^2
+function polySimpleArea(p, options) {
+    if (options === undefined)
+        options = DefaultOptions;
+    let p1;
+    let p2;
+    let p3;
+    let dx;
+    let l;
+    let m;
+    let u;
+    let i;
+    let total = 0;
+    let n = p.length;
+    if (n > 2) {
+        for (i = 0; i < n; i++) {
+            if (i === n - 2) {
+                l = n - 2;
+                m = n - 1;
+                u = 0;
+            }
+            else if (i === n - 1) {
+                l = n - 1;
+                m = 0;
+                u = 1;
+            }
+            else {
+                l = i;
+                m = i + 1;
+                u = i + 2;
+            }
+            p1 = p[l];
+            p2 = p[m];
+            p3 = p[u];
+            dx = (Util.deg2rad(p3[0]) - Util.deg2rad(p1[0]));
+            dx *= Math.sin(Util.deg2rad(p2[1]));
+            total += dx;
+        }
+        total *= exports.EARTH_RADIUS * exports.EARTH_RADIUS / 2;
+    }
+    return Math.abs(total);
+}
+// Allow bare polygon coordinates array or GeoJSON feature.
+// Normalize to multipolygon points array.
+function polyNormalize(poly, options) {
+    if (options === undefined)
+        options = DefaultOptions;
+    // Convert a GeoJSON polygon or multipolygon to the raw list of points
+    if (poly && poly.geometry && poly.geometry.coordinates)
+        poly = poly.geometry.coordinates;
+    // This is really an invalid specification but used internally to represent null polygon
+    if (poly && poly.length == 0)
+        return null;
+    if (Util.depthof(poly) == 4)
+        poly = [poly];
+    return poly;
+}
+exports.polyNormalize = polyNormalize;
+// Area of geographic polygon
+function polyArea(poly, options) {
+    if (options === undefined)
+        options = DefaultOptions;
+    poly = polyNormalize(poly, options);
+    let a = 0;
+    // MultiPolygon is a set of polygons
+    for (let i = 0; poly && i < poly.length; i++) {
+        // Single polygon is exterior ring with interior holes. Holes are subtracted.
+        let p = poly[i];
+        for (let j = 0; j < p.length; j++) {
+            let sp = p[j];
+            a += polySimpleArea(sp, options) * (j == 0 ? 1 : -1);
+        }
+    }
+    return a;
+}
+exports.polyArea = polyArea;
+// Return distance in meters given two lat/lon points
+function haversine(x1, y1, x2, y2, options) {
+    let dLat = Util.deg2rad(y2 - y1);
+    let dLon = Util.deg2rad(x2 - x1);
+    let c;
+    // Short circuit for using simple cartesian algorithm instead of haversine
+    if (options.noLatitudeCorrection)
+        c = Math.sqrt((dLat * dLat) + (dLon * dLon));
+    else {
+        let lat1 = Util.deg2rad(y1);
+        let lat2 = Util.deg2rad(y2);
+        let a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+            Math.sin(dLon / 2) * Math.sin(dLon / 2) * Math.cos(lat1) * Math.cos(lat2);
+        c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+    }
+    return exports.EARTH_RADIUS * c;
+}
+// Perimeter of geographic polygon in meters
+function polyPerimeter(poly, options) {
+    if (options === undefined)
+        options = DefaultOptions;
+    poly = polyNormalize(poly, options);
+    let perimeter = 0;
+    for (let i = 0; poly && i < poly.length; i++) {
+        // Ignore holes so only look at first polyline
+        let p = poly[i][0];
+        for (let j = 0; j < p.length - 1; j++)
+            perimeter += haversine(p[j][0], p[j][1], p[j + 1][0], p[j + 1][1], options);
+        if (p.length > 2 && (p[0][0] != p[p.length - 1][0] || p[0][1] != p[p.length - 1][1]))
+            perimeter += haversine(p[0][0], p[0][1], p[p.length - 1][0], p[p.length - 1][1], options);
+    }
+    return perimeter;
+}
+exports.polyPerimeter = polyPerimeter;
+class Point {
+    constructor(x, y) {
+        this.x = x;
+        this.y = y;
+    }
+}
+class Circle {
+    constructor(x, y, r) {
+        this.x = x;
+        this.y = y;
+        this.r = r;
+    }
+}
+exports.Circle = Circle;
+//
+// Returns the smallest circle that encloses the given polygon.
+// Runs in expected O(n) time, randomized.
+// Note: If 0 points are given, null is returned.
+// If 1 point is given, a circle of radius 0 is returned.
+//
+function polyToCircle(poly, options) {
+    if (options === undefined)
+        options = DefaultOptions;
+    return makeCircle(polyToExteriorPoints(poly));
+}
+exports.polyToCircle = polyToCircle;
+//
+// Returns the circle whose perimeter is equal to the perimeter of the bounding perimeter
+// of the polygon. Use binary search to find an approximation.
+//
+function polyToPolsbyPopperCircle(poly, options) {
+    if (options === undefined)
+        options = DefaultOptions;
+    let c = polyToCircle(poly, options);
+    if (c == null)
+        return c;
+    let p = polyPerimeter(poly, options);
+    c.r = (p / (2 * Math.PI)) / 111139;
+    return c;
+}
+exports.polyToPolsbyPopperCircle = polyToPolsbyPopperCircle;
+function makeCircle(points) {
+    if (points == null)
+        return null;
+    // Clone list to preserve the caller's data, do Durstenfeld shuffle
+    let shuffled = points.slice();
+    for (let i = points.length - 1; i >= 0; i--) {
+        let j = Math.floor(Math.random() * (i + 1));
+        j = Math.max(Math.min(j, i), 0);
+        const temp = shuffled[i];
+        shuffled[i] = shuffled[j];
+        shuffled[j] = temp;
+    }
+    // Progressively add points to circle or recompute circle
+    let c = null;
+    shuffled.forEach((p, i) => {
+        if (c === null || !isInCircle(c, p))
+            c = makeCircleOnePoint(shuffled.slice(0, i + 1), p);
+    });
+    return c;
+}
+// One boundary point known
+function makeCircleOnePoint(points, p) {
+    let c = new Circle(p.x, p.y, 0);
+    points.forEach((q, i) => {
+        if (!isInCircle(c, q)) {
+            if (c.r == 0)
+                c = makeDiameter(p, q);
+            else
+                c = makeCircleTwoPoints(points.slice(0, i + 1), p, q);
+        }
+    });
+    return c;
+}
+// Two boundary points known
+function makeCircleTwoPoints(points, p, q) {
+    const circ = makeDiameter(p, q);
+    let left = null;
+    let right = null;
+    // For each point not in the two-point circle
+    for (const r of points) {
+        if (isInCircle(circ, r))
+            continue;
+        // Form a circumcircle and classify it on left or right side
+        const cross = crossProduct(p.x, p.y, q.x, q.y, r.x, r.y);
+        const c = makeCircumcircle(p, q, r);
+        if (c === null)
+            continue;
+        else if (cross > 0 && (left === null || crossProduct(p.x, p.y, q.x, q.y, c.x, c.y) > crossProduct(p.x, p.y, q.x, q.y, left.x, left.y)))
+            left = c;
+        else if (cross < 0 && (right === null || crossProduct(p.x, p.y, q.x, q.y, c.x, c.y) < crossProduct(p.x, p.y, q.x, q.y, right.x, right.y)))
+            right = c;
+    }
+    // Select which circle to return
+    if (left === null && right === null)
+        return circ;
+    else if (left === null && right !== null)
+        return right;
+    else if (left !== null && right === null)
+        return left;
+    else if (left !== null && right !== null)
+        return left.r <= right.r ? left : right;
+    else
+        throw "Assertion error";
+}
+function makeDiameter(a, b) {
+    const cx = (a.x + b.x) / 2;
+    const cy = (a.y + b.y) / 2;
+    const r0 = Util.distance(cx, cy, a.x, a.y);
+    const r1 = Util.distance(cx, cy, b.x, b.y);
+    return new Circle(cx, cy, Math.max(r0, r1));
+}
+function makeCircumcircle(a, b, c) {
+    // Mathematical algorithm from Wikipedia: Circumscribed circle
+    const ox = (Math.min(a.x, b.x, c.x) + Math.max(a.x, b.x, c.x)) / 2;
+    const oy = (Math.min(a.y, b.y, c.y) + Math.max(a.y, b.y, c.y)) / 2;
+    const ax = a.x - ox;
+    const ay = a.y - oy;
+    const bx = b.x - ox;
+    const by = b.y - oy;
+    const cx = c.x - ox;
+    const cy = c.y - oy;
+    const d = (ax * (by - cy) + bx * (cy - ay) + cx * (ay - by)) * 2;
+    if (d == 0)
+        return null;
+    const x = ox + ((ax * ax + ay * ay) * (by - cy) + (bx * bx + by * by) * (cy - ay) + (cx * cx + cy * cy) * (ay - by)) / d;
+    const y = oy + ((ax * ax + ay * ay) * (cx - bx) + (bx * bx + by * by) * (ax - cx) + (cx * cx + cy * cy) * (bx - ax)) / d;
+    const ra = Util.distance(x, y, a.x, a.y);
+    const rb = Util.distance(x, y, b.x, b.y);
+    const rc = Util.distance(x, y, c.x, c.y);
+    return new Circle(x, y, Math.max(ra, rb, rc));
+}
+/* Simple mathematical functions */
+const MULTIPLICATIVE_EPSILON = 1 + 1e-14;
+function isInCircle(c, p) {
+    return c !== null && Util.distance(p.x, p.y, c.x, c.y) <= c.r * MULTIPLICATIVE_EPSILON;
+}
+// Returns twice the signed area of the triangle defined by (x0, y0), (x1, y1), (x2, y2).
+function crossProduct(x0, y0, x1, y1, x2, y2) {
+    return (x1 - x0) * (y2 - y0) - (y1 - y0) * (x2 - x0);
+}
+// cache x,y circle offsets for one quadrant indexed by number of segments
+let circleOffsets = {};
+function getCircleOffsets(n) {
+    if (circleOffsets[n] === undefined) {
+        let a = [];
+        let incr = (Math.PI / 2) / n;
+        let theta = 0;
+        let i, j;
+        // Compute NE quadrant
+        for (i = 0; i < n; i++, theta += incr) {
+            a.push(Math.sin(theta));
+            a.push(Math.cos(theta));
+        }
+        // Add top of circle
+        a.push(0);
+        a.push(1);
+        // Now flip X and replicate to NW quadrant
+        for (i = 0; i < n; i++) {
+            j = (n - i) * 2;
+            a.push(-a[j - 1]);
+            a.push(a[j - 2]);
+        }
+        // Now flip X and Y and replicate to SW quadrant
+        for (i = 0; i < n; i++) {
+            j = (n - i) * 2;
+            a.push(-a[j - 1]);
+            a.push(-a[j - 2]);
+        }
+        // Add bottom of circle
+        a.push(0);
+        a.push(-1);
+        // Now flip Y and replicate to SE quadrant
+        for (i = 0; i < n; i++) {
+            j = (n - i) * 2;
+            a.push(a[j - 1]);
+            a.push(-a[j - 2]);
+        }
+        // Duplicate final point per GeoJSON spec
+        a.push(a[0]);
+        a.push(a[1]);
+        circleOffsets[n] = a;
+    }
+    return circleOffsets[n];
+}
+// Note that this is essentially an inversion of polyToCircle which computes a mathematical
+// circle given the point values, ignoring latitude correction. This inversion also
+// ignores that correction which means when plotted on a 2D map looks circular but the edge of
+// the circle is not a fixed distance (in physical units, e.g. meters) from the center.
+//
+function polyFromCircle(c, nSegments, options) {
+    if (options === undefined)
+        options = DefaultOptions;
+    if (c === null || c.r == 0)
+        return null;
+    if (!nSegments || nSegments < 8)
+        nSegments = 8;
+    let poly = [];
     let offsets = getCircleOffsets(nSegments);
     const n = offsets.length;
     for (let i = 0; i < n; i += 2)
@@ -98606,6 +100421,7 @@ const analyze_1 = __webpack_require__(/*! ./analyze */ "./src/analyze.ts");
 const score_1 = __webpack_require__(/*! ./score */ "./src/score.ts");
 const results_1 = __webpack_require__(/*! ./results */ "./src/results.ts");
 const results_2 = __webpack_require__(/*! ./results */ "./src/results.ts");
+const geofeature_1 = __webpack_require__(/*! ./geofeature */ "./src/geofeature.ts");
 const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 class AnalyticsSession {
@@ -98625,46 +100441,39 @@ class AnalyticsSession {
         this.features = new D.Features(this, SessionRequest['data'], this.config['datasets']);
         this.plan = new D.Plan(this, SessionRequest['plan']);
         this.districts = new D.Districts(this, SessionRequest['districtShapes']);
-        // TODO - Confirming that the graph includes OUT_OF_STATE neighbors
-        // if (U.keyExists(S.OUT_OF_STATE, this.graph._graph)) {
-        //   console.log("Contiguity graph includes out-of-state neighbors.");
-        // }
-        // else {
-        //   console.log("Contiguity graph does NOT include out-of-state neighbors.");
-        // }
-        // NOTE: I've pulled these out of the individual analytics to here. Eventually,
-        // we could want them to passed into an analytics session as data, along with
-        // everything else. For now, this keeps branching out of the main code.
-        results_1.doConfigureScales(this);
+        // TODO - SCORE: Toggle
+        if (this.useLegacy()) {
+            // NOTE: I've pulled these out of the individual analytics to here. Eventually,
+            // we could want them to passed into an analytics session as data, along with
+            // everything else. For now, this keeps branching out of the main code.
+            results_1.doConfigureScales(this);
+        }
     }
     processConfig(config) {
         // NOTE - Session settings are required:
         // - Analytics suites can be defaulted to all with [], but
         // - Dataset keys must be explicitly specified with 'dataset'
-        // TODO - DASHBOARD: Remove this mechanism. Always run everything.
-        let defaultSuites = [0 /* Legal */, 1 /* Fair */, 2 /* Best */];
-        // If the config passed in has no suites = [], use the default suites
-        if (U.isArrayEmpty(config['suites'])) {
-            config['suites'] = defaultSuites;
-        }
+        config['suites'] = [0 /* Legal */, 1 /* Fair */, 2 /* Best */];
         // Default the Census & redistricting cycle to 2010
         if (!(U.keyExists('cycle', config)))
             config['cycle'] = 2010;
         return config;
     }
+    useLegacy() {
+        return (U.keyExists('useScore', this.config) && (this.config['useScore'])) ? false : true;
+    }
     // Using the the data in the analytics session, calculate all the
     // analytics & validations, saving/updating the individual test results.
-    analyzePlan(bLog = false) {
+    analyzePlan(bLog = false, overridesJSON = undefined) {
         try {
             preprocess_1.doPreprocessData(this, bLog);
             analyze_1.doAnalyzeDistricts(this, bLog);
-            analyze_1.doAnalyzePlan(this, bLog);
             // TODO - SCORE
+            analyze_1.doAnalyzePlan(this, bLog);
             this._profile = score_1.profilePlan(this, bLog);
-            // this._profile = Score.sampleProfile;
             this._scorecard = score_1.scorePlan(this._profile, bLog);
-            // TODO - SCORE
             results_1.doAnalyzePostProcessing(this, bLog);
+            //
         }
         catch (_a) {
             console.log("Exception caught by analyzePlan()");
@@ -98684,13 +100493,6 @@ class AnalyticsSession {
     getPlanScorecard(bLog = false) {
         return this._scorecard;
     }
-    /* TODO - SCORE
-    // NOTE - This assumes that analyzePlan() has been run!
-    getPlanAnalytics(bLog: boolean = false): PlanAnalytics
-    {
-      return preparePlanAnalytics(this, bLog);
-    }
-    */
     // TODO - SCORE
     // NOTE - This assumes that analyzePlan() has been run!
     getRequirementsChecklist(bLog = false) {
@@ -98699,19 +100501,82 @@ class AnalyticsSession {
     // NOTE - This assumes that analyzePlan() has been run!
     getDiscontiguousDistrictFeatures(bLog = false) {
         // Get the (possibly empty) list of discontiguous district IDs
-        let contiguousTest = this.getTest(1 /* Contiguous */);
-        let discontiguousDistrictIDs = contiguousTest['details']['discontiguousDistricts'] || [];
+        const contiguousTest = this.getTest(1 /* Contiguous */);
+        const discontiguousDistrictIDs = contiguousTest['details']['discontiguousDistricts'] || [];
         // Convert them into a (possibly empty) list of features
         let discontiguousDistrictFeatures = { type: 'FeatureCollection', features: [] };
         if (!(U.isArrayEmpty(discontiguousDistrictIDs))) {
             for (let id of discontiguousDistrictIDs) {
                 let poly = this.districts.getDistrictShapeByID(id);
-                if (poly)
-                    discontiguousDistrictFeatures.features.push(poly);
+                if (poly) {
+                    // If a district has a shape & it is not contiguous, by definition,
+                    // it will be a Multipolygon, i.e., it will have multiple pieces, some
+                    // possibly embedded w/in other districts. Get & add all the pieces.
+                    const districtParts = geofeature_1.polyParts(poly);
+                    discontiguousDistrictFeatures.features.push(...districtParts.features);
+                    // discontiguousDistrictFeatures.features.push(poly);
+                }
             }
         }
         return discontiguousDistrictFeatures;
     }
+    // Comments clipped from dra-client geodistrict.ts.
+    // Discontiguous polygons are:
+    //  1. All polygons in a multi-polygon; and
+    //  2. All holes in a otherwise cohesive polygon.
+    // Note that all non-cohesive features are always simple polygons.
+    /*
+    let i: number, j: number;
+    let nPoly: number = 0;
+    for (i = 0;nPoly == 0 && i < this.cacheDistricts.features.length;i++)
+    {
+      let f = this.cacheDistricts.features[i];
+  
+      if (f.geometry.type === 'MultiPolygon')
+        nPoly += f.geometry.coordinates.length;
+      else if (f.geometry.type === 'Polygon' && f.geometry.coordinates.length)
+        nPoly += (f.geometry.coordinates.length - 1);
+    }
+    if (nPoly)
+    {
+      this.cacheNoncohesive = {type: 'FeatureCollection', features: []};
+      let af: any = this.cacheNoncohesive.features;
+      let oUnique: any = {};
+  
+      // First add discontiguous polygons
+      for (i = 0;i < this.cacheDistricts.features.length;i++)
+      {
+        let f = this.cacheDistricts.features[i];
+  
+        if (f.geometry.type === 'MultiPolygon')
+        {
+          // Push all non-contiguous polygons
+          for (j = 0;j < f.geometry.coordinates.length;j++)
+          {
+            let p: any = f.geometry.coordinates[j];
+            oUnique[Hash.qhash(p[0])] = true;
+            af.push({type: 'Feature', properties: {id: `${af.length + 1}`}, geometry: {type: 'Polygon', coordinates: p}});
+          }
+        }
+      }
+  
+      // Now add unique holes
+      for (i = 0;i < this.cacheDistricts.features.length;i++)
+      {
+        let f = this.cacheDistricts.features[i];
+  
+        if (f.geometry.type === 'Polygon')
+        {
+          // Push all holes from this polygon
+          for (j = 1;j < f.geometry.coordinates.length;j++)
+          {
+            let p: any = f.geometry.coordinates[j];
+            if (oUnique[Hash.qhash(p)] === undefined)
+              af.push({type: 'Feature', properties: {id: `${af.length + 1}`}, geometry: {type: 'Polygon', coordinates: [p]}});
+          }
+        }
+      }
+    } */
     // HELPERS USED INTERNALLY
     // Get an individual test, so you can drive UI with the results.
     getTest(testID) {
@@ -98727,9 +100592,17 @@ class AnalyticsSession {
         // Return a pointer to the the test entry for this test
         return this.tests[testID];
     }
-    // NOTE - Not sure why this has to be up here.
+    // NOTE - Not sure why this has to be up here ...
     populationDeviationThreshold() {
-        return 1 - this.testScales[4 /* PopulationDeviation */]['scale'][0];
+        // TODO - SCORE: Toggle
+        // const bLegacy = this._bLegacy; DELETE
+        if (this.useLegacy()) {
+            return 1 - this.testScales[4 /* PopulationDeviation */]['scale'][0];
+        }
+        else {
+            const scorecard = this._scorecard;
+            return scorecard.best.populationDeviation.notes['threshold'];
+        }
     }
 }
 exports.AnalyticsSession = AnalyticsSession;
@@ -98905,7 +100778,7 @@ class Districts {
             let outerThis = this;
             // Default the pop dev % for the dummy Unassigned district to 0%.
             // Default the pop dev % for real (1–N) but empty districts to 100%.
-            // TODO - SCORE
+            // TODO - SCORE: Why did I mark this?
             let popDevPct = (i > 0) ? (targetSize / targetSize) : 0 / targetSize;
             // Get the geoIDs assigned to the district
             // Guard against empty districts
@@ -98932,7 +100805,6 @@ class Districts {
                             // NOTE - SPLITTING
                             // Total population by counties w/in a district,
                             // except the dummy unassigned district 0
-                            // TODO - VFEATURE
                             if (i > 0)
                                 countySplits[outerThis.getCountyIndex(geoID)] += featurePop;
                             // Democratic and Republican vote totals
@@ -99106,10 +100978,7 @@ class Districts {
         compact_1.extractDistrictProperties(this._session, bLog);
     }
     getCountyIndex(geoID) {
-        // TODO - VFEATURE
         let countyFIPS = U.parseGeoID(geoID)['county'];
-        // let countyGeoID = U.parseGeoID(geoID)['county'] as string;
-        // let countyFIPS = U.getFIPSFromCountyGeoID(countyGeoID);
         let countyIndex = this._session.counties.indexFromFIPS(countyFIPS);
         return countyIndex;
     }
@@ -99358,6 +101227,8 @@ exports.doAnalyzeDistricts = doAnalyzeDistricts;
 // NOTE - I could make this table-driven, but I'm thinking that the explicit
 //   calls might make chunking for aync easier.
 function doAnalyzePlan(s, bLog = false) {
+    // TODO - SCORE: Toggle
+    // const bLegacy = s._bLegacy;
     // TODO - Remove this mechanism. Always run all tests
     // Get the requested suites, and only execute those tests
     let requestedSuites = s.config['suites'];
@@ -99404,6 +101275,8 @@ exports.doAnalyzePlan = doAnalyzePlan;
 // NOTE - Should this be conditionalized on the test suites requested? 
 //   Those are encapsulated in reports.ts right now, so not doing that.
 function doDeriveSecondaryTests(s, bLog = false) {
+    // TODO - SCORE: Toggle
+    // const bLegacy = s._bLegacy;
     s.tests[3 /* EqualPopulation */] = equal_1.doHasEqualPopulations(s, bLog);
 }
 exports.doDeriveSecondaryTests = doDeriveSecondaryTests;
@@ -99987,6 +101860,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
+// TODO - SCORE: Delete
 function doPopulationDeviation(s, bLog = false) {
     let test = s.getTest(4 /* PopulationDeviation */);
     let targetSize = s.state.totalPop / s.state.nDistricts;
@@ -100022,6 +101896,13 @@ exports.doPopulationDeviation = doPopulationDeviation;
 // NOTE - This validity check is *derived* and depends on population deviation %
 //   being computed (above) and normalized in test log & scorecard generation.
 function doHasEqualPopulations(s, bLog = false) {
+    // TODO - SCORE: Toggle
+    // const bLegacy = s._bLegacy;
+    const scorecard = s._scorecard;
+    const popDevNormalizedNEW = scorecard.best.populationDeviation.normalized;
+    const bScore = (popDevNormalizedNEW > 0) ? true : false;
+    // TODO - Get scales
+    // TODO - Flow through to RequirementsChecklist
     let test = s.getTest(3 /* EqualPopulation */);
     // Get the normalized population deviation %
     let popDevTest = s.getTest(4 /* PopulationDeviation */);
@@ -100036,6 +101917,7 @@ function doHasEqualPopulations(s, bLog = false) {
     }
     test['details']['deviation'] = popDevPct;
     test['details']['thresholds'] = popDevTest['details']['scale'];
+    console.log("Equal population =", test['score'], bScore);
     // Populate the N+1 summary "district" in district.statistics
     let bEqualPop = s.districts.statistics[D.DistrictField.bEqualPop];
     let summaryRow = s.districts.numberOfRows() - 1;
@@ -100068,6 +101950,23 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const Poly = __importStar(__webpack_require__(/*! @dra2020/poly */ "./node_modules/@dra2020/poly/dist/poly.js"));
+// HELPER
+function polyParts(poly) {
+    let parts = { type: 'FeatureCollection', features: [] };
+    let af = parts.features;
+    if (poly.geometry.type === 'MultiPolygon') {
+        // Push all non-contiguous polygons
+        for (let j = 0; j < poly.geometry.coordinates.length; j++) {
+            let onePoly = poly.geometry.coordinates[j];
+            af.push({ type: 'Feature', properties: { id: `${af.length + 1}` }, geometry: { type: 'Polygon', coordinates: onePoly } });
+        }
+    }
+    else {
+        parts.features.push(poly);
+    }
+    return parts;
+}
+exports.polyParts = polyParts;
 // CARTESIAN SHIMS OVER 'POLY' FUNCTIONS
 // TODO - POLY: Confirm Cartesian calculations
 function gfArea(poly) {
@@ -100369,10 +102268,7 @@ function doPreprocessCensus(s, bLog = false) {
             // Sum total population across the state
             s.state.totalPop += value;
             // Get the county FIPS code for the feature
-            // TODO - VFEATURE
             let countyFIPS = U.parseGeoID(geoID)['county'];
-            // let county = U.parseGeoID(geoID)['county'] as string;
-            // let countyFIPS = U.getFIPSFromCountyGeoID(county);
             // If a subtotal for the county doesn't exist, initialize one
             if (!(U.keyExists(countyFIPS, totalByCounty))) {
                 totalByCounty[countyFIPS] = 0;
@@ -100390,8 +102286,8 @@ function doPreprocessCensus(s, bLog = false) {
     let fipsCodes = U.getObjectKeys(totalByCounty);
     // Sort the results
     fipsCodes = fipsCodes.sort();
-    // TODO - SCORE: This was added for SPLITTING
-    // Add a dummy county, for county-district splitting analysis
+    // NOTE - This was added for the legacy SPLITTING implementation.
+    // Add a dummy county, for county-district splitting analysis.
     fipsCodes.unshift('000');
     // Create the ID-ordinal map
     for (let i in fipsCodes) {
@@ -100481,6 +102377,7 @@ const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
 const analyze_1 = __webpack_require__(/*! ./analyze */ "./src/analyze.ts");
 const state_reqs_json_1 = __importDefault(__webpack_require__(/*! ../static/state-reqs.json */ "./static/state-reqs.json"));
 // Example
+// TODO - DELETE?
 let sampleRequirements = {
     score: 2 /* Red */,
     metrics: {
@@ -100504,6 +102401,7 @@ let sampleRequirements = {
         stateReqs: "https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_20.pdf"
     }
 };
+// TODO - DELETE
 let sampleCompactness = {
     score: 60,
     metrics: {
@@ -100516,6 +102414,7 @@ let sampleCompactness = {
     },
     resources: {}
 };
+// TODO - DELETE
 let sampleSplitting = {
     score: 73,
     metrics: {
@@ -100533,7 +102432,7 @@ let sampleSplitting = {
     datasets: {},
     resources: {}
 };
-// TODO - PARTISAN: This category is still being fleshed out.
+// TODO - DELETE
 let samplePartisan = {
     score: 100,
     metrics: {
@@ -100548,7 +102447,7 @@ let samplePartisan = {
         planScore: "https://planscore.org/plan.html?20180219T202039.596761160Z"
     }
 };
-// TODO - SCORE: Add a minority report
+// TODO - DELETE
 let sampleMinority = {
     score: null,
     metrics: {
@@ -100575,6 +102474,7 @@ let sampleMinority = {
     },
     resources: {}
 };
+// TODO - DELETE
 exports.samplePlanAnalytics = {
     requirements: sampleRequirements,
     compactness: sampleCompactness,
@@ -100583,232 +102483,6 @@ exports.samplePlanAnalytics = {
     partisan: samplePartisan,
     minority: sampleMinority
 };
-/* TODO - SCORE
-export function preparePlanAnalytics(s: AnalyticsSession, bLog: boolean = false): PlanAnalytics
-{
-  if (!(s.bPostProcessingDone))
-  {
-    doAnalyzePostProcessing(s);
-  }
-
-  // REQUIREMENTS CATEGORY
-  let paRequirements: RequirementsCategory;
-
-  {
-    let completeTest = s.getTest(T.Test.Complete) as T.TestEntry;
-    let contiguousTest = s.getTest(T.Test.Contiguous) as T.TestEntry;
-    let freeOfHolesTest = s.getTest(T.Test.FreeOfHoles) as T.TestEntry;
-    let equalPopulationTest = s.getTest(T.Test.EqualPopulation) as T.TestEntry;
-
-    // Combine individual checks into an overall score
-
-    // TODO - DASHBOARD: Until we add three-state support top to bottom in
-    //   requirements/validations, map booleans to tri-states here.
-    let completeMetric = U.mapBooleanToTriState(completeTest['score'] as boolean);
-    let contiguousMetric = U.mapBooleanToTriState(contiguousTest['score'] as boolean);
-    let freeOfHolesMetric = U.mapBooleanToTriState(freeOfHolesTest['score'] as boolean);
-    let equalPopulationMetric = U.mapBooleanToTriState(equalPopulationTest['score'] as boolean);
-
-    let reqScore: T.TriState = T.TriState.Green;
-    let checks = [completeMetric, contiguousMetric, freeOfHolesMetric, equalPopulationMetric];
-    if (checks.includes(T.TriState.Yellow)) reqScore = T.TriState.Yellow;
-    if (checks.includes(T.TriState.Red)) reqScore = T.TriState.Red;
-
-    // Get values to support details entries
-    let unassignedFeaturesDetail = U.deepCopy(completeTest['details']['unassignedFeatures']) || [];
-    let emptyDistrictsDetail = U.deepCopy(completeTest['details']['emptyDistricts']) || [];
-    let discontiguousDistrictsDetail = U.deepCopy(contiguousTest['details']['discontiguousDistricts']) || [];
-    let embeddedDistrictsDetail = U.deepCopy(freeOfHolesTest['details']['embeddedDistricts']) || [];
-
-    let populationDeviationDetail = U.deepCopy(equalPopulationTest['details']['deviation']);
-    let deviationThresholdDetail = U.trim(s.populationDeviationThreshold());
-
-    let xx: string = s.state.xx;
-    // TODO - JSON: Is there a better / easier way to work with the variable?
-    let stateReqsDict: T.Dict = allStateReqs;
-    let reqLinkToStateReqs: string = stateReqsDict[xx];
-
-    // Populate the category
-    paRequirements = {
-      score: reqScore,
-      metrics: {
-        complete: completeMetric,
-        contiguous: contiguousMetric,
-        freeOfHoles: freeOfHolesMetric,
-        equalPopulation: equalPopulationMetric
-      },
-      details: {
-        unassignedFeatures: unassignedFeaturesDetail,
-        emptyDistricts: emptyDistrictsDetail,
-        discontiguousDistricts: discontiguousDistrictsDetail,
-        embeddedDistricts: embeddedDistrictsDetail,
-        populationDeviation: populationDeviationDetail,
-        deviationThreshold: deviationThresholdDetail
-      },
-      datasets: {
-        census: U.deepCopy(s.config['descriptions']['CENSUS']),
-      },
-      resources: {
-        stateReqs: reqLinkToStateReqs
-      }
-    }
-  }
-
-  // COMPACTNESS CATEGORY
-  let paCompactness: CompactnessCategory;
-  {
-    let reockWeight = 0.5;
-    let polsbyWeight = 1.0 - reockWeight;
-
-    let reockTest = s.getTest(T.Test.Reock) as T.TestEntry;
-    let polsbyTest = s.getTest(T.Test.PolsbyPopper) as T.TestEntry;
-
-    let normalizedReock = reockTest['normalizedScore'] as number;
-    let normalizedPolsby = reockTest['normalizedScore'] as number;
-    let compactnessScore = U.trim((reockWeight * normalizedReock) + (polsbyWeight * normalizedPolsby), 0);
-
-    let reockMetric = U.deepCopy(reockTest['score'] as number);
-    let polsbyMetric = U.deepCopy(polsbyTest['score'] as number);
-
-    // Populate the category
-    paCompactness = {
-      score: compactnessScore,
-      metrics: {
-        reock: reockMetric,
-        polsby: polsbyMetric
-      },
-      details: {
-        // None at this time
-      },
-      datasets: {
-        // NOTE - DATASETS
-        shapes: U.deepCopy(s.config['descriptions']['SHAPES'])
-        // shapes: "2010 VTD shapes"
-      },
-      resources: {
-        // None at this time
-      }
-    }
-  }
-
-  // SPLITTING CATEGORY
-
-  let paSplitting: SplittingCategory
-
-  {
-    let unexpectedCountySplittingTest = s.getTest(T.Test.UnexpectedCountySplits) as T.TestEntry;
-    let VTDSplitsTest = s.getTest(T.Test.VTDSplits) as T.TestEntry;
-    let countySplittingTest = s.getTest(T.Test.CountySplitting) as T.TestEntry;
-    let districtSplittingTest = s.getTest(T.Test.DistrictSplitting) as T.TestEntry;
-
-    let unexpectedAffectedMetric = U.deepCopy(unexpectedCountySplittingTest['score']);
-    let countiesSplitUnexpectedlyDetail = U.deepCopy(unexpectedCountySplittingTest['details']['countiesSplitUnexpectedly']);
-
-    let nVTDSplitsMetric = U.deepCopy(VTDSplitsTest['score']);
-    let splitVTDsDetail = U.deepCopy(VTDSplitsTest['details']['splitVTDs']);
-
-    let SqEnt_DCreducedMetric = U.deepCopy(countySplittingTest['score']);
-    let SqEnt_CDreducedMetric = U.deepCopy(districtSplittingTest['score']);
-
-    let countySplittingNormalized = countySplittingTest['normalizedScore'] as number;
-    let districtSplittingNormalized = districtSplittingTest['normalizedScore'] as number;
-    let splittingScore = U.trim((S.COUNTY_SPLITTING_WEIGHT * countySplittingNormalized) +
-      + (S.DISTRICT_SPLITTING_WEIGHT * districtSplittingNormalized), 0);
-
-    paSplitting = {
-      score: splittingScore,
-      metrics: {
-        sqEnt_DCreduced: SqEnt_DCreducedMetric,
-        sqEnt_CDreduced: SqEnt_CDreducedMetric
-        // NOTE - The un-reduced raw values
-        // sqEnt_DC    : SqEnt_DCMetric,
-        // sqEnt_CD    : SqEnt_CDMetric
-      },
-      details: {
-        countiesSplitUnexpectedly: countiesSplitUnexpectedlyDetail,
-        unexpectedAffected: unexpectedAffectedMetric,
-        nSplitVTDs: nVTDSplitsMetric,
-        splitVTDs: splitVTDsDetail
-      },
-      datasets: {
-        // None at this time
-      },
-      resources: {
-        // None at this time
-      }
-    }
-  }
-
-  // PARTISAN CATEGORY
-  //
-  // TODO - PARTISAN: This category is still being fleshed out. Just an example below.
-  let paPartisan: PartisanCategory;
-
-  {
-    paPartisan = {
-      score: 100,
-      metrics: {
-        partisanBias: 0.15,
-        responsiveness: 2.0
-      },
-      details: {},
-      datasets: {
-        election: "2016 Presidential, US Senate, Governor, and AG election results"
-      },
-      resources: {
-        planScore: "https://planscore.org/plan.html?20180219T202039.596761160Z"
-      }
-    }
-  }
-
-  // MINORITY CATEGORY
-  //
-  // TODO - MINORITY: This category is still being fleshed out. Just an example below.
-  let paMinority: MinorityCategory;
-
-  {
-    paMinority = {
-      score: null,
-      metrics: {
-        nBlack37to50: 1,
-        nBlackMajority: 12,
-        nHispanic37to50: 0,
-        nHispanicMajority: 0,
-        nPacific37to50: 0,
-        nPacificMajority: 0,
-        nAsian37to50: 0,
-        nAsianMajority: 0,
-        nNative37to50: 0,
-        nNativeMajority: 0,
-        nMinority37to50: 0,
-        nMinorityMajority: 0,
-
-        averageDVoteShare: 0.90
-      },
-      details: {
-        vap: true,
-        comboCategories: true
-      },
-      datasets: {
-        vap: "2010 Voting Age Population"
-      },
-      resources: {}
-    }
-  }
-
-  // PLAN ANALYTICS
-  let pa: PlanAnalytics = {
-    requirements: paRequirements,
-    compactness: paCompactness,
-    // TODO - Not implemented yet
-    splitting: paSplitting,
-    partisan: paPartisan,
-    minority: paMinority
-  }
-
-  return pa;
-}
-*/
 function prepareRequirementsChecklist(s, bLog = false) {
     if (!(s.bPostProcessingDone)) {
         doAnalyzePostProcessing(s);
@@ -100816,34 +102490,38 @@ function prepareRequirementsChecklist(s, bLog = false) {
     // REQUIREMENTS CATEGORY
     let paRequirements;
     {
-        let completeTest = s.getTest(0 /* Complete */);
-        let contiguousTest = s.getTest(1 /* Contiguous */);
-        let freeOfHolesTest = s.getTest(2 /* FreeOfHoles */);
-        let equalPopulationTest = s.getTest(3 /* EqualPopulation */);
+        const completeTest = s.getTest(0 /* Complete */);
+        const contiguousTest = s.getTest(1 /* Contiguous */);
+        const freeOfHolesTest = s.getTest(2 /* FreeOfHoles */);
+        const equalPopulationTest = s.getTest(3 /* EqualPopulation */);
         // Combine individual checks into an overall score
-        // TODO - DASHBOARD: Until we add three-state support top to bottom in
+        // NOTE - Until we add three-state support top to bottom in
         //   requirements/validations, map booleans to tri-states here.
-        let completeMetric = U.mapBooleanToTriState(completeTest['score']);
-        let contiguousMetric = U.mapBooleanToTriState(contiguousTest['score']);
-        let freeOfHolesMetric = U.mapBooleanToTriState(freeOfHolesTest['score']);
-        let equalPopulationMetric = U.mapBooleanToTriState(equalPopulationTest['score']);
+        const completeMetric = U.mapBooleanToTriState(completeTest['score']);
+        const contiguousMetric = U.mapBooleanToTriState(contiguousTest['score']);
+        const freeOfHolesMetric = U.mapBooleanToTriState(freeOfHolesTest['score']);
+        const equalPopulationMetric = U.mapBooleanToTriState(equalPopulationTest['score']);
         let reqScore = 0 /* Green */;
-        let checks = [completeMetric, contiguousMetric, freeOfHolesMetric, equalPopulationMetric];
+        const checks = [completeMetric, contiguousMetric, freeOfHolesMetric, equalPopulationMetric];
         if (checks.includes(1 /* Yellow */))
             reqScore = 1 /* Yellow */;
         if (checks.includes(2 /* Red */))
             reqScore = 2 /* Red */;
         // Get values to support details entries
-        let unassignedFeaturesDetail = U.deepCopy(completeTest['details']['unassignedFeatures']) || [];
-        let emptyDistrictsDetail = U.deepCopy(completeTest['details']['emptyDistricts']) || [];
-        let discontiguousDistrictsDetail = U.deepCopy(contiguousTest['details']['discontiguousDistricts']) || [];
-        let embeddedDistrictsDetail = U.deepCopy(freeOfHolesTest['details']['embeddedDistricts']) || [];
-        let populationDeviationDetail = U.deepCopy(equalPopulationTest['details']['deviation']);
-        let deviationThresholdDetail = U.trim(s.populationDeviationThreshold());
-        let xx = s.state.xx;
+        const unassignedFeaturesDetail = U.deepCopy(completeTest['details']['unassignedFeatures']) || [];
+        const emptyDistrictsDetail = U.deepCopy(completeTest['details']['emptyDistricts']) || [];
+        const discontiguousDistrictsDetail = U.deepCopy(contiguousTest['details']['discontiguousDistricts']) || [];
+        const embeddedDistrictsDetail = U.deepCopy(freeOfHolesTest['details']['embeddedDistricts']) || [];
+        const scorecard = s._scorecard;
+        const deviationThreshold = scorecard.best.populationDeviation.notes['threshold'];
+        // TODO - SCORE: Toggle
+        const populationDeviationDetail = U.deepCopy(equalPopulationTest['details']['deviation']);
+        const deviationThresholdDetail = U.trim(s.populationDeviationThreshold());
+        console.log("Population deviation thresholds =", deviationThresholdDetail, deviationThreshold);
+        const xx = s.state.xx;
         // TODO - JSON: Is there a better / easier way to work with the variable?
-        let stateReqsDict = state_reqs_json_1.default;
-        let reqLinkToStateReqs = stateReqsDict[xx];
+        const stateReqsDict = state_reqs_json_1.default;
+        const reqLinkToStateReqs = stateReqsDict[xx];
         // Populate the category
         paRequirements = {
             score: reqScore,
@@ -101106,6 +102784,8 @@ exports.doConfigureScales = doConfigureScales;
 // Postprocess analytics - Normalize numeric results and derive secondary tests.
 // Do this after analytics have been run and before preparing a test log or scorecard. 
 function doAnalyzePostProcessing(s, bLog = false) {
+    // TODO - SCORE: Toggle
+    // const bLegacy = s._bLegacy;
     // Normalize the raw scores for all the numerics tests
     let testResults = U.getNumericObjectKeys(testDefns);
     for (let testID of testResults) {
@@ -101149,7 +102829,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const Score = __importStar(__webpack_require__(/*! @dra2020/dra-score */ "./node_modules/@dra2020/dra-score/dist/dra-score.bundle.js"));
+const Score = __importStar(__webpack_require__(/*! @dra2020/dra-score */ "../dra-score/dist/dra-score.bundle.js"));
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
 // PROFILE A PLAN
@@ -101201,13 +102881,11 @@ function makeNakedCxD(s, bLog = false) {
     let CxD = [];
     // Remove the unassigned & total dummy "districts"
     for (let districtID = 1; districtID <= s.state.nDistricts; districtID++) {
-        // TODO - SCORE: OH has an extra county!?!
         const splits = U.deepCopy(adornedCxD[districtID].slice(1));
         CxD.push(splits);
     }
     return CxD;
 }
-// TODO - SCORE: Convert dict of geo props to array by district index
 function makeArrayOfGeoProps(s, bLog = false) {
     let geometryByDistrict = [];
     for (let districtID = 1; districtID <= s.state.nDistricts; districtID++) {
@@ -101305,6 +102983,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const DT = __importStar(__webpack_require__(/*! @dra2020/dra-types */ "./node_modules/@dra2020/dra-types/dist/dra-types.js"));
 const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
 // PLAN HELPERS
 // Is a "neighbor" in state?
@@ -101332,7 +103011,6 @@ function getDistrict(plan, geoID) {
 }
 exports.getDistrict = getDistrict;
 // WORKING WITH GEOIDS
-// TODO - VFEATURE
 function parseGeoID(geoID) {
     let bVfeature = false;
     // Rewrite vfeature GEOIDs to enable lexical parsing of higher-level parts
@@ -101340,12 +103018,7 @@ function parseGeoID(geoID) {
     // Example: vfeature_39153153ASV_0_28e0bc2c8163e5982e1da2d61e2388a8325c575e
     if (geoID.indexOf('vfeature') >= 0) {
         bVfeature = true;
-        // Strip off leading 'vfeature_'
-        let parentGeoID = geoID.slice(9);
-        // Strip off trailing goo
-        const uPos = parentGeoID.indexOf('_');
-        parentGeoID = parentGeoID.slice(0, uPos);
-        geoID = parentGeoID;
+        geoID = DT.vgeoidToGeoid(geoID);
     }
     const parts = {
         vfeature: bVfeature,
@@ -101353,29 +103026,9 @@ function parseGeoID(geoID) {
         county: geoID.substring(2, 5),
         rest: geoID.slice(5)
     };
-    // let l: number = geoID.length;
-    // if (l >= 11)
-    // {
-    //   parts['tract'] = geoID.substring(0, 11);
-    // }
-    // if (l >= 12)
-    // {
-    //   parts['bg'] = geoID.substring(0, 12);
-    // }
-    // if (l == 15)
-    // {
-    //   parts['block'] = geoID;
-    // }
     return parts;
 }
 exports.parseGeoID = parseGeoID;
-// TODO - VFEATURE
-// export function getFIPSFromCountyGeoID(geoID: string): string
-// {
-//   const fips = geoID.substring(2, 5);
-//   if (isNaN(Number(fips))) console.log("Non-numeric GEOID =", geoID);
-//   return fips;
-// }
 function isWaterOnly(geoID) {
     let waterOnlySignature = 'ZZZZZZ';
     if (geoID.indexOf(waterOnlySignature) >= 0)
@@ -102276,113 +103929,6 @@ function formatNumber(n) {
     let p = S.PRECISION;
     return n.toLocaleString('en-US', { minimumFractionDigits: p, maximumFractionDigits: p });
 }
-/* TODO - SCORE: DELETE
-function echoPlanAnalytics(pa: PlanAnalytics): void
-{
-  console.log("Plan Analytics:");
-  console.log("");
-
-  console.log("Requirements:");
-  console.log("* Score:", pa.requirements.score);
-  console.log("* Metrics:");
-  console.log(" - Complete:", pa.requirements.metrics.complete);
-  console.log(" - Contiguous:", pa.requirements.metrics.contiguous);
-  console.log(" - Free of holes:", pa.requirements.metrics.freeOfHoles);
-  console.log(" - Equal population:", pa.requirements.metrics.equalPopulation);
-  console.log("* Details:");
-  console.log(" - Empty districts:", prepareListItems(pa.requirements.details.emptyDistricts));
-  console.log(" - Unassigned features:", prepareListItems(pa.requirements.details.unassignedFeatures));
-  console.log(" - Population deviation:", pa.requirements.details.populationDeviation);
-  console.log(" - Deviation threshold:", pa.requirements.details.deviationThreshold);
-  console.log(" - Discontiguous districts:", prepareListItems(pa.requirements.details.discontiguousDistricts));
-  console.log(" - Embedded districts:", prepareListItems(pa.requirements.details.embeddedDistricts));
-  console.log("* Datasets:");
-  console.log("- Shapes:", pa.requirements.datasets.shapes);
-  console.log("- Census:", pa.requirements.datasets.census);
-  console.log("- VAP:", pa.requirements.datasets.vap);
-  console.log("- Election:", pa.requirements.datasets.election);
-  console.log("* Resources:");
-  console.log("- State requirements:", pa.requirements.resources.stateReqs);
-  console.log("");
-
-  console.log("Compactness:");
-  console.log("* Score:", pa.compactness.score);
-  console.log("* Metrics:");
-  console.log(" - Reock:", pa.compactness.metrics.reock);
-  console.log(" - Polsby-Popper:", pa.compactness.metrics.polsby);
-  console.log("* Details:");
-  console.log(" - N/A");
-  console.log("* Datasets:");
-  console.log("- Shapes:", pa.compactness.datasets.shapes);
-  console.log("- Census:", pa.compactness.datasets.census);
-  console.log("- VAP:", pa.compactness.datasets.vap);
-  console.log("- Election:", pa.compactness.datasets.election);
-  console.log("* Resources:");
-  console.log("- N/A");
-  console.log("");
-
-  console.log("Splitting:");
-  console.log("* Score:", pa.splitting.score);
-  console.log("* Metrics:");
-  console.log(" - sqEnt_DCreduced:", pa.splitting.metrics.sqEnt_DCreduced);
-  console.log(" - sqEnt_CDreduced:", pa.splitting.metrics.sqEnt_CDreduced);
-  console.log("* Details:");
-  console.log(" - countiesSplitUnexpectedly:", prepareListItems(pa.splitting.details.countiesSplitUnexpectedly));
-  console.log(" - unexpectedAffected:", pa.splitting.details.unexpectedAffected);
-  console.log(" - splitVTDs:", pa.splitting.details.splitVTDs);
-  console.log("* Datasets:");
-  console.log("- Shapes:", pa.splitting.datasets.shapes);
-  console.log("- Census:", pa.splitting.datasets.census);
-  console.log("- VAP:", pa.splitting.datasets.vap);
-  console.log("- Election:", pa.splitting.datasets.election);
-  console.log("* Resources:");
-  console.log("- N/A");
-  console.log("");
-
-  console.log("Partisan:");
-  console.log("* Score:", pa.partisan.score);
-  console.log("* Metrics:");
-  console.log(" - sqEnt_DCreduced:", pa.partisan.metrics.partisanBias);
-  console.log(" - sqEnt_CDreduced:", pa.partisan.metrics.responsiveness);
-  console.log("* Details:");
-  console.log(" - N/A");
-  console.log("* Datasets:");
-  console.log("- Shapes:", pa.partisan.datasets.shapes);
-  console.log("- Census:", pa.partisan.datasets.census);
-  console.log("- VAP:", pa.partisan.datasets.vap);
-  console.log("- Election:", pa.partisan.datasets.election);
-  console.log("* Resources:");
-  console.log(" - Plan Score:", pa.partisan.resources.planScore);
-  console.log("");
-
-  console.log("Minority:");
-  console.log("* Score:", pa.minority.score);
-  console.log("* Metrics:");
-  console.log(" - nBlack37to50:", pa.minority.metrics.nBlack37to50);
-  console.log(" - nBlackMajority:", pa.minority.metrics.nBlackMajority);
-  console.log(" - nHispanic37to50:", pa.minority.metrics.nHispanic37to50);
-  console.log(" - nHispanicMajority:", pa.minority.metrics.nHispanicMajority);
-  console.log(" - nPacific37to50:", pa.minority.metrics.nPacific37to50);
-  console.log(" - nPacificMajority:", pa.minority.metrics.nPacificMajority);
-  console.log(" - nAsian37to50:", pa.minority.metrics.nAsian37to50);
-  console.log(" - nAsianMajority:", pa.minority.metrics.nAsianMajority);
-  console.log(" - nNative37to50:", pa.minority.metrics.nNative37to50);
-  console.log(" - nNativeMajority:", pa.minority.metrics.nNativeMajority);
-  console.log(" - nMinority37to50:", pa.minority.metrics.nMinority37to50);
-  console.log(" - nMinorityMajority:", pa.minority.metrics.nMinorityMajority);
-  console.log("* Details:");
-  console.log(" - VAP:", pa.minority.details.vap);
-  console.log(" - comboCategoroes:", pa.minority.details.comboCategories);
-  console.log("* Datasets:");
-  console.log("- Shapes:", pa.minority.datasets.shapes);
-  console.log("- Census:", pa.minority.datasets.census);
-  console.log("- VAP:", pa.minority.datasets.vap);
-  console.log("- Election:", pa.minority.datasets.election);
-  console.log("* Resources:");
-  console.log("- N/A");
-  console.log("");
-}
-*/
 function echoDistrictStatistics(ds) {
     console.log("District Statistics:");
     for (let row of ds.table) {
@@ -102493,6 +104039,17 @@ module.exports = require("assert");
 
 /***/ }),
 
+/***/ "crypto":
+/*!*************************!*\
+  !*** external "crypto" ***!
+  \*************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+module.exports = require("crypto");
+
+/***/ }),
+
 /***/ "fs":
 /*!*********************!*\
   !*** external "fs" ***!