@dra2020/district-analytics 10.0.10 → 10.0.11

package/dist/district-analytics.js

@@ -276,56 +276,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const G = __importStar(__webpack_require__(/*! @dra2020/dra-graph */ "@dra2020/dra-graph"));
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
-// import { isConnected, isEmbedded } from './valid';
 const compact_1 = __webpack_require__(/*! ./compact */ "./src/compact.ts");
 const political_1 = __webpack_require__(/*! ./political */ "./src/political.ts");
 // DEBUG COUNTERS
 let nMissingDataset = 0;
 let nMissingProperty = 0;
-// DISTRICT STATISTICS
-// Indexes for statistics fields in Districts
-// NOTE - Not a const, so the number can be determined dynamically
-var DistrictField;
-(function (DistrictField) {
-    DistrictField[DistrictField["TotalPop"] = 0] = "TotalPop";
-    DistrictField[DistrictField["PopDevPct"] = 1] = "PopDevPct";
-    DistrictField[DistrictField["bEqualPop"] = 2] = "bEqualPop";
-    DistrictField[DistrictField["bNotEmpty"] = 3] = "bNotEmpty";
-    DistrictField[DistrictField["bContiguous"] = 4] = "bContiguous";
-    DistrictField[DistrictField["bNotEmbedded"] = 5] = "bNotEmbedded";
-    DistrictField[DistrictField["CountySplits"] = 6] = "CountySplits";
-    // 10-22-2020 - Added Other votes
-    DistrictField[DistrictField["DemVotes"] = 7] = "DemVotes";
-    DistrictField[DistrictField["RepVotes"] = 8] = "RepVotes";
-    DistrictField[DistrictField["OtherVotes"] = 9] = "OtherVotes";
-    // TwoPartyVote,    // Two-party total ()= Dem + Rep) not all votes!
-    DistrictField[DistrictField["DemPct"] = 10] = "DemPct";
-    DistrictField[DistrictField["RepPct"] = 11] = "RepPct";
-    DistrictField[DistrictField["OtherPct"] = 12] = "OtherPct";
-    // End - OtherVotes changes
-    DistrictField[DistrictField["DemSeat"] = 13] = "DemSeat";
-    DistrictField[DistrictField["TotalVAP"] = 14] = "TotalVAP";
-    DistrictField[DistrictField["MinorityPop"] = 15] = "MinorityPop";
-    DistrictField[DistrictField["WhitePop"] = 16] = "WhitePop";
-    DistrictField[DistrictField["BlackPop"] = 17] = "BlackPop";
-    DistrictField[DistrictField["HispanicPop"] = 18] = "HispanicPop";
-    DistrictField[DistrictField["PacificPop"] = 19] = "PacificPop";
-    DistrictField[DistrictField["AsianPop"] = 20] = "AsianPop";
-    DistrictField[DistrictField["NativePop"] = 21] = "NativePop";
-    DistrictField[DistrictField["WhitePct"] = 22] = "WhitePct";
-    DistrictField[DistrictField["MinorityPct"] = 23] = "MinorityPct";
-    DistrictField[DistrictField["BlackPct"] = 24] = "BlackPct";
-    DistrictField[DistrictField["HispanicPct"] = 25] = "HispanicPct";
-    DistrictField[DistrictField["PacificPct"] = 26] = "PacificPct";
-    DistrictField[DistrictField["AsianPct"] = 27] = "AsianPct";
-    DistrictField[DistrictField["NativePct"] = 28] = "NativePct"; // Display
-})(DistrictField = exports.DistrictField || (exports.DistrictField = {}));
 class Districts {
     constructor(s, ds) {
         this._geoProperties = {};
         this._session = s;
         this._shapes = ds;
-        this.statistics = this.initStatistics();
+        this.table = this.initTable();
     }
     getDistrictShapes() {
         return this._shapes;
@@ -348,21 +309,44 @@ class Districts {
             return null;
     }
     setGeoProperties(i, p) { this._geoProperties[i] = p; }
-    numberOfColumns() { return U.countEnumValues(DistrictField); }
     // +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; }
-    // This is the core statistics 2D matrix:
-    // Fields on the outside, districts on the inside
-    initStatistics() {
-        let nRows = this.numberOfRows();
-        let nCols = this.numberOfColumns();
-        let outer = U.initArray(nCols, undefined);
-        for (let i = 0; i < nCols; i++) {
-            outer[i] = U.initArray(nRows, null);
-        }
-        return outer;
+    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;
     }
     // This is the workhorse computational routine!
     recalcStatistics(bLog = false) {
@@ -559,36 +543,34 @@ class Districts {
                 }
                 { // UPDATE THE DISTRICT STATISTICS
                     // NOTE - These are set below for both non-empty & empty districts:
-                    // this.statistics[DistrictField.bNotEmpty][i] = bNotEmpty;
-                    // this.statistics[DistrictField.bContiguous][i] = bContiguous;
-                    // this.statistics[DistrictField.bNotEmbedded][i] = bNotEmbedded;
-                    // this.statistics[DistrictField.TotalPop][i] = totalPop;
-                    // this.statistics[DistrictField.bEqualPop][i] = bEqualPop;
-                    this.statistics[DistrictField.PopDevPct][i] = popDevPct;
-                    // 10-22-2020 - Added Other votes
-                    this.statistics[DistrictField.DemVotes][i] = demVotes;
-                    this.statistics[DistrictField.RepVotes][i] = repVotes;
-                    this.statistics[DistrictField.OtherVotes][i] = othVotes;
-                    // this.statistics[DistrictField.TwoPartyVote][i] = totVotes;
-                    this.statistics[DistrictField.DemPct][i] = demPct;
-                    this.statistics[DistrictField.RepPct][i] = repPct;
-                    this.statistics[DistrictField.OtherPct][i] = othPct;
-                    this.statistics[DistrictField.DemSeat][i] = DemSeat;
-                    this.statistics[DistrictField.WhitePop][i] = whitePop;
-                    this.statistics[DistrictField.MinorityPop][i] = minorityPop;
-                    this.statistics[DistrictField.BlackPop][i] = blackPop;
-                    this.statistics[DistrictField.HispanicPop][i] = hispanicPop;
-                    this.statistics[DistrictField.PacificPop][i] = pacificPop;
-                    this.statistics[DistrictField.AsianPop][i] = asianPop;
-                    this.statistics[DistrictField.NativePop][i] = nativePop;
-                    this.statistics[DistrictField.TotalVAP][i] = totalVAP;
-                    this.statistics[DistrictField.WhitePct][i] = whitePct;
-                    this.statistics[DistrictField.MinorityPct][i] = minorityPct;
-                    this.statistics[DistrictField.BlackPct][i] = blackPct;
-                    this.statistics[DistrictField.HispanicPct][i] = hispanicPct;
-                    this.statistics[DistrictField.PacificPct][i] = pacificPct;
-                    this.statistics[DistrictField.AsianPct][i] = asianPct;
-                    this.statistics[DistrictField.NativePct][i] = nativePct;
+                    // * 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
@@ -608,60 +590,58 @@ class Districts {
                 }
             }
             else { // If a district is empty, zero these results (vs. null)
-                this.statistics[DistrictField.PopDevPct][i] = popDevPct;
-                // 10-22-2020 - Added Other votes
-                this.statistics[DistrictField.DemVotes][i] = 0;
-                this.statistics[DistrictField.RepVotes][i] = 0;
-                this.statistics[DistrictField.OtherVotes][i] = 0;
-                // this.statistics[DistrictField.TwoPartyVote][i] = 0;
-                this.statistics[DistrictField.DemPct][i] = 0;
-                this.statistics[DistrictField.RepPct][i] = 0;
-                this.statistics[DistrictField.OtherPct][i] = 0;
-                this.statistics[DistrictField.DemSeat][i] = 0;
-                this.statistics[DistrictField.WhitePop][i] = 0;
-                this.statistics[DistrictField.MinorityPop][i] = 0;
-                this.statistics[DistrictField.BlackPop][i] = 0;
-                this.statistics[DistrictField.HispanicPop][i] = 0;
-                this.statistics[DistrictField.PacificPop][i] = 0;
-                this.statistics[DistrictField.AsianPop][i] = 0;
-                this.statistics[DistrictField.NativePop][i] = 0;
-                this.statistics[DistrictField.TotalVAP][i] = 0;
-                this.statistics[DistrictField.WhitePct][i] = 0;
-                this.statistics[DistrictField.MinorityPct][i] = 0;
-                this.statistics[DistrictField.BlackPct][i] = 0;
-                this.statistics[DistrictField.HispanicPct][i] = 0;
-                this.statistics[DistrictField.PacificPct][i] = 0;
-                this.statistics[DistrictField.AsianPct][i] = 0;
-                this.statistics[DistrictField.NativePct][i] = 0;
+                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.statistics[DistrictField.TotalPop][i] = totalPop;
-                this.statistics[DistrictField.bNotEmpty][i] = bNotEmpty;
-                this.statistics[DistrictField.bContiguous][i] = bContiguous;
-                this.statistics[DistrictField.bNotEmbedded][i] = bNotEmbedded;
-                this.statistics[DistrictField.bEqualPop][i] = bEqualPop;
-                this.statistics[DistrictField.CountySplits][i] = countySplits;
+                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.statistics[DistrictField.DemVotes][summaryRow] = stateDemVote;
-            this.statistics[DistrictField.RepVotes][summaryRow] = stateRepVote;
-            this.statistics[DistrictField.DemPct][summaryRow] = stateDemVote / stateTotVote;
-            this.statistics[DistrictField.RepPct][summaryRow] = stateRepVote / stateTotVote;
-            this.statistics[DistrictField.OtherPct][summaryRow] = stateOthVote / stateTotVote;
+            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.statistics[DistrictField.TotalVAP][summaryRow] = stateVAPPop;
-            this.statistics[DistrictField.WhitePct][summaryRow] = stateWhitePop / stateVAPPop;
-            this.statistics[DistrictField.MinorityPct][summaryRow] = stateMinorityPop / stateVAPPop;
-            this.statistics[DistrictField.BlackPct][summaryRow] = stateBlackPop / stateVAPPop;
-            this.statistics[DistrictField.HispanicPct][summaryRow] = stateHispanicPop / stateVAPPop;
-            this.statistics[DistrictField.PacificPct][summaryRow] = statePacificPop / stateVAPPop;
-            this.statistics[DistrictField.AsianPct][summaryRow] = stateAsianPop / stateVAPPop;
-            this.statistics[DistrictField.NativePct][summaryRow] = stateNativePop / stateVAPPop;
+            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(`${nMissingDataset} features with missing datasets.`);
@@ -684,40 +664,6 @@ class Districts {
 }
 exports.Districts = Districts;
 // CLASSES, ETC. FOR FEATURE & COUNTY DATA
-// Types of datasets by feature
-/* 08-13-2020 - Moved to types.ts
-export const enum Dataset
-{
-  SHAPES = "SHAPES",
-  CENSUS = "CENSUS",
-  VAP = "VAP",
-  ELECTION = "ELECTION"
-}
-*/
-/* 08-13-2020 - Moved to types.ts
-export type DatasetKeys = {
-  SHAPES: string;    // A shapefile
-  CENSUS: string;    // A total population Census dataset
-  VAP: string;       // A voting age (or citizen voting age) dataset
-  ELECTION: string;  // An election dataset
-}
-*/
-// Identifiers of fields for each feature in the datasets
-/* 08-13-2020 - Moved to types.ts
-export const enum FeatureField
-{
-  TotalPop = "Tot",
-  WhitePop = "Wh",
-  BlackPop = "BlC",
-  HispanicPop = "His",
-  AsianPop = "AsnC",
-  PacificPop = "PacC",
-  NativePop = "NatC",
-  DemVotes = "D",
-  RepVotes = "R",
-  TotalVotes = "Tot"
-}
-*/
 // Wrap data by feature, to abstract the specifics of the internal structure
 class Features {
     constructor(s, data, keys) {
@@ -1033,7 +979,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
-const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
 // NOTE - The active code is below the long multi-line section to be deleted.
 // ANALYZE SIMPLE COUNTY & VTD SPLITTING
 /*
@@ -1076,7 +1021,9 @@ function doFindCountiesSplitUnexpectedly(s, bLog = false) {
     let countiesSplitUnexpectedly = [];
     // FIRST, ANALYZE THE COUNTY SPLITTING FOR THE PLAN
     // Get the county-district pivot ("splits")
-    let countiesByDistrict = s.districts.statistics[D.DistrictField.CountySplits];
+    let countiesByDistrict = s.districts.table.countySplits;
+    // TODO - DELETE???
+    // let countiesByDistrict = s.districts.statistics[D.DistrictField.CountySplits];
     // countiesByDistrict = countiesByDistrict.slice(1, -1);
     // Find the single-county districts, i.e., districts NOT split across counties.
     // Ignore the dummy unassigned 0 and N+1 summary "districts."
@@ -1307,15 +1254,7 @@ exports.scoreKIWYSICompactness = scoreKIWYSICompactness;
 //
 // EQUAL POPULATION
 //
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
 // 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) {
@@ -1338,7 +1277,7 @@ function doHasEqualPopulations(s, bLog = false) {
     test['details']['deviation'] = popDevPct;
     test['details']['thresholds'] = popDevTest['details']['scale'];
     // Populate the N+1 summary "district" in district.statistics
-    let bEqualPop = s.districts.statistics[D.DistrictField.bEqualPop];
+    let bEqualPop = s.districts.table.bEqualPop;
     let summaryRow = s.districts.numberOfRows() - 1;
     bEqualPop[summaryRow] = test['score'];
     return test;
@@ -1365,7 +1304,6 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(__webpack_require__(/*! ./_api */ "./src/_api.ts"));
-__export(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
 __export(__webpack_require__(/*! ./results */ "./src/results.ts"));
 __export(__webpack_require__(/*! ./types */ "./src/types.ts"));
 
@@ -1631,7 +1569,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
-const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
 const analyze_1 = __webpack_require__(/*! ./analyze */ "./src/analyze.ts");
 function prepareRequirementsChecklist(s, bLog = false) {
     if (!(s.bPostProcessingDone)) {
@@ -1706,37 +1643,29 @@ 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++) {
-        let rawRow = [
-            i,
-            s.districts.statistics[D.DistrictField.TotalPop][i],
-            s.districts.statistics[D.DistrictField.PopDevPct][i],
-            s.districts.statistics[D.DistrictField.bEqualPop][i],
-            s.districts.statistics[D.DistrictField.bNotEmpty][i],
-            s.districts.statistics[D.DistrictField.bContiguous][i],
-            s.districts.statistics[D.DistrictField.bNotEmbedded][i],
-            s.districts.statistics[D.DistrictField.DemPct][i],
-            s.districts.statistics[D.DistrictField.RepPct][i],
-            s.districts.statistics[D.DistrictField.WhitePct][i],
-            s.districts.statistics[D.DistrictField.MinorityPct][i],
-            s.districts.statistics[D.DistrictField.BlackPct][i],
-            s.districts.statistics[D.DistrictField.HispanicPct][i],
-            s.districts.statistics[D.DistrictField.PacificPct][i],
-            s.districts.statistics[D.DistrictField.AsianPct][i],
-            s.districts.statistics[D.DistrictField.NativePct][i],
-            s.districts.statistics[D.DistrictField.TotalVAP][i],
-            // 10-23-2020 - Added Other vote percentage
-            s.districts.statistics[D.DistrictField.OtherPct][i],
-        ];
-        /* TriState
-        // NOTE - Until we add three-state support top to bottom in Requirements,
-        //   map booleans to tri-states here.
-        rawRow[DistrictColumn.bEqualPop] = U.mapBooleanToTriState(rawRow[DistrictColumn.bEqualPop]);
-        rawRow[DistrictColumn.bNotEmpty] = U.mapBooleanToTriState(rawRow[DistrictColumn.bNotEmpty]);
-        rawRow[DistrictColumn.bContiguous] = U.mapBooleanToTriState(rawRow[DistrictColumn.bContiguous]);
-        rawRow[DistrictColumn.bNotEmbedded] = U.mapBooleanToTriState(rawRow[DistrictColumn.bNotEmbedded]);
-        */
+        let 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]
+        };
         let readyRow = U.deepCopy(rawRow);
         dsTable.push(readyRow);
     }
@@ -1815,7 +1744,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Score = __importStar(__webpack_require__(/*! @dra2020/dra-score */ "@dra2020/dra-score"));
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
-const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
 const M = __importStar(__webpack_require__(/*! ./minority */ "./src/minority.ts"));
 const C = __importStar(__webpack_require__(/*! ./compact */ "./src/compact.ts"));
 // PROFILE A PLAN
@@ -1826,18 +1754,17 @@ function profilePlan(s, bLog = false) {
     const nDistricts = s.state.nDistricts;
     const nCounties = s.counties.nCounties;
     const targetSize = Math.round(s.state.totalPop / nDistricts);
-    const popByDistrict = U.deepCopy(s.districts.statistics[D.DistrictField.TotalPop].slice(1, -1));
+    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.statistics[D.DistrictField.DemVotes][summaryRow];
-    const repVote = s.districts.statistics[D.DistrictField.RepVotes][summaryRow];
+    const demVote = s.districts.table.demVotes[summaryRow];
+    const repVote = s.districts.table.repVotes[summaryRow];
     const statewideVf = U.trim(demVote / (demVote + repVote), KEEP_DECIMALS);
-    // const statewideVf: number = U.trim(s.districts.statistics[D.DistrictField.DemPct][summaryRow], 6);
     let vpiArray = [];
-    const demVotes = U.deepCopy(s.districts.statistics[D.DistrictField.DemVotes].slice(1, -1));
-    const repVotes = U.deepCopy(s.districts.statistics[D.DistrictField.RepVotes].slice(1, -1));
+    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];
@@ -1845,7 +1772,6 @@ function profilePlan(s, bLog = false) {
         const v = (T > 0) ? U.trim(D / T, KEEP_DECIMALS) : 0;
         vpiArray.push(v);
     }
-    // const vpiArray: number[] = U.deepCopy(s.districts.statistics[D.DistrictField.DemPct].slice(1, -1)) as number[];
     const statewideDemographics = getStatewideDemographics(s);
     const demographicsByDistrict = getDemographicsByDistrict(s);
     const profile = {
@@ -1876,7 +1802,7 @@ exports.profilePlan = profilePlan;
 //  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.statistics[D.DistrictField.CountySplits];
+    const adornedCxD = s.districts.table.countySplits;
     let CxD = [];
     // Remove the unassigned & total dummy "districts"
     for (let districtID = 1; districtID <= s.state.nDistricts; districtID++) {
@@ -1905,13 +1831,13 @@ function getDemographicsByDistrict(s, bLog = false) {
     // Remove the unassigned & total dummy "districts"
     for (let districtID = 1; districtID <= s.state.nDistricts; districtID++) {
         const districtDemographics = {
-            white: U.trim(s.districts.statistics[D.DistrictField.WhitePct][districtID], KEEP_DECIMALS),
-            minority: U.trim(s.districts.statistics[D.DistrictField.MinorityPct][districtID], KEEP_DECIMALS),
-            black: U.trim(s.districts.statistics[D.DistrictField.BlackPct][districtID], KEEP_DECIMALS),
-            hispanic: U.trim(s.districts.statistics[D.DistrictField.HispanicPct][districtID], KEEP_DECIMALS),
-            pacific: U.trim(s.districts.statistics[D.DistrictField.PacificPct][districtID], KEEP_DECIMALS),
-            asian: U.trim(s.districts.statistics[D.DistrictField.AsianPct][districtID], KEEP_DECIMALS),
-            native: U.trim(s.districts.statistics[D.DistrictField.NativePct][districtID], KEEP_DECIMALS)
+            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)
         };
         demographicsArray.push(districtDemographics);
     }
@@ -1920,13 +1846,13 @@ function getDemographicsByDistrict(s, bLog = false) {
 function getStatewideDemographics(s, bLog = false) {
     const summaryRow = s.districts.numberOfRows() - 1;
     const demographics = {
-        white: U.trim(s.districts.statistics[D.DistrictField.WhitePct][summaryRow], KEEP_DECIMALS),
-        minority: U.trim(s.districts.statistics[D.DistrictField.MinorityPct][summaryRow], KEEP_DECIMALS),
-        black: U.trim(s.districts.statistics[D.DistrictField.BlackPct][summaryRow], KEEP_DECIMALS),
-        hispanic: U.trim(s.districts.statistics[D.DistrictField.HispanicPct][summaryRow], KEEP_DECIMALS),
-        pacific: U.trim(s.districts.statistics[D.DistrictField.PacificPct][summaryRow], KEEP_DECIMALS),
-        asian: U.trim(s.districts.statistics[D.DistrictField.AsianPct][summaryRow], KEEP_DECIMALS),
-        native: U.trim(s.districts.statistics[D.DistrictField.NativePct][summaryRow], KEEP_DECIMALS)
+        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)
     };
     return demographics;
 }
@@ -1943,9 +1869,9 @@ function scorePlan(s, p, bLog = false, overridesJSON) {
     test['score'] = popDev;
     test['details'] = { 'maxDeviation': scorecard.populationDeviation.notes['maxDeviation'] };
     // Populate the N+1 summary "district" in district.statistics
-    let totalPop = s.districts.statistics[D.DistrictField.TotalPop];
-    let popDevPct = s.districts.statistics[D.DistrictField.PopDevPct];
-    let totalVAP = s.districts.statistics[D.DistrictField.TotalVAP];
+    let totalPop = s.districts.table.totalPop;
+    let popDevPct = s.districts.table.popDevPct;
+    let totalVAP = s.districts.table.totalVAP;
     const summaryRow = s.districts.numberOfRows() - 1;
     totalPop[summaryRow] = p.population.targetSize;
     popDevPct[summaryRow] = popDev;
@@ -2299,7 +2225,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
-const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
 //
 // COMPLETE - Are all geo's assigned to a district, and do all districts have
 //   at least one geo assigned to them?
@@ -2308,7 +2233,7 @@ function doIsComplete(s, bLog = false) {
     let test = s.getTest(0 /* Complete */);
     // Get the by-district results, including the dummy unassigned district,
     // but ignoring the N+1 summary district
-    let bNotEmptyByDistrict = s.districts.statistics[D.DistrictField.bNotEmpty];
+    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.
@@ -2374,7 +2299,7 @@ function doIsComplete(s, bLog = false) {
         test['details']['emptyDistricts'] = emptyDistricts;
     }
     // Populate the N+1 summary "district" in district.statistics
-    let bNotEmpty = s.districts.statistics[D.DistrictField.bNotEmpty];
+    let bNotEmpty = s.districts.table.bNotEmpty;
     let summaryRow = s.districts.numberOfRows() - 1;
     bNotEmpty[summaryRow] = test['score'];
     return test;
@@ -2392,7 +2317,7 @@ function doIsContiguous(s, bLog = false) {
     let test = s.getTest(1 /* Contiguous */);
     // Get the contiguity of each district. Ignore dummy unassigned district
     // and the N+1 summary district.
-    let bContiguousByDistrict = s.districts.statistics[D.DistrictField.bContiguous];
+    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);
@@ -2410,7 +2335,7 @@ function doIsContiguous(s, bLog = false) {
         test['details'] = { 'discontiguousDistricts': discontiguousDistricts };
     }
     // Populate the N+1 summary "district" in district.statistics
-    let bContiguous = s.districts.statistics[D.DistrictField.bContiguous];
+    let bContiguous = s.districts.table.bContiguous;
     let summaryRow = s.districts.numberOfRows() - 1;
     bContiguous[summaryRow] = test['score'];
     return test;
@@ -2433,7 +2358,7 @@ function doIsFreeOfHoles(s, bLog = false) {
     let embeddedDistricts = [];
     // Get the embeddedness of each district. Ignore dummy unassigned district
     // and the N+1 summary district.
-    let bNotEmbeddedByDistrict = s.districts.statistics[D.DistrictField.bNotEmbedded];
+    let bNotEmbeddedByDistrict = s.districts.table.bNotEmbedded;
     bNotEmbeddedByDistrict = bNotEmbeddedByDistrict.slice(1, -1);
     let districtID = 1;
     bNotEmbeddedByDistrict.forEach(function (bDistrictNotEmbedded) {
@@ -2449,7 +2374,7 @@ function doIsFreeOfHoles(s, bLog = false) {
         test['details'] = { 'embeddedDistricts': embeddedDistricts };
     }
     // Populate the N+1 summary "district" in district.statistics
-    let bNotEmbedded = s.districts.statistics[D.DistrictField.bNotEmbedded];
+    let bNotEmbedded = s.districts.table.bNotEmbedded;
     let summaryRow = s.districts.numberOfRows() - 1;
     bNotEmbedded[summaryRow] = test['score'];
     return test;