@dra2020/district-analytics 2.0.0 → 2.0.1

package/dist/cli.js

@@ -9034,19 +9034,14 @@ class AnalyticsSession {
         // Convert them into a (possibly empty) list of features
         let discontiguousDistrictFeatures = { type: 'FeatureCollection', features: [] };
         if (!(U.isArrayEmpty(discontiguousDistrictIDs))) {
-            for (let i = 0; i < discontiguousDistrictIDs.length; i++) {
-                let poly = this.districts.getShape(i);
-                discontiguousDistrictFeatures.features.push(poly);
+            for (let id of discontiguousDistrictIDs) {
+                let poly = this.districts.getDistrictShapeByID(id);
+                if (poly)
+                    discontiguousDistrictFeatures.features.push(poly);
             }
         }
         return discontiguousDistrictFeatures;
     }
-    // TODO - DASHBOARD: Delete, when cut over to the new analytics UI.
-    // Prepare a scorecard for rendering
-    // NOTE - This assumes that analyzePlan() has been run!
-    // prepareScorecard(): any {
-    //   return doPrepareScorecard(this);
-    // }
     // HELPERS USED INTERNALLY
     // Get an individual test, so you can drive UI with the results.
     getTest(testID) {
@@ -9062,12 +9057,6 @@ class AnalyticsSession {
         // Return a pointer to the the test entry for this test
         return this.tests[testID];
     }
-    // TODO - DASHBOARD: Delete, when cut over to the new analytics UI.
-    // Prepare test results for rendering
-    // NOTE - This assumes that analyzePlan() has been run!
-    // prepareTestLog(): any {
-    //   return doPrepareTestLog(this);
-    // }
     // NOTE - Not sure why this has to be up here.
     populationDeviationThreshold() {
         return 1 - this.testScales[4 /* PopulationDeviation */]['scale'][0];
@@ -9145,7 +9134,16 @@ class Districts {
         this._shapes = ds;
         this.statistics = this.initStatistics();
     }
-    getShape(i) { return this._shapes.features[i]; }
+    getDistrictShapeByID(id) {
+        // NOTE - Find the district shape by ID (not index)
+        // return this._shapes.features[id]; 
+        for (let f of this._shapes.features) {
+            if (f.properties && (f.properties.id == id)) {
+                return f;
+            }
+        }
+        return undefined;
+    }
     getGeoProperties(i) {
         // Make sure the district shape exists & has geo properties
         if (i in this._geoProperties)
@@ -9616,7 +9614,12 @@ class Graph {
         // Ignore the lengths of the shared borders (the values), for now
         // Protect against getting a GEOID that's not in the graph
         if (U.keyExists(node, this._graph)) {
-            return U.getObjectKeys(this._graph[node]);
+            // NOTE - CONTIGUITY GRAPHS
+            // Handle both unweighted & weighted neighbors
+            let n = this._graph[node];
+            let l = (n instanceof Array) ? n : U.getObjectKeys(n);
+            return l;
+            // return U.getObjectKeys(this._graph[node]);
         }
         else
             return [];
@@ -10210,9 +10213,9 @@ function doPolsbyPopper(s, bLog = false) {
 exports.doPolsbyPopper = doPolsbyPopper;
 // HELPER TO EXTRACT PROPERTIES OF DISTRICT SHAPES
 function extractDistrictProperties(s, bLog = false) {
+    // NOTE - I am assuming that district IDs are integers 1–N
     for (let i = 1; i <= s.state.nDistricts; i++) {
-        let j = i - 1; // TODO - TERRY: How do you get away w/o this?!?
-        let poly = s.districts.getShape(j);
+        let poly = s.districts.getDistrictShapeByID(i);
         // Guard against no shape for empty districts AND null shapes
         let polyOptions = { noLatitudeCorrection: true };
         let bNull = (!Poly.polyNormalize(poly, polyOptions));
@@ -11727,7 +11730,6 @@ function doIsContiguous(s, bLog = false) {
 exports.doIsContiguous = doIsContiguous;
 // Are the features in a district fully connected?
 function isConnected(districtGeos, graph) {
-    // export function isConnected(districtGeos: Set<string>, graph: T.ContiguityGraph): boolean {
     // TODO - TERRY, why does this constructor need a <T> type specification?
     let visited = new Set();
     let toProcess = [];
@@ -12272,36 +12274,6 @@ switch (command) {
         // echoTestResult("Majority-Minority Districts:", t1);  TODO
         break;
     }
-    // TODO - DASHBOARD: DELETE
-    // case 'analyze': {
-    //   console.log("");
-    //   console.log("Analyzing a plan ...");
-    //   console.log("");
-    //   s.analyzePlan(bLog);
-    //   break;
-    // }
-    // TODO - DASHBOARD: DELETE
-    // case 'scorecard': {
-    //   s.analyzePlan(bLog);
-    //   text = s.prepareScorecard();
-    //   console.log("");
-    //   for (let line of text.data) {
-    //     switch (line['variant']) {
-    //       case 'beginTable':
-    //       case 'endTable':
-    //         console.log(line['variant']);
-    //         break;
-    //       case 'row':
-    //         console.log(line['variant'], line['cells']);
-    //         break;
-    //       default:
-    //         console.log(line['variant'], line['text']);
-    //         break;
-    //     }
-    //   }
-    //   console.log("");
-    //   break;
-    // }
     // TODO - DASHBOARD: Print the structures out
     case 'analyze': {
         s.analyzePlan(bLog);
@@ -12311,39 +12283,6 @@ switch (command) {
         echoDistrictStatistics(districtStatistics);
         break;
     }
-    // // TODO - DASHBOARD: DELETE
-    // case 'testlog': {
-    //   s.analyzePlan(bLog);
-    //   text = s.prepareTestLog();
-    //   console.log("");
-    //   for (let line of text.data) {
-    //     console.log(line['variant'], line['text']);
-    //   }
-    //   console.log("");
-    //   break;
-    // }
-    // TODO - DASHBOARD: DELETE
-    // case 'limit': {
-    //   s.analyzePlan(bLog);
-    //   text = s.prepareScorecard();
-    //   console.log("");
-    //   for (let line of text.data) {
-    //     switch (line['variant']) {
-    //       case 'beginTable':
-    //       case 'endTable':
-    //         console.log(line['variant']);
-    //         break;
-    //       case 'row':
-    //         console.log(line['variant'], line['cells']);
-    //         break;
-    //       default:
-    //         console.log(line['variant'], line['text']);
-    //         break;
-    //     }
-    //   }
-    //   console.log("");
-    //   break;
-    // }
 }
 console.log("Ending command @ ", new Date());
 // HELPER FUNCTIONS FOR ECHOING RESULTS