@dra2020/district-analytics 1.0.6 → 1.0.7

package/dist/cli.js

@@ -8838,6 +8838,7 @@ class AnalyticsSession {
             report_1.doAnalyzePostProcessing(this);
         }
         catch (_a) {
+            console.log("Exception caught by analyzePlan()");
             return false;
         }
         return true;
@@ -9038,13 +9039,36 @@ class Districts {
                 demVotes += outerThis._session.features.fieldForFeature(f, "ELECTION" /* ELECTION */, "D" /* DemVotes */);
                 repVotes += outerThis._session.features.fieldForFeature(f, "ELECTION" /* ELECTION */, "R" /* RepVotes */);
                 // Voting-age demographic breakdowns (or citizen voting-age)
-                totalVAP += outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "Tot" /* TotalPop */);
-                whitePop += outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "Wh" /* WhitePop */);
-                blackPop += outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "BlC" /* BlackPop */);
-                hispanicPop += outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "His" /* HispanicPop */);
-                pacificPop += outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "PacC" /* PacificPop */);
-                asianPop += outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "AsnC" /* AsianPop */);
-                nativePop += outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "NatC" /* NativePop */);
+                // Guard againt null/NaN values
+                let _totalVAP = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "Tot" /* TotalPop */);
+                let _whitePop = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "Wh" /* WhitePop */);
+                let _blackPop = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "BlC" /* BlackPop */);
+                let _hispanicPop = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "His" /* HispanicPop */);
+                let _pacificPop = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "PacC" /* PacificPop */);
+                let _asianPop = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "AsnC" /* AsianPop */);
+                let _nativePop = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "NatC" /* NativePop */);
+                if (_totalVAP)
+                    totalVAP += _totalVAP;
+                if (_whitePop)
+                    whitePop += _whitePop;
+                if (_blackPop)
+                    blackPop += _blackPop;
+                if (_hispanicPop)
+                    hispanicPop += _hispanicPop;
+                if (_pacificPop)
+                    pacificPop += _pacificPop;
+                if (_asianPop)
+                    asianPop += _asianPop;
+                if (_nativePop)
+                    nativePop += _nativePop;
+                // TODO - DELETE
+                // totalVAP += outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.TotalPop);
+                // whitePop += outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.WhitePop);
+                // blackPop += outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.BlackPop);
+                // hispanicPop += outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.HispanicPop);
+                // pacificPop += outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.PacificPop);
+                // asianPop += outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.AsianPop);
+                // nativePop += outerThis._session.features.fieldForFeature(f, Dataset.VAP, FeatureField.NativePop);
                 // 4 - MORE ...
             });
             // COMPUTE DERIVED VALUES
@@ -9059,9 +9083,9 @@ class Districts {
             // Total two-party (not total total!) votes, Democratic and Republican vote
             // shares, and Democratic first-past-the-post win (= 1) or loss (= 0).
             let totVotes;
-            let demPct = null;
-            let repPct = null;
-            let DemSeat = null;
+            let demPct = 0;
+            let repPct = 0;
+            let DemSeat = 0;
             totVotes = demVotes + repVotes;
             if (totVotes > 0) {
                 demPct = demVotes / totVotes;
@@ -9071,13 +9095,13 @@ class Districts {
             // Total minority VAP
             let minorityPop = totalVAP - whitePop;
             // Voting-age demographic proportions (or citizen voting-age)
-            let whitePct = null;
-            let minorityPct = null;
-            let blackPct = null;
-            let hispanicPct = null;
-            let pacificPct = null;
-            let asianPct = null;
-            let nativePct = null;
+            let whitePct = 0;
+            let minorityPct = 0;
+            let blackPct = 0;
+            let hispanicPct = 0;
+            let pacificPct = 0;
+            let asianPct = 0;
+            let nativePct = 0;
             if (totalVAP > 0) {
                 whitePct = whitePop / totalVAP;
                 minorityPct = minorityPop / totalVAP;
@@ -9180,8 +9204,12 @@ exports.Districts = Districts;
 exports.DatasetDescriptions = {
     D16F: "2016 ACS Total Population",
     D16T: "2016 ACS Voting Age Population",
-    E16GPR: "2016 Presidential Election"
+    E16GPR: "2016 Presidential Election",
+    D10F: "2010 Census Total Population",
+    D10T: "2010 Voting Age Population",
+    C16GCO: "2016 Presidential, US Senate, Governor, and AG election results"
     // TODO - What other potential datasets?
+    // MORE ...
 };
 // Wrap data by feature, to abstract the specifics of the internal structure
 class Features {
@@ -9193,7 +9221,8 @@ class Features {
     }
     nFeatures() { return this._data.features.length; }
     featureByIndex(i) { return this._data.features[i]; }
-    geoIDForFeature(f) { return f.properties['GEOID']; }
+    // TODO - Generalize this
+    geoIDForFeature(f) { return f.properties['GEOID10']; }
     fieldForFeature(f, dt, fk) {
         let dk = this._keys[dt];
         return _getFeatures(f, dk, fk);
@@ -10313,13 +10342,14 @@ const testDefns = {
     [4 /* PopulationDeviation */]: populationDeviationDefn,
     [5 /* Reock */]: reockDefn,
     [6 /* PolsbyPopper */]: polsbyPopperDefn,
+    // TODO - Flesh out county splits
     [7 /* CountySplits */]: countySplitsDefn,
     [13 /* EfficiencyGap */]: efficiencyGapDefn
     /* TODO - More tests ... */
 };
 // Scorecard category definitions
 const validCategory = {
-    catName: "Valid",
+    catName: "Map Validations",
     catTests: [
         { testID: 0 /* Complete */ },
         { testID: 1 /* Contiguous */ },
@@ -10331,7 +10361,8 @@ const validCategory = {
     catPrepareFn: doPrepareValidSection
 };
 const fairCategory = {
-    catName: "Fair",
+    // TODO - Change this label
+    catName: "Is the map fair?",
     catTests: [
         {
             testID: 13 /* EfficiencyGap */,
@@ -10347,7 +10378,7 @@ const fairCategory = {
 //   multiplied by the associated 'testWeight', and the sum of those is divided
 //   by the total weight. Weights don't have to add to 100.
 const bestCategory = {
-    catName: "Best",
+    catName: "Traditional Districting Principles",
     catTests: [
         {
             testID: 4 /* PopulationDeviation */,
@@ -10360,11 +10391,12 @@ const bestCategory = {
         {
             testID: 6 /* PolsbyPopper */,
             testWeight: 25
-        },
-        {
-            testID: 7 /* CountySplits */,
-            testWeight: 50
         }
+        // TODO - Re-enable, when the metric is implemented
+        // {
+        //   testID: T.Test.CountySplits,
+        //   testWeight: 50
+        // }
     ],
     catNumeric: true,
     catWeight: undefined,
@@ -10494,31 +10526,46 @@ function doPrepareScorecard(s) {
         // Create and cache a new, unformatted scorecard
         s.scorecard = doGenerateScorecard(s);
         // Create a scorecard header
-        blocks.push({ variant: 'h4', text: `Analysis` });
-        // Report district statistics
-        blocks.push({ variant: 'h5', text: `Individual Districts` });
-        let districtStatisticsText = doPrepareDistrictStatistics(s);
-        blocks.push(...districtStatisticsText);
+        blocks.push({ variant: 'h4', text: `Analysis - NC 2019 Special Edition` });
+        blocks.push({ variant: 'body1', text: `In response to the recent court ruling in North Carolina and the court's requirement for transparency, we are pleased to provide the general public with early access to this base set of redistricting analytics. Stay tuned for more updates!` });
+        blocks.push({ variant: 'body1', text: `For more details, see our blog post on Medium.` });
         // Prepare each scorecard category
-        blocks.push({ variant: 'h5', text: `Overall Plan` });
+        blocks.push({ variant: 'beginExpansion', text: `Overall Plan` });
         let categories = U.getNumericObjectKeys(s.scorecard);
         for (let c of categories) {
             let sectionPrepareFn = scorecardDefn[c]['catPrepareFn'];
             let sectionText = sectionPrepareFn(s, c);
             blocks.push(...sectionText);
         }
+        // blocks.push({ variant: 'body1', text: `` });
+        // blocks.push({ variant: 'body1', text: `There is much more analysis coming of county splitting, partisan fairness, and the opportunity for minority representation! For now, you can glean a lot from the district statistics below.` });
+        blocks.push({ variant: 'endExpansion' });
+        // Report district statistics
+        blocks.push({ variant: 'beginExpansion', text: `Individual Districts` });
+        let districtStatisticsText = doPrepareDistrictStatistics(s);
+        blocks.push(...districtStatisticsText);
+        blocks.push({ variant: 'endExpansion' });
         // Report what datasets were used
         let c = s.config['datasets']["CENSUS" /* CENSUS */];
         let v = s.config['datasets']["VAP" /* VAP */];
         let e = s.config['datasets']["ELECTION" /* ELECTION */];
-        blocks.push({ variant: 'body1', text: `Using datasets:` });
-        blocks.push({ variant: 'body1', text: `* ${c}: ${D.DatasetDescriptions[c]}` });
-        blocks.push({ variant: 'body1', text: `* ${v}: ${D.DatasetDescriptions[v]}` });
-        blocks.push({ variant: 'body1', text: `* ${e}: ${D.DatasetDescriptions[e]}` });
+        blocks.push({ variant: 'beginExpansion', text: `About the Data` });
+        blocks.push({ variant: 'body1', text: `These are the 4 datasets used in this analysis:` });
+        // TODO - Get the shape "dataset" from dra-client
+        blocks.push({ variant: 'body1', text: `* Shapes: 2010 VTD shapes` });
+        blocks.push({ variant: 'body1', text: `* Census: ${D.DatasetDescriptions[c]}` });
+        blocks.push({ variant: 'body1', text: `* VAP: ${D.DatasetDescriptions[v]}` });
+        blocks.push({ variant: 'body1', text: `* Elections: ${D.DatasetDescriptions[e]}` });
+        blocks.push({ variant: 'endExpansion' });
+        blocks.push({ variant: 'body1', text: `` });
+        blocks.push({
+            "variant": "link",
+            "text": "Questions or comments?",
+            "label": "analytics@davesredistricting.org",
+            "link": "mailto:analytics@davesredistricting.org"
+        });
     }
     // Otherwise, return a blank scorecard
-    // TODO - What dra-client returns from renderAnalyzeCore()
-    // return <STV.StaticTextView text={ text } />;
     return text;
 }
 exports.doPrepareScorecard = doPrepareScorecard;
@@ -10534,7 +10581,7 @@ function doPrepareDistrictStatistics(s) {
         else {
             tot = Math.round(tot);
             let dev = fractionToPercentage(s.districts.statistics[D.DistrictField.PopDevPct][d]);
-            let bEq = true; // TODO - Set based on population threshold
+            let bEq = s.districts.statistics[D.DistrictField.bEqualPop][d];
             let bC = s.districts.statistics[D.DistrictField.bContiguous][d]
                 && s.districts.statistics[D.DistrictField.bNotEmbedded][d];
             let dPct = fractionToPercentage(s.districts.statistics[D.DistrictField.DemPct][d]);
@@ -10605,8 +10652,6 @@ function doPrepareTestLog(s) {
         }
     }
     // Otherwise, return a blank test log
-    // TODO - What dra-client returns from renderAnalyzeCore()
-    // return <STV.StaticTextView text={ text } />;
     return text;
 }
 exports.doPrepareTestLog = doPrepareTestLog;
@@ -10631,27 +10676,27 @@ function prepareTestEntry(testID, testResult) {
     switch (testType) {
         case TestType.PassFail: {
             scoreText = pfBoolToString(score);
-            blocks.push({ variant: 'body1', text: `${testName}: ${scoreText} ${testNameTrailer}` });
+            blocks.push({ variant: 'body1', text: `<b>${testName}</b>: ${scoreText} ${testNameTrailer}` });
             break;
         }
         case TestType.Percentage: {
             score = fractionToPercentage(score);
             if (bNormalize) {
                 normalizedScore = testResult['normalizedScore'];
-                blocks.push({ variant: 'body1', text: `${testName}: ${normalizedScore} / 100 : ${formatPercentage(score)}% ${testNameTrailer}` });
+                blocks.push({ variant: 'body1', text: `<b>${testName}</b>: ${normalizedScore} / 100 : ${formatPercentage(score)}% ${testNameTrailer}` });
             }
             else {
-                blocks.push({ variant: 'body1', text: `${testName}: ${formatPercentage(score)}% ${testNameTrailer}` });
+                blocks.push({ variant: 'body1', text: `<b>${testName}</b>: ${formatPercentage(score)}% ${testNameTrailer}` });
             }
             break;
         }
         case TestType.Number: {
             if (bNormalize) {
                 normalizedScore = testResult['normalizedScore'];
-                blocks.push({ variant: 'body1', text: `${testName}: ${normalizedScore} / 100 : ${formatNumber(score)} ${testNameTrailer}` });
+                blocks.push({ variant: 'body1', text: `<b>${testName}</b>: ${normalizedScore} / 100 : ${formatNumber(score)} ${testNameTrailer}` });
             }
             else {
-                blocks.push({ variant: 'body1', text: `${testName}: ${formatNumber(score)} ${testNameTrailer}` });
+                blocks.push({ variant: 'body1', text: `<b>${testName}</b>: ${formatNumber(score)} ${testNameTrailer}` });
             }
             break;
         }
@@ -10806,7 +10851,8 @@ function doPrepareValidSection(s, c) {
     let testText;
     // Section header
     let stringScore = pfBoolToString(catScore);
-    blocks.push({ variant: 'h6', text: `${catName}: ${stringScore}` });
+    blocks.push({ variant: 'beginExpansion', text: `${catName}` });
+    // blocks.push({ variant: 'beginExpansion', text: `${catName} ${stringScore}` });
     // Complete
     testReport = catTests[0 /* Complete */];
     testText = prepareTestEntry(0 /* Complete */, testReport);
@@ -10823,6 +10869,7 @@ function doPrepareValidSection(s, c) {
     testReport = catTests[3 /* EqualPopulation */];
     testText = prepareTestEntry(3 /* EqualPopulation */, testReport);
     blocks.push(...testText);
+    blocks.push({ variant: 'endExpansion' });
     return blocks;
 }
 // TODO - NIY
@@ -10836,12 +10883,13 @@ function doPrepareFairSection(s, c) {
     let blocks = text.data;
     let testText;
     // Section header
-    blocks.push({ variant: 'h6', text: `${catName}: ${catScore}` });
+    blocks.push({ variant: 'beginExpansion', text: `${catName} ${catScore} of 100` });
     // TODO - Flesh this out
     // There's only one test: Population Deviation.
     // testReport = catTests[T.Test.PopulationDeviation];
     // testText = prepareTestEntry(T.Test.PopulationDeviation, testReport);
     // blocks.push(...testText);
+    blocks.push({ variant: 'endExpansion' });
     return blocks;
 }
 // This function parses & formats the 'Best' section of a scorecard.
@@ -10854,7 +10902,7 @@ function doPrepareBestSection(s, c) {
     let blocks = text.data;
     let testText;
     // Section header
-    blocks.push({ variant: 'h6', text: `${catName}: ${catScore}` });
+    blocks.push({ variant: 'beginExpansion', text: `${catName} (${catScore} of 100)` });
     // Population deviation
     testReport = catTests[4 /* PopulationDeviation */];
     testText = prepareTestEntry(4 /* PopulationDeviation */, testReport);
@@ -10871,9 +10919,11 @@ function doPrepareBestSection(s, c) {
     blocks.push(...reockTestText);
     blocks.push(...polsbyPopperTestText);
     // County splits
-    testReport = catTests[7 /* CountySplits */];
-    testText = prepareTestEntry(7 /* CountySplits */, testReport);
-    blocks.push(...testText);
+    // TODO - Re-enable this, when the county-splitting metric is implemented.
+    // testReport = catTests[T.Test.CountySplits];
+    // testText = prepareTestEntry(T.Test.CountySplits, testReport);
+    // blocks.push(...testText);
+    blocks.push({ variant: 'endExpansion' });
     return blocks;
 }
 // FORMATTING HELPERS