@dra2020/district-analytics 17.0.1 → 17.1.0

package/dist/district-analytics.js

@@ -20,7 +20,7 @@ return /******/ (() => { // webpackBootstrap
 
 
 //
-// THE NODE PACKAGE API
+// ANALYTICS INTERFACE
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -57,120 +57,23 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.AnalyticsSession = void 0;
-const baseclient_1 = __webpack_require__(/*! @dra2020/baseclient */ "@dra2020/baseclient");
-const dra_analytics_1 = __webpack_require__(/*! @dra2020/dra-analytics */ "@dra2020/dra-analytics");
-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 minority_1 = __webpack_require__(/*! ./minority */ "./src/minority.ts");
-const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
-const M = __importStar(__webpack_require__(/*! ./minority */ "./src/minority.ts"));
+const rpv_1 = __webpack_require__(/*! ./rpv */ "./src/rpv.ts");
+const D = __importStar(__webpack_require__(/*! ./data */ "./src/data.ts"));
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
-// MMD - Extended for optional # reps per district
 class AnalyticsSession {
     constructor(SessionRequest) {
-        this.legislativeDistricts = false; // 2020
-        this.config = {};
-        this.bOneTimeProcessingDone = false;
-        this.bPlanAnalyzed = false;
-        this.bPostProcessingDone = false;
-        this.tests = {};
-        this.title = SessionRequest['title'];
-        this.config = this.processConfig(SessionRequest['config']);
-        // 2020 - Set the CD / LD toggle:
-        // * If 2020, use the PlanType, if given.
-        // * If 2010, use the legacy LD toggle, if given.
-        // * Otherwise assume CD's.
-        // * Use the LD population deviation threshold for districts that are not CD's.
-        if ((this.config.cycle == 2020) && (SessionRequest['planType'] !== undefined))
-            this.legislativeDistricts = (SessionRequest['planType'] != 'congress');
-        else if ((this.config.cycle == 2010) && (SessionRequest['legislativeDistricts'] !== undefined))
-            this.legislativeDistricts = SessionRequest['legislativeDistricts'];
-        // MMD - Validate & handle optional # reps per district
-        const repsByDistrict = SessionRequest['repsByDistrict'];
-        const nDistricts = SessionRequest['nDistricts'];
-        if (repsByDistrict !== undefined) {
-            if (repsByDistrict.length != nDistricts)
-                throw new Error("Mismatched #'s of districts passed to AnalyticsSession constructor!");
-            if (repsByDistrict.includes(0))
-                throw new Error("Zero reps for a district passed to AnalyticsSession constructor!");
-            // Assume a positive integer # of reps per district
-            this.repsByDistrict = repsByDistrict;
-        }
-        this.state = new D.State(this, SessionRequest['stateXX'], nDistricts);
-        this.counties = new D.Counties(this, SessionRequest['counties']);
-        this.graph = new D.GraphClass(this, SessionRequest['graph']);
-        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']);
-        this.aggregates = SessionRequest['aggregates'];
-    }
-    processConfig(config) {
-        // Default the Census & redistricting cycle to 2010
-        if (!(U.keyExists('cycle', config))) {
-            config['cycle'] = 2010;
-            // DEBUG
-            console.log("Cycle was not set explicitly on the session request.");
-        }
-        // DEBUG - Turned off 03/05/21
-        // console.log("Cycle = ", config['cycle']);
-        // console.log("Shapes = ", config['datasets'][T.Dataset.SHAPES], ": ", config['descriptions']['SHAPES']);
-        return config;
+        this.bLog = false;
+        this.data = new D.SessionData(this, SessionRequest);
     }
-    // Using the the data in the analytics session, calculate all the
-    // analytics & validations, saving/updating the individual test results.
     analyzePlan(bLog = false, overridesJSON) {
         // Return values:
         // * true = everything good
         // * false = should not have been called with empty plan
         // * exception = exception caught and logged on the console
         try {
-            // Guard against being handed a map w/o any precincts assigned
-            if (U.isObjectEmpty(this.plan._planByGeoID))
-                return false;
-            (0, preprocess_1.doPreprocessData)(this, bLog);
-            (0, analyze_1.doAnalyzeDistricts)(this, bLog);
-            // This does a little stuff that didn't get factored out into dra-score and then dra-analytics
-            (0, analyze_1.doAnalyzePlan)(this, bLog);
-            // THE MAIN ANALYTICS
-            // Even though we don't save the profile (as I thought we would),
-            // we allow it to be exported, so keep generating it, and use it
-            // to gather the inputs to new analytics (as well as the legacy).
-            this._profile = (0, score_1.profilePlan)(this, bLog);
-            let legacyScorecardAlt = {};
-            let newScorecard = {};
-            // Construct a new/alternate scorecard
-            newScorecard = (0, score_1.computeMetrics)(this._profile, this.getGoodShapes(), bLog); // w/o ratings
-            newScorecard = (0, score_1.rateKeyDimensions)(newScorecard, this._profile, bLog); // w/  ratings
-            legacyScorecardAlt = (0, score_1.thunkScorecard)(newScorecard, bLog);
-            // Add minority notes
-            legacyScorecardAlt.minority.details['majorityMinority'] = M.getMajorityMinority(this);
-            legacyScorecardAlt.minority.details['vraPreclearance'] = M.getVRASection5(this);
-            this._scorecard = legacyScorecardAlt;
-            // Before returning, create a dummy population deviation test, for 
-            // doHasEqualPopulations() to use later.This is preserving the old calling sequence.
-            let test = this.getTest(4 /* T.Test.PopulationDeviation */);
-            // Get the raw population deviation
-            const popDev = this._scorecard.populationDeviation.raw;
-            // Populate the test entry
-            test['score'] = popDev;
-            test['details'] = { 'maxDeviation': this._scorecard.populationDeviation.notes['maxDeviation'] };
-            // Populate the N+1 summary "district" in district.statistics
-            let totalPop = this.districts.table.totalPop;
-            let popDevPct = this.districts.table.popDevPct;
-            let totalVAP = this.districts.table.totalVAP;
-            const summaryRow = this.districts.numberOfRows() - 1;
-            totalPop[summaryRow] = this._profile.population.targetSize; // MMD - This is generalized when the profile is created.
-            popDevPct[summaryRow] = popDev;
-            totalVAP[summaryRow] = Math.round(totalVAP[summaryRow] / this._profile.nDistricts);
-            // Added w/ new scorecard
-            // Use 'roughly' equal population from dra-analytics
-            let test2 = this.getTest(3 /* T.Test.EqualPopulation */);
-            test2['score'] = newScorecard.populationDeviation.roughlyEqual;
-            // END main analytics
-            (0, results_1.doAnalyzePostProcessing)(this, bLog);
+            this.bLog = bLog;
+            (0, analyze_1.newAnalyzePlan)(this);
         }
         catch (e) {
             console.log("Exception caught by analyzePlan().");
@@ -179,108 +82,223 @@ class AnalyticsSession {
         }
         return true;
     }
-    getGoodShapes() {
-        const rawShapes = this.districts.getDistrictShapes();
-        // Filter the real shapes & throw everything else away
-        let goodShapes = {};
-        goodShapes['type'] = "FeatureCollection";
-        goodShapes['features'] = [];
-        for (let i = 0; i < rawShapes.features.length; i++) {
-            const shape = rawShapes.features[i];
-            if (isAShape(shape)) {
-                const d = baseclient_1.Poly.polyDescribe(shape);
-                let f = {
-                    type: 'Feature',
-                    properties: { districtID: `${i + 1}` },
-                    geometry: {
-                        type: (d.npoly > 1) ? 'MultiPolygon' : 'Polygon',
-                        coordinates: shape.geometry.coordinates
-                    }
-                };
-                goodShapes.features.push(f);
-            }
-        }
-        return goodShapes;
-    }
-    // 11-03-2020 - Added for racially polarized voting analysis
-    // NOTE - This assumes that analyzePlan() has been run!
     analyzeRacialPolarization(districtID, groups, bLog = false) {
-        return (0, minority_1.doAnalyzeRacialPolarization)(this, districtID, groups, bLog);
-    }
-    // NOTE - This assumes that analyzePlan() has been run!
-    getDistrictStatistics(bLog = false) {
-        return (0, results_2.prepareDistrictStatistics)(this, bLog);
+        return (0, rpv_1.doRPV)(this.data, districtID, groups, this.bLog);
     }
+    // NOTE - These methods assume that analyzePlan() has been run.
     getPlanProfile(bLog = false) {
-        return this._profile;
+        return U.deepCopy(this.data.profile);
     }
     getPlanScorecard(bLog = false) {
-        return this._scorecard;
+        return U.deepCopy(this.data.legacyScorecardAlt);
     }
     getRatings(bLog = false) {
-        const scorecard = this._scorecard;
-        const r = {
-            proportionality: scorecard.partisan.bias.score,
-            competitiveness: scorecard.partisan.responsiveness.score,
-            minorityRights: scorecard.minority.score,
-            compactness: scorecard.compactness.score,
-            splitting: scorecard.splitting.score
-        };
-        return r;
+        return U.deepCopy(this.data.ratings);
     }
-    // NOTE - This assumes that analyzePlan() has been run!
     getRequirementsChecklist(bLog = false) {
-        return (0, results_2.prepareRequirementsChecklist)(this, bLog);
-    }
-    // NOTE - This assumes that analyzePlan() has been run!
-    getDiscontiguousDistrictFeatures(bLog = false) {
-        // Get the (possibly empty) list of discontiguous district IDs
-        const contiguousTest = this.getTest(1 /* T.Test.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) {
-                    // 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 = baseclient_1.Poly.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.
-    // HELPERS USED INTERNALLY
-    // Get an individual test, so you can drive UI with the results.
-    getTest(testID) {
-        // Get the existing test entries
-        // T.Test is a numeric enum, so convert the string keys to numbers
-        let testValues = U.getNumericObjectKeys(this.tests);
-        // If there's no entry for this test, create & initialize one
-        if (!(testValues.includes(testID))) {
-            this.tests[testID] = {};
-            this.tests[testID]['score'] = undefined;
-            this.tests[testID]['details'] = {};
-        }
-        // Return a pointer to the the test entry for this test
-        return this.tests[testID];
+        return U.deepCopy(this.data.checklist);
     }
-    // NOTE - Not sure why this has to be up here ...
-    populationDeviationThreshold() {
-        const threshold = dra_analytics_1.Rate.popdevThreshold(this.legislativeDistricts);
-        return threshold;
+    getDistrictStatistics(bLog = false) {
+        return U.deepCopy(this.data.statistics);
     }
 }
 exports.AnalyticsSession = AnalyticsSession;
+// END
+
+
+/***/ }),
+
+/***/ "./src/analyze.ts":
+/*!************************!*\
+  !*** ./src/analyze.ts ***!
+  \************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+
+//
+// TOP-LEVEL ANALYTICS FUNCTIONS
+// re-factored here to keep _api.ts small
+//
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.newAnalyzePlan = newAnalyzePlan;
+const baseclient_1 = __webpack_require__(/*! @dra2020/baseclient */ "@dra2020/baseclient");
+const dra_analytics_1 = __webpack_require__(/*! @dra2020/dra-analytics */ "@dra2020/dra-analytics");
+const preprocess_1 = __webpack_require__(/*! ./preprocess */ "./src/preprocess.ts");
+const score_1 = __webpack_require__(/*! ./score */ "./src/score.ts");
+const requirements_1 = __webpack_require__(/*! ./requirements */ "./src/requirements.ts");
+const cohesive_1 = __webpack_require__(/*! ./cohesive */ "./src/cohesive.ts");
+const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
+function newAnalyzePlan(s) {
+    if (U.isObjectEmpty(s.data.plan._planByGeoID))
+        return false;
+    (0, preprocess_1.initialize)(s);
+    s.data.aggregates.process();
+    s.data.profile = (0, score_1.makeProfile)(s.data);
+    s.data.newScorecard = (0, score_1.computeMetrics)(s.data.profile, getGoodShapes(s.data.districts.getShapes()), false /* s.bLog */);
+    s.data.newScorecard = (0, score_1.rateKeyDimensions)(s.data.newScorecard, s.data.profile, false /* s.bLog */);
+    s.data.legacyScorecardAlt = (0, score_1.thunkScorecard)(s.data.newScorecard, false /* s.bLog */);
+    s.data.legacyScorecardAlt.minority.details['majorityMinority'] = {};
+    s.data.legacyScorecardAlt.minority.details['vraPreclearance'] = "";
+    _add_details(s);
+    s.data.ratings = _extractRatings(s);
+    s.data.checklist = _makeRequirementsChecklist(s);
+    s.data.statistics = _makeDistrictStatistics(s);
+    return true;
+}
+function _add_details(s) {
+    const scorecard = s.data.legacyScorecardAlt;
+    const datasets = {
+        shapes: U.deepCopy(s.data.config['descriptions']['SHAPES']),
+        census: U.deepCopy(s.data.config['descriptions']['CENSUS']),
+        vap: U.deepCopy(s.data.config['descriptions']['VAP']),
+        election: U.deepCopy(s.data.config['descriptions']['ELECTION'])
+    };
+    scorecard.partisan.details['election'] = datasets.election;
+    scorecard.minority.details['vap'] = datasets.vap;
+    scorecard.details['shapes'] = datasets.shapes;
+    scorecard.details['census'] = datasets.census;
+    const simpleSplits = (0, cohesive_1.findCountiesSplitUnexpectedly)(s.data, false /* s.bLog */);
+    scorecard.splitting.details['unexpectedAffected'] = simpleSplits['score'];
+    scorecard.splitting.details['nSplits'] = simpleSplits['details']['nSplits'];
+    scorecard.splitting.details['countiesSplitUnexpectedly'] = U.deepCopy(simpleSplits['details']['countiesSplitUnexpectedly']);
+    scorecard.splitting.details['nTooBigCounties'] = simpleSplits['details']['expectedSplits'];
+    scorecard.splitting.details['tooBigName'] = simpleSplits['details']['tooBigName'];
+    scorecard.splitting.details['nCountiesSplit'] = simpleSplits['details']['nCountiesSplit'];
+    scorecard.splitting.details['nSingleCountyDistricts'] = simpleSplits['details']['nSingleCountyDistricts'];
+    scorecard.splitting.details['singleCountyDistrictMax'] = simpleSplits['details']['singleCountyDistrictMax'];
+    scorecard.splitting.details['countiesWithSplits'] = simpleSplits['details']['countiesWithSplits'];
+}
+function _makeRequirementsChecklist(s) {
+    var _a;
+    const popByDistricts = s.data.aggregates.columns.totalPop;
+    const completeness = (0, requirements_1.isComplete)(popByDistricts);
+    const bContiguousByDistrict = s.data.aggregates.columns.bContiguous;
+    const discontiguousDistrictsList = U.falseIndexes(bContiguousByDistrict);
+    const contiguity = bContiguousByDistrict.at(-1);
+    const bNotEmbeddedByDistrict = s.data.aggregates.columns.bNotEmbedded;
+    const embeddedDistrictsList = U.falseIndexes(bNotEmbeddedByDistrict);
+    const freeOfHoles = bNotEmbeddedByDistrict.at(-1);
+    const roughlyEqual = (_a = s.data.newScorecard) === null || _a === void 0 ? void 0 : _a.populationDeviation.roughlyEqual;
+    const reqScore = completeness && contiguity && freeOfHoles && roughlyEqual;
+    // Get values to support details/notes entries in dra-client
+    const unassignedFeaturesDetail = (0, requirements_1.getUnassignedFeatures)(s.data);
+    const emptyDistrictsDetail = (0, requirements_1.emptyDistricts)(popByDistricts);
+    const discontiguousDistrictsDetail = discontiguousDistrictsList;
+    const embeddedDistrictsDetail = embeddedDistrictsList;
+    const newScorecard = s.data.newScorecard;
+    const populationDeviationDetail = newScorecard.populationDeviation.deviation;
+    const deviationThresholdDetail = U.trim(dra_analytics_1.Rate.popdevThreshold(s.data.legislativeDistricts));
+    const census = U.deepCopy(s.data.config['descriptions']['CENSUS']);
+    // Populate the checklist
+    let paRequirements = {
+        score: reqScore,
+        metrics: {
+            complete: completeness,
+            contiguous: contiguity,
+            freeOfHoles: freeOfHoles,
+            equalPopulation: roughlyEqual
+        },
+        details: {
+            unassignedFeatures: unassignedFeaturesDetail,
+            emptyDistricts: emptyDistrictsDetail,
+            discontiguousDistricts: discontiguousDistrictsDetail,
+            embeddedDistricts: embeddedDistrictsDetail,
+            populationDeviation: populationDeviationDetail,
+            deviationThreshold: deviationThresholdDetail
+        },
+        datasets: {
+            census: census,
+        },
+        resources: {
+        // stateReqs: reqLinkToStateReqs
+        }
+    };
+    return paRequirements;
+}
+function _extractRatings(s) {
+    const scorecard = s.data.legacyScorecardAlt;
+    const r = {
+        proportionality: scorecard.partisan.bias.score,
+        competitiveness: scorecard.partisan.responsiveness.score,
+        minorityRights: scorecard.minority.score,
+        compactness: scorecard.compactness.score,
+        splitting: scorecard.splitting.score
+    };
+    s.data.ratings = r;
+    return r;
+}
+function _makeDistrictStatistics(s) {
+    const table = s.data.aggregates.transpose();
+    const datasets = {
+        shapes: U.deepCopy(s.data.config['descriptions']['SHAPES']),
+        census: U.deepCopy(s.data.config['descriptions']['CENSUS']),
+        vap: U.deepCopy(s.data.config['descriptions']['VAP']),
+        election: U.deepCopy(s.data.config['descriptions']['ELECTION'])
+    };
+    const statistics = {
+        table: table,
+        details: {}, // None at this time
+        datasets: datasets,
+        resources: {} // None at this time
+    };
+    return statistics;
+}
+// HELPERS
+function getGoodShapes(rawShapes) {
+    // Filter the real shapes & throw everything else away
+    let goodShapes = {};
+    goodShapes['type'] = "FeatureCollection";
+    goodShapes['features'] = [];
+    for (let i = 0; i < rawShapes.features.length; i++) {
+        const shape = rawShapes.features[i];
+        if (isAShape(shape)) {
+            const d = baseclient_1.Poly.polyDescribe(shape);
+            let f = {
+                type: 'Feature',
+                properties: { districtID: `${i + 1}` },
+                geometry: {
+                    type: (d.npoly > 1) ? 'MultiPolygon' : 'Polygon',
+                    coordinates: shape.geometry.coordinates
+                }
+            };
+            goodShapes.features.push(f);
+        }
+    }
+    return goodShapes;
+}
 function isAShape(poly) {
     if (poly == null)
         return false;
@@ -288,19 +306,21 @@ function isAShape(poly) {
         return false;
     return poly.geometry && poly.geometry.coordinates && !U.isArrayEmpty(poly.geometry.coordinates);
 }
+// END
 
 
 /***/ }),
 
-/***/ "./src/_data.ts":
-/*!**********************!*\
-  !*** ./src/_data.ts ***!
-  \**********************/
+/***/ "./src/cohesive.ts":
+/*!*************************!*\
+  !*** ./src/cohesive.ts ***!
+  \*************************/
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
 //
-// DATA ABSTRACTION LAYER
+// ANALYZE SIMPLE COUNTY SPLITTING
+// The main county-district splitting code is in the dra-analytics package.
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -336,652 +356,487 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.GraphClass = exports.Plan = exports.State = exports.Counties = exports.Features = exports.Districts = void 0;
-exports.inferSelectedMinority = inferSelectedMinority;
-exports.geoIDForFeature = geoIDForFeature;
-exports.fieldForFeature = fieldForFeature;
-exports.invertPlan = invertPlan;
-const dra_analytics_1 = __webpack_require__(/*! @dra2020/dra-analytics */ "@dra2020/dra-analytics");
-const T = __importStar(__webpack_require__(/*! ./types */ "./src/types.ts"));
+exports.findCountiesSplitUnexpectedly = findCountiesSplitUnexpectedly;
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
-const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
-const compact_1 = __webpack_require__(/*! ./compact */ "./src/compact.ts");
-const dra_analytics_2 = __webpack_require__(/*! @dra2020/dra-analytics */ "@dra2020/dra-analytics");
-const dra_types_1 = __webpack_require__(/*! @dra2020/dra-types */ "@dra2020/dra-types");
-// DEBUG COUNTERS
-let nMissingDataset = 0;
-let nMissingProperty = 0;
-class Districts {
-    constructor(s, ds) {
-        this._geoProperties = {};
-        this._session = s;
-        this._shapes = ds;
-        this.table = this.initTable();
-    }
-    getDistrictShapes() {
-        return this._shapes;
-    }
-    getDistrictShapeByID(id) {
-        // NOTE - Find the district shape by ID (not index)
-        // return this._shapes.features[id]; 
-        for (let f of this._shapes.features) {
-            if (f.properties && (f.properties.id == id)) {
-                return f;
-            }
-        }
-        return undefined;
-    }
-    getGeoProperties(i) {
-        // Make sure the district shape exists & has geo properties
-        if (i in this._geoProperties)
-            return this._geoProperties[i];
-        else
-            return null;
-    }
-    setGeoProperties(i, p) { this._geoProperties[i] = p; }
-    // +1 for dummy unassigned 0 "district" and +1 for N+1 summary "district" for state-level values. 
-    // Real districts are 1–N.
-    numberOfRows() { return this._session.state.nDistricts + 2; }
-    numberOfWorkingDistricts() { return this._session.state.nDistricts + 1; }
-    initTable() {
-        let nRows = this.numberOfRows(); // # of districts plus unassigned & summary
-        const t = {
-            totalPop: U.initArray(nRows, null),
-            popDevPct: U.initArray(nRows, null),
-            bEqualPop: U.initArray(nRows, null),
-            bNotEmpty: U.initArray(nRows, null),
-            bContiguous: U.initArray(nRows, null),
-            bNotEmbedded: U.initArray(nRows, null),
-            countySplits: U.initArray(nRows, null),
-            demVotes: U.initArray(nRows, null),
-            repVotes: U.initArray(nRows, null),
-            otherVotes: U.initArray(nRows, null),
-            demPct: U.initArray(nRows, null),
-            repPct: U.initArray(nRows, null),
-            otherPct: U.initArray(nRows, null),
-            demSeat: U.initArray(nRows, null),
-            totalVAP: U.initArray(nRows, null),
-            minorityPop: U.initArray(nRows, null),
-            whitePop: U.initArray(nRows, null),
-            blackPop: U.initArray(nRows, null),
-            hispanicPop: U.initArray(nRows, null),
-            pacificPop: U.initArray(nRows, null),
-            asianPop: U.initArray(nRows, null),
-            nativePop: U.initArray(nRows, null),
-            whitePct: U.initArray(nRows, null),
-            minorityPct: U.initArray(nRows, null),
-            blackPct: U.initArray(nRows, null),
-            hispanicPct: U.initArray(nRows, null),
-            pacificPct: U.initArray(nRows, null),
-            asianPct: U.initArray(nRows, null),
-            nativePct: U.initArray(nRows, null)
-        };
-        return t;
-    }
-    // MMD - Generalized district statistics for MMD's
-    // This is the workhorse computational routine!
-    recalcStatistics(bLog = false) {
-        // Initialize debug counters
-        nMissingDataset = 0;
-        nMissingProperty = 0;
-        // MMD - Generalized targetSize
-        // Compute these once per recalc cycle
-        const nDistricts = this._session.state.nDistricts;
-        const repsByDistrict = this._session.repsByDistrict;
-        const nReps = this._session.state.nReps;
-        const stateTotal = this._session.state.totalPop;
-        const targetSize = this._session.state.targetSize;
-        // const targetSize = Math.round(this._session.state.totalPop / this._session.state.nDistricts);
-        const deviationThreshold = this._session.populationDeviationThreshold();
-        // let planByDistrict = this._session.plan.byDistrictID();
-        const plan = this._session.plan;
-        const graph = this._session.graph;
-        // Add an extra 0th virtual county bucket for county-district splitting analysis 
-        let nCountyBuckets = this._session.counties.nCounties + 1;
-        // INITIALIZE STATE VALUES THAT WILL BE ACCUMULATED
-        // 10-22-2020 - Added Other votes
-        let stateDemVote = 0;
-        let stateRepVote = 0;
-        let stateOthVote = 0;
-        let stateTotVote = 0;
-        // let stateTPVote = 0;
-        let stateVAPPop = 0;
-        let stateWhitePop = 0;
-        let stateMinorityPop = 0;
-        let stateBlackPop = 0;
-        let stateHispanicPop = 0;
-        let statePacificPop = 0;
-        let stateAsianPop = 0;
-        let stateNativePop = 0;
-        // NOTE - These plan-level booleans are set in their respective analytics:
-        // - Equal population (bEqualPop)
-        // - Complete (bNotEmpty)
-        // - Contiguous (bContiguous)
-        // - Free of holes (bNotEmbedded)
-        // Loop over the districts (including the dummy unassigned one)
-        for (let i = 0; i < this.numberOfWorkingDistricts(); i++) {
-            // INITIALIZE DISTRICT VALUES THAT WILL BE ACCUMULATED (VS. DERIVED)
-            let featurePop;
-            let totalPop = 0;
-            let countySplits = U.initArray(nCountyBuckets, 0);
-            // 10-22-2020 - Added Other votes
-            let demVotes = 0;
-            let repVotes = 0;
-            let othVotes = 0;
-            let totVotes = 0;
-            let totalVAP = 0;
-            let whitePop = 0;
-            let blackPop = 0;
-            let hispanicPop = 0;
-            let pacificPop = 0;
-            let asianPop = 0;
-            let nativePop = 0;
-            // NOTE - Only report explicitly found validity issues
-            let bNotEmpty = false;
-            let bContiguous = true;
-            let bNotEmbedded = true;
-            let bEqualPop = true;
-            // HACK - Because "this" gets ghosted inside the forEach loop below
-            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%.
-            let popDevPct = (i > 0) ? (targetSize / targetSize) : 0 / targetSize;
-            // Get the geoIDs assigned to the district
-            // Guard against empty districts
-            let geoIDs = this._session.plan.geoIDsForDistrictID(i);
-            if (geoIDs && (geoIDs.size > 0)) {
-                bNotEmpty = true;
-                // ... loop over the geoIDs creating district-by-district statistics 
-                geoIDs.forEach(function (geoID) {
-                    // 01-04-22 -- Removed water-only guard
-                    // // Skip water-only features
-                    // if (!(U.isWaterOnly(geoID)))
-                    // {
-                    // Map from geoID to feature index
-                    let featureID = outerThis._session.features.featureID(geoID);
-                    let f = outerThis._session.features.featureByIndex(featureID);
-                    if (f == undefined) {
-                        if (bLog)
-                            console.log("Statistics: Skipping undefined feature in district statistics: GEOID =", geoID, "Feature ID =", featureID);
-                    }
-                    else {
-                        // ACCUMULATE VALUES
-                        // Total population of each feature
-                        // NOTE - This result is used more than once
-                        // 03-27-21
-                        const dkCENSUS = outerThis._session.features._keys["CENSUS" /* T.Dataset.CENSUS */];
-                        featurePop = fieldForFeature(f, dkCENSUS, 0 /* T.FeatureField.TotalPop */);
-                        // featurePop = outerThis._session.features.fieldForFeature(f, T.Dataset.CENSUS, T.FeatureField.TotalPop);
-                        // Total district population
-                        totalPop += featurePop;
-                        // Ignore features when the county is unrecognized
-                        const countyFIPS = U.parseGeoID(geoID)['county'];
-                        if (U.keyExists(countyFIPS, outerThis._session.counties.index)) {
-                            // Total population by counties w/in a district,
-                            // except the dummy unassigned district 0
-                            if (i > 0)
-                                countySplits[outerThis.getCountyIndex(geoID)] += featurePop;
-                        }
-                        else {
-                            if (bLog)
-                                console.log("Statistics: County not recognized:", geoID);
-                        }
-                        // Democratic and Republican vote totals
-                        // 10-22-2020 - Added Other votes
-                        // 10-24-2020 - Added guard against inconsistent election data
-                        // 03-27-2021
-                        const dkELECTION = outerThis._session.features._keys["ELECTION" /* T.Dataset.ELECTION */];
-                        const featureDem = fieldForFeature(f, dkELECTION, 7 /* T.FeatureField.DemVotes */);
-                        // const featureDem = outerThis._session.features.fieldForFeature(f, T.Dataset.ELECTION, T.FeatureField.DemVotes);
-                        const featureRep = fieldForFeature(f, dkELECTION, 8 /* T.FeatureField.RepVotes */);
-                        const featureTot = fieldForFeature(f, dkELECTION, 9 /* T.FeatureField.TotalVotes */);
-                        demVotes += featureDem;
-                        repVotes += featureRep;
-                        totVotes += featureTot;
-                        // NOTE: Unless you grab the values above before accumulating them,
-                        //   you can't accumulate othVotes for districts. You must calculate
-                        //   them by implication later.
-                        if (bLog) {
-                            const bBadElection = (featureDem + featureRep > featureTot) ? true : false;
-                            if (bBadElection)
-                                console.log("Statistics: Inconsistent election data for precinct:", geoID, featureDem, featureRep, featureTot);
-                        }
-                        // Voting-age demographic breakdowns (or citizen voting-age)
-                        // 03-27-21
-                        const dkVAP = outerThis._session.features._keys["VAP" /* T.Dataset.VAP */];
-                        totalVAP += fieldForFeature(f, dkVAP, 0 /* T.FeatureField.TotalPop */);
-                        // totalVAP += outerThis._session.features.fieldForFeature(f, T.Dataset.VAP, T.FeatureField.TotalPop);
-                        whitePop += fieldForFeature(f, dkVAP, 1 /* T.FeatureField.WhitePop */);
-                        blackPop += fieldForFeature(f, dkVAP, 2 /* T.FeatureField.BlackPop */);
-                        hispanicPop += fieldForFeature(f, dkVAP, 3 /* T.FeatureField.HispanicPop */);
-                        pacificPop += fieldForFeature(f, dkVAP, 5 /* T.FeatureField.PacificPop */);
-                        asianPop += fieldForFeature(f, dkVAP, 4 /* T.FeatureField.AsianPop */);
-                        nativePop += fieldForFeature(f, dkVAP, 6 /* T.FeatureField.NativePop */);
-                    }
-                    // }
-                    // else
-                    // {
-                    //   if (bLog) console.log("Statistics: Skipping water-only feature in district statistics:", geoID);
-                    // }
-                });
-                //console.log(`totalVAP: ${totalVAP}, blackPop: ${blackPop}`);
-                // COMPUTE DERIVED VALUES
-                // MMD - Generalized the per-district population deviations's for MMD's with variable #'s of reps per district.
-                // - The real districts are indexed 1–N.
-                // - But the # reps per district are indexed from zero.
-                // Population deviation % and equal population (boolean) by district.
-                if (i > 0) {
-                    if (totalPop > 0) {
-                        const n = (repsByDistrict) ? repsByDistrict[i - 1] : 1; // MMD - # of reps for the district
-                        popDevPct = (totalPop - (n * targetSize)) / (n * targetSize); // MMD
-                        // popDevPct = (totalPop - targetSize) / targetSize;
-                        bEqualPop = (Math.abs(popDevPct) <= deviationThreshold);
+/*
+ 
+Sample results for NC 2016 congressional plan
+________________________________________________________________________________
+ 
+State: NC
+Census: 2010
+Total population: 9,535,483
+Number of districts: 13
+Target district size: 733,499
+Number of counties: 100
+ 
+Equal Population: 11.24% deviation
+Compactness: None
+Proportionality: 27.67% gap
+Cohesiveness: 11 unexpected splits, affecting 27.14% of the total population
+ 
+These counties are split unexpectedly (meaning that they're smaller than a district):
+ 
+   • Bladen
+   • Buncombe
+   • Catawba
+   • Cumberland
+   • Durham
+   • Guilford
+   • Iredell
+   • Johnston
+   • Pitt
+   • Rowan
+   • Wilson
+ 
+*/
+// This analysis *assumes* that a map is complete (or nearly so).
+// - We do the analysis regardless, but
+// - Protect against weird results in the client
+function findCountiesSplitUnexpectedly(container, bLog = false) {
+    // Simulate an old school test entry, to preserve this and downstream code
+    let test = {};
+    test['score'] = undefined;
+    test['details'] = {};
+    // THE THREE VALUES TO DETERMINE FOR A PLAN
+    let unexpectedSplits = 0;
+    let unexpectedAffected = 0;
+    let countiesSplitUnexpectedly = [];
+    // FIRST, ANALYZE THE COUNTY SPLITTING FOR THE PLAN
+    // Get the county-district pivot ("splits")
+    let CxD = container.CxD;
+    // NOTE - Unlike the legacy code that uses the district statistics table with extra virtual districts & counties,
+    //   this CxD matrix just has the right number that are zero-indexed.
+    // Find the single-county districts, i.e., districts NOT split across counties.
+    // Ignore the dummy unassigned 0 and N+1 summary "districts."
+    let singleCountyDistricts = [];
+    for (let d = 0; d < container.state.nDistricts; d++) {
+        // See if there's only one county partition
+        // Ignore the dummy unassigned 0 "county."
+        let nCountiesInDistrict = 0;
+        for (let c = 0; c < container.counties.nCounties; c++) {
+            // Guard against empty district
+            if (CxD[d]) {
+                if (CxD[d][c] > 0) {
+                    nCountiesInDistrict += 1;
+                    if (nCountiesInDistrict > 1) {
+                        break;
                     }
                 }
-                // 10-22-2020 - Added Other votes. Revised from two-party to include Other.
-                // let totVotes: number;  <<< Now being accumulated by district
-                let demPct = 0;
-                let repPct = 0;
-                let othPct = 0;
-                let DemSeat = 0;
-                // totVotes now being accumulated by district
-                if (totVotes > 0) {
-                    // 10-24-2020 - Added guard against inconsistent election data.
-                    const bBadElection = (demVotes + repVotes > totVotes) ? true : false;
-                    if (bBadElection && bLog)
-                        console.log("Statistics: Inconsistent election data for district:", i, demVotes, repVotes, totVotes);
-                    if (bBadElection)
-                        totVotes = demVotes + repVotes; // HACK to guard against bad election data!
-                    othVotes = totVotes - demVotes - repVotes;
-                    demPct = demVotes / totVotes;
-                    repPct = repVotes / totVotes;
-                    othPct = othVotes / totVotes;
-                    DemSeat = dra_analytics_2.Partisan.fptpWin(demPct);
-                }
-                // Total minority VAP
-                let minorityPop = totalVAP - whitePop;
-                // Voting-age demographic proportions (or citizen voting-age)
-                let whitePct = 0;
-                let minorityPct = 0;
-                let blackPct = 0;
-                let hispanicPct = 0;
-                let pacificPct = 0;
-                let asianPct = 0;
-                let nativePct = 0;
-                if (totalVAP > 0) {
-                    whitePct = whitePop / totalVAP;
-                    minorityPct = minorityPop / totalVAP;
-                    blackPct = blackPop / totalVAP;
-                    hispanicPct = hispanicPop / totalVAP;
-                    pacificPct = pacificPop / totalVAP;
-                    asianPct = asianPop / totalVAP;
-                    nativePct = nativePop / totalVAP;
-                }
-                // COMPUTE DISTRICT-LEVEL VALUES
-                // Validations
-                // Leave the default values for the dummy unassigned district,
-                // and districts that are empty.
-                if ((i > 0) && bNotEmpty) {
-                    // GRAPH - 10/05/2020 - Using dra-graph instead.
-                    // bContiguous = isConnected(geoIDs, graph);
-                    // bNotEmbedded = (!isEmbedded(i, planByDistrict[i], plan, graph));
-                    // GRAPH - 10/05/2020 - Using dra-graph.
-                    const features = geoIDs;
-                    const nakedGraph = graph._graph;
-                    const nakedPlan = plan._planByGeoID;
-                    bContiguous = dra_analytics_1.Graph.isConnected(features, nakedGraph, bLog);
-                    bNotEmbedded = (!dra_analytics_1.Graph.isEmbedded(i, features, nakedPlan, nakedGraph, bLog));
-                }
-                { // UPDATE THE DISTRICT STATISTICS
-                    // NOTE - These are set below for both non-empty & empty districts:
-                    // * bNotEmpty;
-                    // * bContiguous;
-                    // * bNotEmbedded;
-                    // * totalPop;
-                    // * bEqualPop;
-                    this.table.popDevPct[i] = popDevPct;
-                    this.table.demVotes[i] = demVotes;
-                    this.table.repVotes[i] = repVotes;
-                    this.table.otherVotes[i] = othVotes;
-                    this.table.demPct[i] = demPct;
-                    this.table.repPct[i] = repPct;
-                    this.table.otherPct[i] = othPct;
-                    this.table.demSeat[i] = DemSeat;
-                    this.table.whitePop[i] = whitePop;
-                    this.table.minorityPop[i] = minorityPop;
-                    this.table.blackPop[i] = blackPop;
-                    this.table.hispanicPop[i] = hispanicPop;
-                    this.table.pacificPop[i] = pacificPop;
-                    this.table.asianPop[i] = asianPop;
-                    this.table.nativePop[i] = nativePop;
-                    this.table.totalVAP[i] = totalVAP;
-                    this.table.whitePct[i] = whitePct;
-                    this.table.minorityPct[i] = minorityPct;
-                    this.table.blackPct[i] = blackPct;
-                    this.table.hispanicPct[i] = hispanicPct;
-                    this.table.pacificPct[i] = pacificPct;
-                    this.table.asianPct[i] = asianPct;
-                    this.table.nativePct[i] = nativePct;
-                }
-                { // ACCUMULATE STATE STATISTICS FROM DISTRICT TOTALS
-                    // 10-22-2020 - Added Other votes
-                    stateTotVote += totVotes;
-                    // stateTPVote += totVotes;
-                    stateDemVote += demVotes;
-                    stateRepVote += repVotes;
-                    stateOthVote += othVotes;
-                    stateVAPPop += totalVAP;
-                    stateWhitePop += whitePop;
-                    stateMinorityPop += minorityPop;
-                    stateBlackPop += blackPop;
-                    stateHispanicPop += hispanicPop;
-                    statePacificPop += pacificPop;
-                    stateAsianPop += asianPop;
-                    stateNativePop += nativePop;
-                }
-            }
-            else { // If a district is empty, zero these results (vs. null)
-                this.table.popDevPct[i] = popDevPct;
-                this.table.demVotes[i] = 0;
-                this.table.repVotes[i] = 0;
-                this.table.otherVotes[i] = 0;
-                this.table.demPct[i] = 0;
-                this.table.repPct[i] = 0;
-                this.table.otherPct[i] = 0;
-                this.table.demSeat[i] = 0;
-                this.table.whitePop[i] = 0;
-                this.table.minorityPop[i] = 0;
-                this.table.blackPop[i] = 0;
-                this.table.hispanicPop[i] = 0;
-                this.table.pacificPop[i] = 0;
-                this.table.asianPop[i] = 0;
-                this.table.nativePop[i] = 0;
-                this.table.totalVAP[i] = 0;
-                this.table.whitePct[i] = 0;
-                this.table.minorityPct[i] = 0;
-                this.table.blackPct[i] = 0;
-                this.table.hispanicPct[i] = 0;
-                this.table.pacificPct[i] = 0;
-                this.table.asianPct[i] = 0;
-                this.table.nativePct[i] = 0;
-            }
-            { // UPDATE THESE DISTRICT STATISTICS, EVEN WHEN THEY ARE EMPTY
-                this.table.totalPop[i] = totalPop;
-                this.table.bNotEmpty[i] = bNotEmpty;
-                this.table.bContiguous[i] = bContiguous;
-                this.table.bNotEmbedded[i] = bNotEmbedded;
-                this.table.bEqualPop[i] = bEqualPop;
-                this.table.countySplits[i] = countySplits;
             }
         }
-        // UPDATE STATE STATISTICS
-        let summaryRow = this.numberOfRows() - 1;
-        // 10-22-2020 - Added Other votes
-        if (stateTotVote > 0) {
-            this.table.demVotes[summaryRow] = stateDemVote;
-            this.table.repVotes[summaryRow] = stateRepVote;
-            this.table.demPct[summaryRow] = stateDemVote / stateTotVote;
-            this.table.repPct[summaryRow] = stateRepVote / stateTotVote;
-            this.table.otherPct[summaryRow] = stateOthVote / stateTotVote;
-        }
-        if (stateVAPPop > 0) {
-            this.table.totalVAP[summaryRow] = stateVAPPop;
-            this.table.whitePct[summaryRow] = stateWhitePop / stateVAPPop;
-            this.table.minorityPct[summaryRow] = stateMinorityPop / stateVAPPop;
-            this.table.blackPct[summaryRow] = stateBlackPop / stateVAPPop;
-            this.table.hispanicPct[summaryRow] = stateHispanicPop / stateVAPPop;
-            this.table.pacificPct[summaryRow] = statePacificPop / stateVAPPop;
-            this.table.asianPct[summaryRow] = stateAsianPop / stateVAPPop;
-            this.table.nativePct[summaryRow] = stateNativePop / stateVAPPop;
-        }
-        if (bLog) {
-            console.log(`Statistics: ${nMissingDataset} features with missing datasets.`);
-            console.log(`Statistics: ${nMissingProperty} features with missing properties.`);
+        // If so, save the district
+        if (nCountiesInDistrict == 1) {
+            singleCountyDistricts.push(d + 1); // Districts are 1-indexed
         }
     }
-    // NOTE - I did not roll these into district statistics, because creating the
-    //   district shapes themselves is the big district-by-district activity, these
-    //   calc's already work, and I'm not going to expose these values. Wrapping
-    //   the underlying function and exposing it here to illustrate the parallelism
-    //   with recalcStatistics(). These are called in tandem by doAnalyzeDistricts().
-    extractDistrictShapeProperties(bLog = false) {
-        (0, compact_1.extractDistrictProperties)(this._session, bLog);
-    }
-    getCountyIndex(geoID) {
-        let countyFIPS = U.parseGeoID(geoID)['county'];
-        let countyIndex = this._session.counties.indexFromFIPS(countyFIPS);
-        return countyIndex;
-    }
-    // 11-03-2020 - Added for racially polarized voting analysis
-    extractVotesByDemographic(districtID, groups, bLog = false) {
-        let ids = [];
-        let comparisonPts = []; // Either White -or- (1 – <selected minority>) i.e., White++
-        let hispanicPts = [];
-        let blackPts = [];
-        let pacificPts = [];
-        let asianPts = [];
-        let nativePts = [];
-        let minorityPts = [];
-        // let dataDump: any[] = [];  // For testing
-        // Gather [demographic %, D %] points for the selected district ID
-        let i = districtID;
-        // HACK - For comparing a minority group to everyone else (vs. just White),
-        //   infer the *single* minority group that has been selected.
-        const selectedMinority = inferSelectedMinority(groups);
-        // HACK - Because "this" gets ghosted inside the forEach loop below
-        let outerThis = this;
-        // Get the geoIDs assigned to the district
-        // Guard against empty districts
-        let geoIDs = this._session.plan.geoIDsForDistrictID(i);
-        if (geoIDs && (geoIDs.size > 0)) {
-            // ... loop over the geoIDs collecting the points for ecological regression
-            geoIDs.forEach(function (geoID) {
-                // Skip water-only features
-                if (!(U.isWaterOnly(geoID))) {
-                    // Map from geoID to feature index
-                    let featureID = outerThis._session.features.featureID(geoID);
-                    let f = outerThis._session.features.featureByIndex(featureID);
-                    if (!(f == undefined)) {
-                        // Calculate the Dem two-party vote
-                        // 03-27-21
-                        const dkELECTION = outerThis._session.features._keys["ELECTION" /* T.Dataset.ELECTION */];
-                        const featureDem = fieldForFeature(f, dkELECTION, 7 /* T.FeatureField.DemVotes */);
-                        const featureRep = fieldForFeature(f, dkELECTION, 8 /* T.FeatureField.RepVotes */);
-                        // const featureRep = outerThis._session.features.fieldForFeature(f, T.Dataset.ELECTION, T.FeatureField.RepVotes);
-                        if ((featureDem + featureRep) > 0) {
-                            const pctDem = featureDem / (featureDem + featureRep);
-                            // Calculate the VAP/CVAP percentages by demographic
-                            // 03-27-21
-                            const dkVAP = outerThis._session.features._keys["VAP" /* T.Dataset.VAP */];
-                            const totalVAP = fieldForFeature(f, dkVAP, 0 /* T.FeatureField.TotalPop */);
-                            // const totalVAP = outerThis._session.features.fieldForFeature(f, T.Dataset.VAP, T.FeatureField.TotalPop);
-                            if (totalVAP > 0) {
-                                // Gather all points, for debugging purposes ...
-                                const hispanicVAP = fieldForFeature(f, dkVAP, 3 /* T.FeatureField.HispanicPop */);
-                                const blackVAP = fieldForFeature(f, dkVAP, 2 /* T.FeatureField.BlackPop */);
-                                const pacificVAP = fieldForFeature(f, dkVAP, 5 /* T.FeatureField.PacificPop */);
-                                const asianVAP = fieldForFeature(f, dkVAP, 4 /* T.FeatureField.AsianPop */);
-                                const nativeVAP = fieldForFeature(f, dkVAP, 6 /* T.FeatureField.NativePop */);
-                                const pctHispanic = hispanicVAP / totalVAP;
-                                const pctBlack = blackVAP / totalVAP;
-                                const pctPacific = pacificVAP / totalVAP;
-                                const pctAsian = asianVAP / totalVAP;
-                                const pctNative = nativeVAP / totalVAP;
-                                const whiteVAP = fieldForFeature(f, dkVAP, 1 /* T.FeatureField.WhitePop */);
-                                const minorityVAP = totalVAP - whiteVAP;
-                                const pctMinority = minorityVAP / totalVAP;
-                                let pctComparison = whiteVAP / totalVAP;
-                                if (groups.invertSelection) {
-                                    switch (selectedMinority) {
-                                        case 'Hispanic': {
-                                            pctComparison = (totalVAP - hispanicVAP) / totalVAP;
-                                            break;
-                                        }
-                                        case 'Black': {
-                                            pctComparison = (totalVAP - blackVAP) / totalVAP;
-                                            break;
-                                        }
-                                        case 'Pacific': {
-                                            pctComparison = (totalVAP - pacificVAP) / totalVAP;
-                                            break;
-                                        }
-                                        case 'Asian': {
-                                            pctComparison = (totalVAP - asianVAP) / totalVAP;
-                                            break;
-                                        }
-                                        case 'Native': {
-                                            pctComparison = (totalVAP - nativeVAP) / totalVAP;
-                                            break;
-                                        }
-                                        case 'Minority': {
-                                            pctComparison = (totalVAP - minorityVAP) / totalVAP;
-                                            break;
-                                        }
-                                        default: {
-                                            console.log("Selected minority not recognized!");
-                                            break;
-                                        }
-                                    }
-                                }
-                                ids.push(geoID);
-                                comparisonPts.push({ x: pctComparison, y: pctDem }); // White -or- (1 – <selected minority>)
-                                hispanicPts.push({ x: pctHispanic, y: pctDem });
-                                blackPts.push({ x: pctBlack, y: pctDem });
-                                pacificPts.push({ x: pctPacific, y: pctDem });
-                                asianPts.push({ x: pctAsian, y: pctDem });
-                                nativePts.push({ x: pctNative, y: pctDem });
-                                minorityPts.push({ x: pctMinority, y: pctDem });
-                                /* Dump test data based on config switch
-                                const s: AnalyticsSession = outerThis._session;
-                                const bDump = (('dump' in s.config) && s.config.dump) ? true : false;
-                                if (bDump)
-                                {
-                                  const row: number[] = [pctWhite, pctMinority, pctBlack, pctHispanic, pctPacific, pctAsian, pctNative, pctDem];
-                                  dataDump.push(row);
-                                }
-                                */
-                            }
-                            else {
-                                if (bLog)
-                                    console.log("RPV: Total VAP not > 0.");
-                            }
-                        }
-                        else {
-                            if (bLog)
-                                console.log("RPV: D + R not > 0.");
-                        }
+    // Process the splits/partitions in the plan:
+    // - Count the total # of partitions,
+    // - Find the counties split across districts, and
+    // - Accumulate the number people affected (except when single-county districts)
+    let nPartitionsOverall = 0;
+    let splitCounties = new Set(); // The counties that are split across districts
+    let totalAffected = 0; // The total population affected by those splits
+    // For enumerating # of times each split county is split
+    let countyIndexesWithSplits = [];
+    for (let c = 0; c < container.counties.nCounties; c++) {
+        let nCountyParts = 0;
+        let subtotal = 0;
+        for (let d = 0; d < container.state.nDistricts; d++) {
+            // Guard against empty district
+            if (CxD[d]) {
+                if (CxD[d][c] > 0) {
+                    nPartitionsOverall += 1;
+                    nCountyParts += 1;
+                    if (!(U.arrayContains(singleCountyDistricts, d + 1))) // Districts are 1-indexed
+                     {
+                        subtotal += CxD[d][c];
                     }
                 }
-            });
-            // ... but only keep points for the demographics that are going to be analyzed
-            // dataDump = [];
-            return {
-                ids: ids,
-                comparison: comparisonPts,
-                minority: groups.minority ? minorityPts : [],
-                black: groups.black ? blackPts : [],
-                hispanic: groups.hispanic ? hispanicPts : [],
-                pacific: groups.pacific ? pacificPts : [],
-                asian: groups.asian ? asianPts : [],
-                native: groups.native ? nativePts : []
-            };
+            }
+        }
+        if (nCountyParts > 1) {
+            // Counties are 1-indexed (because of the virtual county bucket)
+            splitCounties.add(c + 1);
+            totalAffected += subtotal;
+            // Enumerate # of times each split county is split
+            countyIndexesWithSplits.push([c + 1, nCountyParts - 1]);
         }
-        // If a district is empty
-        return undefined;
     }
+    // Enumerate # of times each split county is split
+    let splitCountiesWithSplits = [];
+    countyIndexesWithSplits.forEach(pair => {
+        const index = pair[0];
+        const splits = pair[1];
+        // Convert 1–N indices to FIPS codes
+        const fips = container.counties.fips[index];
+        if (fips) {
+            // Convert FIPS codes to names
+            const name = container.counties.nameFromFIPS(fips);
+            // Combine # of splits with names
+            if (name) {
+                const text = `${name} (${splits})`;
+                splitCountiesWithSplits.push(text);
+            }
+        }
+    });
+    // Sort by name
+    splitCountiesWithSplits.sort();
+    // Convert county ordinals to FIPS codes
+    let splitCountiesFIPS = U.getSelectObjectKeys(container.counties.index, [...splitCounties]);
+    // THEN TAKE ACCOUNT OF THE COUNTY SPLITTING THAT IS EXPECTED (REQUIRED)
+    // Compute the total number of splits this way, in case any counties are split
+    // more than once. I.e., it's not just len(all_counties_split).
+    let nSplits = nPartitionsOverall - container.counties.nCounties;
+    // Determine the number of *unexpected* splits. NOTE: Prevent negative numbers,
+    // in case you have a plan the *doesn't* split counties that would have to be
+    // split due to their size.
+    unexpectedSplits = Math.max(0, nSplits - container.state.expectedSplits);
+    // Subtract off the total population that *has* to be affected by splits,
+    // because their counties are too big. NOTE: Again, prevent negative numbers, 
+    // in case you have a plan the *doesn't* split counties that would have to be
+    // split due to their size.
+    unexpectedAffected = U.trim(Math.max(0, totalAffected - container.state.expectedAffected) / container.state.totalPop);
+    // Find the counties that are split *unexpectedly*. From all the counties that
+    // are split, remove those that *have* to be split, because they are bigger than
+    // a district.
+    let countiesSplitUnexpectedlyFIPS = [];
+    for (let fips of splitCountiesFIPS) {
+        if (!(U.arrayContains(container.state.tooBigFIPS, fips))) {
+            countiesSplitUnexpectedlyFIPS.push(fips);
+        }
+    }
+    //  ... and convert the FIPS codes to county names.
+    for (let fips of countiesSplitUnexpectedlyFIPS) {
+        const name = container.counties.nameFromFIPS(fips);
+        // 07-06-20 - Guard in case the FIPS code isn't in the county name lookup
+        if (name)
+            countiesSplitUnexpectedly.push(name);
+        else {
+            if (bLog)
+                console.log("County is not in the FIPS-to-name lookup table: ", fips);
+        }
+    }
+    countiesSplitUnexpectedly = countiesSplitUnexpectedly.sort();
+    test['score'] = U.trim(unexpectedAffected);
+    test['details']['nSplits'] = nSplits;
+    test['details']['unexpectedSplits'] = unexpectedSplits;
+    test['details']['countiesSplitUnexpectedly'] = countiesSplitUnexpectedly;
+    test['details']['expectedSplits'] = container.state.expectedSplits;
+    test['details']['tooBigName'] = container.state.tooBigName;
+    test['details']['singleCountyDistrictMax'] = container.state.singleCountyDistrictMax;
+    test['details']['nCountiesSplit'] = splitCountiesFIPS.length;
+    test['details']['nSingleCountyDistricts'] = singleCountyDistricts.length;
+    test['details']['countiesWithSplits'] = splitCountiesWithSplits;
+    return test;
 }
-exports.Districts = Districts;
-function inferSelectedMinority(groups) {
-    if (groups.hispanic)
-        return 'Hispanic';
-    if (groups.black)
-        return 'Black';
-    if (groups.pacific)
-        return 'Pacific';
-    if (groups.asian)
-        return 'Asian';
-    if (groups.native)
-        return 'Native';
-    if (groups.minority)
-        return 'Minority';
-    return 'No minority selected!';
+// END
+
+
+/***/ }),
+
+/***/ "./src/data.ts":
+/*!*********************!*\
+  !*** ./src/data.ts ***!
+  \*********************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+
+//
+// DATA ABSTRACTION LAYER
+//
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Plan = exports.State = exports.Counties = exports.Features = exports.Districts = exports.Aggregates = exports.SessionData = void 0;
+exports.geoIDForFeature = geoIDForFeature;
+exports.fieldForFeature = fieldForFeature;
+exports.invertPlan = invertPlan;
+exports.processConfig = processConfig;
+const dra_types_1 = __webpack_require__(/*! @dra2020/dra-types */ "@dra2020/dra-types");
+const T = __importStar(__webpack_require__(/*! ./types */ "./src/types.ts"));
+const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
+const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
+const requirements_1 = __webpack_require__(/*! ./requirements */ "./src/requirements.ts");
+class SessionData {
+    constructor(s, SessionRequest) {
+        this.bOneTimeProcessingDone = false;
+        this.bPlanAnalyzed = false;
+        this.legislativeDistricts = false;
+        this.config = {};
+        this.CxD = []; // Derived later
+        this._session = s;
+        this.title = SessionRequest['title'];
+        this.config = processConfig(SessionRequest['config']);
+        // 2020 - Set the CD / LD toggle:
+        // * If 2020+, use the PlanType, if given.
+        // * If 2010, use the legacy LD toggle, if given.
+        // * Otherwise assume CD's.
+        // * Use the LD population deviation threshold for districts that are not CD's.
+        if ((this.config.cycle > 2010) && (SessionRequest['planType'] !== undefined))
+            this.legislativeDistricts = (SessionRequest['planType'] != 'congress');
+        else if ((this.config.cycle == 2010) && (SessionRequest['legislativeDistricts'] !== undefined))
+            this.legislativeDistricts = SessionRequest['legislativeDistricts'];
+        const repsByDistrict = SessionRequest['repsByDistrict'];
+        const nDistricts = SessionRequest['nDistricts'];
+        if (repsByDistrict !== undefined) {
+            if (repsByDistrict.length != nDistricts)
+                throw new Error("Mismatched #'s of districts passed to AnalyticsSession constructor!");
+            if (repsByDistrict.includes(0))
+                throw new Error("Zero reps for a district passed to AnalyticsSession constructor!");
+            // Assume a positive integer # of reps per district
+            this.repsByDistrict = repsByDistrict;
+        }
+        this.state = new State(this, SessionRequest['stateXX'], SessionRequest['nDistricts']);
+        this.counties = new Counties(this, SessionRequest['counties']);
+        this.graph = SessionRequest['graph'];
+        this.features = new Features(this, SessionRequest['data'], this.config['datasets']);
+        this.plan = new Plan(this, SessionRequest['plan']);
+        this.districts = new Districts(this, SessionRequest['districtShapes']);
+        this.aggregates = new Aggregates(this, SessionRequest['aggregates']);
+    }
+}
+exports.SessionData = SessionData;
+// CLASSES FOR DISTRICTS & DISTRICT AGGREGATES
+class Aggregates {
+    constructor(container, aggregates) {
+        this._container = container;
+        this._aggregates = aggregates;
+        this.unpacked = {};
+        this.columns = {};
+    }
+    process() {
+        this._unpack();
+        this._columnize();
+        this._checkReqs();
+        this._convert();
+    }
+    transpose() {
+        const nRows = this._container.state.nDistricts + 2; // +1 for unassigned, +1 for statewide
+        let table = [];
+        for (let i = 0; i < nRows; i++) {
+            const row = {
+                districtID: this.columns['districtID'][i],
+                totalPop: this.columns['totalPop'][i],
+                popDevPct: this.columns['popDevPct'][i],
+                bEqualPop: this.columns['bEqualPop'][i],
+                bNotEmpty: this.columns['bNotEmpty'][i],
+                bContiguous: this.columns['bContiguous'][i],
+                bNotEmbedded: this.columns['bNotEmbedded'][i],
+                demPct: this.columns['demPct'][i],
+                repPct: this.columns['repPct'][i],
+                othPct: this.columns['othPct'][i],
+                whitePct: this.columns['whitePct'][i],
+                totalVAP: this.columns['totalVAP'][i],
+                minorityPct: this.columns['minorityPct'][i],
+                blackPct: this.columns['blackPct'][i],
+                hispanicPct: this.columns['hispanicPct'][i],
+                pacificPct: this.columns['pacificPct'][i],
+                asianPct: this.columns['asianPct'][i],
+                nativePct: this.columns['nativePct'][i]
+            };
+            table.push(row);
+        }
+        return table;
+    }
+    // PRIVATE HELPER METHODS
+    _unpack() {
+        // NOTE - This maintains the dataset hierarchy, but merges multi-fields into single buckets
+        var _a, _b, _c;
+        for (const dataset of Object.values(T.Dataset)) {
+            if (dataset === T.Dataset.SHAPES)
+                continue;
+            if (!this.unpacked[dataset]) {
+                this.unpacked[dataset] = {};
+            }
+            const did = this._container.config['datasets'][dataset];
+            const fields = packedFields(this._aggregates, did);
+            for (const field of fields) {
+                const mappedField = (_a = T.fieldMap[dataset]) === null || _a === void 0 ? void 0 : _a[field];
+                if (mappedField) {
+                    const bucket = T.multiFields.includes(field) ? field : mappedField;
+                    this.unpacked[dataset][bucket] = unpackedFields(this._aggregates, did, field);
+                }
+            }
+            // Post-process potential multiField pairs
+            for (const [field1, field2] of T.multiFieldPairs) {
+                const has1 = field1 in this.unpacked[dataset];
+                const has2 = field2 in this.unpacked[dataset];
+                if (has1 && has2) {
+                    // Both exist - pick the one with max sum
+                    const sum1 = this.unpacked[dataset][field1].reduce((a, b) => a + b, 0);
+                    const sum2 = this.unpacked[dataset][field2].reduce((a, b) => a + b, 0);
+                    const keepField = sum1 >= sum2 ? field1 : field2;
+                    const removeField = sum1 >= sum2 ? field2 : field1;
+                    const mappedField = (_b = T.fieldMap[dataset]) === null || _b === void 0 ? void 0 : _b[keepField];
+                    if (mappedField) {
+                        this.unpacked[dataset][mappedField] = this.unpacked[dataset][keepField];
+                        delete this.unpacked[dataset][keepField];
+                    }
+                    delete this.unpacked[dataset][removeField];
+                }
+                else if (has1 || has2) {
+                    // Only one exists - rename it
+                    const existingField = has1 ? field1 : field2;
+                    const mappedField = (_c = T.fieldMap[dataset]) === null || _c === void 0 ? void 0 : _c[existingField];
+                    if (mappedField) {
+                        this.unpacked[dataset][mappedField] = this.unpacked[dataset][existingField];
+                        delete this.unpacked[dataset][existingField];
+                    }
+                }
+            }
+        }
+    }
+    _columnize() {
+        // Flatten the unpacked aggregates
+        for (const dataset in this.unpacked) {
+            Object.assign(this.columns, this.unpacked[dataset]);
+        }
+        // Add statewide totals
+        for (const field in this.columns) {
+            const statewide = U.sumArray(this.columns[field]);
+            this.columns[field].push(statewide);
+        }
+        // Add a district id column
+        const nRows = this._container.state.nDistricts + 2; // +1 for unassigned, +1 for statewide
+        this.columns['districtID'] = [...Array(nRows).keys()];
+    }
+    // Check district requirements and other other booleans for the district statistics table
+    _checkReqs() {
+        let contiguous = [true]; // Dummy value for the unassigned district
+        let notEmbedded = [true];
+        const simpleGraph = this._container.graph; // HACK
+        for (let d = 1; d <= this._container.state.nDistricts; d++) // Skip unassigned district
+         {
+            let geoIDs = this._container.plan.geoIDsForDistrictID(d);
+            if (geoIDs && (geoIDs.size > 0)) {
+                contiguous.push((0, requirements_1.isContiguous)(geoIDs, simpleGraph));
+                notEmbedded.push(!(0, requirements_1.isEmbedded)(d, geoIDs, this._container.plan.byGeoID(), simpleGraph));
+            }
+            else {
+                contiguous.push(true); // Empty districts are trivially contiguous
+                notEmbedded.push(true); // Empty districts are trivially non-embedded
+            }
+        }
+        const bPlanContiguous = contiguous.every(c => c);
+        contiguous.push(bPlanContiguous);
+        const bPlanFreeOfHoles = notEmbedded.every(ne => ne);
+        notEmbedded.push(bPlanFreeOfHoles);
+        const nRows = this._container.state.nDistricts + 2; // +1 for unassigned, +1 for statewide
+        let equalPop = U.initArray(nRows, true);
+        this.columns['bContiguous'] = contiguous;
+        this.columns['bNotEmbedded'] = notEmbedded;
+        this.columns['bEqualPop'] = equalPop;
+        this.columns['bNotEmpty'] = this.columns.TotalPop.map((value, index) => index === 0 || index === this.columns.TotalPop.length - 1 || value !== 0);
+    }
+    // Convert counts to %'s for the plan profile and the district statistics table
+    _convert() {
+        // Compute population deviations by district
+        {
+            let popDevPct = [];
+            const targetSize = this._container.state.targetSize;
+            const repsByDistrict = this._container.repsByDistrict;
+            for (let i = 0; i < this.columns.TotalPop.length; i++) {
+                if (i === 0) {
+                    popDevPct.push(0.0); // Dummy value for the unassigned district
+                    continue;
+                }
+                const totalPop = this.columns.TotalPop[i];
+                if ((totalPop === 0) || (i === this.columns.TotalPop.length - 1)) {
+                    popDevPct.push(1.0);
+                    continue;
+                }
+                // NOTE - Generalized for MMD
+                const n = (repsByDistrict) ? repsByDistrict[i - 1] : 1;
+                const dev = (totalPop - (n * targetSize)) / (n * targetSize);
+                popDevPct.push(dev);
+            }
+            this.columns['popDevPct'] = popDevPct;
+        }
+        // Convert election data to %'s
+        {
+            this.columns['demPct'] = U.divideArrays(this.columns['DemVotes'], this.columns['TotalVotes']);
+            this.columns['repPct'] = U.divideArrays(this.columns['RepVotes'], this.columns['TotalVotes']);
+            const twoPartyTotals = U.addArrays(this.columns['DemVotes'], this.columns['RepVotes']);
+            this.columns['othPct'] = U.divideArrays(U.subtractArrays(this.columns['TotalVotes'], twoPartyTotals), this.columns['TotalVotes']);
+            this.columns['Vf'] = U.divideArrays(this.columns['DemVotes'], twoPartyTotals);
+        }
+        // Convert VAP/CVAP data to %'s
+        {
+            // Derive minority VAP from total and white VAP
+            this.columns['MinorityVAP'] = U.subtractArrays(this.columns['TotalVAP'], this.columns['WhiteVAP']);
+            // Rename total pop and total VAP fields for district statistics table
+            this.columns['totalPop'] = this.columns['TotalPop'];
+            delete this.columns['TotalPop'];
+            this.columns['totalVAP'] = this.columns['TotalVAP'];
+            delete this.columns['TotalVAP'];
+            // Compute %'s
+            this.columns['whitePct'] = U.divideArrays(this.columns['WhiteVAP'], this.columns['totalVAP']);
+            this.columns['minorityPct'] = U.divideArrays(this.columns['MinorityVAP'], this.columns['totalVAP']);
+            this.columns['blackPct'] = U.divideArrays(this.columns['BlackVAP'], this.columns['totalVAP']);
+            this.columns['hispanicPct'] = U.divideArrays(this.columns['HispanicVAP'], this.columns['totalVAP']);
+            this.columns['pacificPct'] = U.divideArrays(this.columns['PacificVAP'], this.columns['totalVAP']);
+            this.columns['asianPct'] = U.divideArrays(this.columns['AsianVAP'], this.columns['totalVAP']);
+            this.columns['nativePct'] = U.divideArrays(this.columns['NativeVAP'], this.columns['totalVAP']);
+        }
+    }
 }
-// CLASSES, ETC. FOR FEATURE & COUNTY DATA
-// Wrap data by feature, to abstract the specifics of the internal structure
+exports.Aggregates = Aggregates;
+class Districts {
+    constructor(container, ds) {
+        this._container = container;
+        this._shapes = ds;
+    }
+    getShapes() {
+        return this._shapes;
+    }
+}
+exports.Districts = Districts;
+// CLASSES & HELPERS FOR FEATURE & COUNTY DATA
 class Features {
-    constructor(s, data, keys) {
+    constructor(container, data, keys) {
         this._featureIDs = {};
-        this._session = s;
+        this._container = container;
         this._data = data;
         this._keys = keys;
     }
     nFeatures() { return this._data.features.length; }
     featureByIndex(i) { return this._data.features[i]; }
-    /* 03/27/21 - Moved to top-level & exported:
-    geoIDForFeature(f: any): string
-    {
-      // 12-02-2020 - Switched to using ids vs. geoids per Terry
-      if (f.properties && f.properties['id'])
-      {
-        return f.properties['id'];
-        // GEOIDs will be one of these properties
-        // const value = f.properties['GEOID10'] || f.properties['GEOID20'] || f.properties['GEOID'];
-  
-        // return value;
-      }
-      else
-      {
-        console.log("This feature does not have an id property:", f);
-        throw "Feature with no id property.";
-      }
-    }
-    fieldForFeature(f: any, dt: T.Dataset, fk: string): any
-    {
-      const dk: string = this._keys[dt];
-  
-      let result = undefined;
-  
-      // 07-31-2020 - Fix to post-process PVI into the expected election composite format.
-      if (dk === 'P16GPR')
-      {
-        // 10-27-2020 - Enabling a 'Tot' result for PVI, now that we're reporting 'Other'
-        switch (fk)
-        {
-          case 'D': {
-            result = (_getFeatures(f, dk, 'D12') + _getFeatures(f, dk, 'D16')) / 2;
-            break;
-          }
-          case 'R': {
-            result = (_getFeatures(f, dk, 'R12') + _getFeatures(f, dk, 'R16')) / 2;
-            break;
-          }
-          case 'Tot': {
-            result = (_getFeatures(f, dk, 'D12') + _getFeatures(f, dk, 'D16') + _getFeatures(f, dk, 'R12') + _getFeatures(f, dk, 'R16')) / 2;
-            break;
-          }
-          default: {
-            console.log("Field not recognized.");
-            break;
-          }
-        }
-        // result = (_getFeatures(f, dk, (fk === 'D' ? 'D12' : 'R12')) + _getFeatures(f, dk, (fk === 'D' ? 'D16' : 'R16'))) / 2;
-      }
-      else
-        result = _getFeatures(f, dk, fk);
-  
-      return result;
-    }
-    */
-    resetDataset(d, k) {
-        this._keys[d] = k;
-        // NOTE - RECALC: Does anything need to be recalc'd now when a dataset is changed?
-    }
     mapGeoIDsToFeatureIDs() {
-        for (let i = 0; i < this._session.features.nFeatures(); i++) {
-            let f = this._session.features.featureByIndex(i);
-            // 03-27-21
+        for (let i = 0; i < this.nFeatures(); i++) {
+            let f = this.featureByIndex(i);
             let geoID = geoIDForFeature(f);
-            // let geoID: string = this._session.features.geoIDForFeature(f);
             this._featureIDs[geoID] = i;
         }
     }
@@ -1006,10 +861,10 @@ function fieldForFeature(f, dk /* dt: T.Dataset */, ff) {
     // Take the max (typically one field will be zero, but some datasets contain Bl subset of BlC)
     return Math.max(...T.fieldsFromFeatureField(dk, ff).map(key => _getFeatures(f, dk, key)));
 }
-// NOTE - This accessor is cloned from fGetW() in dra-client/restrict.ts
-//  f is a direct GeoJSON feature
-//  p is a geoID
 function _getFeatures(f, datasetKey, p) {
+    // This accessor is cloned from fGetW() in dra-client/restrict.ts
+    //  f is a direct GeoJSON feature
+    //  p is a geoID
     if (!f.properties)
         return 0;
     // This is actual path
@@ -1022,19 +877,17 @@ function _getFeatures(f, datasetKey, p) {
     return !n || isNaN(n) ? 0 : n;
     */
 }
-// Wrap data by county, to abstract the specifics of the internal structure
 class Counties {
-    constructor(s, data) {
+    constructor(container, data) {
         this._countyNameLookup = {};
         this.index = {};
         this.fips = {};
         this.totalPopulation = [];
-        this._session = s;
+        this._container = container;
         this._data = data;
         this.nCounties = this._data.features.length;
     }
     countyByIndex(i) { return this._data.features[i]; }
-    // 10-16-21 - Analyze view crashing because county names were undefined in the lookup table.
     // Property had changed from 'NAME' to 'name' for *some* states.
     propertyForCounty(f, pk) {
         return f.properties[pk] ? f.properties[pk] : f.properties[pk.toLowerCase()];
@@ -1044,542 +897,94 @@ class Counties {
     indexFromFIPS(fips) { return this.index[fips]; }
 }
 exports.Counties = Counties;
-// CLASSES TO ORGANIZE AND/OR ABSTRACT OTHER DATA
-// MMD - Extended this for # of reps
+// CLASSES & HELPERS FOR STATE & PLAN DATA
 class State {
-    constructor(s, xx, n) {
+    constructor(container, xx, n) {
         this.totalPop = 0;
-        this.targetSize = 0; // HACK - Will get set by doPreprocessCensus()
+        this.targetSize = 0; // HACK - This gets set later
         this.tooBigFIPS = [];
         this.tooBigName = [];
         this.singleCountyDistrictMax = 0;
         this.expectedSplits = 0;
         this.expectedAffected = 0;
-        this._session = s;
+        this._container = container;
         this.xx = xx;
         this.nDistricts = n;
-        this.nReps = (s.repsByDistrict) ? s.repsByDistrict.reduce((a, b) => a + b, 0) : this.nDistricts; // MMD
+        this.nReps = (container.repsByDistrict) ? container.repsByDistrict.reduce((a, b) => a + b, 0) : this.nDistricts;
     }
 }
 exports.State = State;
-class Plan {
-    constructor(s, p) {
-        this._session = s;
-        this._planByGeoID = p;
-        this._planByDistrictID = {};
-        this.districtIDs = []; // Set when the plan in inverted
-    }
-    // NOTE - DON'T remove water-only features from the plan, as they may be required
-    // for contiguity. Just skip them in aggregating district statistics.
-    //
-    // removeWaterOnlyFeatures(plan: T.PlanByGeoID): T.PlanByGeoID {
-    //   let newPlan = {} as T.PlanByGeoID;
-    //   for (let geoID in plan) {
-    //     // Remove water-only features
-    //     if (!(U.isWaterOnly(geoID))) {
-    //       newPlan[geoID] = plan[geoID];
-    //     }
-    //     else {
-    //       console.log("Removing water-only feature", geoID);
-    //     }
-    //   }
-    //   return newPlan;
-    // }
-    invertPlan(bLog = false) {
-        this._planByDistrictID = invertPlan(this._planByGeoID, this._session, bLog);
-        this.districtIDs = U.getNumericObjectKeys(this._planByDistrictID);
-    }
-    initializeDistrict(i) { this._planByDistrictID[i] = new Set(); }
-    byGeoID() { return this._planByGeoID; }
-    byDistrictID() { return this._planByDistrictID; }
-    districtForGeoID(i) { return this._planByGeoID[i]; }
-    geoIDsForDistrictID(i) { return this._planByDistrictID[i]; }
-}
-exports.Plan = Plan;
-// Invert a feature assignment structure to sets of ids by district
-function invertPlan(plan, s, bLog = false) {
-    let invertedPlan = {};
-    // Add a dummy 'unassigned' district
-    invertedPlan[S.NOT_ASSIGNED] = new Set();
-    // The feature assignments coming from DRA do not include unassigned ones.
-    // - In the DRA-calling context, there's an analytics session with a reference
-    //   to the features. Loop over all the features to find the unassigned ones,
-    //   and add them to the dummy unassigned district explicitly.
-    // - In the CLI-calling context, there's no session (yet) but the plan is complete.
-    if (!(s == undefined)) {
-        for (let i = 0; i < s.features.nFeatures(); i++) {
-            let f = s.features.featureByIndex(i);
-            // 03-27-21
-            let geoID = geoIDForFeature(f);
-            // let geoID: string = s.features.geoIDForFeature(f);
-            // If the feature is NOT explicitly assigned to a district, add the geoID
-            // to the dummy unassigned district 0.
-            if (!(U.keyExists(geoID, plan)))
-                invertedPlan[S.NOT_ASSIGNED].add(geoID);
-            // NOTE - NOT skipping WATER-ONLY features here, because we're
-            // not skipping them below when they are explicitly assigned in plans. Should
-            // we skip them in both places?
-        }
-    }
-    for (let geoID in plan) {
-        let districtID = plan[geoID];
-        // Make sure the set for the districtID exists
-        if (!(U.objectContains(invertedPlan, districtID))) {
-            invertedPlan[districtID] = new Set();
-        }
-        // Add the geoID to the districtID's set
-        invertedPlan[districtID].add(geoID);
-        if (U.isWaterOnly(geoID) && bLog)
-            console.log("Invert plan: Water-only feature still in plan!", geoID);
-    }
-    return invertedPlan;
-}
-class GraphClass {
-    constructor(s, graph) {
-        this._session = s;
-        this._graph = graph;
-    }
-    peerNeighbors(node) {
-        // Get the neighboring geoIDs connected to a geoID
-        // Ignore the lengths of the shared borders (the values), for now
-        // Protect against getting a GEOID that's not in the graph
-        if (U.keyExists(node, this._graph)) {
-            // Handle both unweighted & weighted neighbors
-            let n = this._graph[node];
-            let l = (n instanceof Array) ? n : U.getObjectKeys(n);
-            return l;
-            // return U.getObjectKeys(this._graph[node]);
-        }
-        else
-            return [];
-        // return U.getObjectKeys(this._graph[node]);
-    }
-}
-exports.GraphClass = GraphClass;
-
-
-/***/ }),
-
-/***/ "./src/analyze.ts":
-/*!************************!*\
-  !*** ./src/analyze.ts ***!
-  \************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-
-//
-// ANALYZE A PLAN
-//
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.doAnalyzeDistricts = doAnalyzeDistricts;
-exports.doAnalyzePlan = doAnalyzePlan;
-exports.doDeriveSecondaryTests = doDeriveSecondaryTests;
-const valid_1 = __webpack_require__(/*! ./valid */ "./src/valid.ts");
-const equal_1 = __webpack_require__(/*! ./equal */ "./src/equal.ts");
-const cohesive_1 = __webpack_require__(/*! ./cohesive */ "./src/cohesive.ts");
-// Compile district-level info for plan/map-level analytics
-function doAnalyzeDistricts(s, bLog = false) {
-    s.districts.recalcStatistics(bLog);
-    s.districts.extractDistrictShapeProperties(bLog);
-}
-// Calculate the analytics & validations and cache the results
-// NOTE - doAnalyzePlan() depends on doAnalyzeDistricts() having run first.
-// 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) {
-    s.tests[0 /* T.Test.Complete */] = (0, valid_1.doIsComplete)(s, bLog);
-    s.tests[1 /* T.Test.Contiguous */] = (0, valid_1.doIsContiguous)(s, bLog);
-    s.tests[2 /* T.Test.FreeOfHoles */] = (0, valid_1.doIsFreeOfHoles)(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 /* T.Test.EqualPopulation */] = s.getTest(3 /* T.Test.EqualPopulation */);
-    s.tests[5 /* T.Test.UnexpectedCountySplits */] = (0, cohesive_1.doFindCountiesSplitUnexpectedly)(s, bLog);
-    s.tests[6 /* T.Test.VTDSplits */] = (0, cohesive_1.doFindSplitVTDs)(s, bLog);
-    // Enable a Test Log and Scorecard to be generated
-    s.bPlanAnalyzed = true;
-    s.bPostProcessingDone = false;
-}
-//
-// Derive secondary analytics that are based on primary tests.
-// This concept allows Population Deviation to be a primary numeric test and
-// Equal Population to be secondary pass/fail validation.
-//
-function doDeriveSecondaryTests(s, bLog = false) {
-    s.tests[3 /* T.Test.EqualPopulation */] = (0, equal_1.doHasEqualPopulations)(s, bLog);
-}
-
-
-/***/ }),
-
-/***/ "./src/cohesive.ts":
-/*!*************************!*\
-  !*** ./src/cohesive.ts ***!
-  \*************************/
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
-
-
-//
-// SPLITTING
-//
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.doFindCountiesSplitUnexpectedly = doFindCountiesSplitUnexpectedly;
-exports.doFindSplitVTDs = doFindSplitVTDs;
-const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
-// The main county-district splitting code is in the dra-analytics package.
-// ANALYZE SIMPLE COUNTY & VTD SPLITTING
-/*
- 
-Sample results for NC 2016 dongressional plan
-________________________________________________________________________________
- 
-State: NC
-Census: 2010
-Total population: 9,535,483
-Number of districts: 13
-Target district size: 733,499
-Number of counties: 100
- 
-Equal Population: 11.24% deviation
-Compactness: None
-Proportionality: 27.67% gap
-Cohesiveness: 11 unexpected splits, affecting 27.14% of the total population
- 
-These counties are split unexpectedly (meaning that they're smaller than a district):
- 
-   • Bladen
-   • Buncombe
-   • Catawba
-   • Cumberland
-   • Durham
-   • Guilford
-   • Iredell
-   • Johnston
-   • Pitt
-   • Rowan
-   • Wilson
- 
-*/
-// 10-23-21 - This analysis *assumes* that a map is complete (or nearly so).
-// - We do the analysis regardless, but
-// - Protect against weird results in the client
-function doFindCountiesSplitUnexpectedly(s, bLog = false) {
-    let test = s.getTest(5 /* T.Test.UnexpectedCountySplits */);
-    // THE THREE VALUES TO DETERMINE FOR A PLAN
-    let unexpectedSplits = 0;
-    let unexpectedAffected = 0;
-    let countiesSplitUnexpectedly = [];
-    // FIRST, ANALYZE THE COUNTY SPLITTING FOR THE PLAN
-    // Get the county-district pivot ("splits")
-    let countiesByDistrict = s.districts.table.countySplits;
-    // Find the single-county districts, i.e., districts NOT split across counties.
-    // Ignore the dummy unassigned 0 and N+1 summary "districts."
-    let singleCountyDistricts = [];
-    for (let d = 1; d <= s.state.nDistricts; d++) {
-        // See if there's only one county partition
-        // Ignore the dummy unassigned 0 "county."
-        let nCountiesInDistrict = 0;
-        for (let c = 1; c <= s.counties.nCounties; c++) {
-            // Guard against empty district
-            if (countiesByDistrict[d]) {
-                if (countiesByDistrict[d][c] > 0) {
-                    nCountiesInDistrict += 1;
-                    if (nCountiesInDistrict > 1) {
-                        break;
-                    }
-                }
-            }
-        }
-        // If so, save the district
-        if (nCountiesInDistrict == 1) {
-            singleCountyDistricts.push(d);
-        }
+class Plan {
+    constructor(container, p) {
+        this._container = container;
+        this._planByGeoID = p;
+        this._planByDistrictID = {};
+        this.districtIDs = []; // Set when the plan in inverted
     }
-    // Process the splits/partitions in the plan:
-    // - Count the total # of partitions,
-    // - Find the counties split across districts, and
-    // - Accumulate the number people affected (except when single-county districts)
-    let nPartitionsOverall = 0;
-    let splitCounties = new Set(); // The counties that are split across districts
-    let totalAffected = 0; // The total population affected by those splits
-    // 07-17-21 - For enumerating # of times each split county is split
-    let countyIndexesWithSplits = [];
-    // Ignore the dummy unassigned 0 "county."
-    for (let c = 1; c <= s.counties.nCounties; c++) {
-        let nCountyParts = 0;
-        let subtotal = 0;
-        // Ignore the dummy unassigned 0 and N+1 summary "districts."
-        for (let d = 1; d <= s.state.nDistricts; d++) {
-            // Guard against empty district
-            if (countiesByDistrict[d]) {
-                if (countiesByDistrict[d][c] > 0) {
-                    nPartitionsOverall += 1;
-                    nCountyParts += 1;
-                    if (!(U.arrayContains(singleCountyDistricts, d))) {
-                        subtotal += countiesByDistrict[d][c];
-                    }
-                }
-            }
-        }
-        if (nCountyParts > 1) {
-            splitCounties.add(c);
-            totalAffected += subtotal;
-            // 07-17-21 - Enumerate # of times each split county is split
-            countyIndexesWithSplits.push([c, nCountyParts - 1]);
-        }
+    invertPlan(bLog = false) {
+        this._planByDistrictID = invertPlan(this._planByGeoID, this._container, bLog);
+        this.districtIDs = U.getNumericObjectKeys(this._planByDistrictID);
     }
-    // 07-17-21 - Enumerate # of times each split county is split
-    let splitCountiesWithSplits = [];
-    countyIndexesWithSplits.forEach(pair => {
-        const index = pair[0];
-        const splits = pair[1];
-        // Convert 1–N indices to FIPS codes
-        const fips = s.counties.fips[index];
-        if (fips) {
-            // Convert FIPS codes to names
-            const name = s.counties.nameFromFIPS(fips);
-            // Combine # of splits with names
-            if (name) {
-                const text = `${name} (${splits})`;
-                splitCountiesWithSplits.push(text);
-            }
-        }
-    });
-    // Sort by name
-    splitCountiesWithSplits.sort();
-    // End
-    // Convert county ordinals to FIPS codes
-    let splitCountiesFIPS = U.getSelectObjectKeys(s.counties.index, [...splitCounties]);
-    // THEN TAKE ACCOUNT OF THE COUNTY SPLITTING THAT IS EXPECTED (REQUIRED)
-    // Compute the total number of splits this way, in case any counties are split
-    // more than once. I.e., it's not just len(all_counties_split).
-    let nSplits = nPartitionsOverall - s.counties.nCounties;
-    // Determine the number of *unexpected* splits. NOTE: Prevent negative numbers,
-    // in case you have a plan the *doesn't* split counties that would have to be
-    // split due to their size.
-    unexpectedSplits = Math.max(0, nSplits - s.state.expectedSplits);
-    // Subtract off the total population that *has* to be affected by splits,
-    // because their counties are too big. NOTE: Again, prevent negative numbers, 
-    // in case you have a plan the *doesn't* split counties that would have to be
-    // split due to their size.
-    unexpectedAffected = U.trim(Math.max(0, totalAffected - s.state.expectedAffected) / s.state.totalPop);
-    // Find the counties that are split *unexpectedly*. From all the counties that
-    // are split, remove those that *have* to be split, because they are bigger than
-    // a district.
-    let countiesSplitUnexpectedlyFIPS = [];
-    for (let fips of splitCountiesFIPS) {
-        if (!(U.arrayContains(s.state.tooBigFIPS, fips))) {
-            countiesSplitUnexpectedlyFIPS.push(fips);
+    initializeDistrict(i) { this._planByDistrictID[i] = new Set(); }
+    byGeoID() { return this._planByGeoID; }
+    byDistrictID() { return this._planByDistrictID; }
+    districtForGeoID(i) { return this._planByGeoID[i]; }
+    geoIDsForDistrictID(i) { return this._planByDistrictID[i]; }
+}
+exports.Plan = Plan;
+function invertPlan(plan, container, bLog = false) {
+    let invertedPlan = {};
+    // Add a dummy 'unassigned' district
+    invertedPlan[S.NOT_ASSIGNED] = new Set();
+    // The feature assignments coming from DRA do not include unassigned ones.
+    // - In the DRA-calling context, there's an analytics session with a reference
+    //   to the features. Loop over all the features to find the unassigned ones,
+    //   and add them to the dummy unassigned district explicitly.
+    // - In the CLI-calling context, there's no session (yet) but the plan is complete.
+    if (!(container == undefined)) {
+        for (let i = 0; i < container.features.nFeatures(); i++) {
+            let f = container.features.featureByIndex(i);
+            let geoID = geoIDForFeature(f);
+            // If the feature is NOT explicitly assigned to a district, add the geoID
+            // to the dummy unassigned district 0.
+            if (!(U.keyExists(geoID, plan)))
+                invertedPlan[S.NOT_ASSIGNED].add(geoID);
         }
     }
-    //  ... and convert the FIPS codes to county names.
-    for (let fips of countiesSplitUnexpectedlyFIPS) {
-        const name = s.counties.nameFromFIPS(fips);
-        // 07-06-20 - Guard in case the FIPS code isn't in the county name lookup
-        if (name)
-            countiesSplitUnexpectedly.push(name);
-        else {
-            if (bLog)
-                console.log("County is not in the FIPS-to-name lookup table: ", fips);
+    for (let geoID in plan) {
+        let districtID = plan[geoID];
+        // Make sure the set for the districtID exists
+        if (!(U.objectContains(invertedPlan, districtID))) {
+            invertedPlan[districtID] = new Set();
         }
+        // Add the geoID to the districtID's set
+        invertedPlan[districtID].add(geoID);
+        if (U.isWaterOnly(geoID) && bLog)
+            console.log("Invert plan: Water-only feature still in plan!", geoID);
     }
-    countiesSplitUnexpectedly = countiesSplitUnexpectedly.sort();
-    test['score'] = U.trim(unexpectedAffected);
-    test['details']['nSplits'] = nSplits;
-    test['details']['unexpectedSplits'] = unexpectedSplits;
-    test['details']['countiesSplitUnexpectedly'] = countiesSplitUnexpectedly;
-    // 02-23-21 - Added single-county district details
-    test['details']['expectedSplits'] = s.state.expectedSplits;
-    test['details']['tooBigName'] = s.state.tooBigName;
-    test['details']['singleCountyDistrictMax'] = s.state.singleCountyDistrictMax;
-    test['details']['nCountiesSplit'] = splitCountiesFIPS.length;
-    test['details']['nSingleCountyDistricts'] = singleCountyDistricts.length;
-    // 07-17-21 - Enumerate # of times each split county is split
-    test['details']['countiesWithSplits'] = splitCountiesWithSplits;
-    return test;
-}
-// NOTE - This function just creates an empty container that dra-client fills in when generating the UI
-function doFindSplitVTDs(s, bLog = false) {
-    let test = s.getTest(6 /* T.Test.VTDSplits */);
-    let splitVTDs = [];
-    test['score'] = splitVTDs.length;
-    test['details']['splitVTDs'] = splitVTDs;
-    return test;
+    return invertedPlan;
 }
-
-
-/***/ }),
-
-/***/ "./src/compact.ts":
-/*!************************!*\
-  !*** ./src/compact.ts ***!
-  \************************/
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
-
-
-//
-// COMPACT
-//
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.extractDistrictProperties = extractDistrictProperties;
-const baseclient_1 = __webpack_require__(/*! @dra2020/baseclient */ "@dra2020/baseclient");
-const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
-// The main compactness code is in the dra-analytics package.
-// HELPER TO EXTRACT PROPERTIES OF DISTRICT SHAPES
-function extractDistrictProperties(s, bLog = false) {
-    // NOTE - I am assuming that district IDs are integers 1–N
-    for (let i = 1; i <= s.state.nDistricts; i++) {
-        const poly = s.districts.getDistrictShapeByID(i);
-        // Guard against no shape for empty districts AND null shapes
-        if (isAShape(poly)) {
-            const area = baseclient_1.Poly.polyAreaFlat(poly);
-            const perimeter = baseclient_1.Poly.polyPerimeterFlat(poly);
-            const diameter = baseclient_1.Poly.polyDiameterFlat(poly);
-            let props = [0, 0, 0];
-            props[0 /* T.DistrictShapeProperty.Area */] = area;
-            props[1 /* T.DistrictShapeProperty.Diameter */] = diameter;
-            props[2 /* T.DistrictShapeProperty.Perimeter */] = perimeter;
-            s.districts.setGeoProperties(i, props);
-            // if (bLog) console.log("District", i, "A =", area, "P =", perimeter, "D =", diameter);
-        }
+// HELPERS
+function processConfig(config) {
+    // Set the default the Census & redistricting cycle to 2010
+    if (!(U.keyExists('cycle', config))) {
+        config['cycle'] = 2010;
+        console.log("Cycle was not set explicitly on the session request.");
     }
+    return config;
 }
-function isAShape(poly) {
-    if (poly == null)
-        return false;
-    if (baseclient_1.Poly.polyNull(poly))
-        return false;
-    return poly.geometry && poly.geometry.coordinates && !U.isArrayEmpty(poly.geometry.coordinates);
+function packedFields(pfs, did) {
+    let pf = pfs[0];
+    if (!pf || !pf.dsGroup || !pf.dsGroup[did])
+        return [];
+    let fields = pf.dsGroup[did].fields[did];
+    const keys = Object.keys(fields);
+    return keys;
 }
-// SAVE THESE NOTES, IN CASE WE NEED TO REWORK HOW WE PERFORM THESE CALCS.
-// THEY REFLECT HOW I DID THEM IN PYTHON.
-//
-// THE COMPACTNESS ANALYTICS NEED THE FOLLOWING DATA,
-// IN ADDITION TO THE MAP (IDEALLY, GEO_IDS INDEXED BY DISTRICT_ID)
-//
-// Shapes by geo_id
-//
-// If we need/want to speed compactness calculations up, we'll need
-//   to calculate the perimeters and diameters (and areas) of districts implicitly,
-//   which will require identifying district boundaries initially and updating
-//   them incrementally as districts are (re)assigned.
-//
-//   A district's boundary info is the set/list of features that constitute the
-//   district's border along with each boundary feature's neighbors. Hence, this
-//   requires a contiguity graph with the lengths of shared edges between features
-//   precomputed.
-//
-// NOTE - I can write up (if not implement) the logic for determining what shapes
-//   constitute a district's boundary. There are a few nuances.
-//
-//   If we have to optimize like this when we generalize to mixed maps, the
-//   determination of "neighbors in the map" and the length of shared borders
-//   (for determining a district perimeters) becomes more complicated and dynamic.
-//
-// NOTE - Again, I can write up (if not implement) the logic for both of these.
-//   They are a bit tricky and require special preprocessing of the summary level
-//   hierarchy (which I also have a script for that we can repurpose).
-
-
-/***/ }),
-
-/***/ "./src/equal.ts":
-/*!**********************!*\
-  !*** ./src/equal.ts ***!
-  \**********************/
-/***/ ((__unused_webpack_module, exports) => {
-
-
-//
-// EQUAL POPULATION
-//
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.doHasEqualPopulations = doHasEqualPopulations;
-// MMD - This generalizes for variable #'s of reps per district.
-// NOTE - This validity check is *derived* and depends on population deviation %
-//   being computed (above) and normalized in test log & scorecard generation.
-function doHasEqualPopulations(s, bLog = false) {
-    let test = s.getTest(3 /* T.Test.EqualPopulation */);
-    // Get the normalized population deviation %
-    let popDevTest = s.getTest(4 /* T.Test.PopulationDeviation */);
-    const popDevPct = popDevTest['score'];
-    // const popDevNormalized: number = popDevTest['normalizedScore'] as number;
-    test['details']['deviation'] = popDevPct;
-    test['details']['thresholds'] = popDevTest['details']['scale'];
-    // Populate the N+1 summary "district" in district.statistics
-    let bEqualPop = s.districts.table.bEqualPop;
-    let summaryRow = s.districts.numberOfRows() - 1;
-    bEqualPop[summaryRow] = test['score'];
-    return test;
+function unpackedFields(aggs, did, field) {
+    return aggs.map(agg => dra_types_1.PF.getPackedField(agg, did, field));
 }
+// END
 
 
 /***/ }),
@@ -1611,11 +1016,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.uncertaintyOfMembership = exports.effectiveSplits = exports.avgSVError = exports.isAntimajoritarian = exports.normalizePartisanBias = exports.ratePartisanBias = exports.estSeatProbability = exports.inferSelectedMinority = exports.fieldForFeature = exports.geoIDForFeature = void 0;
 __exportStar(__webpack_require__(/*! ./_api */ "./src/_api.ts"), exports);
-var _data_1 = __webpack_require__(/*! ./_data */ "./src/_data.ts");
-Object.defineProperty(exports, "geoIDForFeature", ({ enumerable: true, get: function () { return _data_1.geoIDForFeature; } }));
-Object.defineProperty(exports, "fieldForFeature", ({ enumerable: true, get: function () { return _data_1.fieldForFeature; } }));
-Object.defineProperty(exports, "inferSelectedMinority", ({ enumerable: true, get: function () { return _data_1.inferSelectedMinority; } }));
-__exportStar(__webpack_require__(/*! ./results */ "./src/results.ts"), exports);
+var data_1 = __webpack_require__(/*! ./data */ "./src/data.ts");
+Object.defineProperty(exports, "geoIDForFeature", ({ enumerable: true, get: function () { return data_1.geoIDForFeature; } }));
+Object.defineProperty(exports, "fieldForFeature", ({ enumerable: true, get: function () { return data_1.fieldForFeature; } }));
+var rpv_1 = __webpack_require__(/*! ./rpv */ "./src/rpv.ts");
+Object.defineProperty(exports, "inferSelectedMinority", ({ enumerable: true, get: function () { return rpv_1.inferSelectedMinority; } }));
 __exportStar(__webpack_require__(/*! ./types */ "./src/types.ts"), exports);
 __exportStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"), exports);
 // Re-export RPV types and COI splitting functions
@@ -1627,63 +1032,7 @@ exports.isAntimajoritarian = dra_analytics_1.Rate.isAntimajoritarian;
 exports.avgSVError = dra_analytics_1.Partisan.avgSVError;
 exports.effectiveSplits = dra_analytics_1.Splitting.effectiveSplits;
 exports.uncertaintyOfMembership = dra_analytics_1.Splitting.uncertaintyOfMembership;
-
-
-/***/ }),
-
-/***/ "./src/minority.ts":
-/*!*************************!*\
-  !*** ./src/minority.ts ***!
-  \*************************/
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
-
-
-//
-// PROTECTS MINORITIES
-//
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getMajorityMinority = getMajorityMinority;
-exports.getVRASection5 = getVRASection5;
-exports.doAnalyzeRacialPolarization = doAnalyzeRacialPolarization;
-const dra_analytics_1 = __webpack_require__(/*! @dra2020/dra-analytics */ "@dra2020/dra-analytics");
-const majority_minority_json_1 = __importDefault(__webpack_require__(/*! ../static/majority-minority.json */ "./static/majority-minority.json"));
-const vra5_preclearance_json_1 = __importDefault(__webpack_require__(/*! ../static/vra5-preclearance.json */ "./static/vra5-preclearance.json"));
-// TODO - Update/revise this, when the update comes out in September:
-// Sources for majority-minority info:
-// - https://en.wikipedia.org/wiki/List_of_majority-minority_United_States_congressional_districts
-// - http://www.ncsl.org/Portals/1/Documents/Redistricting/Redistricting_2010.pdf (PP. 80–84)
-// - https://www.justice.gov/crt/jurisdictions-previously-covered-section-5
-function getMajorityMinority(s) {
-    const xx = s.state.xx;
-    const mMDict = majority_minority_json_1.default;
-    const stateMM = mMDict[xx];
-    return stateMM;
-}
-function getVRASection5(s) {
-    const xx = s.state.xx;
-    const vraPreDict = vra5_preclearance_json_1.default;
-    const stateVRAPre = vraPreDict[xx];
-    return stateVRAPre;
-}
-// RPV - pulled into a separate component 11-17-2020
-function doAnalyzeRacialPolarization(s, districtID, groups, bLog = false) {
-    // Make sure that a minority is specified
-    if (!(groups.black || groups.hispanic || groups.pacific || groups.asian || groups.native || groups.minority))
-        return undefined;
-    const points = s.districts.extractVotesByDemographic(districtID, groups, bLog);
-    // Make sure the district is not empty & there are enough points
-    if (points === undefined)
-        return undefined;
-    if (points.comparison === undefined)
-        return undefined;
-    if (points.comparison.length <= 10)
-        return undefined;
-    return dra_analytics_1.Minority.analyzeRacialVoting(points, districtID, groups);
-}
-// RPV is in the dra-analytics package.
+// END
 
 
 /***/ }),
@@ -1732,72 +1081,67 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.doPreprocessData = doPreprocessData;
+exports.initialize = initialize;
+const T = __importStar(__webpack_require__(/*! ./types */ "./src/types.ts"));
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
-const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
-// NOTE - Do preprocessing separately, so the constructor returns quickly.
-function doPreprocessData(s, bLog = false) {
+const D = __importStar(__webpack_require__(/*! ./data */ "./src/data.ts"));
+function initialize(s) {
+    // NOTE - Do preprocessing separately, so the constructor returns quickly.
     // If necessary, do one-time preprocessing
-    if (!s.bOneTimeProcessingDone) {
-        doPreprocessCountyFeatures(s, bLog);
-        doPreprocessCensus(s, bLog);
-        // doPreprocessElection(s, bLog);
-        s.bOneTimeProcessingDone = true;
+    if (!s.data.bOneTimeProcessingDone) {
+        preprocessCountyFeatures(s.data, s.bLog);
+        preprocessCensus(s.data, s.bLog);
+        s.data.features.mapGeoIDsToFeatureIDs();
+        s.data.bOneTimeProcessingDone = true;
     }
-    // Invert the plan by district ID
-    s.plan.invertPlan(bLog);
-    // Create a map of geoIDs to feature IDs
-    s.features.mapGeoIDsToFeatureIDs();
+    s.data.plan.invertPlan(s.bLog);
 }
 // CREATE A FIPS CODE TO COUNTY NAME LOOKUP
-function doPreprocessCountyFeatures(s, bLog = false) {
+function preprocessCountyFeatures(container, bLog = false) {
     let fipsCodes = [];
     // CREATE A MAP OF FIPS CODES TO NAMES
-    for (let i = 0; i < s.counties.nCounties; i++) {
-        let county = s.counties.countyByIndex(i);
-        let fips = s.counties.propertyForCounty(county, 'COUNTYFP');
+    for (let i = 0; i < container.counties.nCounties; i++) {
+        let county = container.counties.countyByIndex(i);
+        let fips = container.counties.propertyForCounty(county, 'COUNTYFP');
         fipsCodes.push(fips);
-        let name = s.counties.propertyForCounty(county, 'NAME');
-        s.counties.mapFIPSToName(fips, name);
+        let name = container.counties.propertyForCounty(county, 'NAME');
+        container.counties.mapFIPSToName(fips, name);
     }
     // CREATE A FIPS CODE-ORDINAL MAP
     // Sort the FIPS codes in the county shapes
     fipsCodes = fipsCodes.sort();
+    // NOTE - 02/05/25 - I'm not sure why we're adding the virtual county bucket here, 
+    //   because we strip it off in creating the profile for analytics. To be safe, I'm
+    //   Keeping it here and stripping it off later.
     // Add a dummy county, for county-district splitting analysis.
     fipsCodes.unshift('000');
-    // NOTE - This was added for the legacy SPLITTING implementation.
     // Create the ID-ordinal map
     for (let i in fipsCodes) {
-        s.counties.index[fipsCodes[i]] = Number(i);
+        container.counties.index[fipsCodes[i]] = Number(i);
         // 07-17-21 - For enumerating # of times each split county is split
-        s.counties.fips[Number(i)] = fipsCodes[i];
+        container.counties.fips[Number(i)] = fipsCodes[i];
     }
 }
 // ANALYZE THE CENSUS BY COUNTY
-function doPreprocessCensus(s, bLog = false) {
-    // The county-splitting analytic needs the following info, using NC as an example:
-    // '_stateTotal' = The total state population, e.g., 9,535,483 for NC's 2010 Census
-    // 'totalByCounty' = The total population by county FIPS code
+function preprocessCensus(container, bLog = false) {
     // SUM TOTAL POPULATION BY COUNTY
     let totalByCounty = {};
     // NOTE - This works w/o GEOIDs, because you're looping over all features.
-    for (let i = 0; i < s.features.nFeatures(); i++) {
-        let f = s.features.featureByIndex(i);
+    for (let i = 0; i < container.features.nFeatures(); i++) {
+        let f = container.features.featureByIndex(i);
         // 03-27-21
         let geoID = D.geoIDForFeature(f);
-        // let geoID: string = s.features.geoIDForFeature(f);
         // Skip water-only features
         if (!(U.isWaterOnly(geoID))) {
             // 03-27-21
-            const dk = s.features._keys["CENSUS" /* T.Dataset.CENSUS */];
+            const dk = container.features._keys[T.Dataset.CENSUS];
             let value = D.fieldForFeature(f, dk, 0 /* T.FeatureField.TotalPop */);
-            // let value: number = s.features.fieldForFeature(f, T.Dataset.CENSUS, T.FeatureField.TotalPop);
             // Sum total population across the state
-            s.state.totalPop += value;
+            container.state.totalPop += value;
             // Get the county FIPS code for the feature
             let countyFIPS = U.parseGeoID(geoID)['county'];
             // Ignore features when the county is unrecognized
-            if (U.keyExists(countyFIPS, s.counties.index)) {
+            if (U.keyExists(countyFIPS, container.counties.index)) {
                 // If a subtotal for the county doesn't exist, initialize one
                 if (!(U.keyExists(countyFIPS, totalByCounty))) {
                     totalByCounty[countyFIPS] = 0;
@@ -1815,40 +1159,21 @@ function doPreprocessCensus(s, bLog = false) {
                 console.log("Skipping water-only feature in Census preprocessing:", geoID);
         }
     }
-    // NOTE - The above could be replaced, if I got totals on county.geojson.
-    /* Moved this to doPreprocessCountyFeatures() - 09-14-2020 to fix VA county mismatch bug
-    // CREATE A FIPS CODE-ORDINAL MAP
-  
-    // Get the county FIPS codes
-    let fipsCodes = U.getObjectKeys(totalByCounty);
-    // Sort the results
-    fipsCodes = fipsCodes.sort();
-  
-    // 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)
-    {
-      s.counties.index[fipsCodes[i]] = Number(i);
-    }
-    */
     // MAKE AN ARRAY OF TOTAL POPULATIONS BY COUNTY INDEX
     // Add an extra 0th virtual county bucket for county-district splitting analysis 
-    let nCountyBuckets = s.counties.nCounties + 1;
+    let nCountyBuckets = container.counties.nCounties + 1;
     let countyTotals = U.initArray(nCountyBuckets, 0);
     for (let fipsCode in totalByCounty) {
-        let i = s.counties.indexFromFIPS(fipsCode);
+        let i = container.counties.indexFromFIPS(fipsCode);
         countyTotals[i] = totalByCounty[fipsCode];
     }
-    s.counties.totalPopulation = countyTotals;
+    container.counties.totalPopulation = countyTotals;
     // MMD - Rationalized calculation of target size *per rep*
-    s.state.targetSize = s.state.totalPop / s.state.nReps;
+    container.state.targetSize = Math.round(container.state.totalPop / container.state.nReps);
     // ANALYZE THE COUNTIES
     // MMD - This "these counties must be split" analysis does NOT generalize to heterogenous MMD.
     // 'target_size': 733499, # calc as total / districts
-    const targetSize = s.state.targetSize;
+    const targetSize = container.state.targetSize;
     // let targetSize = Math.round(s.state.totalPop / s.state.nDistricts);
     // Find counties that are bigger than the target district size.
     // 'too_big' = The counties that are bigger than a district, e.g., ['Mecklenburg', 'Wake']
@@ -1861,7 +1186,7 @@ function doPreprocessCensus(s, bLog = false) {
     let expectedSplits = 0;
     let expectedAffected = 0;
     // Get the county FIPS codes
-    let fipsCodes = U.getObjectKeys(s.counties.index);
+    let fipsCodes = U.getObjectKeys(container.counties.index);
     // Loop over the counties
     for (let county in fipsCodes) {
         let fipsCode = fipsCodes[county];
@@ -1877,37 +1202,166 @@ function doPreprocessCensus(s, bLog = false) {
         if (countySplits > 0) {
             countyAffected = totalByCounty[fipsCode] % targetSize;
             tooBigFIPS.push(fipsCode);
-            tooBigName.push(s.counties.nameFromFIPS(fipsCode));
+            tooBigName.push(container.counties.nameFromFIPS(fipsCode));
             singleCountyDistrictMax += countySplits;
         }
         expectedSplits += countySplits;
         expectedAffected += countyAffected;
     }
-    s.state.tooBigFIPS = tooBigFIPS;
-    s.state.tooBigName = tooBigName;
-    s.state.expectedSplits = expectedSplits;
-    s.state.expectedAffected = expectedAffected;
-    s.state.singleCountyDistrictMax = singleCountyDistrictMax;
+    container.state.tooBigFIPS = tooBigFIPS;
+    container.state.tooBigName = tooBigName;
+    container.state.expectedSplits = expectedSplits;
+    container.state.expectedAffected = Math.round(expectedAffected);
+    container.state.singleCountyDistrictMax = singleCountyDistrictMax;
+}
+// END
+
+
+/***/ }),
+
+/***/ "./src/requirements.ts":
+/*!*****************************!*\
+  !*** ./src/requirements.ts ***!
+  \*****************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+
+//
+// MAP/PLAN REQUIREMENTS CHECKS ("CONSTRAINTS")
+//
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.isComplete = isComplete;
+exports.emptyDistricts = emptyDistricts;
+exports.getUnassignedFeatures = getUnassignedFeatures;
+exports.isContiguous = isContiguous;
+exports.isEmbedded = isEmbedded;
+const dra_analytics_1 = __webpack_require__(/*! @dra2020/dra-analytics */ "@dra2020/dra-analytics");
+const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
+const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
+// COMPLETE-NESS
+/*
+ * A plan is "complete" if all districts have non-zero population, and
+ * all unassigned features have zero population.
+ *
+ * Note: This helper does not verify the correct number of districts:
+ * That is the caller's responsibility.
+ */
+function isComplete(popByDistricts) {
+    if (popByDistricts[0] > 0)
+        return false; // Unassigned pop
+    for (let d = 1; d < popByDistricts.length; d++) {
+        if (popByDistricts[d] <= 0)
+            return false; // Empty district
+    }
+    return true;
+}
+function emptyDistricts(popByDistricts) {
+    let emptyDistricts = [];
+    for (let d = 1; d < popByDistricts.length; d++) {
+        if (popByDistricts[d] <= 0)
+            emptyDistricts.push(d); // Empty district
+    }
+    return emptyDistricts;
+}
+function getUnassignedFeatures(container) {
+    // Simulate an old school test entry, to preserve this and downstream code
+    let test = {};
+    const bLog = container._session.bLog;
+    let unassignedFeatures = [];
+    // Is all population assigned to real districts?
+    // If not, collect populated features (not water-only or uninhabited).
+    if (container.aggregates.columns.totalPop[S.NOT_ASSIGNED] > 0) {
+        const geoIDs = Array.from(container.plan.geoIDsForDistrictID(S.NOT_ASSIGNED));
+        geoIDs.forEach(function (geoID) {
+            if (U.isWaterOnly(geoID, container)) {
+                if (bLog)
+                    console.log("Unassigned water-only feature ignored in completeness check: ", geoID);
+                return;
+            }
+            if (U.isUninhabited(geoID, container)) {
+                if (bLog)
+                    console.log("Uninhabited feature ignored in completeness check: ", geoID);
+                return;
+            }
+            // Not water-only and inhabited
+            unassignedFeatures.push(geoID);
+            return;
+        });
+    }
+    return unassignedFeatures;
+}
+// CONTIGUITY
+/*
+ * A district is contiguous if all geo's in the set are connected
+ * via the contiguity graph.
+ *
+ * Use this helper to test individual districts in dra-client.
+ * AND all the district results together to test plan contiguity.
+ */
+function isContiguous(geoids, graph, bLog = false) {
+    return dra_analytics_1.Graph.isConnected(geoids, graph, bLog);
+}
+// FREE OF HOLES (NOT EMBEDDED)
+/*
+ * A district is NOT a "donut hole" district:
+ * - If any neighbor is 'OUT_OF_STATE'; or
+ * - If there are 2 or more neighboring districts.
+ *
+ * Use this helper to test individual districts in dra-client.
+ * AND all the district results together to test whether a plan is free of holes.
+ */
+function isEmbedded(districtID, geoids, plan, graph, bLog = false) {
+    return dra_analytics_1.Graph.isEmbedded(districtID, geoids, plan, graph, bLog);
 }
-// PREPROCESS ELECTION RESULTS
-// function doPreprocessElection(s: AnalyticsSession, bLog: boolean = false): void
-// {
-//   if (bLog) console.log("Preprocessing election data ...");
-// }
+// END
 
 
 /***/ }),
 
-/***/ "./src/results.ts":
-/*!************************!*\
-  !*** ./src/results.ts ***!
-  \************************/
+/***/ "./src/rpv.ts":
+/*!********************!*\
+  !*** ./src/rpv.ts ***!
+  \********************/
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
 //
-// TEMPLATES FOR UNFORMATTED ANALYTICS RESULTS
-// 
+// RACIALLY POLARIZED VOTING (RPV) SUPPORT
+// The main RPV code is in the dra-analytics package.
+//
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -1942,165 +1396,163 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.prepareRequirementsChecklist = prepareRequirementsChecklist;
-exports.prepareDistrictStatistics = prepareDistrictStatistics;
-exports.doAnalyzePostProcessing = doAnalyzePostProcessing;
+exports.doRPV = doRPV;
+exports.inferSelectedMinority = inferSelectedMinority;
+const dra_analytics_1 = __webpack_require__(/*! @dra2020/dra-analytics */ "@dra2020/dra-analytics");
+const T = __importStar(__webpack_require__(/*! ./types */ "./src/types.ts"));
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
-const analyze_1 = __webpack_require__(/*! ./analyze */ "./src/analyze.ts");
-function prepareRequirementsChecklist(s, bLog = false) {
-    if (!(s.bPostProcessingDone)) {
-        doAnalyzePostProcessing(s);
-    }
-    // REQUIREMENTS CATEGORY
-    let paRequirements;
-    {
-        const completeTest = s.getTest(0 /* T.Test.Complete */);
-        const contiguousTest = s.getTest(1 /* T.Test.Contiguous */);
-        const freeOfHolesTest = s.getTest(2 /* T.Test.FreeOfHoles */);
-        const equalPopulationTest = s.getTest(3 /* T.Test.EqualPopulation */);
-        // Combine individual checks into an overall score
-        const completeMetric = completeTest['score'];
-        const contiguousMetric = contiguousTest['score'];
-        const freeOfHolesMetric = freeOfHolesTest['score'];
-        const equalPopulationMetric = equalPopulationTest['score'];
-        const reqScore = completeMetric && contiguousMetric && freeOfHolesMetric && equalPopulationMetric;
-        /* T.TriState
-        // NOTE - Until we add three-state support top to bottom in
-        //   requirements/validations, map booleans to tri-states here.
-        const completeMetric = U.mapBooleanToTriState(completeTest['score'] as boolean);
-        const contiguousMetric = U.mapBooleanToTriState(contiguousTest['score'] as boolean);
-        const freeOfHolesMetric = U.mapBooleanToTriState(freeOfHolesTest['score'] as boolean);
-        const equalPopulationMetric = U.mapBooleanToTriState(equalPopulationTest['score'] as boolean);
-    
-        let reqScore: T.TriState = T.TriState.Green;
-        const 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
-        const unassignedFeaturesDetail = U.deepCopy(completeTest['details']['unassignedFeatures']) || [];
-        const emptyDistrictsDetail = U.deepCopy(completeTest['details']['emptyDistricts']) || [];
-        const discontiguousDistrictsDetail = U.deepCopy(contiguousTest['details']['discontiguousDistricts']) || [];
-        const embeddedDistrictsDetail = U.deepCopy(freeOfHolesTest['details']['embeddedDistricts']) || [];
-        const populationDeviationDetail = U.deepCopy(equalPopulationTest['details']['deviation']);
-        const deviationThresholdDetail = U.trim(s.populationDeviationThreshold());
-        // const xx: string = s.state.xx;
-        // const stateReqsDict: T.Dict = allStateReqs;
-        // const 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
+const data_1 = __webpack_require__(/*! ./data */ "./src/data.ts");
+function doRPV(container, districtID, groups, bLog = false) {
+    // Make sure that a minority is specified
+    if (!(groups.black || groups.hispanic || groups.pacific || groups.asian || groups.native || groups.minority))
+        return undefined;
+    const points = extractVotesByDemographic(container, districtID, groups, bLog);
+    // Make sure the district is not empty & there are enough points
+    if (points === undefined)
+        return undefined;
+    if (points.comparison === undefined)
+        return undefined;
+    if (points.comparison.length <= 10)
+        return undefined;
+    return dra_analytics_1.Minority.analyzeRacialVoting(points, districtID, groups);
+}
+function extractVotesByDemographic(container, districtID, groups, bLog = false) {
+    let ids = [];
+    let comparisonPts = []; // Either White -or- (1 – <selected minority>) i.e., White++
+    let hispanicPts = [];
+    let blackPts = [];
+    let pacificPts = [];
+    let asianPts = [];
+    let nativePts = [];
+    let minorityPts = [];
+    // Gather [demographic %, D %] points for the selected district ID
+    let i = districtID;
+    // HACK - For comparing a minority group to everyone else (vs. just White),
+    //   infer the *single* minority group that has been selected.
+    const selectedMinority = inferSelectedMinority(groups);
+    // Get the geoIDs assigned to the district
+    // Guard against empty districts
+    let geoIDs = container.plan.geoIDsForDistrictID(i);
+    if (geoIDs && (geoIDs.size > 0)) {
+        // ... loop over the geoIDs collecting the points for ecological regression
+        geoIDs.forEach(function (geoID) {
+            // Skip water-only features
+            if (!(U.isWaterOnly(geoID))) {
+                // Map from geoID to feature index
+                let featureID = container.features.featureID(geoID);
+                let f = container.features.featureByIndex(featureID);
+                if (!(f == undefined)) {
+                    // Calculate the Dem two-party vote
+                    // 03-27-21
+                    const dkELECTION = container.features._keys[T.Dataset.ELECTION];
+                    const featureDem = (0, data_1.fieldForFeature)(f, dkELECTION, 7 /* T.FeatureField.DemVotes */);
+                    const featureRep = (0, data_1.fieldForFeature)(f, dkELECTION, 8 /* T.FeatureField.RepVotes */);
+                    if ((featureDem + featureRep) > 0) {
+                        const pctDem = featureDem / (featureDem + featureRep);
+                        // Calculate the VAP/CVAP percentages by demographic
+                        // 03-27-21
+                        const dkVAP = container.features._keys[T.Dataset.VAP];
+                        const totalVAP = (0, data_1.fieldForFeature)(f, dkVAP, 0 /* T.FeatureField.TotalPop */);
+                        if (totalVAP > 0) {
+                            // Gather all points, for debugging purposes ...
+                            const hispanicVAP = (0, data_1.fieldForFeature)(f, dkVAP, 3 /* T.FeatureField.HispanicPop */);
+                            const blackVAP = (0, data_1.fieldForFeature)(f, dkVAP, 2 /* T.FeatureField.BlackPop */);
+                            const pacificVAP = (0, data_1.fieldForFeature)(f, dkVAP, 5 /* T.FeatureField.PacificPop */);
+                            const asianVAP = (0, data_1.fieldForFeature)(f, dkVAP, 4 /* T.FeatureField.AsianPop */);
+                            const nativeVAP = (0, data_1.fieldForFeature)(f, dkVAP, 6 /* T.FeatureField.NativePop */);
+                            const pctHispanic = hispanicVAP / totalVAP;
+                            const pctBlack = blackVAP / totalVAP;
+                            const pctPacific = pacificVAP / totalVAP;
+                            const pctAsian = asianVAP / totalVAP;
+                            const pctNative = nativeVAP / totalVAP;
+                            const whiteVAP = (0, data_1.fieldForFeature)(f, dkVAP, 1 /* T.FeatureField.WhitePop */);
+                            const minorityVAP = totalVAP - whiteVAP;
+                            const pctMinority = minorityVAP / totalVAP;
+                            let pctComparison = whiteVAP / totalVAP;
+                            if (groups.invertSelection) {
+                                switch (selectedMinority) {
+                                    case 'Hispanic': {
+                                        pctComparison = (totalVAP - hispanicVAP) / totalVAP;
+                                        break;
+                                    }
+                                    case 'Black': {
+                                        pctComparison = (totalVAP - blackVAP) / totalVAP;
+                                        break;
+                                    }
+                                    case 'Pacific': {
+                                        pctComparison = (totalVAP - pacificVAP) / totalVAP;
+                                        break;
+                                    }
+                                    case 'Asian': {
+                                        pctComparison = (totalVAP - asianVAP) / totalVAP;
+                                        break;
+                                    }
+                                    case 'Native': {
+                                        pctComparison = (totalVAP - nativeVAP) / totalVAP;
+                                        break;
+                                    }
+                                    case 'Minority': {
+                                        pctComparison = (totalVAP - minorityVAP) / totalVAP;
+                                        break;
+                                    }
+                                    default: {
+                                        console.log("Selected minority not recognized!");
+                                        break;
+                                    }
+                                }
+                            }
+                            ids.push(geoID);
+                            comparisonPts.push({ x: pctComparison, y: pctDem }); // White -or- (1 – <selected minority>)
+                            hispanicPts.push({ x: pctHispanic, y: pctDem });
+                            blackPts.push({ x: pctBlack, y: pctDem });
+                            pacificPts.push({ x: pctPacific, y: pctDem });
+                            asianPts.push({ x: pctAsian, y: pctDem });
+                            nativePts.push({ x: pctNative, y: pctDem });
+                            minorityPts.push({ x: pctMinority, y: pctDem });
+                        }
+                        else {
+                            if (bLog)
+                                console.log("RPV: Total VAP not > 0.");
+                        }
+                    }
+                    else {
+                        if (bLog)
+                            console.log("RPV: D + R not > 0.");
+                    }
+                }
             }
+        });
+        // ... but only keep points for the demographics that are going to be analyzed
+        return {
+            ids: ids,
+            comparison: comparisonPts,
+            minority: groups.minority ? minorityPts : [],
+            black: groups.black ? blackPts : [],
+            hispanic: groups.hispanic ? hispanicPts : [],
+            pacific: groups.pacific ? pacificPts : [],
+            asian: groups.asian ? asianPts : [],
+            native: groups.native ? nativePts : []
         };
     }
-    return paRequirements;
+    // If a district is empty
+    return undefined;
 }
-// Create a DistrictStatistics instance, deep copying the underlying values.
-function prepareDistrictStatistics(s, bLog = false) {
-    if (!(s.bPostProcessingDone)) {
-        doAnalyzePostProcessing(s);
-    }
-    // Transpose the rows & columns, so rows are districts.
-    let dsTable = [];
-    for (let i = 0; i < s.districts.numberOfRows(); i++) {
-        const rawRow = {
-            districtID: i,
-            totalPop: s.districts.table.totalPop[i],
-            popDevPct: s.districts.table.popDevPct[i],
-            bEqualPop: s.districts.table.bEqualPop[i],
-            bNotEmpty: s.districts.table.bNotEmpty[i],
-            bContiguous: s.districts.table.bContiguous[i],
-            bNotEmbedded: s.districts.table.bNotEmbedded[i],
-            demPct: s.districts.table.demPct[i],
-            repPct: s.districts.table.repPct[i],
-            othPct: s.districts.table.otherPct[i],
-            whitePct: s.districts.table.whitePct[i],
-            totalVAP: s.districts.table.totalVAP[i],
-            minorityPct: s.districts.table.minorityPct[i],
-            blackPct: s.districts.table.blackPct[i],
-            hispanicPct: s.districts.table.hispanicPct[i],
-            pacificPct: s.districts.table.pacificPct[i],
-            asianPct: s.districts.table.asianPct[i],
-            nativePct: s.districts.table.nativePct[i]
-        };
-        const readyRow = U.deepCopy(rawRow);
-        dsTable.push(readyRow);
-    }
-    const dsDetails = {
-    // None at this time
-    };
-    const dsDatasets = {
-        shapes: U.deepCopy(s.config['descriptions']['SHAPES']), // 2020
-        census: U.deepCopy(s.config['descriptions']['CENSUS']),
-        vap: U.deepCopy(s.config['descriptions']['VAP']),
-        election: U.deepCopy(s.config['descriptions']['ELECTION'])
-    };
-    const dsResources = {
-    // None at this time
-    };
-    const ds = {
-        table: dsTable,
-        details: dsDetails,
-        datasets: dsDatasets,
-        resources: dsResources
-    };
-    return ds;
-}
-// 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) {
-    // Just populate the normalized population deviation score in the test
-    const scorecard = s._scorecard;
-    let popDev = s.getTest(4 /* T.Test.PopulationDeviation */);
-    popDev['normalizedScore'] = scorecard.populationDeviation.normalized;
-    const datasets = {
-        shapes: U.deepCopy(s.config['descriptions']['SHAPES']), // 2020
-        census: U.deepCopy(s.config['descriptions']['CENSUS']),
-        vap: U.deepCopy(s.config['descriptions']['VAP']),
-        election: U.deepCopy(s.config['descriptions']['ELECTION'])
-    };
-    scorecard.partisan.details['election'] = datasets.election;
-    scorecard.minority.details['vap'] = datasets.vap;
-    scorecard.details['shapes'] = datasets.shapes;
-    scorecard.details['census'] = datasets.census;
-    const simpleSplits = s.getTest(5 /* T.Test.UnexpectedCountySplits */);
-    scorecard.splitting.details['unexpectedAffected'] = simpleSplits['score'];
-    scorecard.splitting.details['nSplits'] = simpleSplits['details']['nSplits'];
-    scorecard.splitting.details['countiesSplitUnexpectedly'] = U.deepCopy(simpleSplits['details']['countiesSplitUnexpectedly']);
-    // 02-23-21 - Added single-county district details
-    scorecard.splitting.details['nTooBigCounties'] = simpleSplits['details']['expectedSplits'];
-    scorecard.splitting.details['tooBigName'] = simpleSplits['details']['tooBigName'];
-    scorecard.splitting.details['nCountiesSplit'] = simpleSplits['details']['nCountiesSplit'];
-    scorecard.splitting.details['nSingleCountyDistricts'] = simpleSplits['details']['nSingleCountyDistricts'];
-    scorecard.splitting.details['singleCountyDistrictMax'] = simpleSplits['details']['singleCountyDistrictMax'];
-    // 07-17-21 - Enumerate # of times each split county is split
-    scorecard.splitting.details['countiesWithSplits'] = simpleSplits['details']['countiesWithSplits'];
-    // NOTE - Add split precincts in dra-client directly
-    // Derive secondary tests
-    // Note - The only secondary test is 'roughly equal population (true/false)
-    (0, analyze_1.doDeriveSecondaryTests)(s, bLog);
-    // Toggle the semaphore, so postprocessing isn't for both the testlog & scorecard
-    s.bPostProcessingDone = true;
+function inferSelectedMinority(groups) {
+    if (groups.hispanic)
+        return 'Hispanic';
+    if (groups.black)
+        return 'Black';
+    if (groups.pacific)
+        return 'Pacific';
+    if (groups.asian)
+        return 'Asian';
+    if (groups.native)
+        return 'Native';
+    if (groups.minority)
+        return 'Minority';
+    return 'No minority selected!';
 }
+// END
 
 
 /***/ }),
@@ -2149,57 +1601,52 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.profilePlan = profilePlan;
-exports.getStatewideDemographics = getStatewideDemographics;
+exports.makeProfile = makeProfile;
 exports.computeMetrics = computeMetrics;
 exports.rateKeyDimensions = rateKeyDimensions;
 exports.thunkScorecard = thunkScorecard;
-const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 const dra_analytics_1 = __webpack_require__(/*! @dra2020/dra-analytics */ "@dra2020/dra-analytics");
+const T = __importStar(__webpack_require__(/*! ./types */ "./src/types.ts"));
+const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
+const D = __importStar(__webpack_require__(/*! ./data */ "./src/data.ts"));
 // PROFILE A PLAN
 const KEEP_DECIMALS = 6;
-// MMD - Added # reps per district to the profile
-function profilePlan(s, bLog = false) {
-    const state = s.state.xx;
-    const planName = s.title;
-    const nDistricts = s.state.nDistricts;
-    const nReps = s.state.nReps; // MMD
-    const nCounties = s.counties.nCounties;
-    const targetSize = Math.round(s.state.totalPop / nReps); // MMD
-    // const targetSize: number = Math.round(s.state.totalPop / nDistricts);
-    const popByDistrict = U.deepCopy(s.districts.table.totalPop.slice(1, -1));
-    const geoPropsByDistrict = makeArrayOfGeoProps(s, bLog);
-    const splits = makeNakedCxD(s);
-    const summaryRow = s.districts.numberOfRows() - 1;
-    // 10-22-2020 - Converted Dem + Rep + Other = Total to two-party vote shares for analytics.
-    const demVote = s.districts.table.demVotes[summaryRow];
-    const repVote = s.districts.table.repVotes[summaryRow];
+function makeProfile(container) {
+    const state = container.state.xx;
+    const planName = container.title;
+    const nDistricts = container.state.nDistricts;
+    const nReps = container.state.nReps;
+    const nCounties = container.counties.nCounties;
+    const targetSize = container.state.targetSize;
+    const popByDistrict = U.deepCopy(container.aggregates.columns.totalPop.slice(1, -1));
+    // const geoPropsByDistrict: L.GeoProperties[] = makeArrayOfGeoProps(s, bLog); // No longer used
+    const splits = _makeCxD(container, container._session.bLog);
+    container.CxD = splits; // Squirrel CxD away for later "unexpected splits" analysis
+    const demVote = container.aggregates.columns.DemVotes.at(-1);
+    const repVote = container.aggregates.columns.RepVotes.at(-1);
     const statewideVf = U.trim(demVote / (demVote + repVote), KEEP_DECIMALS);
     let vpiArray = [];
-    const demVotes = U.deepCopy(s.districts.table.demVotes.slice(1, -1));
-    const repVotes = U.deepCopy(s.districts.table.repVotes.slice(1, -1));
-    for (let districtID = 1; districtID <= nDistricts; districtID++) {
-        const D = demVotes[districtID - 1];
-        const R = repVotes[districtID - 1];
+    for (let d = 1; d <= nDistricts; d++) {
+        const D = container.aggregates.columns.DemVotes[d];
+        const R = container.aggregates.columns.RepVotes[d];
         const T = D + R;
         const v = (T > 0) ? U.trim(D / T, KEEP_DECIMALS) : 0;
         vpiArray.push(v);
     }
-    const statewideDemographics = getStatewideDemographics(s);
-    const demographicsByDistrict = getDemographicsByDistrict(s);
-    // MMD - Extended the profile for # reps per district
+    const statewideDemographics = _makeStatewideDemographics(container, container._session.bLog);
+    const demographicsByDistrict = _makeDemographicsByDistrict(container, container._session.bLog);
     const profile = {
         state: state,
         name: planName,
         nDistricts: nDistricts,
-        repsByDistrict: s.repsByDistrict, // MMD
+        repsByDistrict: container.repsByDistrict,
         nCounties: nCounties,
-        bStateLeg: s.legislativeDistricts, // TODO - 2020
+        bStateLeg: container.legislativeDistricts,
         population: {
             byDistrict: popByDistrict,
             targetSize: targetSize
         },
-        shapes: geoPropsByDistrict,
+        shapes: [] /*geoPropsByDistrict*/,
         counties: splits,
         partisanship: {
             statewide: statewideVf,
@@ -2212,64 +1659,71 @@ function profilePlan(s, bLog = false) {
     };
     return profile;
 }
-// NOTE - The CxD splits structure from _data.ts includes dummy districts for
-//  unassigned precincts & state summary and an extra 0 county. But dra-score takes
-//  a simple 1–D x 1–C splits array (zero-based, of course).
-function makeNakedCxD(s, bLog = false) {
-    const adornedCxD = s.districts.table.countySplits;
-    let CxD = [];
-    // Remove the unassigned & total dummy "districts"
-    for (let districtID = 1; districtID <= s.state.nDistricts; districtID++) {
-        const splits = U.deepCopy(adornedCxD[districtID].slice(1));
-        CxD.push(splits);
-    }
-    return CxD;
-}
-function makeArrayOfGeoProps(s, bLog = false) {
-    let geometryByDistrict = [];
-    for (let districtID = 1; districtID <= s.state.nDistricts; districtID++) {
-        let districtProps = s.districts.getGeoProperties(districtID);
-        // Guard against no shape and no properties
-        if (districtProps) {
-            let a = U.trim(districtProps[0 /* T.DistrictShapeProperty.Area */], KEEP_DECIMALS);
-            let p = U.trim(districtProps[2 /* T.DistrictShapeProperty.Perimeter */], KEEP_DECIMALS);
-            let d = U.trim(districtProps[1 /* T.DistrictShapeProperty.Diameter */], KEEP_DECIMALS);
-            // Save each triple
-            geometryByDistrict.push({ area: a, perimeter: p, diameter: d });
-        }
-    }
-    return geometryByDistrict;
-}
-function getDemographicsByDistrict(s, bLog = false) {
+function _makeDemographicsByDistrict(container, bLog = false) {
     let demographicsArray = [];
-    // Remove the unassigned & total dummy "districts"
-    for (let districtID = 1; districtID <= s.state.nDistricts; districtID++) {
+    // Ignorethe unassigned & total dummy "districts"
+    for (let d = 1; d <= container.state.nDistricts; d++) {
         const districtDemographics = {
-            white: U.trim(s.districts.table.whitePct[districtID], KEEP_DECIMALS),
-            minority: U.trim(s.districts.table.minorityPct[districtID], KEEP_DECIMALS),
-            black: U.trim(s.districts.table.blackPct[districtID], KEEP_DECIMALS),
-            hispanic: U.trim(s.districts.table.hispanicPct[districtID], KEEP_DECIMALS),
-            pacific: U.trim(s.districts.table.pacificPct[districtID], KEEP_DECIMALS),
-            asian: U.trim(s.districts.table.asianPct[districtID], KEEP_DECIMALS),
-            native: U.trim(s.districts.table.nativePct[districtID], KEEP_DECIMALS)
+            white: U.trim(container.aggregates.columns.whitePct[d], KEEP_DECIMALS),
+            minority: U.trim(container.aggregates.columns.minorityPct[d], KEEP_DECIMALS),
+            black: U.trim(container.aggregates.columns.blackPct[d], KEEP_DECIMALS),
+            hispanic: U.trim(container.aggregates.columns.hispanicPct[d], KEEP_DECIMALS),
+            pacific: U.trim(container.aggregates.columns.pacificPct[d], KEEP_DECIMALS),
+            asian: U.trim(container.aggregates.columns.asianPct[d], KEEP_DECIMALS),
+            native: U.trim(container.aggregates.columns.nativePct[d], KEEP_DECIMALS)
         };
         demographicsArray.push(districtDemographics);
     }
     return demographicsArray;
 }
-function getStatewideDemographics(s, bLog = false) {
-    const summaryRow = s.districts.numberOfRows() - 1;
+function _makeStatewideDemographics(container, bLog = false) {
+    const summaryRow = container.state.nDistricts + 2 - 1; // Account for unassigned & total dummy "districts";
     const demographics = {
-        white: U.trim(s.districts.table.whitePct[summaryRow], KEEP_DECIMALS),
-        minority: U.trim(s.districts.table.minorityPct[summaryRow], KEEP_DECIMALS),
-        black: U.trim(s.districts.table.blackPct[summaryRow], KEEP_DECIMALS),
-        hispanic: U.trim(s.districts.table.hispanicPct[summaryRow], KEEP_DECIMALS),
-        pacific: U.trim(s.districts.table.pacificPct[summaryRow], KEEP_DECIMALS),
-        asian: U.trim(s.districts.table.asianPct[summaryRow], KEEP_DECIMALS),
-        native: U.trim(s.districts.table.nativePct[summaryRow], KEEP_DECIMALS)
+        white: U.trim(container.aggregates.columns.whitePct[summaryRow], KEEP_DECIMALS),
+        minority: U.trim(container.aggregates.columns.minorityPct[summaryRow], KEEP_DECIMALS),
+        black: U.trim(container.aggregates.columns.blackPct[summaryRow], KEEP_DECIMALS),
+        hispanic: U.trim(container.aggregates.columns.hispanicPct[summaryRow], KEEP_DECIMALS),
+        pacific: U.trim(container.aggregates.columns.pacificPct[summaryRow], KEEP_DECIMALS),
+        asian: U.trim(container.aggregates.columns.asianPct[summaryRow], KEEP_DECIMALS),
+        native: U.trim(container.aggregates.columns.nativePct[summaryRow], KEEP_DECIMALS)
     };
     return demographics;
 }
+function _makeCxD(container, bLog = false) {
+    let CxD = [];
+    let nCountyBuckets = container.counties.nCounties;
+    for (let d = 1; d <= container.state.nDistricts; d++) {
+        let countySplits = U.initArray(nCountyBuckets, 0);
+        let geoIDs = container.plan.geoIDsForDistrictID(d);
+        if (geoIDs && (geoIDs.size > 0)) {
+            geoIDs.forEach(function (geoID) {
+                let featureID = container.features.featureID(geoID);
+                let f = container.features.featureByIndex(featureID);
+                if (f == undefined) {
+                    if (bLog)
+                        console.log("Skipping undefined feature in making CxD matrix: GEOID =", geoID, "Feature ID =", featureID);
+                }
+                else {
+                    const dkCENSUS = container.features._keys[T.Dataset.CENSUS];
+                    const featurePop = D.fieldForFeature(f, dkCENSUS, 0 /* T.FeatureField.TotalPop */);
+                    // Ignore features when the county is unrecognized
+                    const countyFIPS = U.parseGeoID(geoID)['county'];
+                    if (U.keyExists(countyFIPS, container.counties.index)) {
+                        // Total population by counties w/in a district
+                        let i = container.counties.indexFromFIPS(countyFIPS) - 1; // Remove the virtual county bucket
+                        countySplits[i] += featurePop;
+                    }
+                    else {
+                        if (bLog)
+                            console.log("Statistics: County not recognized:", geoID);
+                    }
+                }
+            });
+        }
+        CxD.push(countySplits);
+    }
+    return CxD;
+}
 // SCORE A PLAN using dra-analytics
 function computeMetrics(p, districtShapes, bLog = false) {
     if (bLog)
@@ -2356,13 +1810,12 @@ function thunkScorecard(newScorecard, bLog = false) {
     const scratchpad = newScorecard.scratchpad;
     // Partisan scorecard
     const pS = U.deepCopy(newScorecard.partisan);
+    // NOTE - 02/05/26 - Stopped return experimental metrics in the scorecard.
     // EXPERIMENTAL
-    const lPropAlt = newScorecard.partisan.experimental.lProp;
-    if (lPropAlt)
-        pS.details['lProp'] = lPropAlt;
-    const lUE = newScorecard.partisan.experimental.lUE;
-    if (lUE)
-        pS.details['lUE'] = lUE;
+    // const lPropAlt = newScorecard.partisan.experimental.lProp;
+    // if (lPropAlt) pS.details['lProp'] = lPropAlt;
+    // const lUE = newScorecard.partisan.experimental.lUE;
+    // if (lUE) pS.details['lUE'] = lUE;
     // Minority scorecard
     const mS = U.deepCopy(newScorecard.minority);
     // Compactness scorecard
@@ -2420,6 +1873,7 @@ function thunkScorecard(newScorecard, bLog = false) {
     };
     return scorecard;
 }
+// END
 
 
 /***/ }),
@@ -2435,14 +1889,12 @@ function thunkScorecard(newScorecard, bLog = false) {
 // GLOBAL CONSTANTS
 //
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.OUT_OF_STATE = exports.NUMBER_OF_ITEMS_TO_REPORT = exports.NOT_ASSIGNED = exports.PRECISION = void 0;
+exports.OUT_OF_STATE = exports.NOT_ASSIGNED = exports.PRECISION = void 0;
 // Keep four decimal places for fractions [0–1], i.e.,
 // keep two decimal places for %'s [0–100].
 exports.PRECISION = 4;
 // The dummy district ID for features not assigned districts yet
 exports.NOT_ASSIGNED = 0;
-// # of items to report as problematic (e.g., features, districts, etc.)
-exports.NUMBER_OF_ITEMS_TO_REPORT = 10;
 // The virtual geoID for "neighbors" in other states
 exports.OUT_OF_STATE = "OUT_OF_STATE";
 
@@ -2460,7 +1912,48 @@ exports.OUT_OF_STATE = "OUT_OF_STATE";
 // TYPE DEFINITIONS
 //
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.StatisticsFields = exports.multiFields = exports.multiFieldPairs = exports.fieldMap = exports.Dataset = void 0;
 exports.fieldsFromFeatureField = fieldsFromFeatureField;
+var Dataset;
+(function (Dataset) {
+    Dataset["SHAPES"] = "SHAPES";
+    Dataset["CENSUS"] = "CENSUS";
+    Dataset["VAP"] = "VAP";
+    Dataset["ELECTION"] = "ELECTION";
+})(Dataset || (exports.Dataset = Dataset = {}));
+// MAPPING BETWEEN FIELDS OF VARIOUS TYPES
+// Map between packed field keys and buckets
+exports.fieldMap = {
+    "CENSUS": {
+        "Tot": "TotalPop"
+    },
+    "VAP": {
+        "Tot": "TotalVAP",
+        "Wh": "WhiteVAP",
+        "Bl": "BlackVAP",
+        "BlC": "BlackVAP",
+        "His": "HispanicVAP",
+        "Asn": "AsianVAP",
+        "AsnC": "AsianVAP",
+        "Pac": "PacificVAP",
+        "PacC": "PacificVAP",
+        "Nat": "NativeVAP",
+        "NatC": "NativeVAP"
+    },
+    "ELECTION": {
+        "Tot": "TotalVotes",
+        "D": "DemVotes",
+        "R": "RepVotes"
+    }
+};
+// Pairs of packed/source fields that can correspond to the same bucket
+exports.multiFieldPairs = [
+    ["Bl", "BlC"],
+    ["Asn", "AsnC"],
+    ["Pac", "PacC"],
+    ["Nat", "NatC"]
+];
+exports.multiFields = exports.multiFieldPairs.flat();
 const FieldsByFeatureField = [
     ["Tot"],
     ["Wh"],
@@ -2476,6 +1969,29 @@ const FieldsByFeatureField = [
 function fieldsFromFeatureField(ds, ff) {
     return FieldsByFeatureField[ff];
 }
+var StatisticsFields;
+(function (StatisticsFields) {
+    StatisticsFields["districtID"] = "districtID";
+    StatisticsFields["totalPop"] = "totalPop";
+    StatisticsFields["popDevPct"] = "popDevPct";
+    StatisticsFields["bEqualPop"] = "bEqualPop";
+    StatisticsFields["bNotEmpty"] = "bNotEmpty";
+    StatisticsFields["bContiguous"] = "bContiguous";
+    StatisticsFields["bNotEmbedded"] = "bNotEmbedded";
+    StatisticsFields["demPct"] = "demPct";
+    StatisticsFields["repPct"] = "repPct";
+    StatisticsFields["othPct"] = "othPct";
+    StatisticsFields["totalVAP"] = "totalVAP";
+    StatisticsFields["whitePct"] = "whitePct";
+    StatisticsFields["minorityPct"] = "minorityPct";
+    StatisticsFields["blackPct"] = "blackPct";
+    StatisticsFields["hispanicPct"] = "hispanicPct";
+    StatisticsFields["pacificPct"] = "pacificPct";
+    StatisticsFields["asianPct"] = "asianPct";
+    StatisticsFields["nativePct"] = "nativePct";
+})(StatisticsFields || (exports.StatisticsFields = StatisticsFields = {}));
+;
+// END
 
 
 /***/ }),
@@ -2524,7 +2040,6 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getDistrict = getDistrict;
 exports.parseGeoID = parseGeoID;
 exports.isWaterOnly = isWaterOnly;
 exports.isUninhabited = isUninhabited;
@@ -2535,6 +2050,10 @@ exports.minArray = minArray;
 exports.maxArray = maxArray;
 exports.initArray = initArray;
 exports.andArray = andArray;
+exports.addArrays = addArrays;
+exports.subtractArrays = subtractArrays;
+exports.divideArrays = divideArrays;
+exports.falseIndexes = falseIndexes;
 exports.keyExists = keyExists;
 exports.isObjectEmpty = isObjectEmpty;
 exports.isSetEmpty = isSetEmpty;
@@ -2544,26 +2063,14 @@ exports.getNumericObjectKeys = getNumericObjectKeys;
 exports.getSelectObjectKeys = getSelectObjectKeys;
 exports.arrayContains = arrayContains;
 exports.objectContains = objectContains;
-exports.countEnumValues = countEnumValues;
 exports.shallowCopy = shallowCopy;
 exports.deepCopy = deepCopy;
 exports.depthof = depthof;
+exports.deepEqual = deepEqual;
 const dra_types_1 = __webpack_require__(/*! @dra2020/dra-types */ "@dra2020/dra-types");
-const _data_1 = __webpack_require__(/*! ./_data */ "./src/_data.ts");
+const D = __importStar(__webpack_require__(/*! ./data */ "./src/data.ts"));
+const T = __importStar(__webpack_require__(/*! ./types */ "./src/types.ts"));
 const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
-// PLAN HELPERS
-// Get the districtID to which a geoID is assigned
-function getDistrict(plan, geoID) {
-    // All geoIDs in a state *should be* assigned to a district (including the
-    // dummy "unassigned" district), but "water-only" features are sometimes missing
-    // from a map. This is also a guard against a bug in which a geoID has no district.
-    if (keyExists(geoID, plan)) {
-        return plan[geoID];
-    }
-    else {
-        return undefined;
-    }
-}
 // WORKING WITH GEOIDS
 function parseGeoID(geoID) {
     let bVfeature = false;
@@ -2581,15 +2088,14 @@ function parseGeoID(geoID) {
     };
     return parts;
 }
-// 08-13-2020 - Enhanced completeness checking.
-function isWaterOnly(geoID, s) {
+function isWaterOnly(geoID, container) {
     const waterOnlySignature = 'ZZZZZZ';
     if (geoID.indexOf(waterOnlySignature) >= 0)
         return true;
-    if (s) {
+    if (container) {
         // If called with a session, get the feature ...
-        const featureID = s.features.featureID(geoID);
-        const f /* T.GeoFeature */ = s.features.featureByIndex(featureID);
+        const featureID = container.features.featureID(geoID);
+        const f /* T.GeoFeature */ = container.features.featureByIndex(featureID);
         // ... and also check the 'ALAND' property
         const bNoLand = ((f.properties['ALAND10'] !== undefined) && (f.properties['ALAND10'] == 0)) ? true : false;
         return bNoLand;
@@ -2597,12 +2103,12 @@ function isWaterOnly(geoID, s) {
     else
         return false;
 }
-function isUninhabited(geoID, s) {
-    const featureID = s.features.featureID(geoID);
-    const f /* T.GeoFeature */ = s.features.featureByIndex(featureID);
+function isUninhabited(geoID, container) {
+    const featureID = container.features.featureID(geoID);
+    const f /* T.GeoFeature */ = container.features.featureByIndex(featureID);
     // 03-27-21
-    const dk = s.features._keys["CENSUS" /* T.Dataset.CENSUS */];
-    const totalPop = (0, _data_1.fieldForFeature)(f, dk, 0 /* T.FeatureField.TotalPop */);
+    const dk = container.features._keys[T.Dataset.CENSUS];
+    const totalPop = D.fieldForFeature(f, dk, 0 /* T.FeatureField.TotalPop */);
     // const totalPop = s.features.fieldForFeature(f, T.Dataset.CENSUS, T.FeatureField.TotalPop);
     let bUninhabited = (totalPop > 0) ? false : true;
     // HACK for Kentucky's atypical data, so the official map shows as complete
@@ -2643,20 +2149,44 @@ function initArray(n, value) {
 function andArray(arr) {
     return arr.reduce(function (a, b) { return a && b; }, true);
 }
+function addArrays(a, b) {
+    if (a.length !== b.length) {
+        throw new Error(`Array lengths must match: ${a.length} !== ${b.length}`);
+    }
+    return a.map((val, i) => val + b[i]);
+}
+function subtractArrays(a, b) {
+    if (a.length !== b.length) {
+        throw new Error(`Array lengths must match: ${a.length} !== ${b.length}`);
+    }
+    return a.map((val, i) => val - b[i]);
+}
+function divideArrays(numerator, denominator) {
+    if (numerator.length !== denominator.length) {
+        throw new Error(`Array lengths must match: ${numerator.length} !== ${denominator.length}`);
+    }
+    return numerator.map((val, i) => denominator[i] <= 0 ? 0.0 : val / denominator[i]);
+}
+// NOTE - This helper excludes the first and last items in the array, 
+//   which are dummy unassigned and summary values, respectively.
+function falseIndexes(booleans) {
+    return booleans.reduce((indexes, value, index) => {
+        if (index > 0 && index < booleans.length - 1 && value === false) {
+            indexes.push(index);
+        }
+        return indexes;
+    }, []);
+}
 // WORKING WITH OBJECT KEYS/PROPERTIES
-// Does an object have a key/property?
 function keyExists(k, o) {
     return k in o;
 }
-// Does an object (dict) have any keys/properties?
 function isObjectEmpty(o) {
     return Object.keys(o).length === 0;
 }
-// Does a Set have any members?
 function isSetEmpty(s) {
     return s.size === 0;
 }
-// Does an array hold any items?
 function isArrayEmpty(a) {
     if (a === undefined || a.length == 0) {
         // array empty or does not exist
@@ -2666,7 +2196,6 @@ function isArrayEmpty(a) {
         return false;
     }
 }
-// Get the keys for an object
 function getObjectKeys(o) {
     return Object.keys(o);
 }
@@ -2688,16 +2217,6 @@ function arrayContains(a, item) {
 function objectContains(o, key) {
     return (key in o);
 }
-// ENUM HELPERS
-// Source: https://stackoverflow.com/questions/38034673/determine-the-number-of-enum-elements-typescript
-function countEnumValues(enumName) {
-    let count = 0;
-    for (let item in enumName) {
-        if (isNaN(Number(item)))
-            count++;
-    }
-    return count;
-}
 // COPYING - Copied from dra-client/util.ts
 function shallowCopy(src) {
     if (Array.isArray(src))
@@ -2755,233 +2274,104 @@ function depthof(a) {
             }
     }
 }
-
-
-/***/ }),
-
-/***/ "./src/valid.ts":
-/*!**********************!*\
-  !*** ./src/valid.ts ***!
-  \**********************/
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
-
-
-//
-// MAP/PLAN VALIDATIONS
-//
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
+// EQUALITY HELPERS
+function approxEqual(x, y, places = 2) {
+    const tolerance = Math.pow(10, -places) * 0.5;
+    return Math.abs(x - y) <= tolerance;
+}
+function deepEqual(obj1, obj2, path = '') {
+    // Same reference
+    if (obj1 === obj2)
+        return true;
+    // Type checking
+    if (typeof obj1 !== typeof obj2) {
+        console.log(`${path || 'root'}: type mismatch - ${typeof obj1} vs ${typeof obj2}`);
+        return false;
     }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.doIsComplete = doIsComplete;
-exports.doIsContiguous = doIsContiguous;
-exports.doIsFreeOfHoles = doIsFreeOfHoles;
-const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
-const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
-//
-// COMPLETE - Are all geo's assigned to a district, and do all districts have
-//   at least one geo assigned to them?
-//
-function doIsComplete(s, bLog = false) {
-    let test = s.getTest(0 /* T.Test.Complete */);
-    // Get the by-district results, including the dummy unassigned district,
-    // but ignoring the N+1 summary district
-    let bNotEmptyByDistrict = s.districts.table.bNotEmpty;
-    bNotEmptyByDistrict = bNotEmptyByDistrict.slice(0, -1);
-    // Are all features assigned to districts?
-    // Check the dummy district that holds any unassigned features.
-    let unassignedFeatures = [];
-    let bAllAssigned = (!bNotEmptyByDistrict[S.NOT_ASSIGNED]);
-    let bAllNonWaterOnlyAssigned = bAllAssigned ? true : false;
-    if (!bAllAssigned) {
-        let unassignedDistrict = s.plan.geoIDsForDistrictID(S.NOT_ASSIGNED);
-        unassignedFeatures = Array.from(unassignedDistrict);
-        // unassignedFeatures = unassignedFeatures.slice(0, S.NUMBER_OF_ITEMS_TO_REPORT);
-        // 08-13-2020 - Enhanced completeness checking.
-        // Are any of the unassigned features not water-only -or- inhabited?
-        // Check the official congressional maps for CT, KY, IL, and MI.
-        bAllNonWaterOnlyAssigned = !unassignedFeatures.some(function (geoID) {
-            if (U.isWaterOnly(geoID, s)) {
-                if (bLog)
-                    console.log("Unassigned water-only feature ignored in completeness check: ", geoID);
-                return false;
-            }
-            if (U.isUninhabited(geoID, s)) {
-                if (bLog)
-                    console.log("Uninhabited feature ignored in completeness check: ", geoID);
-                return false;
+    // Handle null
+    if (obj1 === null || obj2 === null) {
+        console.log(`${path || 'root'}: ${obj1} vs ${obj2}`);
+        return false;
+    }
+    // Atomic type comparisons
+    if (typeof obj1 === 'string') {
+        // Strings must be exactly equal
+        if (obj1 !== obj2) {
+            console.log(`${path || 'root'}: "${obj1}" vs "${obj2}"`);
+            return false;
+        }
+        return true;
+    }
+    if (typeof obj1 === 'number') {
+        // Numbers use approximate equality (2 decimal places)
+        if (!approxEqual(obj1, obj2, 2)) {
+            console.log(`${path || 'root'}: ${obj1} vs ${obj2} (difference: ${Math.abs(obj1 - obj2)})`);
+            return false;
+        }
+        return true;
+    }
+    if (typeof obj1 === 'boolean') {
+        // Booleans must be exactly equal
+        if (obj1 !== obj2) {
+            console.log(`${path || 'root'}: ${obj1} vs ${obj2}`);
+            return false;
+        }
+        return true;
+    }
+    // If not an object type, fall back to strict equality
+    if (typeof obj1 !== 'object') {
+        if (obj1 !== obj2) {
+            console.log(`${path || 'root'}: ${obj1} vs ${obj2}`);
+            return false;
+        }
+        return true;
+    }
+    // Array handling
+    if (Array.isArray(obj1) !== Array.isArray(obj2)) {
+        console.log(`${path || 'root'}: array vs non-array`);
+        return false;
+    }
+    if (Array.isArray(obj1)) {
+        if (obj1.length !== obj2.length) {
+            console.log(`${path || 'root'}: array length ${obj1.length} vs ${obj2.length}`);
+            return false;
+        }
+        let isEqual = true;
+        obj1.forEach((val, idx) => {
+            const itemPath = `${path}[${idx}]`;
+            if (!deepEqual(val, obj2[idx], itemPath)) {
+                isEqual = false;
             }
-            // Not water-only and inhabited
-            return true;
         });
-    }
-    // Do all real districts have at least one feature assigned to them?
-    let emptyDistricts = [];
-    let bNoneEmpty = true;
-    bNotEmptyByDistrict = bNotEmptyByDistrict.slice(1);
-    let districtID = 1;
-    bNotEmptyByDistrict.forEach(function (bNotEmpty) {
-        if (!bNotEmpty) {
-            bNoneEmpty = false;
-            emptyDistricts.push(districtID);
+        return isEqual;
+    }
+    // Object handling
+    const keys1 = Object.keys(obj1);
+    const keys2 = Object.keys(obj2);
+    // Check for missing keys
+    const allKeys = new Set([...keys1, ...keys2]);
+    let isEqual = true;
+    for (const key of allKeys) {
+        const keyPath = path ? `${path}.${key}` : key;
+        if (!(key in obj1)) {
+            console.log(`${keyPath}: missing in first object`);
+            isEqual = false;
         }
-        districtID += 1;
-    });
-    // Case 1 - One or more districts are missing:
-    //   The # of enumerated districts minus the dummy NOT_ASSIGNED one should
-    //   equal the number apportioned districts. This guards against a district
-    //   not being included in a map that is imported.
-    //
-    // NOTE - I'm no longer checking for this, but DRA should!
-    // Case 2 - Or a district is explicitly named but empty:
-    //   Note, this can happen if a district is created, and then all features
-    //   are removed from it (in DRA).
-    // Populate the test entry
-    // 08-13-2020 - Revised completeness check:
-    // A plan is complete if:
-    // * All inhabited, not water-only districts are assigned to districts. 
-    // * No districts are empty, i.e., each has one or more geos assigned to them.
-    //   Note: We're not checking (in _data.ts) whether those geos are water-only
-    //   or have any population, but that's a real edge case.
-    test['score'] = bAllNonWaterOnlyAssigned && bNoneEmpty;
-    // test['score'] = bAllAssigned && bNoneEmpty;
-    if (!bAllAssigned) {
-        test['details']['unassignedFeatures'] = unassignedFeatures;
-    }
-    if (!bNoneEmpty) {
-        test['details']['emptyDistricts'] = emptyDistricts;
-    }
-    // Populate the N+1 summary "district" in district.statistics
-    let bNotEmpty = s.districts.table.bNotEmpty;
-    let summaryRow = s.districts.numberOfRows() - 1;
-    bNotEmpty[summaryRow] = test['score'];
-    return test;
-}
-//
-// CONTIGUOUS - Is each district in a plan fully connected?
-//
-//   NOTE - To check "operational contiguity," we need to use a graph, i.e.,
-//   we can't rely on just the geometric contiguity of shapes in a shapefile.
-//
-//   To test this, load the NC 2010 map 'SAMPLE-BG-map-discontiguous.csv'.
-//
-function doIsContiguous(s, bLog = false) {
-    let test = s.getTest(1 /* T.Test.Contiguous */);
-    // Get the contiguity of each district. Ignore dummy unassigned district
-    // and the N+1 summary district.
-    let bContiguousByDistrict = s.districts.table.bContiguous;
-    bContiguousByDistrict = bContiguousByDistrict.slice(1, -1);
-    // If any real districts aren't contiguous, mark the plan as not contiguous
-    let bMapContiguous = U.andArray(bContiguousByDistrict);
-    // If the map is not contiguous, log the offending districts.
-    let discontiguousDistricts = [];
-    let districtID = 1;
-    bContiguousByDistrict.forEach(function (bDistrictContiguous) {
-        if (!bDistrictContiguous)
-            discontiguousDistricts.push(districtID);
-        districtID += 1;
-    });
-    // Populate the test entry
-    test['score'] = bMapContiguous;
-    if (!bMapContiguous) {
-        test['details'] = { 'discontiguousDistricts': discontiguousDistricts };
-    }
-    // Populate the N+1 summary "district" in district.statistics
-    let bContiguous = s.districts.table.bContiguous;
-    let summaryRow = s.districts.numberOfRows() - 1;
-    bContiguous[summaryRow] = test['score'];
-    return test;
-}
-//
-// FREE OF HOLES - Are any districts fully embedded w/in another district?
-//
-//   A district is NOT a "donut hole" district:
-//   - If any neighbor is 'OUT_OF_STATE'; or
-//   - If there are 2 or more neighboring districts.
-//
-//   To test this, load the NC 2010 map 'SAMPLE-BG-map-hole.csv'. District 1,
-//   Buncombe County (37021), is a donut hole w/in District 3.
-//
-function doIsFreeOfHoles(s, bLog = false) {
-    let test = s.getTest(2 /* T.Test.FreeOfHoles */);
-    // Initialize values
-    let bFreeOfHoles = true;
-    let embeddedDistricts = [];
-    // Get the embeddedness of each district. Ignore dummy unassigned district
-    // and the N+1 summary district.
-    let bNotEmbeddedByDistrict = s.districts.table.bNotEmbedded;
-    bNotEmbeddedByDistrict = bNotEmbeddedByDistrict.slice(1, -1);
-    let districtID = 1;
-    bNotEmbeddedByDistrict.forEach(function (bDistrictNotEmbedded) {
-        if (!bDistrictNotEmbedded) {
-            embeddedDistricts.push(districtID);
-            bFreeOfHoles = false;
+        else if (!(key in obj2)) {
+            console.log(`${keyPath}: missing in second object`);
+            isEqual = false;
         }
-        districtID += 1;
-    });
-    // Populate the test entry
-    test['score'] = bFreeOfHoles;
-    if (!bFreeOfHoles) {
-        test['details'] = { 'embeddedDistricts': embeddedDistricts };
-    }
-    // Populate the N+1 summary "district" in district.statistics
-    let bNotEmbedded = s.districts.table.bNotEmbedded;
-    let summaryRow = s.districts.numberOfRows() - 1;
-    bNotEmbedded[summaryRow] = test['score'];
-    return test;
+        else {
+            if (!deepEqual(obj1[key], obj2[key], keyPath)) {
+                isEqual = false;
+            }
+        }
+    }
+    return isEqual;
 }
+// END
 
 
-/***/ }),
-
-/***/ "./static/majority-minority.json":
-/*!***************************************!*\
-  !*** ./static/majority-minority.json ***!
-  \***************************************/
-/***/ ((module) => {
-
-module.exports = /*#__PURE__*/JSON.parse('{"AL":{"Black":[7],"Hispanic":[],"Pacific":[]},"AK":{"Black":[],"Hispanic":[],"Pacific":[]},"AZ":{"Black":[],"Hispanic":[2,4,7],"Pacific":[]},"AR":{"Black":[],"Hispanic":[],"Pacific":[]},"CA":{"Black":[13,37,43],"Hispanic":[17,18,20,21,28,31,32,34,35,38,39,43,45,47,51],"Pacific":[12,13,14,15,17,18,19,27,34,39,45,47,52]},"CO":{"Black":[],"Hispanic":[],"Pacific":[]},"CT":{"Black":[],"Hispanic":[],"Pacific":[]},"DC":{"Black":[],"Hispanic":[],"Pacific":[]},"DE":{"Black":[],"Hispanic":[],"Pacific":[]},"FL":{"Black":[5,20,24],"Hispanic":[18,21,25],"Pacific":[]},"GA":{"Black":[2,4,5,13],"Hispanic":[],"Pacific":[]},"HI":{"Black":[],"Hispanic":[],"Pacific":[2]},"ID":{"Black":[],"Hispanic":[1],"Pacific":[]},"IL":{"Black":[1,2,7],"Hispanic":[4],"Pacific":[]},"IN":{"Black":[7],"Hispanic":[],"Pacific":[]},"IA":{"Black":[],"Hispanic":[],"Pacific":[]},"KS":{"Black":[],"Hispanic":[],"Pacific":[]},"KY":{"Black":[],"Hispanic":[],"Pacific":[]},"LA":{"Black":[2],"Hispanic":[],"Pacific":[]},"ME":{"Black":[],"Hispanic":[],"Pacific":[]},"MD":{"Black":[4,7],"Hispanic":[],"Pacific":[]},"MA":{"Black":[],"Hispanic":[],"Pacific":[]},"MI":{"Black":[13,14],"Hispanic":[],"Pacific":[]},"MN":{"Black":[],"Hispanic":[],"Pacific":[]},"MS":{"Black":[2],"Hispanic":[],"Pacific":[]},"MO":{"Black":[1,5],"Hispanic":[],"Pacific":[]},"MT":{"Black":[],"Hispanic":[],"Pacific":[]},"NE":{"Black":[],"Hispanic":[],"Pacific":[]},"NV":{"Black":[],"Hispanic":[],"Pacific":[]},"NH":{"Black":[],"Hispanic":[],"Pacific":[]},"NJ":{"Black":[10,12],"Hispanic":[13],"Pacific":[6]},"NM":{"Black":[],"Hispanic":[2,13],"Pacific":[]},"NY":{"Black":[5,8,9,13],"Hispanic":[12,16],"Pacific":[6,7,10]},"NC":{"Black":[1,12],"Hispanic":[],"Pacific":[]},"ND":{"Black":[],"Hispanic":[],"Pacific":[]},"OH":{"Black":[3,11],"Hispanic":[],"Pacific":[]},"OK":{"Black":[],"Hispanic":[],"Pacific":[]},"OR":{"Black":[],"Hispanic":[],"Pacific":[]},"PA":{"Black":[2],"Hispanic":[],"Pacific":[]},"PR":{"Black":[],"Hispanic":[],"Pacific":[]},"RI":{"Black":[],"Hispanic":[],"Pacific":[]},"SC":{"Black":[6],"Hispanic":[],"Pacific":[]},"SD":{"Black":[],"Hispanic":[],"Pacific":[]},"TN":{"Black":[9],"Hispanic":[],"Pacific":[]},"TX":{"Black":[9,18,33],"Hispanic":[15,16,19,20,23,27,28,29,32],"Pacific":[]},"UT":{"Black":[],"Hispanic":[],"Pacific":[]},"VT":{"Black":[],"Hispanic":[],"Pacific":[]},"VA":{"Black":[3],"Hispanic":[],"Pacific":[]},"WA":{"Black":[],"Hispanic":[3],"Pacific":[9]},"WV":{"Black":[],"Hispanic":[],"Pacific":[]},"WI":{"Black":[4],"Hispanic":[],"Pacific":[]},"WY":{"Black":[],"Hispanic":[],"Pacific":[]}}');
-
-/***/ }),
-
-/***/ "./static/vra5-preclearance.json":
-/*!***************************************!*\
-  !*** ./static/vra5-preclearance.json ***!
-  \***************************************/
-/***/ ((module) => {
-
-module.exports = /*#__PURE__*/JSON.parse('{"AL":"all","AK":"all","AZ":"all","CA":"parts","FL":"parts","GA":"all","LA":"all","MI":"parts","MS":"all","NY":"parts","NC":"parts","SC":"all","SD":"parts","TX":"all","VA":"all"}');
-
 /***/ }),
 
 /***/ "@dra2020/baseclient":