@dra2020/district-analytics 16.0.2 → 16.1.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2021 Dave's Redistricting, LLC.
+Copyright (c) 2020-2022 Dave's Redistricting, LLC.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -1,6 +1,6 @@
 # District Analytics
 
-Analytics for scoring congressional and legislative district maps.
+This is the shim between the DRA client proper (dra-client) and the DRA analytics code (dra-analytics). 
 
 ## Build Status
 

package/dist/district-analytics.js

@@ -7,7 +7,7 @@
 		exports["district-analytics"] = factory();
 	else
 		root["district-analytics"] = factory();
-})(global, function() {
+})(global, () => {
 return /******/ (() => { // webpackBootstrap
 /******/ 	"use strict";
 /******/ 	var __webpack_modules__ = ({
@@ -24,7 +24,11 @@ return /******/ (() => { // webpackBootstrap
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -136,7 +140,7 @@ class AnalyticsSession {
             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 /* PopulationDeviation */);
+            let test = this.getTest(4 /* T.Test.PopulationDeviation */);
             // Get the raw population deviation
             const popDev = this._scorecard.populationDeviation.raw;
             // Populate the test entry
@@ -152,7 +156,7 @@ class AnalyticsSession {
             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 /* EqualPopulation */);
+            let test2 = this.getTest(3 /* T.Test.EqualPopulation */);
             test2['score'] = newScorecard.populationDeviation.roughlyEqual;
             // END main analytics
             (0, results_1.doAnalyzePostProcessing)(this, bLog);
@@ -220,7 +224,7 @@ class AnalyticsSession {
     // 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 /* Contiguous */);
+        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: [] };
@@ -289,7 +293,11 @@ function isAShape(poly) {
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -475,8 +483,8 @@ class Districts {
                         // Total population of each feature
                         // NOTE - This result is used more than once
                         // 03-27-21
-                        const dkCENSUS = outerThis._session.features._keys["CENSUS" /* CENSUS */];
-                        featurePop = fieldForFeature(f, dkCENSUS, 0 /* TotalPop */);
+                        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;
@@ -496,11 +504,11 @@ class Districts {
                         // 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" /* ELECTION */];
-                        const featureDem = fieldForFeature(f, dkELECTION, 7 /* DemVotes */);
+                        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 /* RepVotes */);
-                        const featureTot = fieldForFeature(f, dkELECTION, 9 /* TotalVotes */);
+                        const featureRep = fieldForFeature(f, dkELECTION, 8 /* T.FeatureField.RepVotes */);
+                        const featureTot = fieldForFeature(f, dkELECTION, 9 /* T.FeatureField.TotalVotes */);
                         demVotes += featureDem;
                         repVotes += featureRep;
                         totVotes += featureTot;
@@ -514,15 +522,15 @@ class Districts {
                         }
                         // Voting-age demographic breakdowns (or citizen voting-age)
                         // 03-27-21
-                        const dkVAP = outerThis._session.features._keys["VAP" /* VAP */];
-                        totalVAP += fieldForFeature(f, dkVAP, 0 /* TotalPop */);
+                        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 /* WhitePop */);
-                        blackPop += fieldForFeature(f, dkVAP, 2 /* BlackPop */);
-                        hispanicPop += fieldForFeature(f, dkVAP, 3 /* HispanicPop */);
-                        pacificPop += fieldForFeature(f, dkVAP, 5 /* PacificPop */);
-                        asianPop += fieldForFeature(f, dkVAP, 4 /* AsianPop */);
-                        nativePop += fieldForFeature(f, dkVAP, 6 /* NativePop */);
+                        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
@@ -749,30 +757,30 @@ class Districts {
                     if (!(f == undefined)) {
                         // Calculate the Dem two-party vote
                         // 03-27-21
-                        const dkELECTION = outerThis._session.features._keys["ELECTION" /* ELECTION */];
-                        const featureDem = fieldForFeature(f, dkELECTION, 7 /* DemVotes */);
-                        const featureRep = fieldForFeature(f, dkELECTION, 8 /* RepVotes */);
+                        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" /* VAP */];
-                            const totalVAP = fieldForFeature(f, dkVAP, 0 /* TotalPop */);
+                            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 /* HispanicPop */);
-                                const blackVAP = fieldForFeature(f, dkVAP, 2 /* BlackPop */);
-                                const pacificVAP = fieldForFeature(f, dkVAP, 5 /* PacificPop */);
-                                const asianVAP = fieldForFeature(f, dkVAP, 4 /* AsianPop */);
-                                const nativeVAP = fieldForFeature(f, dkVAP, 6 /* NativePop */);
+                                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 /* WhitePop */);
+                                const whiteVAP = fieldForFeature(f, dkVAP, 1 /* T.FeatureField.WhitePop */);
                                 const minorityVAP = totalVAP - whiteVAP;
                                 const pctMinority = minorityVAP / totalVAP;
                                 let pctComparison = whiteVAP / totalVAP;
@@ -1261,17 +1269,17 @@ exports.doAnalyzeDistricts = doAnalyzeDistricts;
 // NOTE - I could make this table-driven, but I'm thinking that the explicit
 //   calls might make chunking for aync easier.
 function doAnalyzePlan(s, bLog = false) {
-    s.tests[0 /* Complete */] = (0, valid_1.doIsComplete)(s, bLog);
-    s.tests[1 /* Contiguous */] = (0, valid_1.doIsContiguous)(s, bLog);
-    s.tests[2 /* FreeOfHoles */] = (0, valid_1.doIsFreeOfHoles)(s, bLog);
+    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 /* EqualPopulation */] = s.getTest(3 /* EqualPopulation */);
-    s.tests[5 /* UnexpectedCountySplits */] = (0, cohesive_1.doFindCountiesSplitUnexpectedly)(s, bLog);
-    s.tests[6 /* VTDSplits */] = (0, cohesive_1.doFindSplitVTDs)(s, bLog);
+    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;
@@ -1283,7 +1291,7 @@ exports.doAnalyzePlan = doAnalyzePlan;
 // Equal Population to be secondary pass/fail validation.
 //
 function doDeriveSecondaryTests(s, bLog = false) {
-    s.tests[3 /* EqualPopulation */] = (0, equal_1.doHasEqualPopulations)(s, bLog);
+    s.tests[3 /* T.Test.EqualPopulation */] = (0, equal_1.doHasEqualPopulations)(s, bLog);
 }
 exports.doDeriveSecondaryTests = doDeriveSecondaryTests;
 
@@ -1302,7 +1310,11 @@ exports.doDeriveSecondaryTests = doDeriveSecondaryTests;
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -1360,7 +1372,7 @@ These counties are split unexpectedly (meaning that they're smaller than a distr
 // - We do the analysis regardless, but
 // - Protect against weird results in the client
 function doFindCountiesSplitUnexpectedly(s, bLog = false) {
-    let test = s.getTest(5 /* UnexpectedCountySplits */);
+    let test = s.getTest(5 /* T.Test.UnexpectedCountySplits */);
     // THE THREE VALUES TO DETERMINE FOR A PLAN
     let unexpectedSplits = 0;
     let unexpectedAffected = 0;
@@ -1497,7 +1509,7 @@ function doFindCountiesSplitUnexpectedly(s, bLog = false) {
 exports.doFindCountiesSplitUnexpectedly = doFindCountiesSplitUnexpectedly;
 // 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 /* VTDSplits */);
+    let test = s.getTest(6 /* T.Test.VTDSplits */);
     let splitVTDs = [];
     test['score'] = splitVTDs.length;
     test['details']['splitVTDs'] = splitVTDs;
@@ -1520,7 +1532,11 @@ exports.doFindSplitVTDs = doFindSplitVTDs;
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -1553,9 +1569,9 @@ function extractDistrictProperties(s, bLog = false) {
             const perimeter = baseclient_1.Poly.polyPerimeterFlat(poly);
             const diameter = baseclient_1.Poly.polyDiameterFlat(poly);
             let props = [0, 0, 0];
-            props[0 /* Area */] = area;
-            props[1 /* Diameter */] = diameter;
-            props[2 /* Perimeter */] = perimeter;
+            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);
         }
@@ -1617,9 +1633,9 @@ exports.doHasEqualPopulations = void 0;
 // 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 /* EqualPopulation */);
+    let test = s.getTest(3 /* T.Test.EqualPopulation */);
     // Get the normalized population deviation %
-    let popDevTest = s.getTest(4 /* PopulationDeviation */);
+    let popDevTest = s.getTest(4 /* T.Test.PopulationDeviation */);
     const popDevPct = popDevTest['score'];
     // const popDevNormalized: number = popDevTest['normalizedScore'] as number;
     test['details']['deviation'] = popDevPct;
@@ -1647,7 +1663,11 @@ exports.doHasEqualPopulations = doHasEqualPopulations;
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -1748,7 +1768,11 @@ exports.doAnalyzeRacialPolarization = doAnalyzeRacialPolarization;
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -1824,8 +1848,8 @@ function doPreprocessCensus(s, bLog = false) {
         // Skip water-only features
         if (!(U.isWaterOnly(geoID))) {
             // 03-27-21
-            const dk = s.features._keys["CENSUS" /* CENSUS */];
-            let value = D.fieldForFeature(f, dk, 0 /* TotalPop */);
+            const dk = s.features._keys["CENSUS" /* 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;
@@ -1945,7 +1969,11 @@ function doPreprocessCensus(s, bLog = false) {
 // 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -1973,10 +2001,10 @@ function prepareRequirementsChecklist(s, bLog = false) {
     // REQUIREMENTS CATEGORY
     let paRequirements;
     {
-        const completeTest = s.getTest(0 /* Complete */);
-        const contiguousTest = s.getTest(1 /* Contiguous */);
-        const freeOfHolesTest = s.getTest(2 /* FreeOfHoles */);
-        const equalPopulationTest = s.getTest(3 /* EqualPopulation */);
+        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'];
@@ -2091,7 +2119,7 @@ exports.prepareDistrictStatistics = prepareDistrictStatistics;
 function doAnalyzePostProcessing(s, bLog = false) {
     // Just populate the normalized population deviation score in the test
     const scorecard = s._scorecard;
-    let popDev = s.getTest(4 /* PopulationDeviation */);
+    let popDev = s.getTest(4 /* T.Test.PopulationDeviation */);
     popDev['normalizedScore'] = scorecard.populationDeviation.normalized;
     const datasets = {
         shapes: U.deepCopy(s.config['descriptions']['SHAPES']),
@@ -2103,7 +2131,7 @@ function doAnalyzePostProcessing(s, bLog = false) {
     scorecard.minority.details['vap'] = datasets.vap;
     scorecard.details['shapes'] = datasets.shapes;
     scorecard.details['census'] = datasets.census;
-    const simpleSplits = s.getTest(5 /* UnexpectedCountySplits */);
+    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']);
@@ -2139,7 +2167,11 @@ exports.doAnalyzePostProcessing = doAnalyzePostProcessing;
 // 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -2236,9 +2268,9 @@ function makeArrayOfGeoProps(s, bLog = false) {
         let districtProps = s.districts.getGeoProperties(districtID);
         // Guard against no shape and no properties
         if (districtProps) {
-            let a = U.trim(districtProps[0 /* Area */], KEEP_DECIMALS);
-            let p = U.trim(districtProps[2 /* Perimeter */], KEEP_DECIMALS);
-            let d = U.trim(districtProps[1 /* Diameter */], KEEP_DECIMALS);
+            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 });
         }
@@ -2472,17 +2504,17 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.fieldFromFeatureField = void 0;
 function fieldFromFeatureField(ds, ff) {
     switch (ff) {
-        case 0 /* TotalPop */: return "Tot";
-        case 1 /* WhitePop */: return "Wh";
-        case 2 /* BlackPop */: return ds.endsWith("NH") ? "Bl" : "BlC";
-        case 3 /* HispanicPop */: return "His";
-        case 4 /* AsianPop */: return ds.endsWith("NH") ? "Asn" : "AsnC";
-        case 5 /* PacificPop */: return ds.endsWith("NH") ? "Pac" : "PacC";
-        case 6 /* NativePop */: return ds.endsWith("NH") ? "Nat" : "NatC";
-        case 7 /* DemVotes */: return "D";
-        case 8 /* RepVotes */: return "R";
+        case 0 /* FeatureField.TotalPop */: return "Tot";
+        case 1 /* FeatureField.WhitePop */: return "Wh";
+        case 2 /* FeatureField.BlackPop */: return ds.endsWith("NH") ? "Bl" : "BlC";
+        case 3 /* FeatureField.HispanicPop */: return "His";
+        case 4 /* FeatureField.AsianPop */: return ds.endsWith("NH") ? "Asn" : "AsnC";
+        case 5 /* FeatureField.PacificPop */: return ds.endsWith("NH") ? "Pac" : "PacC";
+        case 6 /* FeatureField.NativePop */: return ds.endsWith("NH") ? "Nat" : "NatC";
+        case 7 /* FeatureField.DemVotes */: return "D";
+        case 8 /* FeatureField.RepVotes */: return "R";
         // NOTE: "Other" is implied as Tot - D - R
-        case 9 /* TotalVotes */: return "Tot";
+        case 9 /* FeatureField.TotalVotes */: return "Tot";
     }
 }
 exports.fieldFromFeatureField = fieldFromFeatureField;
@@ -2502,7 +2534,11 @@ exports.fieldFromFeatureField = fieldFromFeatureField;
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -2564,7 +2600,7 @@ function isWaterOnly(geoID, s) {
     if (s) {
         // If called with a session, get the feature ...
         const featureID = s.features.featureID(geoID);
-        const f = s.features.featureByIndex(featureID);
+        const f /* T.GeoFeature */ = s.features.featureByIndex(featureID);
         // ... and also check the 'ALAND' property
         const bNoLand = ((f.properties['ALAND10'] !== undefined) && (f.properties['ALAND10'] == 0)) ? true : false;
         return bNoLand;
@@ -2575,10 +2611,10 @@ function isWaterOnly(geoID, s) {
 exports.isWaterOnly = isWaterOnly;
 function isUninhabited(geoID, s) {
     const featureID = s.features.featureID(geoID);
-    const f = s.features.featureByIndex(featureID);
+    const f /* T.GeoFeature */ = s.features.featureByIndex(featureID);
     // 03-27-21
-    const dk = s.features._keys["CENSUS" /* CENSUS */];
-    const totalPop = (0, _data_1.fieldForFeature)(f, dk, 0 /* TotalPop */);
+    const dk = s.features._keys["CENSUS" /* T.Dataset.CENSUS */];
+    const totalPop = (0, _data_1.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
@@ -2768,7 +2804,11 @@ exports.depthof = depthof;
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -2794,7 +2834,7 @@ const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"
 //   at least one geo assigned to them?
 //
 function doIsComplete(s, bLog = false) {
-    let test = s.getTest(0 /* Complete */);
+    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;
@@ -2878,7 +2918,7 @@ exports.doIsComplete = doIsComplete;
 //   To test this, load the NC 2010 map 'SAMPLE-BG-map-discontiguous.csv'.
 //
 function doIsContiguous(s, bLog = false) {
-    let test = s.getTest(1 /* Contiguous */);
+    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;
@@ -2916,7 +2956,7 @@ exports.doIsContiguous = doIsContiguous;
 //   Buncombe County (37021), is a donut hole w/in District 3.
 //
 function doIsFreeOfHoles(s, bLog = false) {
-    let test = s.getTest(2 /* FreeOfHoles */);
+    let test = s.getTest(2 /* T.Test.FreeOfHoles */);
     // Initialize values
     let bFreeOfHoles = true;
     let embeddedDistricts = [];