@dra2020/district-analytics 3.0.0 → 3.2.0

package/dist/district-analytics.js

@@ -121,6 +121,7 @@ const analyze_1 = __webpack_require__(/*! ./analyze */ "./src/analyze.ts");
 const score_1 = __webpack_require__(/*! ./score */ "./src/score.ts");
 const results_1 = __webpack_require__(/*! ./results */ "./src/results.ts");
 const results_2 = __webpack_require__(/*! ./results */ "./src/results.ts");
+const geofeature_1 = __webpack_require__(/*! ./geofeature */ "./src/geofeature.ts");
 const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 class AnalyticsSession {
@@ -140,45 +141,48 @@ class AnalyticsSession {
         this.features = new D.Features(this, SessionRequest['data'], this.config['datasets']);
         this.plan = new D.Plan(this, SessionRequest['plan']);
         this.districts = new D.Districts(this, SessionRequest['districtShapes']);
-        // TODO - Confirming that the graph includes OUT_OF_STATE neighbors
-        // if (U.keyExists(S.OUT_OF_STATE, this.graph._graph)) {
-        //   console.log("Contiguity graph includes out-of-state neighbors.");
-        // }
-        // else {
-        //   console.log("Contiguity graph does NOT include out-of-state neighbors.");
-        // }
-        // NOTE: I've pulled these out of the individual analytics to here. Eventually,
-        // we could want them to passed into an analytics session as data, along with
-        // everything else. For now, this keeps branching out of the main code.
-        results_1.doConfigureScales(this);
+        // TODO - SCORE: Toggle
+        if (this.useLegacy()) {
+            console.log("Using legacy district-analytics.");
+            // NOTE: I've pulled these out of the individual analytics to here. Eventually,
+            // we could want them to passed into an analytics session as data, along with
+            // everything else. For now, this keeps branching out of the main code.
+            results_1.doConfigureScales(this);
+        }
+        else {
+            console.log("Using dra-score analytics.");
+            // TODO - SCORE: Temporary HACK. Query dra-score for threshold.
+            results_1.doConfigureScales(this);
+        }
     }
     processConfig(config) {
         // NOTE - Session settings are required:
         // - Analytics suites can be defaulted to all with [], but
         // - Dataset keys must be explicitly specified with 'dataset'
-        // TODO - DASHBOARD: Remove this mechanism. Always run everything.
-        let defaultSuites = [0 /* Legal */, 1 /* Fair */, 2 /* Best */];
-        // If the config passed in has no suites = [], use the default suites
-        if (U.isArrayEmpty(config['suites'])) {
-            config['suites'] = defaultSuites;
-        }
+        // TODO - SCORE: Delete
+        config['suites'] = [0 /* Legal */, 1 /* Fair */, 2 /* Best */];
         // Default the Census & redistricting cycle to 2010
         if (!(U.keyExists('cycle', config)))
             config['cycle'] = 2010;
         return config;
     }
+    // TODO - SCORE: Toggle = Invert this logic
+    useLegacy() {
+        // TODO - SCORE: Opt-out
+        return (U.keyExists('useScore', this.config) && (this.config['useScore'] != null) && (!(this.config['useScore']))) ? true : false;
+        // TODO - SCORE: Opt-in
+        // return (U.keyExists('useScore', this.config) && (this.config['useScore'])) ? false : true;
+    }
     // Using the the data in the analytics session, calculate all the
     // analytics & validations, saving/updating the individual test results.
-    analyzePlan(bLog = false) {
+    analyzePlan(bLog = false, overridesJSON) {
         try {
             preprocess_1.doPreprocessData(this, bLog);
             analyze_1.doAnalyzeDistricts(this, bLog);
             analyze_1.doAnalyzePlan(this, bLog);
             // TODO - SCORE
             this._profile = score_1.profilePlan(this, bLog);
-            // this._profile = Score.sampleProfile;
-            this._scorecard = score_1.scorePlan(this._profile, bLog);
-            // TODO - SCORE
+            this._scorecard = score_1.scorePlan(this, this._profile, bLog, overridesJSON);
             results_1.doAnalyzePostProcessing(this, bLog);
         }
         catch (_a) {
@@ -199,13 +203,6 @@ class AnalyticsSession {
     getPlanScorecard(bLog = false) {
         return this._scorecard;
     }
-    /* TODO - SCORE
-    // NOTE - This assumes that analyzePlan() has been run!
-    getPlanAnalytics(bLog: boolean = false): PlanAnalytics
-    {
-      return preparePlanAnalytics(this, bLog);
-    }
-    */
     // TODO - SCORE
     // NOTE - This assumes that analyzePlan() has been run!
     getRequirementsChecklist(bLog = false) {
@@ -214,19 +211,82 @@ class AnalyticsSession {
     // NOTE - This assumes that analyzePlan() has been run!
     getDiscontiguousDistrictFeatures(bLog = false) {
         // Get the (possibly empty) list of discontiguous district IDs
-        let contiguousTest = this.getTest(1 /* Contiguous */);
-        let discontiguousDistrictIDs = contiguousTest['details']['discontiguousDistricts'] || [];
+        const contiguousTest = this.getTest(1 /* Contiguous */);
+        const discontiguousDistrictIDs = contiguousTest['details']['discontiguousDistricts'] || [];
         // Convert them into a (possibly empty) list of features
         let discontiguousDistrictFeatures = { type: 'FeatureCollection', features: [] };
         if (!(U.isArrayEmpty(discontiguousDistrictIDs))) {
             for (let id of discontiguousDistrictIDs) {
                 let poly = this.districts.getDistrictShapeByID(id);
-                if (poly)
-                    discontiguousDistrictFeatures.features.push(poly);
+                if (poly) {
+                    // If a district has a shape & it is not contiguous, by definition,
+                    // it will be a Multipolygon, i.e., it will have multiple pieces, some
+                    // possibly embedded w/in other districts. Get & add all the pieces.
+                    const districtParts = geofeature_1.polyParts(poly);
+                    discontiguousDistrictFeatures.features.push(...districtParts.features);
+                    // discontiguousDistrictFeatures.features.push(poly);
+                }
             }
         }
         return discontiguousDistrictFeatures;
     }
+    // Comments clipped from dra-client geodistrict.ts.
+    // Discontiguous polygons are:
+    //  1. All polygons in a multi-polygon; and
+    //  2. All holes in a otherwise cohesive polygon.
+    // Note that all non-cohesive features are always simple polygons.
+    /*
+    let i: number, j: number;
+    let nPoly: number = 0;
+    for (i = 0;nPoly == 0 && i < this.cacheDistricts.features.length;i++)
+    {
+      let f = this.cacheDistricts.features[i];
+  
+      if (f.geometry.type === 'MultiPolygon')
+        nPoly += f.geometry.coordinates.length;
+      else if (f.geometry.type === 'Polygon' && f.geometry.coordinates.length)
+        nPoly += (f.geometry.coordinates.length - 1);
+    }
+    if (nPoly)
+    {
+      this.cacheNoncohesive = {type: 'FeatureCollection', features: []};
+      let af: any = this.cacheNoncohesive.features;
+      let oUnique: any = {};
+  
+      // First add discontiguous polygons
+      for (i = 0;i < this.cacheDistricts.features.length;i++)
+      {
+        let f = this.cacheDistricts.features[i];
+  
+        if (f.geometry.type === 'MultiPolygon')
+        {
+          // Push all non-contiguous polygons
+          for (j = 0;j < f.geometry.coordinates.length;j++)
+          {
+            let p: any = f.geometry.coordinates[j];
+            oUnique[Hash.qhash(p[0])] = true;
+            af.push({type: 'Feature', properties: {id: `${af.length + 1}`}, geometry: {type: 'Polygon', coordinates: p}});
+          }
+        }
+      }
+  
+      // Now add unique holes
+      for (i = 0;i < this.cacheDistricts.features.length;i++)
+      {
+        let f = this.cacheDistricts.features[i];
+  
+        if (f.geometry.type === 'Polygon')
+        {
+          // Push all holes from this polygon
+          for (j = 1;j < f.geometry.coordinates.length;j++)
+          {
+            let p: any = f.geometry.coordinates[j];
+            if (oUnique[Hash.qhash(p)] === undefined)
+              af.push({type: 'Feature', properties: {id: `${af.length + 1}`}, geometry: {type: 'Polygon', coordinates: [p]}});
+          }
+        }
+      }
+    } */
     // HELPERS USED INTERNALLY
     // Get an individual test, so you can drive UI with the results.
     getTest(testID) {
@@ -242,9 +302,17 @@ class AnalyticsSession {
         // Return a pointer to the the test entry for this test
         return this.tests[testID];
     }
-    // NOTE - Not sure why this has to be up here.
+    // NOTE - Not sure why this has to be up here ...
     populationDeviationThreshold() {
-        return 1 - this.testScales[4 /* PopulationDeviation */]['scale'][0];
+        // TODO - SCORE: Toggle
+        if (this.useLegacy()) {
+            return 1 - this.testScales[4 /* PopulationDeviation */]['scale'][0];
+        }
+        else {
+            // TODO - SCORE: Temporary HACK. Query dra-score for threshold.
+            // NOTE - The plan may not have been scored yet, i.e., no scorecard yet.
+            return 1 - this.testScales[4 /* PopulationDeviation */]['scale'][0];
+        }
     }
 }
 exports.AnalyticsSession = AnalyticsSession;
@@ -420,7 +488,6 @@ class Districts {
             let outerThis = this;
             // Default the pop dev % for the dummy Unassigned district to 0%.
             // Default the pop dev % for real (1–N) but empty districts to 100%.
-            // TODO - SCORE
             let popDevPct = (i > 0) ? (targetSize / targetSize) : 0 / targetSize;
             // Get the geoIDs assigned to the district
             // Guard against empty districts
@@ -447,7 +514,6 @@ class Districts {
                             // NOTE - SPLITTING
                             // Total population by counties w/in a district,
                             // except the dummy unassigned district 0
-                            // TODO - VFEATURE
                             if (i > 0)
                                 countySplits[outerThis.getCountyIndex(geoID)] += featurePop;
                             // Democratic and Republican vote totals
@@ -621,10 +687,7 @@ class Districts {
         compact_1.extractDistrictProperties(this._session, bLog);
     }
     getCountyIndex(geoID) {
-        // TODO - VFEATURE
         let countyFIPS = U.parseGeoID(geoID)['county'];
-        // let countyGeoID = U.parseGeoID(geoID)['county'] as string;
-        // let countyFIPS = U.getFIPSFromCountyGeoID(countyGeoID);
         let countyIndex = this._session.counties.indexFromFIPS(countyFIPS);
         return countyIndex;
     }
@@ -873,11 +936,45 @@ exports.doAnalyzeDistricts = doAnalyzeDistricts;
 // NOTE - I could make this table-driven, but I'm thinking that the explicit
 //   calls might make chunking for aync easier.
 function doAnalyzePlan(s, bLog = false) {
-    // TODO - Remove this mechanism. Always run all tests
-    // Get the requested suites, and only execute those tests
-    let requestedSuites = s.config['suites'];
-    // Tests in the "Legal" suite, i.e., pass/ fail constraints
-    if (requestedSuites.includes(0 /* Legal */)) {
+    // TODO - SCORE: Toggle
+    if (s.useLegacy()) {
+        // Disable most legacy analytics
+        // Get the requested suites, and only execute those tests
+        let requestedSuites = s.config['suites'];
+        // Tests in the "Legal" suite, i.e., pass/ fail constraints
+        if (requestedSuites.includes(0 /* Legal */)) {
+            s.tests[0 /* Complete */] = valid_1.doIsComplete(s, bLog);
+            s.tests[1 /* Contiguous */] = valid_1.doIsContiguous(s, bLog);
+            s.tests[2 /* FreeOfHoles */] = valid_1.doIsFreeOfHoles(s, bLog);
+            s.tests[4 /* PopulationDeviation */] = equal_1.doPopulationDeviation(s, bLog);
+            // NOTE - I can't check whether a population deviation is legal or not, until
+            // the raw % is normalized. A zero (0) would mean "too much" / "not legal," for
+            // the given type of district (CD vs. LD). The EqualPopulation test is derived
+            // from PopulationDeviation, as part of scorecard or test log preparation.
+            // Create an empty test entry here though ...
+            s.tests[3 /* EqualPopulation */] = s.getTest(3 /* EqualPopulation */);
+        }
+        // Tests in the "Fair" suite
+        if (requestedSuites.includes(1 /* Fair */)) {
+            s.tests[11 /* SeatsBias */] = political_1.doSeatsBias(s, bLog);
+            s.tests[12 /* VotesBias */] = political_1.doVotesBias(s, bLog);
+            s.tests[13 /* Responsiveness */] = political_1.doResponsiveness(s, bLog);
+            s.tests[14 /* ResponsiveDistricts */] = political_1.doResponsiveDistricts(s, bLog);
+            s.tests[15 /* EfficiencyGap */] = political_1.doEfficiencyGap(s, bLog);
+            s.tests[16 /* MajorityMinorityDistricts */] = minority_1.doMajorityMinorityDistricts(s, bLog);
+        }
+        // Tests in the "Best" suite, i.e., criteria for better/worse
+        if (requestedSuites.includes(2 /* Best */)) {
+            s.tests[5 /* Reock */] = compact_1.doReock(s, bLog);
+            s.tests[6 /* PolsbyPopper */] = compact_1.doPolsbyPopper(s, bLog);
+            s.tests[7 /* UnexpectedCountySplits */] = cohesive_1.doFindCountiesSplitUnexpectedly(s, bLog);
+            s.tests[10 /* VTDSplits */] = cohesive_1.doFindSplitVTDs(s, bLog);
+            s.tests[8 /* CountySplitting */] = cohesive_1.doCountySplitting(s, bLog);
+            s.tests[9 /* DistrictSplitting */] = cohesive_1.doDistrictSplitting(s, bLog);
+        }
+    }
+    else {
+        // TODO - SCORE: Except these. Continue to do these here vs. dra-score.
         s.tests[0 /* Complete */] = valid_1.doIsComplete(s, bLog);
         s.tests[1 /* Contiguous */] = valid_1.doIsContiguous(s, bLog);
         s.tests[2 /* FreeOfHoles */] = valid_1.doIsFreeOfHoles(s, bLog);
@@ -888,24 +985,8 @@ function doAnalyzePlan(s, bLog = false) {
         // from PopulationDeviation, as part of scorecard or test log preparation.
         // Create an empty test entry here though ...
         s.tests[3 /* EqualPopulation */] = s.getTest(3 /* EqualPopulation */);
-    }
-    // Tests in the "Fair" suite
-    if (requestedSuites.includes(1 /* Fair */)) {
-        s.tests[11 /* SeatsBias */] = political_1.doSeatsBias(s, bLog);
-        s.tests[12 /* VotesBias */] = political_1.doVotesBias(s, bLog);
-        s.tests[13 /* Responsiveness */] = political_1.doResponsiveness(s, bLog);
-        s.tests[14 /* ResponsiveDistricts */] = political_1.doResponsiveDistricts(s, bLog);
-        s.tests[15 /* EfficiencyGap */] = political_1.doEfficiencyGap(s, bLog);
-        s.tests[16 /* MajorityMinorityDistricts */] = minority_1.doMajorityMinorityDistricts(s, bLog);
-    }
-    // Tests in the "Best" suite, i.e., criteria for better/worse
-    if (requestedSuites.includes(2 /* Best */)) {
-        s.tests[5 /* Reock */] = compact_1.doReock(s, bLog);
-        s.tests[6 /* PolsbyPopper */] = compact_1.doPolsbyPopper(s, bLog);
         s.tests[7 /* UnexpectedCountySplits */] = cohesive_1.doFindCountiesSplitUnexpectedly(s, bLog);
         s.tests[10 /* VTDSplits */] = cohesive_1.doFindSplitVTDs(s, bLog);
-        s.tests[8 /* CountySplitting */] = cohesive_1.doCountySplitting(s, bLog);
-        s.tests[9 /* DistrictSplitting */] = cohesive_1.doDistrictSplitting(s, bLog);
     }
     // Enable a Test Log and Scorecard to be generated
     s.bPlanAnalyzed = true;
@@ -1502,6 +1583,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
+// TODO - SCORE: Delete
 function doPopulationDeviation(s, bLog = false) {
     let test = s.getTest(4 /* PopulationDeviation */);
     let targetSize = s.state.totalPop / s.state.nDistricts;
@@ -1540,8 +1622,8 @@ function doHasEqualPopulations(s, bLog = false) {
     let test = s.getTest(3 /* EqualPopulation */);
     // Get the normalized population deviation %
     let popDevTest = s.getTest(4 /* PopulationDeviation */);
-    let popDevPct = popDevTest['score'];
-    let popDevNormalized = popDevTest['normalizedScore'];
+    const popDevPct = popDevTest['score'];
+    const popDevNormalized = popDevTest['normalizedScore'];
     // Populate the test entry
     if (popDevNormalized > 0) {
         test['score'] = true;
@@ -1583,6 +1665,23 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const Poly = __importStar(__webpack_require__(/*! @dra2020/poly */ "@dra2020/poly"));
+// HELPER
+function polyParts(poly) {
+    let parts = { type: 'FeatureCollection', features: [] };
+    let af = parts.features;
+    if (poly.geometry.type === 'MultiPolygon') {
+        // Push all non-contiguous polygons
+        for (let j = 0; j < poly.geometry.coordinates.length; j++) {
+            let onePoly = poly.geometry.coordinates[j];
+            af.push({ type: 'Feature', properties: { id: `${af.length + 1}` }, geometry: { type: 'Polygon', coordinates: onePoly } });
+        }
+    }
+    else {
+        parts.features.push(poly);
+    }
+    return parts;
+}
+exports.polyParts = polyParts;
 // CARTESIAN SHIMS OVER 'POLY' FUNCTIONS
 // TODO - POLY: Confirm Cartesian calculations
 function gfArea(poly) {
@@ -1908,10 +2007,7 @@ function doPreprocessCensus(s, bLog = false) {
             // Sum total population across the state
             s.state.totalPop += value;
             // Get the county FIPS code for the feature
-            // TODO - VFEATURE
             let countyFIPS = U.parseGeoID(geoID)['county'];
-            // let county = U.parseGeoID(geoID)['county'] as string;
-            // let countyFIPS = U.getFIPSFromCountyGeoID(county);
             // If a subtotal for the county doesn't exist, initialize one
             if (!(U.keyExists(countyFIPS, totalByCounty))) {
                 totalByCounty[countyFIPS] = 0;
@@ -1929,8 +2025,8 @@ function doPreprocessCensus(s, bLog = false) {
     let fipsCodes = U.getObjectKeys(totalByCounty);
     // Sort the results
     fipsCodes = fipsCodes.sort();
-    // TODO - SCORE: This was added for SPLITTING
-    // Add a dummy county, for county-district splitting analysis
+    // NOTE - This was added for the legacy SPLITTING implementation.
+    // Add a dummy county, for county-district splitting analysis.
     fipsCodes.unshift('000');
     // Create the ID-ordinal map
     for (let i in fipsCodes) {
@@ -2020,6 +2116,7 @@ const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
 const analyze_1 = __webpack_require__(/*! ./analyze */ "./src/analyze.ts");
 const state_reqs_json_1 = __importDefault(__webpack_require__(/*! ../static/state-reqs.json */ "./static/state-reqs.json"));
 // Example
+// TODO - DELETE?
 let sampleRequirements = {
     score: 2 /* Red */,
     metrics: {
@@ -2043,6 +2140,7 @@ let sampleRequirements = {
         stateReqs: "https://www.brennancenter.org/sites/default/files/publications/2019_06_50States_FINALsinglepages_20.pdf"
     }
 };
+// TODO - DELETE
 let sampleCompactness = {
     score: 60,
     metrics: {
@@ -2055,6 +2153,7 @@ let sampleCompactness = {
     },
     resources: {}
 };
+// TODO - DELETE
 let sampleSplitting = {
     score: 73,
     metrics: {
@@ -2072,7 +2171,7 @@ let sampleSplitting = {
     datasets: {},
     resources: {}
 };
-// TODO - PARTISAN: This category is still being fleshed out.
+// TODO - DELETE
 let samplePartisan = {
     score: 100,
     metrics: {
@@ -2087,7 +2186,7 @@ let samplePartisan = {
         planScore: "https://planscore.org/plan.html?20180219T202039.596761160Z"
     }
 };
-// TODO - SCORE: Add a minority report
+// TODO - DELETE
 let sampleMinority = {
     score: null,
     metrics: {
@@ -2114,6 +2213,7 @@ let sampleMinority = {
     },
     resources: {}
 };
+// TODO - DELETE
 exports.samplePlanAnalytics = {
     requirements: sampleRequirements,
     compactness: sampleCompactness,
@@ -2122,232 +2222,6 @@ exports.samplePlanAnalytics = {
     partisan: samplePartisan,
     minority: sampleMinority
 };
-/* TODO - SCORE
-export function preparePlanAnalytics(s: AnalyticsSession, bLog: boolean = false): PlanAnalytics
-{
-  if (!(s.bPostProcessingDone))
-  {
-    doAnalyzePostProcessing(s);
-  }
-
-  // REQUIREMENTS CATEGORY
-  let paRequirements: RequirementsCategory;
-
-  {
-    let completeTest = s.getTest(T.Test.Complete) as T.TestEntry;
-    let contiguousTest = s.getTest(T.Test.Contiguous) as T.TestEntry;
-    let freeOfHolesTest = s.getTest(T.Test.FreeOfHoles) as T.TestEntry;
-    let equalPopulationTest = s.getTest(T.Test.EqualPopulation) as T.TestEntry;
-
-    // Combine individual checks into an overall score
-
-    // TODO - DASHBOARD: Until we add three-state support top to bottom in
-    //   requirements/validations, map booleans to tri-states here.
-    let completeMetric = U.mapBooleanToTriState(completeTest['score'] as boolean);
-    let contiguousMetric = U.mapBooleanToTriState(contiguousTest['score'] as boolean);
-    let freeOfHolesMetric = U.mapBooleanToTriState(freeOfHolesTest['score'] as boolean);
-    let equalPopulationMetric = U.mapBooleanToTriState(equalPopulationTest['score'] as boolean);
-
-    let reqScore: T.TriState = T.TriState.Green;
-    let checks = [completeMetric, contiguousMetric, freeOfHolesMetric, equalPopulationMetric];
-    if (checks.includes(T.TriState.Yellow)) reqScore = T.TriState.Yellow;
-    if (checks.includes(T.TriState.Red)) reqScore = T.TriState.Red;
-
-    // Get values to support details entries
-    let unassignedFeaturesDetail = U.deepCopy(completeTest['details']['unassignedFeatures']) || [];
-    let emptyDistrictsDetail = U.deepCopy(completeTest['details']['emptyDistricts']) || [];
-    let discontiguousDistrictsDetail = U.deepCopy(contiguousTest['details']['discontiguousDistricts']) || [];
-    let embeddedDistrictsDetail = U.deepCopy(freeOfHolesTest['details']['embeddedDistricts']) || [];
-
-    let populationDeviationDetail = U.deepCopy(equalPopulationTest['details']['deviation']);
-    let deviationThresholdDetail = U.trim(s.populationDeviationThreshold());
-
-    let xx: string = s.state.xx;
-    // TODO - JSON: Is there a better / easier way to work with the variable?
-    let stateReqsDict: T.Dict = allStateReqs;
-    let reqLinkToStateReqs: string = stateReqsDict[xx];
-
-    // Populate the category
-    paRequirements = {
-      score: reqScore,
-      metrics: {
-        complete: completeMetric,
-        contiguous: contiguousMetric,
-        freeOfHoles: freeOfHolesMetric,
-        equalPopulation: equalPopulationMetric
-      },
-      details: {
-        unassignedFeatures: unassignedFeaturesDetail,
-        emptyDistricts: emptyDistrictsDetail,
-        discontiguousDistricts: discontiguousDistrictsDetail,
-        embeddedDistricts: embeddedDistrictsDetail,
-        populationDeviation: populationDeviationDetail,
-        deviationThreshold: deviationThresholdDetail
-      },
-      datasets: {
-        census: U.deepCopy(s.config['descriptions']['CENSUS']),
-      },
-      resources: {
-        stateReqs: reqLinkToStateReqs
-      }
-    }
-  }
-
-  // COMPACTNESS CATEGORY
-  let paCompactness: CompactnessCategory;
-  {
-    let reockWeight = 0.5;
-    let polsbyWeight = 1.0 - reockWeight;
-
-    let reockTest = s.getTest(T.Test.Reock) as T.TestEntry;
-    let polsbyTest = s.getTest(T.Test.PolsbyPopper) as T.TestEntry;
-
-    let normalizedReock = reockTest['normalizedScore'] as number;
-    let normalizedPolsby = reockTest['normalizedScore'] as number;
-    let compactnessScore = U.trim((reockWeight * normalizedReock) + (polsbyWeight * normalizedPolsby), 0);
-
-    let reockMetric = U.deepCopy(reockTest['score'] as number);
-    let polsbyMetric = U.deepCopy(polsbyTest['score'] as number);
-
-    // Populate the category
-    paCompactness = {
-      score: compactnessScore,
-      metrics: {
-        reock: reockMetric,
-        polsby: polsbyMetric
-      },
-      details: {
-        // None at this time
-      },
-      datasets: {
-        // NOTE - DATASETS
-        shapes: U.deepCopy(s.config['descriptions']['SHAPES'])
-        // shapes: "2010 VTD shapes"
-      },
-      resources: {
-        // None at this time
-      }
-    }
-  }
-
-  // SPLITTING CATEGORY
-
-  let paSplitting: SplittingCategory
-
-  {
-    let unexpectedCountySplittingTest = s.getTest(T.Test.UnexpectedCountySplits) as T.TestEntry;
-    let VTDSplitsTest = s.getTest(T.Test.VTDSplits) as T.TestEntry;
-    let countySplittingTest = s.getTest(T.Test.CountySplitting) as T.TestEntry;
-    let districtSplittingTest = s.getTest(T.Test.DistrictSplitting) as T.TestEntry;
-
-    let unexpectedAffectedMetric = U.deepCopy(unexpectedCountySplittingTest['score']);
-    let countiesSplitUnexpectedlyDetail = U.deepCopy(unexpectedCountySplittingTest['details']['countiesSplitUnexpectedly']);
-
-    let nVTDSplitsMetric = U.deepCopy(VTDSplitsTest['score']);
-    let splitVTDsDetail = U.deepCopy(VTDSplitsTest['details']['splitVTDs']);
-
-    let SqEnt_DCreducedMetric = U.deepCopy(countySplittingTest['score']);
-    let SqEnt_CDreducedMetric = U.deepCopy(districtSplittingTest['score']);
-
-    let countySplittingNormalized = countySplittingTest['normalizedScore'] as number;
-    let districtSplittingNormalized = districtSplittingTest['normalizedScore'] as number;
-    let splittingScore = U.trim((S.COUNTY_SPLITTING_WEIGHT * countySplittingNormalized) +
-      + (S.DISTRICT_SPLITTING_WEIGHT * districtSplittingNormalized), 0);
-
-    paSplitting = {
-      score: splittingScore,
-      metrics: {
-        sqEnt_DCreduced: SqEnt_DCreducedMetric,
-        sqEnt_CDreduced: SqEnt_CDreducedMetric
-        // NOTE - The un-reduced raw values
-        // sqEnt_DC    : SqEnt_DCMetric,
-        // sqEnt_CD    : SqEnt_CDMetric
-      },
-      details: {
-        countiesSplitUnexpectedly: countiesSplitUnexpectedlyDetail,
-        unexpectedAffected: unexpectedAffectedMetric,
-        nSplitVTDs: nVTDSplitsMetric,
-        splitVTDs: splitVTDsDetail
-      },
-      datasets: {
-        // None at this time
-      },
-      resources: {
-        // None at this time
-      }
-    }
-  }
-
-  // PARTISAN CATEGORY
-  //
-  // TODO - PARTISAN: This category is still being fleshed out. Just an example below.
-  let paPartisan: PartisanCategory;
-
-  {
-    paPartisan = {
-      score: 100,
-      metrics: {
-        partisanBias: 0.15,
-        responsiveness: 2.0
-      },
-      details: {},
-      datasets: {
-        election: "2016 Presidential, US Senate, Governor, and AG election results"
-      },
-      resources: {
-        planScore: "https://planscore.org/plan.html?20180219T202039.596761160Z"
-      }
-    }
-  }
-
-  // MINORITY CATEGORY
-  //
-  // TODO - MINORITY: This category is still being fleshed out. Just an example below.
-  let paMinority: MinorityCategory;
-
-  {
-    paMinority = {
-      score: null,
-      metrics: {
-        nBlack37to50: 1,
-        nBlackMajority: 12,
-        nHispanic37to50: 0,
-        nHispanicMajority: 0,
-        nPacific37to50: 0,
-        nPacificMajority: 0,
-        nAsian37to50: 0,
-        nAsianMajority: 0,
-        nNative37to50: 0,
-        nNativeMajority: 0,
-        nMinority37to50: 0,
-        nMinorityMajority: 0,
-
-        averageDVoteShare: 0.90
-      },
-      details: {
-        vap: true,
-        comboCategories: true
-      },
-      datasets: {
-        vap: "2010 Voting Age Population"
-      },
-      resources: {}
-    }
-  }
-
-  // PLAN ANALYTICS
-  let pa: PlanAnalytics = {
-    requirements: paRequirements,
-    compactness: paCompactness,
-    // TODO - Not implemented yet
-    splitting: paSplitting,
-    partisan: paPartisan,
-    minority: paMinority
-  }
-
-  return pa;
-}
-*/
 function prepareRequirementsChecklist(s, bLog = false) {
     if (!(s.bPostProcessingDone)) {
         doAnalyzePostProcessing(s);
@@ -2355,34 +2229,40 @@ function prepareRequirementsChecklist(s, bLog = false) {
     // REQUIREMENTS CATEGORY
     let paRequirements;
     {
-        let completeTest = s.getTest(0 /* Complete */);
-        let contiguousTest = s.getTest(1 /* Contiguous */);
-        let freeOfHolesTest = s.getTest(2 /* FreeOfHoles */);
-        let equalPopulationTest = s.getTest(3 /* EqualPopulation */);
+        const completeTest = s.getTest(0 /* Complete */);
+        const contiguousTest = s.getTest(1 /* Contiguous */);
+        const freeOfHolesTest = s.getTest(2 /* FreeOfHoles */);
+        const equalPopulationTest = s.getTest(3 /* EqualPopulation */);
         // Combine individual checks into an overall score
-        // TODO - DASHBOARD: Until we add three-state support top to bottom in
+        // NOTE - Until we add three-state support top to bottom in
         //   requirements/validations, map booleans to tri-states here.
-        let completeMetric = U.mapBooleanToTriState(completeTest['score']);
-        let contiguousMetric = U.mapBooleanToTriState(contiguousTest['score']);
-        let freeOfHolesMetric = U.mapBooleanToTriState(freeOfHolesTest['score']);
-        let equalPopulationMetric = U.mapBooleanToTriState(equalPopulationTest['score']);
+        const completeMetric = U.mapBooleanToTriState(completeTest['score']);
+        const contiguousMetric = U.mapBooleanToTriState(contiguousTest['score']);
+        const freeOfHolesMetric = U.mapBooleanToTriState(freeOfHolesTest['score']);
+        const equalPopulationMetric = U.mapBooleanToTriState(equalPopulationTest['score']);
         let reqScore = 0 /* Green */;
-        let checks = [completeMetric, contiguousMetric, freeOfHolesMetric, equalPopulationMetric];
+        const checks = [completeMetric, contiguousMetric, freeOfHolesMetric, equalPopulationMetric];
         if (checks.includes(1 /* Yellow */))
             reqScore = 1 /* Yellow */;
         if (checks.includes(2 /* Red */))
             reqScore = 2 /* Red */;
         // Get values to support details entries
-        let unassignedFeaturesDetail = U.deepCopy(completeTest['details']['unassignedFeatures']) || [];
-        let emptyDistrictsDetail = U.deepCopy(completeTest['details']['emptyDistricts']) || [];
-        let discontiguousDistrictsDetail = U.deepCopy(contiguousTest['details']['discontiguousDistricts']) || [];
-        let embeddedDistrictsDetail = U.deepCopy(freeOfHolesTest['details']['embeddedDistricts']) || [];
-        let populationDeviationDetail = U.deepCopy(equalPopulationTest['details']['deviation']);
-        let deviationThresholdDetail = U.trim(s.populationDeviationThreshold());
-        let xx = s.state.xx;
+        const unassignedFeaturesDetail = U.deepCopy(completeTest['details']['unassignedFeatures']) || [];
+        const emptyDistrictsDetail = U.deepCopy(completeTest['details']['emptyDistricts']) || [];
+        const discontiguousDistrictsDetail = U.deepCopy(contiguousTest['details']['discontiguousDistricts']) || [];
+        const embeddedDistrictsDetail = U.deepCopy(freeOfHolesTest['details']['embeddedDistricts']) || [];
+        // TODO - SCORE: DELETE - This code is hooked correctly to use dra-score
+        // const scorecard = s._scorecard as Score.Scorecard;
+        // const populationDeviation = scorecard.best.populationDeviation.raw;
+        const populationDeviationDetail = U.deepCopy(equalPopulationTest['details']['deviation']);
+        // console.log("Population deviations =", populationDeviationDetail, populationDeviation);
+        // const deviationThreshold = scorecard.best.populationDeviation.notes['threshold'];
+        const deviationThresholdDetail = U.trim(s.populationDeviationThreshold());
+        // console.log("Population deviation thresholds =", deviationThresholdDetail, deviationThreshold);
+        const xx = s.state.xx;
         // TODO - JSON: Is there a better / easier way to work with the variable?
-        let stateReqsDict = state_reqs_json_1.default;
-        let reqLinkToStateReqs = stateReqsDict[xx];
+        const stateReqsDict = state_reqs_json_1.default;
+        const reqLinkToStateReqs = stateReqsDict[xx];
         // Populate the category
         paRequirements = {
             score: reqScore,
@@ -2645,19 +2525,28 @@ exports.doConfigureScales = doConfigureScales;
 // Postprocess analytics - Normalize numeric results and derive secondary tests.
 // Do this after analytics have been run and before preparing a test log or scorecard. 
 function doAnalyzePostProcessing(s, bLog = false) {
-    // Normalize the raw scores for all the numerics tests
-    let testResults = U.getNumericObjectKeys(testDefns);
-    for (let testID of testResults) {
-        if (testDefns[testID]['normalize']) {
-            let testResult = s.getTest(testID);
-            let rawScore = testResult['score'];
-            let normalizedScore;
-            normalizedScore = U.normalize(rawScore, s.testScales[testID]);
-            testResult['normalizedScore'] = normalizedScore;
-            // Add the scale used to normalize the raw score to the details
-            testResult['details']['scale'] = s.testScales[testID].scale;
+    // TODO - SCORE: Toggle
+    if (s.useLegacy()) {
+        // Normalize the raw scores for all the numerics tests
+        let testResults = U.getNumericObjectKeys(testDefns);
+        for (let testID of testResults) {
+            if (testDefns[testID]['normalize']) {
+                let testResult = s.getTest(testID);
+                let rawScore = testResult['score'];
+                let normalizedScore;
+                normalizedScore = U.normalize(rawScore, s.testScales[testID]);
+                testResult['normalizedScore'] = normalizedScore;
+                // Add the scale used to normalize the raw score to the details
+                testResult['details']['scale'] = s.testScales[testID].scale;
+            }
         }
     }
+    else {
+        // Just populate the normalized population deviation score in the test
+        const scorecard = s._scorecard;
+        let test = s.getTest(4 /* PopulationDeviation */);
+        test['normalizedScore'] = scorecard.best.populationDeviation.normalized;
+    }
     // Derive secondary tests
     analyze_1.doDeriveSecondaryTests(s, bLog);
     // Toggle the semaphore, so postprocessing isn't for both the testlog & scorecard
@@ -2740,13 +2629,11 @@ function makeNakedCxD(s, bLog = false) {
     let CxD = [];
     // Remove the unassigned & total dummy "districts"
     for (let districtID = 1; districtID <= s.state.nDistricts; districtID++) {
-        // TODO - SCORE: OH has an extra county!?!
         const splits = U.deepCopy(adornedCxD[districtID].slice(1));
         CxD.push(splits);
     }
     return CxD;
 }
-// TODO - SCORE: Convert dict of geo props to array by district index
 function makeArrayOfGeoProps(s, bLog = false) {
     let geometryByDistrict = [];
     for (let districtID = 1; districtID <= s.state.nDistricts; districtID++) {
@@ -2780,9 +2667,27 @@ function makeArrayOfDemographics(s, bLog = false) {
     return demographicsArray;
 }
 // SCORE A PLAN
-function scorePlan(p, bLog = false) {
+function scorePlan(s, p, bLog = false, overridesJSON) {
     let scorer = new Score.Scorer();
-    return scorer.score(p);
+    const scorecard = scorer.score(p, overridesJSON);
+    // TODO - SCORE: Toggle: Before returning, create a dummy population deviation
+    //   test, for doHasEqualPopulations() to use later. This is preserving the old
+    //   calling sequence.
+    let test = s.getTest(4 /* PopulationDeviation */);
+    // TODO - SCORE: U.trim(popDev)???
+    // Get the raw population deviation
+    const popDev = scorecard.best.populationDeviation.raw;
+    // Populate the test entry
+    test['score'] = popDev;
+    test['details'] = { 'maxDeviation': scorecard.best.populationDeviation.notes['maxDeviation'] };
+    // Populate the N+1 summary "district" in district.statistics
+    let totalPop = s.districts.statistics[D.DistrictField.TotalPop];
+    let popDevPct = s.districts.statistics[D.DistrictField.PopDevPct];
+    let summaryRow = s.districts.numberOfRows() - 1;
+    totalPop[summaryRow] = p.populationProfile.targetSize;
+    popDevPct[summaryRow] = popDev;
+    //
+    return scorecard;
 }
 exports.scorePlan = scorePlan;
 
@@ -2866,6 +2771,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const DT = __importStar(__webpack_require__(/*! @dra2020/dra-types */ "@dra2020/dra-types"));
 const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
 // PLAN HELPERS
 // Is a "neighbor" in state?
@@ -2893,7 +2799,6 @@ function getDistrict(plan, geoID) {
 }
 exports.getDistrict = getDistrict;
 // WORKING WITH GEOIDS
-// TODO - VFEATURE
 function parseGeoID(geoID) {
     let bVfeature = false;
     // Rewrite vfeature GEOIDs to enable lexical parsing of higher-level parts
@@ -2901,12 +2806,7 @@ function parseGeoID(geoID) {
     // Example: vfeature_39153153ASV_0_28e0bc2c8163e5982e1da2d61e2388a8325c575e
     if (geoID.indexOf('vfeature') >= 0) {
         bVfeature = true;
-        // Strip off leading 'vfeature_'
-        let parentGeoID = geoID.slice(9);
-        // Strip off trailing goo
-        const uPos = parentGeoID.indexOf('_');
-        parentGeoID = parentGeoID.slice(0, uPos);
-        geoID = parentGeoID;
+        geoID = DT.vgeoidToGeoid(geoID);
     }
     const parts = {
         vfeature: bVfeature,
@@ -2914,29 +2814,9 @@ function parseGeoID(geoID) {
         county: geoID.substring(2, 5),
         rest: geoID.slice(5)
     };
-    // let l: number = geoID.length;
-    // if (l >= 11)
-    // {
-    //   parts['tract'] = geoID.substring(0, 11);
-    // }
-    // if (l >= 12)
-    // {
-    //   parts['bg'] = geoID.substring(0, 12);
-    // }
-    // if (l == 15)
-    // {
-    //   parts['block'] = geoID;
-    // }
     return parts;
 }
 exports.parseGeoID = parseGeoID;
-// TODO - VFEATURE
-// export function getFIPSFromCountyGeoID(geoID: string): string
-// {
-//   const fips = geoID.substring(2, 5);
-//   if (isNaN(Number(fips))) console.log("Non-numeric GEOID =", geoID);
-//   return fips;
-// }
 function isWaterOnly(geoID) {
     let waterOnlySignature = 'ZZZZZZ';
     if (geoID.indexOf(waterOnlySignature) >= 0)
@@ -3386,6 +3266,17 @@ module.exports = require("@dra2020/dra-score");
 
 /***/ }),
 
+/***/ "@dra2020/dra-types":
+/*!*************************************!*\
+  !*** external "@dra2020/dra-types" ***!
+  \*************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+module.exports = require("@dra2020/dra-types");
+
+/***/ }),
+
 /***/ "@dra2020/poly":
 /*!********************************!*\
   !*** external "@dra2020/poly" ***!