@dra2020/district-analytics 3.0.1 → 3.3.0

package/dist/cli.js

@@ -89264,13 +89264,24 @@ module.exports = g;
 //
 // THE NODE PACKAGE API
 //
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result["default"] = mod;
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const C = __importStar(__webpack_require__(/*! ./config */ "./src/config.ts"));
 const score_1 = __webpack_require__(/*! ./score */ "./src/score.ts");
 class Scorer {
     constructor() {
     }
-    score(plan) {
-        return score_1.scorePlan(plan);
+    score(profile, overridesJSON) {
+        return score_1.scorePlan(profile, overridesJSON);
+    }
+    populationDeviationThreshold(bLegislative) {
+        return C.popdevThreshold(bLegislative);
     }
 }
 exports.Scorer = Scorer;
@@ -89300,27 +89311,33 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
+const C = __importStar(__webpack_require__(/*! ./config */ "./src/config.ts"));
 const normalize_1 = __webpack_require__(/*! ./normalize */ "./src/normalize.ts");
 function scoreCountySplitting(rawValue, nCounties, nDistricts) {
     const _normalizer = new normalize_1.Normalizer(rawValue);
-    const stateCountySplitThreshold = countySplitThreshold(nCounties, nDistricts);
-    _normalizer.clip(S.COUNTY_BEST, stateCountySplitThreshold);
-    _normalizer.unitize(S.COUNTY_BEST, stateCountySplitThreshold);
+    const best = C.countySplittingRange()[C.BEG];
+    const worst = countySplitThreshold(nCounties, nDistricts);
+    _normalizer.clip(best, worst);
+    _normalizer.unitize(best, worst);
     _normalizer.invert();
     _normalizer.rescale();
     return _normalizer.normalizedNum;
 }
 exports.scoreCountySplitting = scoreCountySplitting;
 function countySplitThreshold(nCounties, nDistricts) {
-    const nAllowableSplits = Math.min(S.ALLOWABLE_SPLITS_MULTIPLIER * (nDistricts - 1));
-    const threshold = ((nAllowableSplits * S.COUNTY_WORST) + ((nCounties - nAllowableSplits) * 1.0)) / nCounties;
+    const m = C.allowableSplitsMultiplier();
+    const worst = C.countySplittingRange()[1];
+    const nAllowableSplits = Math.min(m * (nDistricts - 1));
+    const threshold = ((nAllowableSplits * worst) + ((nCounties - nAllowableSplits) * 1.0)) / nCounties;
     return threshold;
 }
 exports.countySplitThreshold = countySplitThreshold;
 function scoreDistrictSplitting(rawValue) {
     const _normalizer = new normalize_1.Normalizer(rawValue);
-    _normalizer.clip(S.DISTRICT_BEST, S.DISTRICT_WORST);
-    _normalizer.unitize(S.DISTRICT_BEST, S.DISTRICT_WORST);
+    const best = C.districtSplittingRange()[C.BEG];
+    const worst = C.districtSplittingRange()[C.END];
+    _normalizer.clip(best, worst);
+    _normalizer.unitize(best, worst);
     _normalizer.invert();
     _normalizer.rescale();
     return _normalizer.normalizedNum;
@@ -89593,7 +89610,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
-const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
+const C = __importStar(__webpack_require__(/*! ./config */ "./src/config.ts"));
 const normalize_1 = __webpack_require__(/*! ./normalize */ "./src/normalize.ts");
 // Migrated from district-analytics:
 // Measures of compactness compare district shapes to various ideally compact
@@ -89715,8 +89732,10 @@ function calcReock(area, diameter) {
 exports.calcReock = calcReock;
 function scoreReock(rawValue) {
     const _normalizer = new normalize_1.Normalizer(rawValue);
-    _normalizer.clip(S.REOCK_WORST, S.REOCK_BEST);
-    _normalizer.unitize(S.REOCK_WORST, S.REOCK_BEST);
+    const worst = C.reockRange()[C.BEG];
+    const best = C.reockRange()[C.END];
+    _normalizer.clip(worst, best);
+    _normalizer.unitize(worst, best);
     _normalizer.rescale();
     return _normalizer.normalizedNum;
 }
@@ -89734,12 +89753,12 @@ function doPolsbyPopper(g, bLog = false) {
         if (districtProps) {
             let a = districtProps[0 /* Area */];
             let p = districtProps[1 /* Perimeter */];
-            let polsbyPopper = calcPolsbyPopper(a, p);
+            let polsby = calcPolsbyPopper(a, p);
             // Save each district score
-            scores.push(polsbyPopper);
+            scores.push(polsby);
             // Echo the results by district
             if (bLog)
-                console.log("Polsby-Popper for district", districtID, "=", polsbyPopper);
+                console.log("Polsby-Popper for district", districtID, "=", polsby);
         }
         else {
             console.log("No shape or no geopropertes in Polsby-Popper ...");
@@ -89762,14 +89781,202 @@ function calcPolsbyPopper(area, perimeter) {
 exports.calcPolsbyPopper = calcPolsbyPopper;
 function scorePolsbyPopper(rawValue) {
     const _normalizer = new normalize_1.Normalizer(rawValue);
-    _normalizer.clip(S.POLSBY_WORST, S.POLSBY_BEST);
-    _normalizer.unitize(S.POLSBY_WORST, S.POLSBY_BEST);
+    const worst = C.polsbyRange()[C.BEG];
+    const best = C.polsbyRange()[C.END];
+    _normalizer.clip(worst, best);
+    _normalizer.unitize(worst, best);
     _normalizer.rescale();
     return _normalizer.normalizedNum;
 }
 exports.scorePolsbyPopper = scorePolsbyPopper;
 
 
+/***/ }),
+
+/***/ "./src/config.json":
+/*!*************************!*\
+  !*** ./src/config.json ***!
+  \*************************/
+/*! exports provided: partisan, traditionalPrinciples, default */
+/***/ (function(module) {
+
+module.exports = JSON.parse("{\"partisan\":{\"bias\":{\"range\":[0,0.2],\"weight\":[50,80]},\"impact\":{\"weight\":[50,0],\"threshold\":4},\"competitiveness\":{\"overall\":{\"range\":[0,0.67],\"weight\":25},\"marginal\":{\"range\":[0,0.85],\"weight\":75},\"range\":[0.45,0.55],\"distribution\":[0.25,0.75],\"weight\":[0,20]},\"weight\":[100,80]},\"traditionalPrinciples\":{\"compactness\":{\"reock\":{\"range\":[0.25,0.5],\"weight\":50},\"polsby\":{\"range\":[0.1,0.5],\"weight\":50},\"weight\":[0,50]},\"splitting\":{\"county\":{\"range\":[1,1.71],\"allowableSplitsMultiplier\":1.5,\"weight\":50},\"district\":{\"range\":[1,1.5],\"weight\":50},\"weight\":[0,50]},\"popdev\":{\"range\":[[0.0075,0.002],[0.1,-1]],\"weight\":[0,0]},\"weight\":[0,20]}}");
+
+/***/ }),
+
+/***/ "./src/config.ts":
+/*!***********************!*\
+  !*** ./src/config.ts ***!
+  \***********************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+//
+// THRESHOLDS, SCALES, AND WEIGHTS FOR SCORING MODEL
+//
+// * A layer of functions over config.json, so that they can be overridden dynamically (TODO)
+//
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+// Defaults
+const config_json_1 = __importDefault(__webpack_require__(/*! ./config.json */ "./src/config.json"));
+exports.BEG = 0;
+exports.END = 1;
+// PARTISAN
+function biasWeight(context, overridesJSON) {
+    const bW = config_json_1.default.partisan.bias.weight[context];
+    return bW;
+}
+exports.biasWeight = biasWeight;
+function biasRange(overridesJSON) {
+    const range = config_json_1.default.partisan.bias.range;
+    return range;
+}
+exports.biasRange = biasRange;
+function impactWeight(context, overridesJSON) {
+    const iW = config_json_1.default.partisan.impact.weight[context];
+    return iW;
+}
+exports.impactWeight = impactWeight;
+// The maximum # of unearned seats that scores positively
+function unearnedThreshold(overridesJSON) {
+    const threshold = config_json_1.default.partisan.impact.threshold;
+    return threshold;
+}
+exports.unearnedThreshold = unearnedThreshold;
+function competitivenessWeight(context, overridesJSON) {
+    const cW = config_json_1.default.partisan.competitiveness.weight[context];
+    return cW;
+}
+exports.competitivenessWeight = competitivenessWeight;
+function competitiveRange(overridesJSON) {
+    const range = config_json_1.default.partisan.competitiveness.range;
+    return range;
+}
+exports.competitiveRange = competitiveRange;
+function competitiveDistribution(overridesJSON) {
+    const dist = config_json_1.default.partisan.competitiveness.distribution;
+    return dist;
+}
+exports.competitiveDistribution = competitiveDistribution;
+function overallCompetitivenessRange(overridesJSON) {
+    const range = config_json_1.default.partisan.competitiveness.overall.range;
+    return range;
+}
+exports.overallCompetitivenessRange = overallCompetitivenessRange;
+function marginalCompetitivenessRange(overridesJSON) {
+    const range = config_json_1.default.partisan.competitiveness.marginal.range;
+    return range;
+}
+exports.marginalCompetitivenessRange = marginalCompetitivenessRange;
+function marginalCompetitivenessWeight(overridesJSON) {
+    const mcW = config_json_1.default.partisan.competitiveness.marginal.weight;
+    return mcW;
+}
+exports.marginalCompetitivenessWeight = marginalCompetitivenessWeight;
+function overallCompetitivenessWeight(overridesJSON) {
+    const ocW = config_json_1.default.partisan.competitiveness.overall.weight;
+    return ocW;
+}
+exports.overallCompetitivenessWeight = overallCompetitivenessWeight;
+// TRADITIONAL DISTRICTING PRINCIPLES
+function compactnessWeight(context, overridesJSON) {
+    const cW = config_json_1.default.traditionalPrinciples.compactness.weight[context];
+    return cW;
+}
+exports.compactnessWeight = compactnessWeight;
+function reockWeight(overridesJSON) {
+    const rW = config_json_1.default.traditionalPrinciples.compactness.reock.weight;
+    return rW;
+}
+exports.reockWeight = reockWeight;
+function reockRange(overridesJSON) {
+    const range = config_json_1.default.traditionalPrinciples.compactness.reock.range;
+    return range;
+}
+exports.reockRange = reockRange;
+function polsbyWeight(overridesJSON) {
+    const ppW = config_json_1.default.traditionalPrinciples.compactness.polsby.weight;
+    return ppW;
+}
+exports.polsbyWeight = polsbyWeight;
+function polsbyRange(overridesJSON) {
+    const range = config_json_1.default.traditionalPrinciples.compactness.polsby.range;
+    return range;
+}
+exports.polsbyRange = polsbyRange;
+function splittingWeight(context, overridesJSON) {
+    const sW = config_json_1.default.traditionalPrinciples.splitting.weight[context];
+    return sW;
+}
+exports.splittingWeight = splittingWeight;
+function countySplittingWeight(overridesJSON) {
+    const csW = config_json_1.default.traditionalPrinciples.splitting.county.weight;
+    return csW;
+}
+exports.countySplittingWeight = countySplittingWeight;
+function countySplittingRange(overridesJSON) {
+    const range = config_json_1.default.traditionalPrinciples.splitting.county.range;
+    return range;
+}
+exports.countySplittingRange = countySplittingRange;
+function allowableSplitsMultiplier(overridesJSON) {
+    const m = config_json_1.default.traditionalPrinciples.splitting.county.allowableSplitsMultiplier;
+    return m;
+}
+exports.allowableSplitsMultiplier = allowableSplitsMultiplier;
+function districtSplittingWeight(overridesJSON) {
+    const dsW = config_json_1.default.traditionalPrinciples.splitting.district.weight;
+    return dsW;
+}
+exports.districtSplittingWeight = districtSplittingWeight;
+function districtSplittingRange(overridesJSON) {
+    const range = config_json_1.default.traditionalPrinciples.splitting.district.range;
+    return range;
+}
+exports.districtSplittingRange = districtSplittingRange;
+function popdevWeight(context, overridesJSON) {
+    const pdW = config_json_1.default.traditionalPrinciples.popdev.weight[context];
+    return pdW;
+}
+exports.popdevWeight = popdevWeight;
+// NOTE - Raw ranges, not inverted (i.e., smaller is better)
+// NOTE - This could be optimized to not calc LD values for CD's (or do it once)
+function popdevRange(bLegislative, overridesJSON) {
+    const cdRange = config_json_1.default.traditionalPrinciples.popdev.range[0 /* Congressional */];
+    const worstCD = cdRange[exports.BEG];
+    const bestCD = cdRange[exports.END];
+    const ldRange = config_json_1.default.traditionalPrinciples.popdev.range[1 /* StateLegislative */];
+    const iRange = bLegislative ? ldRange : cdRange;
+    const worst = iRange[exports.BEG];
+    const best = bLegislative ? (bestCD / worstCD) * iRange[exports.BEG] : iRange[exports.END];
+    // Invert the range, so bigger is better.
+    return [worst, best];
+}
+exports.popdevRange = popdevRange;
+// NOTE - Raw threshold, not inverted (i.e., smaller is better)
+function popdevThreshold(bLegislative, overridesJSON) {
+    const threshold = popdevRange(bLegislative)[exports.BEG];
+    return threshold;
+}
+exports.popdevThreshold = popdevThreshold;
+// OVERALL SCORE 
+function partisanWeight(context, overridesJSON) {
+    const pW = config_json_1.default.partisan.weight[context];
+    return pW;
+}
+exports.partisanWeight = partisanWeight;
+function traditionalPrinciplesWeight(context, overridesJSON) {
+    const tpW = config_json_1.default.traditionalPrinciples.weight[context];
+    return tpW;
+}
+exports.traditionalPrinciplesWeight = traditionalPrinciplesWeight;
+
+
 /***/ }),
 
 /***/ "./src/equal.ts":
@@ -89793,7 +90000,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
-const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
+const C = __importStar(__webpack_require__(/*! ./config */ "./src/config.ts"));
 const normalize_1 = __webpack_require__(/*! ./normalize */ "./src/normalize.ts");
 // Migrated from district-analytics
 // Expect a full dict of district IDs & values (which might be zero = empty)
@@ -89814,7 +90021,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 = C.popdevThreshold(bLegislative);
+    const notes = {
+        'maxDeviation': max - min,
+        'threshold': threshold
+    };
     // Populate the measurement
     const m = {
         raw: popDev,
@@ -89826,11 +90037,11 @@ function doPopulationDeviation(e, targetSize, bLegislative, bLog = false) {
 exports.doPopulationDeviation = doPopulationDeviation;
 function scorePopulationDeviation(rawValue, bLegislative) {
     const _normalizer = new normalize_1.Normalizer(rawValue);
-    const rangeMin = bLegislative ? S.POPEQ_MIN_LD : S.POPEQ_MIN;
-    const rangeMax = bLegislative ? S.POPEQ_MAX_LD : S.POPEQ_MAX;
+    // Raw range in not inverted (i.e., smaller is better)
+    const range = C.popdevRange(bLegislative);
     _normalizer.invert();
-    _normalizer.clip(rangeMin, rangeMax);
-    _normalizer.unitize(rangeMin, rangeMax);
+    _normalizer.clip(1.0 - range[C.BEG], 1.0 - range[C.END]);
+    _normalizer.unitize(1.0 - range[C.BEG], 1.0 - range[C.END]);
     _normalizer.rescale();
     return _normalizer.normalizedNum;
 }
@@ -89839,10 +90050,129 @@ exports.scorePopulationDeviation = scorePopulationDeviation;
 
 /***/ }),
 
-/***/ "./src/fair.ts":
-/*!*********************!*\
-  !*** ./src/fair.ts ***!
-  \*********************/
+/***/ "./src/index.ts":
+/*!**********************!*\
+  !*** ./src/index.ts ***!
+  \**********************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+//
+// SCORE PACKAGE API
+//
+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__(/*! ./_api */ "./src/_api.ts"));
+var types_1 = __webpack_require__(/*! ./types */ "./src/types.ts");
+exports.sampleProfile = types_1.sampleProfile;
+exports.sampleScorecard = types_1.sampleScorecard;
+
+
+/***/ }),
+
+/***/ "./src/normalize.ts":
+/*!**************************!*\
+  !*** ./src/normalize.ts ***!
+  \**************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+//
+// NORMALIZATION UTILITIES
+//
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result["default"] = mod;
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
+class Normalizer {
+    constructor(rawValue) {
+        this.rawNum = rawValue;
+        this.wipNum = this.rawNum;
+    }
+    // *Don't* transform the input.
+    identity() {
+        return this.wipNum;
+    }
+    positive() {
+        this.wipNum = Math.abs(this.wipNum);
+        return this.wipNum;
+    }
+    // Invert a value in the unit range [0.0–1.0] (so that bigger is better).
+    invert() {
+        // TODO - DAVID: Can we make this throw an Error and expect that in unit test?
+        console.assert(((this.wipNum >= 0.0) && (this.wipNum <= 1.0)), "Inverting: " + S.OUT_OF_RANGE_MSG, this.wipNum);
+        this.wipNum = 1.0 - this.wipNum;
+        return this.wipNum;
+    }
+    // Constrain the value to be within a specified range.
+    clip(begin_range, end_range) {
+        // Handle the ends of the range being given either order
+        const min_range = Math.min(begin_range, end_range);
+        const max_range = Math.max(begin_range, end_range);
+        this.wipNum = Math.max(Math.min(this.wipNum, max_range), min_range);
+        return this.wipNum;
+    }
+    // Recast the value as the delta from a baseline value. NOOP if it is zero.
+    // NOTE - Values can be + or -.
+    rebase(base) {
+        this.wipNum = this.wipNum - base;
+        return this.wipNum;
+    }
+    // Re-scale a value into the [0.0 – 1.0] range, using a given range.
+    // NOTE - This assumes that values have alrady been clipped into the range.
+    unitize(begin_range, end_range) {
+        const min_range = Math.min(begin_range, end_range);
+        const max_range = Math.max(begin_range, end_range);
+        // TODO - DAVID: Can we make this throw an Error and expect that in unit test?
+        console.assert(((this.wipNum >= min_range) && (this.wipNum <= max_range)), "Unitizing: " + S.OUT_OF_RANGE_MSG, this.wipNum);
+        const ranged = this.wipNum - min_range;
+        this.wipNum = Math.abs(ranged / (end_range - begin_range));
+        return this.wipNum;
+    }
+    // Decay a value in the unit range [0.0–1.0] by its distance from zero.
+    // NOTE - If the range is already such that "bigger is better," then the closer
+    //   the value is to 1.0 (the best) the *less* it will decay.
+    decay(fn = 0 /* Gravity */) {
+        // TODO - DAVID: Can we make this throw an Error and expect that in unit test?
+        console.assert(((this.wipNum >= 0.0) && (this.wipNum <= 1.0)), "Decaying: " + S.OUT_OF_RANGE_MSG, this.wipNum);
+        switch (fn) {
+            case 0 /* Gravity */: {
+                this.wipNum = Math.pow(this.wipNum, S.DISTANCE_WEIGHT);
+                return this.wipNum;
+            }
+            default: {
+                throw new Error("Decay function not recognized.");
+            }
+        }
+    }
+    // Translate a value in the unit range to the user-friendly range [0 – 100].
+    rescale() {
+        // TODO - DAVID: Can we make this throw an Error and expect that in unit test?
+        console.assert(((this.wipNum >= 0.0) && (this.wipNum <= 1.0)), "Rescaling: " + S.OUT_OF_RANGE_MSG, this.wipNum);
+        this.normalizedNum = Math.round(this.wipNum * S.NORMALIZED_RANGE);
+        return this.normalizedNum;
+    }
+}
+exports.Normalizer = Normalizer;
+
+
+/***/ }),
+
+/***/ "./src/partisan.ts":
+/*!*************************!*\
+  !*** ./src/partisan.ts ***!
+  \*************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -89861,48 +90191,61 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
+const C = __importStar(__webpack_require__(/*! ./config */ "./src/config.ts"));
 const normalize_1 = __webpack_require__(/*! ./normalize */ "./src/normalize.ts");
 // NOTE - I'm passing T.VfArray's into everything. District indices = array indices.
 // NOTE - I do not (cannot) assume that the values are sorted.
 // SCORE BIAS & COMPETITIVENESS
-/* SCORECARD FIELDS:
+/* SCORECARD FIELDS <<< TODO: Update
 
 * ^S# [BestS] = the Democratic seats closest to proportional
 * ^S% [BestSf] = the corresponding Democratic seat share
-* F# [FptpS] = the estimated number of Democratic seats using first past the post
+* S! [FptpS] = the estimated number of Democratic seats using first past the post
 * S# [ProbableS] = the estimated Democratic seats, using seat probabilities
 * S% [ProbableSf] = the estimated Democratic seat share fraction, calculated as S# / N
+* UE# [UnearnedS] = the number of unearned seats (R = positive; D = negative)
 * B% [Bias]= the bias calculated as S% – ^S%
 * B$ [BiasScore] = the bias score normalized [0–100]
 
 * R# [R] = the responsiveness at V%
 * Rd [Rd] = the estimated # of responsive districts (using probabilities)
 * Rd% [Rdf] = the estimated # of responsive districts, as a fraction of N
+
+* C [C] = the number of districts that fall into the range [45–55%]
 * Cd [Cd] = the estimated # of competitive districts, using probabilities & a narrower [0.25–0.75] range
 * Cd% [Cdf] = the estimated # of competitive districts, as a fraction of N
+* [beg, end] [Mrange] = the 1–N indices for the first and last district that separate the likely result and the proportional result
+* Md [Md] = the competitiveness of the marginal districts
 * Md% [Mdf] = the probability that the marginal seats will flip, so S% => ^S%
 * C$ [CompetitiveScore] = the competitiveness score normalized [0–100]
 
-* $$$ = the combined partisan score normalize [0–100]
+* F$ = the combined partisan score normalize [0–100]
 
 */
-function scorePartisan(Vf, VfArray, all = false) {
+function scorePartisan(Vf, VfArray, bAll = false, bConstrained = true) {
     const N = VfArray.length;
     const BestS = bestSeats(N, Vf);
     const BestSf = bestSeatShare(BestS, N);
-    const FptpS = all ? estFPTPSeats(VfArray) : undefined;
-    const ProbableS = estProbableSeats(VfArray);
+    const FptpS = bAll ? estFPTPSeats(VfArray) : undefined;
+    const range = bConstrained ? C.competitiveDistribution() : undefined;
+    const ProbableS = estProbableSeats(VfArray, range);
     const ProbableSf = estProbableSeatShare(ProbableS, N);
     const Bias = estBias(ProbableSf, BestSf);
-    const normalizedBias = scoreBias(Bias, Vf, ProbableSf, N);
-    const inferredSVpoints = all ? inferSVpoints(Vf, VfArray) : undefined;
-    const R = all ? estResponsiveness(Vf, inferredSVpoints) : undefined;
-    const Rd = all ? estResponsiveDistricts(VfArray) : undefined;
-    const Rdf = all ? estResponsiveDistrictsShare(Rd, N) : undefined;
-    const Cd = estCompetitiveDistricts(VfArray);
+    const biasScore = scoreBias(Bias, Vf, ProbableSf, N);
+    const UnearnedS = estUnearnedSeats(BestS, ProbableS);
+    const impactScore = scoreImpact(UnearnedS);
+    const bInferSV = (bAll || (!bConstrained));
+    const inferredSVpoints = bInferSV ? inferSVpoints(Vf, VfArray, range) : undefined;
+    const R = bInferSV ? estResponsiveness(Vf, inferredSVpoints) : undefined;
+    const Rd = bInferSV ? estResponsiveDistricts(VfArray) : undefined;
+    const Rdf = bInferSV ? estResponsiveDistrictsShare(Rd, N) : undefined;
+    const Cn = countCompetitiveDistricts(VfArray);
+    const Cd = bConstrained ? estCompetitiveDistricts(VfArray) : Rd;
     const Cdf = estCompetitiveDistrictsShare(Cd, N);
-    const Mdf = estMarginalCompetitiveShare(Vf, VfArray, N);
-    const normalizedCompetitiveness = scoreCompetitiveness(Mdf, Cdf);
+    const Mrange = findMarginalDistricts(Vf, VfArray, N);
+    const Md = estMarginalCompetitiveDistricts(Mrange, VfArray);
+    const Mdf = estMarginalCompetitiveShare(Md, Mrange);
+    const competitivenessScore = scoreCompetitiveness(Mdf, Cdf);
     const biasScoring = {
         BestS: BestS,
         BestSf: BestSf,
@@ -89910,61 +90253,73 @@ function scorePartisan(Vf, VfArray, all = false) {
         ProbableS: ProbableS,
         ProbableSf: ProbableSf,
         Bias: Bias,
-        normalized: normalizedBias
+        score: biasScore
     };
-    let competitiveScoring;
-    if (all) {
-        competitiveScoring = {
-            R: R,
-            Rd: Rd,
-            Rdf: Rdf,
-            Cd: Cd,
-            Cdf: Cdf,
-            Mdf: Mdf,
-            normalized: normalizedCompetitiveness
-        };
-    }
-    else {
-        competitiveScoring = {
-            Cd: Cd,
-            Cdf: Cdf,
-            Mdf: Mdf,
-            normalized: normalizedCompetitiveness
-        };
-    }
+    const impactScoring = {
+        UnearnedS: UnearnedS,
+        score: impactScore
+    };
+    let competitiveScoring = {
+        R: R,
+        Rd: Rd,
+        Rdf: Rdf,
+        C: Cn,
+        Cd: Cd,
+        Cdf: Cdf,
+        Mrange: Mrange,
+        Md: Md,
+        Mdf: Mdf,
+        score: competitivenessScore
+    };
+    if (bAll) {
+        competitiveScoring.R = R;
+        competitiveScoring.Rd = Rd;
+        competitiveScoring.Rdf = Rdf;
+    }
+    // Weight bias, impact, and competitiveness into partisan scores to compare
+    // plans across states and within a state.
+    const bS = biasScoring.score;
+    const iS = impactScoring.score;
+    const cS = competitiveScoring.score;
+    const acrossStatesPartisanScore = weightPartisan(bS, iS, cS, 0 /* AcrossStates */);
+    const withinStatesPartisanScore = weightPartisan(bS, iS, cS, 1 /* WithinAState */);
     const s = {
         bias: biasScoring,
-        competitiveness: competitiveScoring
+        impact: impactScoring,
+        competitiveness: competitiveScoring,
+        score: acrossStatesPartisanScore,
+        score2: withinStatesPartisanScore
     };
     return s;
 }
 exports.scorePartisan = scorePartisan;
-function weightPartisan(b, c) {
-    return Math.round(((S.BIAS_WEIGHT * b) + (S.COMPETITIVE_WEIGHT * c)) / (S.BIAS_WEIGHT + S.COMPETITIVE_WEIGHT));
+function weightPartisan(bS, iS, cS, context) {
+    const bW = C.biasWeight(context);
+    const iW = C.impactWeight(context);
+    const cW = C.competitivenessWeight(context);
+    const score = Math.round(((bS * bW) + (iS * iW) + (cS * cW)) / (bW + iW + cW));
+    return score;
 }
 exports.weightPartisan = weightPartisan;
-function printFairScorecardHeader() {
-    console.log('XX, Name, N, V%, ^S#, ^S%, F#, S#, S%, B%, B$, R#, Rd, Rd%, Cd, Cd%, Md%, C$, $$$');
+function printPartisanScorecardHeader() {
+    console.log('XX, Name, N, 1/N%, V%, ^S#, ^S%, S!, S#, S%, B%, B$, UE#, I$, R#, Rd, Rd%, C#, Cd, Cd%, beg, end, Md, Md%, C$, <P$, >P$');
 }
-exports.printFairScorecardHeader = printFairScorecardHeader;
-function printFairScorecard(xx, name, N, Vf, s) {
-    console.log('%s, %s, %i, %f, %i, %f, %i, %f, %f, %f, %i, %f, %f, %f, %f, %f, %f, %f, %i', xx, name, N, Vf, s.bias.BestS, s.bias.BestSf, s.bias.FptpS, s.bias.ProbableS, s.bias.ProbableSf, s.bias.Bias, s.bias.normalized, s.competitiveness.R, s.competitiveness.Rd, s.competitiveness.Rdf, s.competitiveness.Cd, s.competitiveness.Cdf, s.competitiveness.Mdf, s.competitiveness.normalized, s.score);
+exports.printPartisanScorecardHeader = printPartisanScorecardHeader;
+function printPartisanScorecardRow(xx, name, N, Vf, s) {
+    console.log('%s, %s, %i, %f, %f, %i, %f, %i, %f, %f, %f, %i, %f, %i, %f, %f, %f, %i, %f, %f, %i, %i, %f, %f, %i, %i, %i', xx, name, N, U.trim(1 / N), Vf, s.bias.BestS, s.bias.BestSf, s.bias.FptpS, s.bias.ProbableS, s.bias.ProbableSf, s.bias.Bias, s.bias.score, s.impact.UnearnedS, s.impact.score, s.competitiveness.R, s.competitiveness.Rd, s.competitiveness.Rdf, s.competitiveness.C, s.competitiveness.Cd, s.competitiveness.Cdf, s.competitiveness.Mrange[C.BEG], s.competitiveness.Mrange[C.END], s.competitiveness.Md, s.competitiveness.Mdf, s.competitiveness.score, s.score, s.score2);
 }
-exports.printFairScorecard = printFairScorecard;
+exports.printPartisanScorecardRow = printPartisanScorecardRow;
 function scoreBias(rawBias, Vf, Sf, N) {
     if (isAntimajoritarian(Vf, Sf)) {
         return 0;
     }
     else {
         const _normalizer = new normalize_1.Normalizer(rawBias);
-        const oneSeatFraction = 1 / N;
-        const worst = Math.min(oneSeatFraction, S.BIAS_WORST);
-        const best = S.BIAS_BEST;
+        const worst = C.biasRange()[C.BEG];
+        const best = C.biasRange()[C.END];
         _normalizer.clip(worst, best);
         _normalizer.unitize(worst, best);
         _normalizer.invert();
-        // TODO - SCORE: Would also decaying raw values (e.g., by squaring them) be too
-        //   much with a small range (like 10% or one seat)?
         // _normalizer.decay();
         _normalizer.rescale();
         const score = _normalizer.normalizedNum;
@@ -89972,6 +90327,20 @@ function scoreBias(rawBias, Vf, Sf, N) {
     }
 }
 exports.scoreBias = scoreBias;
+// Normalize unearned seats
+function scoreImpact(rawUE) {
+    const _normalizer = new normalize_1.Normalizer(rawUE);
+    const worst = C.unearnedThreshold();
+    const best = 0.0;
+    _normalizer.positive();
+    _normalizer.clip(worst, best);
+    _normalizer.unitize(worst, best);
+    _normalizer.invert();
+    _normalizer.rescale();
+    const score = _normalizer.normalizedNum;
+    return score;
+}
+exports.scoreImpact = scoreImpact;
 function isAntimajoritarian(Vf, Sf) {
     const bDem = ((Vf < 0.5) && (Sf > 0.5)) ? true : false;
     const bRep = (((1 - Vf) < 0.5) && ((1 - Sf) > 0.5)) ? true : false;
@@ -89983,16 +90352,24 @@ function scoreCompetitiveness(rawMarginal, rawOverall) {
     // But the practical max is more like 2/3's, so unitize that range to [0.0–1.0].
     // Then scale the values to [0–100].
     const _overall = new normalize_1.Normalizer(rawOverall);
-    _overall.clip(S.COMPETITIVE_WORST, S.COMPETITIVE_BEST);
-    _overall.unitize(S.COMPETITIVE_WORST, S.COMPETITIVE_BEST);
+    let worst = C.overallCompetitivenessRange()[C.BEG];
+    let best = C.overallCompetitivenessRange()[C.END];
+    _overall.clip(worst, best);
+    _overall.unitize(worst, best);
     _overall.rescale();
-    const overall = _overall.normalizedNum;
+    const ocS = _overall.normalizedNum;
     // Normalize marginal competitiveness
     const _marginal = new normalize_1.Normalizer(rawMarginal);
+    worst = C.marginalCompetitivenessRange()[C.BEG];
+    best = C.marginalCompetitivenessRange()[C.END];
+    _marginal.clip(worst, best);
+    _marginal.unitize(worst, best);
     _marginal.rescale();
-    const marginal = _marginal.normalizedNum;
+    const mcS = _marginal.normalizedNum;
+    const mcW = C.marginalCompetitivenessWeight();
+    const ocW = C.overallCompetitivenessWeight();
     // Then combine the results
-    const score = Math.round(((S.MARGINAL_WEIGHT * marginal) + (S.OVERALL_WEIGHT * overall)) / (S.MARGINAL_WEIGHT + S.OVERALL_WEIGHT));
+    const score = Math.round(((mcW * mcS) + (ocW * ocS)) / (mcW + ocW));
     return score;
 }
 exports.scoreCompetitiveness = scoreCompetitiveness;
@@ -90002,23 +90379,40 @@ const { erf } = __webpack_require__(/*! mathjs */ "./node_modules/mathjs/main/es
 // console.log("erf(-0.5) =", erf(-0.5));  // returns -0.5204998778130465
 // console.log("erf(4) =", erf(4));        // returns 0.9999999845827421
 // Estimate the probability of a seat win for district, given a Vf
-function estSeatProbability(Vf) {
+function estSeatProbability(Vf, range) {
+    if (range) {
+        const _normalizer = new normalize_1.Normalizer(Vf);
+        // The end points of a compressed probability distribution
+        // NOTE - These aren't the points where races start or stop being contested,
+        //   just the end points of a distribution that yields the desired behavior
+        //   in the typical competitive range [45-55%].
+        const distBeg = range[C.BEG];
+        const distEnd = range[C.END];
+        _normalizer.clip(distBeg, distEnd);
+        _normalizer.unitize(distBeg, distEnd);
+        return seatProbabilityFn(_normalizer.wipNum);
+    }
+    else {
+        return seatProbabilityFn(Vf);
+    }
+}
+exports.estSeatProbability = estSeatProbability;
+function seatProbabilityFn(Vf) {
     // Python: 0.5 * (1 + erf((vpi - 0.50) / (0.02 * sqrt(8))))
     return U.trim(0.5 * (1.0 + erf((Vf - 0.50) / (0.02 * Math.sqrt(8)))));
 }
-exports.estSeatProbability = estSeatProbability;
 // Estimate the number of responsive districts [R(d)], given a set of Vf's
 function estDistrictResponsiveness(Vf) {
     // Python: 1 - 4 * (est_seat_probability(vpi) - 0.5)**2
     return U.trim(1.0 - 4.0 * Math.pow((estSeatProbability(Vf) - 0.5), 2));
 }
 exports.estDistrictResponsiveness = estDistrictResponsiveness;
-function inferSVpoints(Vf, VfArray) {
+function inferSVpoints(Vf, VfArray, range) {
     const nDistricts = VfArray.length;
     let SVpoints = [];
     for (let shiftedVf of shiftRange()) {
         const shiftedVPI = shiftDistricts(Vf, VfArray, shiftedVf);
-        const shiftedSf = estProbableSeats(shiftedVPI) / nDistricts;
+        const shiftedSf = estProbableSeats(shiftedVPI, range) / nDistricts;
         SVpoints.push({ v: shiftedVf, s: shiftedSf });
     }
     return SVpoints;
@@ -90056,8 +90450,9 @@ function shiftRange() {
 }
 // ESTIMATE BIAS ("FAIR")
 // ^S# - The # of Democratic seats closest to proportional @ statewide Vf
+// The "expected number of seats" from http://bit.ly/2Fcuf4q
 function bestSeats(N, Vf) {
-    return Math.round(N * Vf);
+    return Math.round((N * Vf) - S.EPSILON);
 }
 exports.bestSeats = bestSeats;
 // ^S% - The corresponding Democratic seat share 
@@ -90066,9 +90461,9 @@ function bestSeatShare(bestS, N) {
 }
 exports.bestSeatShare = bestSeatShare;
 // S# - The estimated # of Democratic seats @ statewide Vf, using seat probabilities
-function estProbableSeats(VfArray) {
+function estProbableSeats(VfArray, range) {
     // Python: sum([est_seat_probability(vpi) for vpi in vpi_by_district])
-    return U.trim(U.sumArray(VfArray.map(v => estSeatProbability(v))));
+    return U.trim(U.sumArray(VfArray.map(v => estSeatProbability(v, range))));
 }
 exports.estProbableSeats = estProbableSeats;
 // S% - The estimated Democratic seat share fraction @ statewide Vf
@@ -90094,6 +90489,13 @@ function estBias(estSeatShare, bestSeatShare) {
     return U.trim(Math.abs(estSeatShare - bestSeatShare));
 }
 exports.estBias = estBias;
+// UE# - The estimated # of unearned seats
+// UE_# from http://bit.ly/2Fcuf4q
+function estUnearnedSeats(best, probable) {
+    // NOTE - + values = unearned R seats; – values = unearned D seats
+    return U.trim(best - probable);
+}
+exports.estUnearnedSeats = estUnearnedSeats;
 // ESTIMATE RESPONSIVENESS ("COMPETITIVE")
 // R# - Estimate responsiveness at the statewide vote share
 function estResponsiveness(Vf, inferredSVpoints) {
@@ -90148,6 +90550,14 @@ function estResponsiveDistrictsShare(Rd, N) {
 }
 exports.estResponsiveDistrictsShare = estResponsiveDistrictsShare;
 // ESTIMATE COMPETITIVENESS (ENHANCED)
+// C - Count the # of competitive districts, defined as v in [45–55%]
+function countCompetitiveDistricts(VfArray) {
+    return U.trim(U.sumArray(VfArray.map(v => isCompetitive(v))));
+}
+exports.countCompetitiveDistricts = countCompetitiveDistricts;
+function isCompetitive(v) {
+    return ((v >= C.competitiveRange()[C.BEG]) && (v <= C.competitiveRange()[C.END])) ? 1 : 0;
+}
 // Cd - The estimated # of competitive districts
 function estCompetitiveDistricts(VfArray) {
     return U.trim(U.sumArray(VfArray.map(v => estDistrictCompetitiveness(v))));
@@ -90156,8 +90566,14 @@ exports.estCompetitiveDistricts = estCompetitiveDistricts;
 // Re-scale a Democratic vote share to the competitive range (e.g., 45–55%).
 function estDistrictCompetitiveness(Vf) {
     const _normalizer = new normalize_1.Normalizer(Vf);
-    _normalizer.clip(S.MIN_CONTESTED, S.MAX_CONTESTED);
-    _normalizer.unitize(S.MIN_CONTESTED, S.MAX_CONTESTED);
+    // The end points of a compressed probability distribution
+    // NOTE - These aren't the points where races start or stop being contested,
+    //   just the end points of a distribution that yields the desired behavior
+    //   in the typical competitive range [45-55%].
+    const distBeg = C.competitiveDistribution()[C.BEG];
+    const distEnd = C.competitiveDistribution()[C.END];
+    _normalizer.clip(distBeg, distEnd);
+    _normalizer.unitize(distBeg, distEnd);
     const dC = estDistrictResponsiveness(_normalizer.wipNum);
     return dC;
 }
@@ -90167,9 +90583,30 @@ function estCompetitiveDistrictsShare(Cd, N) {
     return U.trim(Cd / N);
 }
 exports.estCompetitiveDistrictsShare = estCompetitiveDistrictsShare;
+// Md - The estimated # of "marginal" districts in and around the likely FPTP
+//   seats & the best seat split that are competitive.
+function estMarginalCompetitiveDistricts(Mrange, VfArray) {
+    const minId = Mrange[C.BEG];
+    const maxId = Mrange[C.END];
+    // Sort the array values, and subset it to those districts
+    // NOTE - I'm *not* keeping track of the district indexes right now
+    let subsetVfArray = VfArray.sort().slice(minId - 1, maxId);
+    // Est. competitive districts on that array
+    const Md = U.sumArray(subsetVfArray.map(v => estDistrictCompetitiveness(v)));
+    return U.trim(Md);
+}
+exports.estMarginalCompetitiveDistricts = estMarginalCompetitiveDistricts;
 // Md% - The estimated competitiveness of the "marginal" districts in and around
 //   the likely FPTP seats & the best seat split as a fraction
-function estMarginalCompetitiveShare(Vf, VfArray, N) {
+function estMarginalCompetitiveShare(Md, Mrange) {
+    const minId = Mrange[C.BEG];
+    const maxId = Mrange[C.END];
+    // Est. competitive district share on that result
+    const MdShare = U.trim(estCompetitiveDistrictsShare(Md, maxId - minId + 1));
+    return U.trim(MdShare);
+}
+exports.estMarginalCompetitiveShare = estMarginalCompetitiveShare;
+function findMarginalDistricts(Vf, VfArray, N) {
     const bestS = bestSeats(N, Vf);
     const fptpS = estFPTPSeats(VfArray);
     // Find the marginal districts IDs (indexed 1–N)
@@ -90188,24 +90625,16 @@ function estMarginalCompetitiveShare(Vf, VfArray, N) {
         minId = Math.max((N - bestS) - 1, 1);
         maxId = Math.min((N - bestS) + 1, N);
     }
-    const deltaS = maxId - minId + 1;
-    // Sort the array values, and subset it to those districts
-    // NOTE - I'm *not* keeping track of the district indexes right now
-    let subsetVfArray = VfArray.sort().slice(minId - 1, maxId);
-    // Est. competitive districts on that array
-    const Md = U.sumArray(subsetVfArray.map(v => estDistrictCompetitiveness(v)));
-    // Est. competitive district share on that result
-    const MdShare = U.trim(estCompetitiveDistrictsShare(Md, deltaS));
-    return U.trim(MdShare);
+    return [minId, maxId];
 }
-exports.estMarginalCompetitiveShare = estMarginalCompetitiveShare;
+exports.findMarginalDistricts = findMarginalDistricts;
 
 
 /***/ }),
 
-/***/ "./src/index.ts":
+/***/ "./src/score.ts":
 /*!**********************!*\
-  !*** ./src/index.ts ***!
+  !*** ./src/score.ts ***!
   \**********************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
@@ -90213,148 +90642,29 @@ exports.estMarginalCompetitiveShare = estMarginalCompetitiveShare;
 "use strict";
 
 //
-// SCORE PACKAGE API
+// OVERALL SCORING FRAMEWORK
 //
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result["default"] = mod;
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-__export(__webpack_require__(/*! ./_api */ "./src/_api.ts"));
-var types_1 = __webpack_require__(/*! ./types */ "./src/types.ts");
-exports.sampleProfile = types_1.sampleProfile;
-exports.sampleScorecard = types_1.sampleScorecard;
-
-
-/***/ }),
-
-/***/ "./src/normalize.ts":
-/*!**************************!*\
-  !*** ./src/normalize.ts ***!
-  \**************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-//
-// NORMALIZATION UTILITIES
-//
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
-class Normalizer {
-    constructor(rawValue) {
-        this.rawNum = rawValue;
-        this.wipNum = this.rawNum;
-    }
-    // *Don't* transform the input.
-    identity() {
-        return this.wipNum;
-    }
-    // TODO - Do I need this? If so, add TEST cases.
-    positive() {
-        this.wipNum = Math.abs(this.wipNum);
-        return this.wipNum;
-    }
-    // Invert a value in the unit range [0.0–1.0] (so that bigger is better).
-    invert() {
-        // TODO - DAVID: Can we make this throw an Error and expect that in unit test?
-        console.assert(((this.wipNum >= 0.0) && (this.wipNum <= 1.0)), S.OUT_OF_RANGE_MSG);
-        this.wipNum = 1.0 - this.wipNum;
-        return this.wipNum;
-    }
-    // Constrain the value to be within a specified range.
-    clip(begin_range, end_range) {
-        // Handle the ends of the range being given either order
-        const min_range = Math.min(begin_range, end_range);
-        const max_range = Math.max(begin_range, end_range);
-        this.wipNum = Math.max(Math.min(this.wipNum, max_range), min_range);
-        return this.wipNum;
-    }
-    // Recast the value as the delta from a baseline value. NOOP if it is zero.
-    // NOTE - Values can be + or -.
-    rebase(base) {
-        this.wipNum = this.wipNum - base;
-        return this.wipNum;
-    }
-    // Re-scale a value into the [0.0 – 1.0] range, using a given range.
-    // NOTE - This assumes that values have alrady been clipped into the range.
-    unitize(begin_range, end_range) {
-        const min_range = Math.min(begin_range, end_range);
-        const max_range = Math.max(begin_range, end_range);
-        // TODO - DAVID: Can we make this throw an Error and expect that in unit test?
-        console.assert(((this.wipNum >= min_range) && (this.wipNum <= max_range)), S.OUT_OF_RANGE_MSG);
-        const ranged = this.wipNum - min_range;
-        this.wipNum = Math.abs(ranged / (end_range - begin_range));
-        return this.wipNum;
-    }
-    // Decay a value in the unit range [0.0–1.0] by its distance from zero.
-    // NOTE - If the range is already such that "bigger is better," then the closer
-    //   the value is to 1.0 (the best) the *less* it will decay.
-    decay(fn = 0 /* Gravity */) {
-        // TODO - DAVID: Can we make this throw an Error and expect that in unit test?
-        console.assert(((this.wipNum >= 0.0) && (this.wipNum <= 1.0)), S.OUT_OF_RANGE_MSG);
-        switch (fn) {
-            case 0 /* Gravity */: {
-                this.wipNum = Math.pow(this.wipNum, S.DISTANCE_WEIGHT);
-                return this.wipNum;
-            }
-            default: {
-                throw new Error("Decay function not recognized.");
-            }
-        }
-    }
-    // Translate a value in the unit range to the user-friendly range [0 – 100].
-    rescale() {
-        // TODO - DAVID: Can we make this throw an Error and expect that in unit test?
-        console.assert(((this.wipNum >= 0.0) && (this.wipNum <= 1.0)), S.OUT_OF_RANGE_MSG);
-        this.normalizedNum = Math.round(this.wipNum * S.NORMALIZED_RANGE);
-        return this.normalizedNum;
-    }
-}
-exports.Normalizer = Normalizer;
-
-
-/***/ }),
-
-/***/ "./src/score.ts":
-/*!**********************!*\
-  !*** ./src/score.ts ***!
-  \**********************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-//
-// OVERALL SCORING FRAMEWORK
-//
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
+const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
+const C = __importStar(__webpack_require__(/*! ./config */ "./src/config.ts"));
 const compact_1 = __webpack_require__(/*! ./compact */ "./src/compact.ts");
 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");
+const partisan_1 = __webpack_require__(/*! ./partisan */ "./src/partisan.ts");
 // TODO - Score opportunity for minority representation
-function scorePlan(p) {
-    // BEST subcategories - compactness, splitting, population deviation
+function scorePlan(p, overridesJSON) {
+    // TRADITIONAL DISTRICTING PRINCIPLES ("best") subcategories - compactness, splitting, population deviation
     // Compactness
     const reockM = compact_1.doReock(p.compactnessProfile.GeometryByDistrict);
     const polsbyM = compact_1.doPolsbyPopper(p.compactnessProfile.GeometryByDistrict);
-    const compactnessScore = Math.round(((S.REOCK_WEIGHT * reockM.normalized) + (S.POLSBY_WEIGHT * polsbyM.normalized)) / (S.REOCK_WEIGHT + S.POLSBY_WEIGHT));
+    const compactnessScore = weightCompactness(reockM.normalized, polsbyM.normalized);
     const cS = {
         score: compactnessScore,
         reock: reockM,
@@ -90366,51 +90676,77 @@ function scorePlan(p) {
     const cT = cohesive_1.totalCounties(CxD);
     const countyM = cohesive_1.doCountySplittingReduced(CxD, dT, cT);
     const districtM = cohesive_1.doDistrictSplittingReduced(CxD, dT, cT);
-    const splittingScore = Math.round(((S.COUNTY_WEIGHT * countyM.normalized) + (S.DISTANCE_WEIGHT * districtM.normalized)) / (S.COUNTY_WEIGHT + S.DISTANCE_WEIGHT));
+    const splittingScore = weightSplitting(countyM.normalized, districtM.normalized);
     const sS = {
         score: splittingScore,
         county: countyM,
         district: districtM
     };
     // Population deviation
-    const eS = equal_1.doPopulationDeviation(p.populationProfile.TotalPopByDistrict, p.populationProfile.targetSize, p.legislativeDistricts);
-    // Combine compactness, splitting, & population deviation into a "best" score
-    const bestScore = Math.round(((S.COMPACTNESS_WEIGHT * cS.score) + (S.SPLITTING_WEIGHT * sS.score) + (S.POPDEV_WEIGHT * eS.normalized)) / (S.COMPACTNESS_WEIGHT + S.SPLITTING_WEIGHT + S.POPDEV_WEIGHT));
-    // Populate the "best" scorecard
-    const bS = {
-        BestScore: bestScore,
+    const pdS = equal_1.doPopulationDeviation(p.populationProfile.TotalPopByDistrict, p.populationProfile.targetSize, p.legislativeDistricts);
+    // Combine traditional principles into a score to compare plans w/in a state
+    const tpScore = weightTradtionalPrinciples(cS.score, sS.score, pdS.normalized, 1 /* WithinAState */);
+    // Populate the "best" traditional principles scorecard
+    const tpS = {
+        score: tpScore,
         compactness: cS,
         splitting: sS,
-        populationDeviation: eS
+        populationDeviation: pdS
     };
-    // FAIR subcategories - bias & competitiveness
-    // NOTE - This calculates a # of measures of bias & competitiveness.
-    const pS = fair_1.scorePartisan(p.partisanProfile.statewideVf, p.partisanProfile.VfArray);
-    pS.score = fair_1.weightPartisan(pS.bias.normalized, pS.competitiveness.normalized);
-    // Combine "best" and "fair" scores into an overall score for the plan
-    const score = Math.round(((S.FAIR_WEIGHT * pS.score) + (S.BEST_WEIGHT * bS.BestScore)) / (S.FAIR_WEIGHT + S.BEST_WEIGHT));
+    // PARTISAN ("fair") subcategories - bias, impact, & competitiveness (plus lots of supporting measures)
+    const pS = partisan_1.scorePartisan(p.partisanProfile.statewideVf, p.partisanProfile.VfArray);
+    // Combine the partisan/partisan & traditional principles/best scores into an overall
+    // score for comparing plans w/in a state
+    const score = weightBestFair(pS.score2, tpS.score, 1 /* WithinAState */);
     // Roll up an overall scorecard
     const scorecard = {
-        score: score,
-        best: bS,
-        fair: pS
+        partisan: pS,
+        traditionalPrinciples: tpS,
+        score: score
     };
     return scorecard;
 }
 exports.scorePlan = scorePlan;
+// HELPERS
+function weightCompactness(rS, ppS) {
+    const rW = C.reockWeight();
+    const ppW = C.polsbyWeight();
+    const score = Math.round(((rS * rW) + (ppS * ppW)) / (rW + ppW));
+    return score;
+}
+exports.weightCompactness = weightCompactness;
+function weightSplitting(csS, dsS) {
+    const csW = C.countySplittingWeight();
+    const dsW = C.districtSplittingWeight();
+    const score = Math.round(((csS * csW) + (dsS * dsW)) / (csW + dsW));
+    return score;
+}
+exports.weightSplitting = weightSplitting;
+function weightTradtionalPrinciples(cS, sS, pdS, context) {
+    const cW = C.compactnessWeight(context);
+    const sW = C.splittingWeight(context);
+    const pdW = C.popdevWeight(context);
+    const score = Math.round(((cS * cW) + (sS * sW) + (pdS * pdW)) / (cW + sW + pdW));
+    return score;
+}
+exports.weightTradtionalPrinciples = weightTradtionalPrinciples;
+function weightBestFair(pS, tpS, context) {
+    const pW = C.partisanWeight(context);
+    const tpW = C.traditionalPrinciplesWeight(context);
+    const score = Math.round(((pS * pW) + (tpS * tpW)) / (pW + tpW));
+    return score;
+}
+exports.weightBestFair = weightBestFair;
+function printScorecardHeader() {
+    console.log('XX, Name, N, V%, ^S#, S#, B%, B$, UE#, I$, C#, Cd, Md, C$, <P$, >P$, Rc, Rc$, Pc, Pc$, G$, Cs, Cs$, Ds, Ds$, S$, Eq, Eq$, T$, $$$');
+}
+exports.printScorecardHeader = printScorecardHeader;
+function printScorecardRow(xx, name, N, Vf, s) {
+    console.log('%s, %s, %i, %f, %i, %f, %f, %i, %f, %i, %i, %f, %f, %i, %i, %i, %f, %i, %f, %i, %i, %f, %i, %f, %i, %i, %f, %i, %i, %i', xx, name, N, U.trim(Vf), s.partisan.bias.BestS, s.partisan.bias.ProbableS, s.partisan.bias.Bias, s.partisan.bias.score, s.partisan.impact.UnearnedS, s.partisan.impact.score, s.partisan.competitiveness.C, s.partisan.competitiveness.Cd, s.partisan.competitiveness.Md, s.partisan.competitiveness.score, s.partisan.score, s.partisan.score2, s.traditionalPrinciples.compactness.reock.raw, s.traditionalPrinciples.compactness.reock.normalized, s.traditionalPrinciples.compactness.polsby.raw, s.traditionalPrinciples.compactness.polsby.normalized, s.traditionalPrinciples.compactness.score, s.traditionalPrinciples.splitting.county.raw, s.traditionalPrinciples.splitting.county.normalized, s.traditionalPrinciples.splitting.district.raw, s.traditionalPrinciples.splitting.district.normalized, s.traditionalPrinciples.splitting.score, s.traditionalPrinciples.populationDeviation.raw, s.traditionalPrinciples.populationDeviation.normalized, s.traditionalPrinciples.score, s.score);
+}
+exports.printScorecardRow = printScorecardRow;
 
 
-/***/ }),
-
-/***/ "./src/scoring-defaults.json":
-/*!***********************************!*\
-  !*** ./src/scoring-defaults.json ***!
-  \***********************************/
-/*! exports provided: fair, best, default */
-/***/ (function(module) {
-
-module.exports = JSON.parse("{\"fair\":{\"unbiased\":{\"worst\":0.1,\"best\":0,\"weight\":80},\"competitive\":{\"worst\":0,\"best\":0.67,\"weight\":20,\"min\":0.25,\"max\":0.75,\"marginal\":75,\"overall\":25},\"weight\":80},\"best\":{\"compact\":{\"reock\":{\"worst\":0.25,\"best\":0.5,\"weight\":50},\"polsby\":{\"worst\":0.1,\"best\":0.5,\"weight\":50},\"weight\":50},\"cohesive\":{\"county\":{\"best\":1,\"worst\":1.71,\"allowableSplitsMultiplier\":1.5,\"weight\":50},\"district\":{\"best\":1,\"worst\":1.5,\"weight\":50},\"weight\":50},\"equal\":{\"worst\":0.0075,\"best\":0.002,\"stateLeg\":{\"worst\":0.1},\"weight\":0},\"weight\":20}}");
-
 /***/ }),
 
 /***/ "./src/settings.ts":
@@ -90425,16 +90761,13 @@ module.exports = JSON.parse("{\"fair\":{\"unbiased\":{\"worst\":0.1,\"best\":0,\
 //
 // GLOBAL CONSTANTS
 //
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 // Normalized scores [0-100]
 exports.NORMALIZED_RANGE = 100;
 // Square deviations from the ideal
 exports.DISTANCE_WEIGHT = 2;
 // Out of range message
-exports.OUT_OF_RANGE_MSG = "# out of range";
+exports.OUT_OF_RANGE_MSG = "%f out of range";
 // A small delta to use when testing ranges of values
 exports.EPSILON = 1 / Math.pow(10, 6);
 // Keep 4 decimals for fractions [0.0–1.0], i.e., 2 for %'s [0–100]
@@ -90442,68 +90775,6 @@ exports.PRECISION = 4;
 // "Roughly equal" = average census block size / 2
 exports.AVERAGE_BLOCK_SIZE = 30;
 exports.EQUAL_TOLERANCE = exports.AVERAGE_BLOCK_SIZE / 2;
-// SCORING PARAMETERS
-const scoring_defaults_json_1 = __importDefault(__webpack_require__(/*! ./scoring-defaults.json */ "./src/scoring-defaults.json"));
-function readOverrides() {
-    // TODO - TERRY: Replumb this to:
-    // - Respond to an environment variable or config.json, and
-    // - Read settings.json at runtime from S3
-    // - Otherwise return false/null, so the conditionals below work
-    // - Note the utils/settings interdependency
-    // return U.readJSON('scoring-overrides.json');
-    return undefined;
-}
-exports.readOverrides = readOverrides;
-let overrides = readOverrides();
-// SETTINGS FOR PARTISAN SCORING
-exports.MIN_CONTESTED = overrides ? overrides.fair.competitive.min : scoring_defaults_json_1.default.fair.competitive.min;
-exports.MAX_CONTESTED = overrides ? overrides.fair.competitive.max : scoring_defaults_json_1.default.fair.competitive.max;
-// SCALES FOR NORMALIZING RAW VALUES
-// Compactness scales
-exports.REOCK_WORST = overrides ? overrides.best.compact.reock.worst : scoring_defaults_json_1.default.best.compact.reock.worst;
-exports.REOCK_BEST = overrides ? overrides.best.compact.reock.best : scoring_defaults_json_1.default.best.compact.reock.best;
-exports.POLSBY_WORST = overrides ? overrides.best.compact.polsby.worst : scoring_defaults_json_1.default.best.compact.polsby.worst;
-exports.POLSBY_BEST = overrides ? overrides.best.compact.polsby.best : scoring_defaults_json_1.default.best.compact.polsby.best;
-// County-District splitting scales (not inverted)
-exports.COUNTY_BEST = overrides ? overrides.best.cohesive.county.best : scoring_defaults_json_1.default.best.cohesive.county.best;
-exports.COUNTY_WORST = overrides ? overrides.best.cohesive.county.worst : scoring_defaults_json_1.default.best.cohesive.county.worst;
-exports.ALLOWABLE_SPLITS_MULTIPLIER = overrides ? overrides.best.cohesive.county.allowableSplitsMultiplier : scoring_defaults_json_1.default.best.cohesive.county.allowableSplitsMultiplier;
-exports.DISTRICT_BEST = overrides ? overrides.best.cohesive.district.best : scoring_defaults_json_1.default.best.cohesive.district.best;
-exports.DISTRICT_WORST = overrides ? overrides.best.cohesive.district.worst : scoring_defaults_json_1.default.best.cohesive.district.worst;
-// Population deviation thresholds & scales (inverted)
-exports.POPDEV_WORST = overrides ? overrides.best.equal.worst : scoring_defaults_json_1.default.best.equal.worst;
-exports.POPDEV_BEST = overrides ? overrides.best.equal.best : scoring_defaults_json_1.default.best.equal.best;
-exports.POPEQ_MIN = 1.0 - exports.POPDEV_WORST;
-exports.POPEQ_MAX = 1.0 - exports.POPDEV_BEST;
-exports.POPDEV_WORST_LD = overrides ? overrides.best.equal.stateLeg.worst : scoring_defaults_json_1.default.best.equal.stateLeg.worst;
-exports.POPDEV_BEST_LD = ((exports.POPDEV_BEST / exports.POPDEV_WORST) * exports.POPDEV_WORST_LD);
-exports.POPEQ_MIN_LD = 1.0 - exports.POPDEV_WORST_LD;
-exports.POPEQ_MAX_LD = 1.0 - exports.POPDEV_BEST_LD;
-// Bias & competitiveness scales
-// TODO - SCORE:
-// * How wide a range do we want for bias? 10%? 20%?
-// * Do we want it to be state-specific? E.g., one seat?
-exports.BIAS_WORST = overrides ? overrides.fair.unbiased.worst : scoring_defaults_json_1.default.fair.unbiased.worst;
-exports.BIAS_BEST = overrides ? overrides.fair.unbiased.best : scoring_defaults_json_1.default.fair.unbiased.best;
-// The range for raw overall competitiveness values
-exports.COMPETITIVE_WORST = overrides ? overrides.fair.competitive.worst : scoring_defaults_json_1.default.fair.competitive.worst;
-exports.COMPETITIVE_BEST = overrides ? overrides.fair.competitive.best : scoring_defaults_json_1.default.fair.competitive.best;
-// WEIGHTS FOR COMBINING NORMALIZED VALUES
-exports.REOCK_WEIGHT = overrides ? overrides.best.compact.reock.weight : scoring_defaults_json_1.default.best.compact.reock.weight;
-exports.POLSBY_WEIGHT = overrides ? overrides.best.compact.polsby.weight : scoring_defaults_json_1.default.best.compact.polsby.weight;
-exports.COUNTY_WEIGHT = overrides ? overrides.best.cohesive.county.weight : scoring_defaults_json_1.default.best.cohesive.county.weight;
-exports.DISTRICT_WEIGHT = overrides ? overrides.best.cohesive.district.weight : scoring_defaults_json_1.default.best.cohesive.district.weight;
-exports.COMPACTNESS_WEIGHT = overrides ? overrides.best.compact.weight : scoring_defaults_json_1.default.best.compact.weight;
-exports.SPLITTING_WEIGHT = overrides ? overrides.best.cohesive.weight : scoring_defaults_json_1.default.best.cohesive.weight;
-exports.POPDEV_WEIGHT = overrides ? overrides.best.equal.weight : scoring_defaults_json_1.default.best.equal.weight;
-// TODO - SCORE: What kind of relative weighting do we want between marginal and
-//   overall competitiveness?
-exports.MARGINAL_WEIGHT = overrides ? overrides.fair.competitive.marginal : scoring_defaults_json_1.default.fair.competitive.marginal;
-exports.OVERALL_WEIGHT = overrides ? overrides.fair.competitive.overall : scoring_defaults_json_1.default.fair.competitive.overall;
-exports.BIAS_WEIGHT = overrides ? overrides.fair.unbiased.weight : scoring_defaults_json_1.default.fair.unbiased.weight;
-exports.COMPETITIVE_WEIGHT = overrides ? overrides.fair.competitive.weight : scoring_defaults_json_1.default.fair.competitive.weight;
-exports.FAIR_WEIGHT = overrides ? overrides.fair.weight : scoring_defaults_json_1.default.fair.weight;
-exports.BEST_WEIGHT = overrides ? overrides.best.weight : scoring_defaults_json_1.default.best.weight;
 
 
 /***/ }),
@@ -90524,9 +90795,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const sample_profile_json_1 = __importDefault(__webpack_require__(/*! ../testdata/profiles/sample-profile.json */ "./testdata/profiles/sample-profile.json"));
+const sample_profile_json_1 = __importDefault(__webpack_require__(/*! ../testdata/samples/sample-profile.json */ "./testdata/samples/sample-profile.json"));
 exports.sampleProfile = sample_profile_json_1.default;
-const sample_scorecard_json_1 = __importDefault(__webpack_require__(/*! ../testdata/profiles/sample-scorecard.json */ "./testdata/profiles/sample-scorecard.json"));
+const sample_scorecard_json_1 = __importDefault(__webpack_require__(/*! ../testdata/samples/sample-scorecard.json */ "./testdata/samples/sample-scorecard.json"));
 exports.sampleScorecard = sample_scorecard_json_1.default;
 
 
@@ -90603,35 +90874,1846 @@ function deepCopy(src) {
     else
         return src;
 }
-exports.deepCopy = deepCopy;
+exports.deepCopy = deepCopy;
+
+
+/***/ }),
+
+/***/ "./testdata/samples/sample-profile.json":
+/*!**********************************************!*\
+  !*** ./testdata/samples/sample-profile.json ***!
+  \**********************************************/
+/*! exports provided: state, planName, nDistricts, nCounties, legislativeDistricts, populationProfile, compactnessProfile, splittingProfile, partisanProfile, demographicProfile, default */
+/***/ (function(module) {
+
+module.exports = JSON.parse("{\"state\":\"NC\",\"planName\":\"Sample profile\",\"nDistricts\":13,\"nCounties\":100,\"legislativeDistricts\":false,\"populationProfile\":{\"TotalPopByDistrict\":[725807,721754,732627,733218,730051,729580,728476,729721,731507,724085,733447,730845,729710],\"targetSize\":729294},\"compactnessProfile\":{\"GeometryByDistrict\":[[1.5773977911324972,10.187637000340999,2.6574300583946115],[0.7058475358440041,7.6543777040386445,1.7632772181381422],[2.920140664739499,9.983421957097065,2.733997011824872],[0.19139679136850038,3.5473804553379114,0.9224411598627837],[1.0389865962844946,6.505473449741405,2.1061393959539023],[1.0334553158144995,6.472595447414713,1.6394147493749138],[1.6241801669130118,8.040301088673953,1.952917034583555],[0.7706765524270006,7.015983900119356,2.1886348192462464],[0.9976965229710011,8.405282685068,2.5604335810665138],[0.676265120610002,5.866361656441843,1.7264712385837822],[1.719226531340005,10.410671767954964,3.1586859214584764],[0.11329460131899982,2.3038812649606695,0.5379072920877442],[0.48373856130249987,5.267369326010034,1.45173753753012]]},\"splittingProfile\":{\"CountyPopByDistrict\":[[0,0,0,0,0,0,0,0,21282,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,240299,56552,0,0,0,12197,0,59916,0,0,54691,0,0,0,24669,0,0,0,0,0,0,0,0,0,0,0,0,24505,0,0,0,0,0,0,22099,0,0,0,0,0,0,0,74235,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45422,0,20972,13228,0,0,0,55740,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60619,0,0,0,0,0,0,0,114678,0,0,0,0,0,0,0,109245,0,0,0,0,0,0,0,0,0,0,0,0,95840,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,324879,0,0,0,0,0,16493,0,0],[0,0,0,0,0,0,0,47759,0,0,0,0,0,0,0,9980,66469,0,0,0,0,14793,0,0,0,103505,0,23547,33920,0,0,0,0,0,0,0,0,0,0,0,21362,0,0,0,0,0,0,0,5810,0,0,0,10153,0,59495,0,0,0,0,0,0,0,0,0,0,0,0,177772,0,13144,40661,0,13453,0,86397,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4407,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133801,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,572129,0,0,0,0,0,0,0,0],[0,0,37198,11155,0,27281,17797,0,0,0,0,0,0,0,0,0,0,0,6051,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,350670,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,47401,73673,0,0,0,0,0,0,0,0,51079,0,69340,0,38406,0],[0,151131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23719,0,63505,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,158500,0,0,0,0,0,0,0,0,0,0,0,57866,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,39464,0,0,141752,0,0,93643,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,8316,107431,0,0,0,0,0,0,0,0,0,0,0,0,0,58098,0,0,0,0,0,0,58505,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,55188,0,0,0,0,0,0,0,0,0,0,0,0,0,202667,0,0,0,0,0,52217,0,0,0,0,0,0,0,0,0,0,63431,0,0,0,0,0,0,0,0,0,0,0,0,0,122623,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,178011,0,0,0,0,0,0,0,0,0,0,0,0,242290,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,46952,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27798,88247,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,85838,0,0,0,60585,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,26948,0,0,0,0,25045,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,75524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,185734,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,46639,134168,0,0,0,0,36157,0,0,0,0,0,0,201292,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,108857,0,0,0,0,0,0,144479,0,0,0,0,98078,0,0,0,0,0,0,0,0,0,0,0,0,206086,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,78265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20510,0,0,0,0,0,67810,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,126417,90912,0,83029,0,0,0,0,0,27444,0,10587,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8861,0,0,0,0,0,59036,106740,0,0,0,0,40271,0,0,0,0,0,44996,33922,20764,0,0,15579,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13981,33090,0,0,0,0,0,0,0,0,0,0,0,17818],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,730845,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162878,41240,0,0,0,0,0,0,0,0,0,0,325932,0,0,0,0,0,0,0,150509,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,49151,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]]},\"partisanProfile\":{\"statewideVf\":0.515036,\"VfArray\":[0.4235,0.428588,0.43388,0.443866,0.454505,0.456985,0.458005,0.458134,0.463947,0.473144,0.718314,0.73662,0.775817]},\"demographicProfile\":{\"DemographicsByDistrict\":[[0.462,0.538,0.0659,0.4445,0.0219,0.0009,0.013],[0.7063,0.2937,0.0714,0.1968,0.0203,0.001,0.0113],[0.7125,0.2875,0.0537,0.2118,0.0163,0.0021,0.0104],[0.6162,0.3838,0.0869,0.2239,0.0715,0.0012,0.0101],[0.7767,0.2233,0.0669,0.1402,0.013,0.0008,0.0077],[0.7112,0.2888,0.0715,0.1985,0.0136,0.0008,0.0102],[0.7086,0.2914,0.0695,0.2023,0.0097,0.0011,0.0142],[0.6698,0.3302,0.0725,0.224,0.0229,0.0029,0.0188],[0.6406,0.3594,0.0594,0.1962,0.0222,0.001,0.0862],[0.8193,0.1807,0.0451,0.1158,0.0141,0.0007,0.008],[0.8956,0.1044,0.0433,0.0327,0.0103,0.0012,0.0197],[0.4657,0.5343,0.1215,0.3618,0.0507,0.0017,0.011],[0.698,0.302,0.0572,0.2117,0.0286,0.0009,0.0095]]}}");
+
+/***/ }),
+
+/***/ "./testdata/samples/sample-scorecard.json":
+/*!************************************************!*\
+  !*** ./testdata/samples/sample-scorecard.json ***!
+  \************************************************/
+/*! exports provided: score, traditionalPrinciples, partisan, default */
+/***/ (function(module) {
+
+module.exports = JSON.parse("{\"score\":5,\"traditionalPrinciples\":{\"score\":18,\"compactness\":{\"score\":35,\"reock\":{\"raw\":0.3373,\"normalized\":35,\"notes\":{}},\"polsby\":{\"raw\":0.2418,\"normalized\":35,\"notes\":{}}},\"splitting\":{\"score\":0,\"county\":{\"raw\":1.1474,\"normalized\":0,\"notes\":{}},\"district\":{\"raw\":1.4839,\"normalized\":3,\"notes\":{}}},\"populationDeviation\":{\"raw\":0.016,\"normalized\":0,\"notes\":{\"maxDeviation\":11693}}},\"partisan\":{\"bias\":{\"BestS\":7,\"BestSf\":0.5385,\"ProbableS\":4.1925,\"ProbableSf\":0.3225,\"Bias\":0.216,\"score\":0},\"impact\":{\"UnearnedS\":2.8075,\"score\":0},\"competitiveness\":{\"C\":6,\"Cd\":0.7266,\"Cdf\":0.0559,\"Mrange\":[5,11],\"Md\":0.7134,\"Mdf\":0.1019,\"score\":10},\"score\":3,\"score2\":2}}");
+
+/***/ })
+
+/******/ });
+});
+
+
+/***/ }),
+
+/***/ "./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__) {
+
+(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__(/*! ./dra-types */ "./lib/dra-types.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");
+// Canonical hashing of splitblock data
+function hash(o) {
+    return Hash(o, { respectType: false,
+        unorderedArrays: true,
+        unorderedObjects: true,
+        excludeKeys: (k) => (k === 'id' || k === 'chunk')
+    });
+}
+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 districtID;
+}
+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 -1;
+}
+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;
+}
+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.parseCSVLine = parseCSVLine;
+function blockmapToState(blockMap) {
+    for (var id in blockMap)
+        if (blockMap.hasOwnProperty(id))
+            return geoidToState(id);
+    return null;
+}
+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.
+//
+//  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 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
+                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;
+            }
+        }
+    // 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;
+}
+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;
+    return exports.GEOIDToState[a[1]];
+}
+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];
+}
+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;
+        }
+    }
+    clear(id) {
+        if (this.test(id)) {
+            this.n--;
+            delete this.val[id];
+        }
+    }
+    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);
 
-/***/ "./testdata/profiles/sample-profile.json":
-/*!***********************************************!*\
-  !*** ./testdata/profiles/sample-profile.json ***!
-  \***********************************************/
-/*! exports provided: state, planName, nDistricts, nCounties, legislativeDistricts, populationProfile, compactnessProfile, splittingProfile, partisanProfile, demographicProfile, default */
-/***/ (function(module) {
+  return typeHasher(options, stream).dispatch(object);
+};
 
-module.exports = JSON.parse("{\"state\":\"NC\",\"planName\":\"Sample profile\",\"nDistricts\":13,\"nCounties\":100,\"legislativeDistricts\":false,\"populationProfile\":{\"TotalPopByDistrict\":[725807,721754,732627,733218,730051,729580,728476,729721,731507,724085,733447,730845,729710],\"targetSize\":729294},\"compactnessProfile\":{\"GeometryByDistrict\":[[1.5773977911324972,10.187637000340999,2.6574300583946115],[0.7058475358440041,7.6543777040386445,1.7632772181381422],[2.920140664739499,9.983421957097065,2.733997011824872],[0.19139679136850038,3.5473804553379114,0.9224411598627837],[1.0389865962844946,6.505473449741405,2.1061393959539023],[1.0334553158144995,6.472595447414713,1.6394147493749138],[1.6241801669130118,8.040301088673953,1.952917034583555],[0.7706765524270006,7.015983900119356,2.1886348192462464],[0.9976965229710011,8.405282685068,2.5604335810665138],[0.676265120610002,5.866361656441843,1.7264712385837822],[1.719226531340005,10.410671767954964,3.1586859214584764],[0.11329460131899982,2.3038812649606695,0.5379072920877442],[0.48373856130249987,5.267369326010034,1.45173753753012]]},\"splittingProfile\":{\"CountyPopByDistrict\":[[0,0,0,0,0,0,0,0,21282,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,240299,56552,0,0,0,12197,0,59916,0,0,54691,0,0,0,24669,0,0,0,0,0,0,0,0,0,0,0,0,24505,0,0,0,0,0,0,22099,0,0,0,0,0,0,0,74235,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45422,0,20972,13228,0,0,0,55740,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60619,0,0,0,0,0,0,0,114678,0,0,0,0,0,0,0,109245,0,0,0,0,0,0,0,0,0,0,0,0,95840,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,324879,0,0,0,0,0,16493,0,0],[0,0,0,0,0,0,0,47759,0,0,0,0,0,0,0,9980,66469,0,0,0,0,14793,0,0,0,103505,0,23547,33920,0,0,0,0,0,0,0,0,0,0,0,21362,0,0,0,0,0,0,0,5810,0,0,0,10153,0,59495,0,0,0,0,0,0,0,0,0,0,0,0,177772,0,13144,40661,0,13453,0,86397,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4407,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133801,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,572129,0,0,0,0,0,0,0,0],[0,0,37198,11155,0,27281,17797,0,0,0,0,0,0,0,0,0,0,0,6051,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,350670,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,47401,73673,0,0,0,0,0,0,0,0,51079,0,69340,0,38406,0],[0,151131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23719,0,63505,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,158500,0,0,0,0,0,0,0,0,0,0,0,57866,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,39464,0,0,141752,0,0,93643,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,8316,107431,0,0,0,0,0,0,0,0,0,0,0,0,0,58098,0,0,0,0,0,0,58505,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,55188,0,0,0,0,0,0,0,0,0,0,0,0,0,202667,0,0,0,0,0,52217,0,0,0,0,0,0,0,0,0,0,63431,0,0,0,0,0,0,0,0,0,0,0,0,0,122623,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,178011,0,0,0,0,0,0,0,0,0,0,0,0,242290,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,46952,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27798,88247,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,85838,0,0,0,60585,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,26948,0,0,0,0,25045,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,75524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,185734,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,46639,134168,0,0,0,0,36157,0,0,0,0,0,0,201292,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,108857,0,0,0,0,0,0,144479,0,0,0,0,98078,0,0,0,0,0,0,0,0,0,0,0,0,206086,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,78265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20510,0,0,0,0,0,67810,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,126417,90912,0,83029,0,0,0,0,0,27444,0,10587,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8861,0,0,0,0,0,59036,106740,0,0,0,0,40271,0,0,0,0,0,44996,33922,20764,0,0,15579,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13981,33090,0,0,0,0,0,0,0,0,0,0,0,17818],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,730845,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162878,41240,0,0,0,0,0,0,0,0,0,0,325932,0,0,0,0,0,0,0,150509,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,49151,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]]},\"partisanProfile\":{\"statewideVf\":0.515036,\"VfArray\":[0.4235,0.428588,0.43388,0.443866,0.454505,0.456985,0.458005,0.458134,0.463947,0.473144,0.718314,0.73662,0.775817]},\"demographicProfile\":{\"DemographicsByDistrict\":[[0.462,0.538,0.0659,0.4445,0.0219,0.0009,0.013],[0.7063,0.2937,0.0714,0.1968,0.0203,0.001,0.0113],[0.7125,0.2875,0.0537,0.2118,0.0163,0.0021,0.0104],[0.6162,0.3838,0.0869,0.2239,0.0715,0.0012,0.0101],[0.7767,0.2233,0.0669,0.1402,0.013,0.0008,0.0077],[0.7112,0.2888,0.0715,0.1985,0.0136,0.0008,0.0102],[0.7086,0.2914,0.0695,0.2023,0.0097,0.0011,0.0142],[0.6698,0.3302,0.0725,0.224,0.0229,0.0029,0.0188],[0.6406,0.3594,0.0594,0.1962,0.0222,0.001,0.0862],[0.8193,0.1807,0.0451,0.1158,0.0141,0.0007,0.008],[0.8956,0.1044,0.0433,0.0327,0.0103,0.0012,0.0197],[0.4657,0.5343,0.1215,0.3618,0.0507,0.0017,0.011],[0.698,0.302,0.0572,0.2117,0.0286,0.0009,0.0095]]}}");
+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);
+      }
 
-/***/ "./testdata/profiles/sample-scorecard.json":
-/*!*************************************************!*\
-  !*** ./testdata/profiles/sample-scorecard.json ***!
-  \*************************************************/
-/*! exports provided: score, best, fair, default */
-/***/ (function(module) {
+      var type = typeof value;
+      if (value === null) {
+        type = 'null';
+      }
 
-module.exports = JSON.parse("{\"score\":5,\"best\":{\"BestScore\":18,\"compactness\":{\"score\":35,\"reock\":{\"raw\":0.3373,\"normalized\":35,\"notes\":{}},\"polsby\":{\"raw\":0.2418,\"normalized\":35,\"notes\":{}}},\"splitting\":{\"score\":0,\"county\":{\"raw\":1.1474,\"normalized\":0,\"notes\":{}},\"district\":{\"raw\":1.4839,\"normalized\":3,\"notes\":{}}},\"populationDeviation\":{\"raw\":0.016,\"normalized\":0,\"notes\":{\"maxDeviation\":11693}}},\"fair\":{\"bias\":{\"BestS\":7,\"BestSf\":0.5385,\"ProbableS\":4.1925,\"ProbableSf\":0.3225,\"Bias\":0.216,\"normalized\":0,\"notes\":{}},\"competitiveness\":{\"Cd\":0.7266,\"Cdf\":0.0559,\"Mdf\":0.1019,\"normalized\":10,\"notes\":{}},\"score\":2,\"notes\":{}}}");
+      //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;
+    }
+  };
+}
 
 
 /***/ }),
@@ -98601,11 +100683,13 @@ 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 preprocess_1 = __webpack_require__(/*! ./preprocess */ "./src/preprocess.ts");
 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,45 +100709,48 @@ 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()) {
+            console.log("Using legacy district-analytics.");
+            // 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);
+        }
+        else {
+            console.log("Using dra-score analytics.");
+            // TODO - SCORE: Temporary HACK. Query dra-score for threshold.
+            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;
-        }
+        // TODO - SCORE: Delete
+        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;
     }
+    // TODO - SCORE: Toggle = Invert this logic
+    useLegacy() {
+        // TODO - SCORE: Opt-out
+        return (U.keyExists('useScore', this.config) && (this.config['useScore'] != null) && (!(this.config['useScore']))) ? true : false;
+        // TODO - SCORE: Opt-in
+        // 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) {
         try {
             preprocess_1.doPreprocessData(this, bLog);
             analyze_1.doAnalyzeDistricts(this, bLog);
             analyze_1.doAnalyzePlan(this, bLog);
             // TODO - SCORE
             this._profile = score_1.profilePlan(this, bLog);
-            // this._profile = Score.sampleProfile;
-            this._scorecard = score_1.scorePlan(this._profile, bLog);
-            // TODO - SCORE
+            this._scorecard = score_1.scorePlan(this, this._profile, bLog, overridesJSON);
             results_1.doAnalyzePostProcessing(this, bLog);
         }
         catch (_a) {
@@ -98684,13 +100771,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 +100779,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 +100870,21 @@ 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
+        if (this.useLegacy()) {
+            return 1 - this.testScales[4 /* PopulationDeviation */]['scale'][0];
+        }
+        else {
+            // NOTE - This assumes the plan has been profiled
+            const scorer = new Score.Scorer();
+            const popdev = scorer.populationDeviationThreshold(this.legislativeDistricts);
+            return popdev;
+            // TODO - SCORE: Temporary HACK. Query dra-score for threshold.
+            // NOTE - The plan may not have been scored yet, i.e., no scorecard yet.
+            // return 1 - this.testScales[T.Test.PopulationDeviation]['scale'][0];
+        }
     }
 }
 exports.AnalyticsSession = AnalyticsSession;
@@ -98905,7 +101060,6 @@ 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
             let popDevPct = (i > 0) ? (targetSize / targetSize) : 0 / targetSize;
             // Get the geoIDs assigned to the district
             // Guard against empty districts
@@ -98932,7 +101086,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 +101259,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,11 +101508,45 @@ 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 - Remove this mechanism. Always run all tests
-    // Get the requested suites, and only execute those tests
-    let requestedSuites = s.config['suites'];
-    // Tests in the "Legal" suite, i.e., pass/ fail constraints
-    if (requestedSuites.includes(0 /* Legal */)) {
+    // TODO - SCORE: Toggle
+    if (s.useLegacy()) {
+        // Disable most legacy analytics
+        // Get the requested suites, and only execute those tests
+        let requestedSuites = s.config['suites'];
+        // Tests in the "Legal" suite, i.e., pass/ fail constraints
+        if (requestedSuites.includes(0 /* Legal */)) {
+            s.tests[0 /* Complete */] = valid_1.doIsComplete(s, bLog);
+            s.tests[1 /* Contiguous */] = valid_1.doIsContiguous(s, bLog);
+            s.tests[2 /* FreeOfHoles */] = valid_1.doIsFreeOfHoles(s, bLog);
+            s.tests[4 /* PopulationDeviation */] = equal_1.doPopulationDeviation(s, bLog);
+            // NOTE - I can't check whether a population deviation is legal or not, until
+            // the raw % is normalized. A zero (0) would mean "too much" / "not legal," for
+            // the given type of district (CD vs. LD). The EqualPopulation test is derived
+            // from PopulationDeviation, as part of scorecard or test log preparation.
+            // Create an empty test entry here though ...
+            s.tests[3 /* EqualPopulation */] = s.getTest(3 /* EqualPopulation */);
+        }
+        // Tests in the "Fair" suite
+        if (requestedSuites.includes(1 /* Fair */)) {
+            s.tests[11 /* SeatsBias */] = political_1.doSeatsBias(s, bLog);
+            s.tests[12 /* VotesBias */] = political_1.doVotesBias(s, bLog);
+            s.tests[13 /* Responsiveness */] = political_1.doResponsiveness(s, bLog);
+            s.tests[14 /* ResponsiveDistricts */] = political_1.doResponsiveDistricts(s, bLog);
+            s.tests[15 /* EfficiencyGap */] = political_1.doEfficiencyGap(s, bLog);
+            s.tests[16 /* MajorityMinorityDistricts */] = minority_1.doMajorityMinorityDistricts(s, bLog);
+        }
+        // Tests in the "Best" suite, i.e., criteria for better/worse
+        if (requestedSuites.includes(2 /* Best */)) {
+            s.tests[5 /* Reock */] = compact_1.doReock(s, bLog);
+            s.tests[6 /* PolsbyPopper */] = compact_1.doPolsbyPopper(s, bLog);
+            s.tests[7 /* UnexpectedCountySplits */] = cohesive_1.doFindCountiesSplitUnexpectedly(s, bLog);
+            s.tests[10 /* VTDSplits */] = cohesive_1.doFindSplitVTDs(s, bLog);
+            s.tests[8 /* CountySplitting */] = cohesive_1.doCountySplitting(s, bLog);
+            s.tests[9 /* DistrictSplitting */] = cohesive_1.doDistrictSplitting(s, bLog);
+        }
+    }
+    else {
+        // TODO - SCORE: Except these. Continue to do these here vs. dra-score.
         s.tests[0 /* Complete */] = valid_1.doIsComplete(s, bLog);
         s.tests[1 /* Contiguous */] = valid_1.doIsContiguous(s, bLog);
         s.tests[2 /* FreeOfHoles */] = valid_1.doIsFreeOfHoles(s, bLog);
@@ -99373,24 +101557,8 @@ function doAnalyzePlan(s, bLog = false) {
         // from PopulationDeviation, as part of scorecard or test log preparation.
         // Create an empty test entry here though ...
         s.tests[3 /* EqualPopulation */] = s.getTest(3 /* EqualPopulation */);
-    }
-    // Tests in the "Fair" suite
-    if (requestedSuites.includes(1 /* Fair */)) {
-        s.tests[11 /* SeatsBias */] = political_1.doSeatsBias(s, bLog);
-        s.tests[12 /* VotesBias */] = political_1.doVotesBias(s, bLog);
-        s.tests[13 /* Responsiveness */] = political_1.doResponsiveness(s, bLog);
-        s.tests[14 /* ResponsiveDistricts */] = political_1.doResponsiveDistricts(s, bLog);
-        s.tests[15 /* EfficiencyGap */] = political_1.doEfficiencyGap(s, bLog);
-        s.tests[16 /* MajorityMinorityDistricts */] = minority_1.doMajorityMinorityDistricts(s, bLog);
-    }
-    // Tests in the "Best" suite, i.e., criteria for better/worse
-    if (requestedSuites.includes(2 /* Best */)) {
-        s.tests[5 /* Reock */] = compact_1.doReock(s, bLog);
-        s.tests[6 /* PolsbyPopper */] = compact_1.doPolsbyPopper(s, bLog);
         s.tests[7 /* UnexpectedCountySplits */] = cohesive_1.doFindCountiesSplitUnexpectedly(s, bLog);
         s.tests[10 /* VTDSplits */] = cohesive_1.doFindSplitVTDs(s, bLog);
-        s.tests[8 /* CountySplitting */] = cohesive_1.doCountySplitting(s, bLog);
-        s.tests[9 /* DistrictSplitting */] = cohesive_1.doDistrictSplitting(s, bLog);
     }
     // Enable a Test Log and Scorecard to be generated
     s.bPlanAnalyzed = true;
@@ -99987,6 +102155,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;
@@ -100025,8 +102194,8 @@ function doHasEqualPopulations(s, bLog = false) {
     let test = s.getTest(3 /* EqualPopulation */);
     // Get the normalized population deviation %
     let popDevTest = s.getTest(4 /* PopulationDeviation */);
-    let popDevPct = popDevTest['score'];
-    let popDevNormalized = popDevTest['normalizedScore'];
+    const popDevPct = popDevTest['score'];
+    const popDevNormalized = popDevTest['normalizedScore'];
     // Populate the test entry
     if (popDevNormalized > 0) {
         test['score'] = true;
@@ -100068,6 +102237,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 +102555,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 +102573,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 +102664,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 +102688,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 +102701,7 @@ let sampleCompactness = {
     },
     resources: {}
 };
+// TODO - DELETE
 let sampleSplitting = {
     score: 73,
     metrics: {
@@ -100533,7 +102719,7 @@ let sampleSplitting = {
     datasets: {},
     resources: {}
 };
-// TODO - PARTISAN: This category is still being fleshed out.
+// TODO - DELETE
 let samplePartisan = {
     score: 100,
     metrics: {
@@ -100548,7 +102734,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 +102761,7 @@ let sampleMinority = {
     },
     resources: {}
 };
+// TODO - DELETE
 exports.samplePlanAnalytics = {
     requirements: sampleRequirements,
     compactness: sampleCompactness,
@@ -100583,232 +102770,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 +102777,40 @@ 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']) || [];
+        // TODO - SCORE: DELETE - This code is hooked correctly to use dra-score
+        // const scorecard = s._scorecard as Score.Scorecard;
+        // const populationDeviation = scorecard.best.populationDeviation.raw;
+        const populationDeviationDetail = U.deepCopy(equalPopulationTest['details']['deviation']);
+        // console.log("Population deviations =", populationDeviationDetail, populationDeviation);
+        // const deviationThreshold = scorecard.best.populationDeviation.notes['threshold'];
+        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,19 +103073,30 @@ 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) {
-    // Normalize the raw scores for all the numerics tests
-    let testResults = U.getNumericObjectKeys(testDefns);
-    for (let testID of testResults) {
-        if (testDefns[testID]['normalize']) {
-            let testResult = s.getTest(testID);
-            let rawScore = testResult['score'];
-            let normalizedScore;
-            normalizedScore = U.normalize(rawScore, s.testScales[testID]);
-            testResult['normalizedScore'] = normalizedScore;
-            // Add the scale used to normalize the raw score to the details
-            testResult['details']['scale'] = s.testScales[testID].scale;
+    // TODO - SCORE: Toggle
+    if (s.useLegacy()) {
+        // Normalize the raw scores for all the numerics tests
+        let testResults = U.getNumericObjectKeys(testDefns);
+        for (let testID of testResults) {
+            if (testDefns[testID]['normalize']) {
+                let testResult = s.getTest(testID);
+                let rawScore = testResult['score'];
+                let normalizedScore;
+                normalizedScore = U.normalize(rawScore, s.testScales[testID]);
+                testResult['normalizedScore'] = normalizedScore;
+                // Add the scale used to normalize the raw score to the details
+                testResult['details']['scale'] = s.testScales[testID].scale;
+            }
         }
     }
+    else {
+        // Just populate the normalized population deviation score in the test
+        const scorecard = s._scorecard;
+        let test = s.getTest(4 /* PopulationDeviation */);
+        test['normalizedScore'] = scorecard.traditionalPrinciples.populationDeviation.normalized;
+        // TODO - DELETE
+        // test['normalizedScore'] = scorecard.best.populationDeviation.normalized;
+    }
     // Derive secondary tests
     analyze_1.doDeriveSecondaryTests(s, bLog);
     // Toggle the semaphore, so postprocessing isn't for both the testlog & scorecard
@@ -101163,7 +103141,7 @@ function profilePlan(s, bLog = false) {
     const geoPropsByDistrict = makeArrayOfGeoProps(s, bLog);
     const splits = makeNakedCxD(s);
     const summaryRow = s.districts.numberOfRows() - 1;
-    const statewideVf = s.districts.statistics[D.DistrictField.DemPct][summaryRow];
+    const statewideVf = U.trim(s.districts.statistics[D.DistrictField.DemPct][summaryRow], 6);
     const vpiArray = U.deepCopy(s.districts.statistics[D.DistrictField.DemPct].slice(1, -1));
     const demographicsByDistrict = makeArrayOfDemographics(s);
     const profile = {
@@ -101201,13 +103179,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++) {
@@ -101241,9 +103217,30 @@ function makeArrayOfDemographics(s, bLog = false) {
     return demographicsArray;
 }
 // SCORE A PLAN
-function scorePlan(p, bLog = false) {
+function scorePlan(s, p, bLog = false, overridesJSON) {
     let scorer = new Score.Scorer();
-    return scorer.score(p);
+    const scorecard = scorer.score(p, overridesJSON);
+    // TODO - SCORE: Toggle: Before returning, create a dummy population deviation
+    //   test, for doHasEqualPopulations() to use later. This is preserving the old
+    //   calling sequence.
+    let test = s.getTest(4 /* PopulationDeviation */);
+    // TODO - SCORE: U.trim(popDev)???
+    // const popDev = scorecard.best.populationDeviation.raw;
+    // Get the raw population deviation
+    const popDev = scorecard.traditionalPrinciples.populationDeviation.raw;
+    // Populate the test entry
+    test['score'] = popDev;
+    test['details'] = { 'maxDeviation': scorecard.traditionalPrinciples.populationDeviation.notes['maxDeviation'] };
+    // TODO - DELETE
+    // test['details'] = { 'maxDeviation': scorecard.best.populationDeviation.notes['maxDeviation'] };
+    // Populate the N+1 summary "district" in district.statistics
+    let totalPop = s.districts.statistics[D.DistrictField.TotalPop];
+    let popDevPct = s.districts.statistics[D.DistrictField.PopDevPct];
+    let summaryRow = s.districts.numberOfRows() - 1;
+    totalPop[summaryRow] = p.populationProfile.targetSize;
+    popDevPct[summaryRow] = popDev;
+    //
+    return scorecard;
 }
 exports.scorePlan = scorePlan;
 
@@ -101305,6 +103302,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 +103330,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 +103337,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 +103345,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 +104248,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 +104358,17 @@ module.exports = require("assert");
 
 /***/ }),
 
+/***/ "crypto":
+/*!*************************!*\
+  !*** external "crypto" ***!
+  \*************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+module.exports = require("crypto");
+
+/***/ }),
+
 /***/ "fs":
 /*!*********************!*\
   !*** external "fs" ***!