@dra2020/district-analytics 8.2.3 → 8.2.6

package/dist/district-analytics.js

@@ -503,10 +503,17 @@ class Districts {
                             featurePop = outerThis._session.features.fieldForFeature(f, "CENSUS" /* CENSUS */, "Tot" /* TotalPop */);
                             // Total district population
                             totalPop += featurePop;
-                            // Total population by counties w/in a district,
-                            // except the dummy unassigned district 0
-                            if (i > 0)
-                                countySplits[outerThis.getCountyIndex(geoID)] += featurePop;
+                            // Ignore features when the county is unrecognized
+                            const countyFIPS = U.parseGeoID(geoID)['county'];
+                            if (U.keyExists(countyFIPS, outerThis._session.counties.index)) {
+                                // Total population by counties w/in a district,
+                                // except the dummy unassigned district 0
+                                if (i > 0)
+                                    countySplits[outerThis.getCountyIndex(geoID)] += featurePop;
+                            }
+                            else {
+                                console.log("County not recognized:", geoID);
+                            }
                             // Democratic and Republican vote totals
                             demVotes += outerThis._session.features.fieldForFeature(f, "ELECTION" /* ELECTION */, "D" /* DemVotes */);
                             repVotes += outerThis._session.features.fieldForFeature(f, "ELECTION" /* ELECTION */, "R" /* RepVotes */);
@@ -1216,10 +1223,11 @@ function extractDistrictProperties(s, bLog = false) {
 }
 exports.extractDistrictProperties = extractDistrictProperties;
 function isAShape(poly) {
-    const bPolyUndefined = (poly === undefined) ? true : false;
-    const bNull = (bPolyUndefined) ? true : Poly.polyNull(poly); // TODO
-    const bNoCoordinates = U.isArrayEmpty((poly.geometry.coordinates)) ? true : false;
-    return (!bPolyUndefined && !bNull && !bNoCoordinates);
+    if (poly == null)
+        return false;
+    if (Poly.polyNull(poly))
+        return false;
+    return poly.geometry && poly.geometry.coordinates && !U.isArrayEmpty(poly.geometry.coordinates);
 }
 // SCORE KIWYSI COMPACTNESS
 function scoreKIWYSICompactness(s, bLog = false) {
@@ -1457,12 +1465,25 @@ function doPreprocessData(s, bLog = false) {
 exports.doPreprocessData = doPreprocessData;
 // CREATE A FIPS CODE TO COUNTY NAME LOOKUP
 function doPreprocessCountyFeatures(s, bLog = false) {
+    let fipsCodes = [];
+    // CREATE A MAP OF FIPS CODES TO NAMES
     for (let i = 0; i < s.counties.nCounties; i++) {
         let county = s.counties.countyByIndex(i);
         let fips = s.counties.propertyForCounty(county, 'COUNTYFP');
+        fipsCodes.push(fips);
         let name = s.counties.propertyForCounty(county, 'NAME');
         s.counties.mapFIPSToName(fips, name);
     }
+    // CREATE A FIPS CODE-ORDINAL MAP
+    // Sort the FIPS codes in the county shapes
+    fipsCodes = fipsCodes.sort();
+    // Add a dummy county, for county-district splitting analysis.
+    fipsCodes.unshift('000');
+    // NOTE - This was added for the legacy SPLITTING implementation.
+    // Create the ID-ordinal map
+    for (let i in fipsCodes) {
+        s.counties.index[fipsCodes[i]] = Number(i);
+    }
 }
 // ANALYZE THE CENSUS BY COUNTY
 function doPreprocessCensus(s, bLog = false) {
@@ -1482,12 +1503,18 @@ function doPreprocessCensus(s, bLog = false) {
             s.state.totalPop += value;
             // Get the county FIPS code for the feature
             let countyFIPS = U.parseGeoID(geoID)['county'];
-            // If a subtotal for the county doesn't exist, initialize one
-            if (!(U.keyExists(countyFIPS, totalByCounty))) {
-                totalByCounty[countyFIPS] = 0;
+            // Ignore features when the county is unrecognized
+            if (U.keyExists(countyFIPS, s.counties.index)) {
+                // If a subtotal for the county doesn't exist, initialize one
+                if (!(U.keyExists(countyFIPS, totalByCounty))) {
+                    totalByCounty[countyFIPS] = 0;
+                }
+                // Sum total population by county
+                totalByCounty[countyFIPS] += value;
+            }
+            else {
+                console.log("County not recognized:", geoID);
             }
-            // Sum total population by county
-            totalByCounty[countyFIPS] += value;
         }
         else {
             if (bLog)
@@ -1495,18 +1522,24 @@ function doPreprocessCensus(s, bLog = false) {
         }
     }
     // NOTE - The above could be replaced, if I got totals on county.geojson.
+    /* Moved this to doPreprocessCountyFeatures() - 09-14-2020 to fix VA county mismatch bug
     // CREATE A FIPS CODE-ORDINAL MAP
+  
     // Get the county FIPS codes
     let fipsCodes = U.getObjectKeys(totalByCounty);
     // Sort the results
     fipsCodes = fipsCodes.sort();
+  
     // 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) {
-        s.counties.index[fipsCodes[i]] = Number(i);
+    for (let i in fipsCodes)
+    {
+      s.counties.index[fipsCodes[i]] = Number(i);
     }
+    */
     // MAKE AN ARRAY OF TOTAL POPULATIONS BY COUNTY INDEX
     // Add an extra 0th virtual county bucket for county-district splitting analysis 
     let nCountyBuckets = s.counties.nCounties + 1;
@@ -1528,6 +1561,8 @@ function doPreprocessCensus(s, bLog = false) {
     let tooBigName = [];
     let expectedSplits = 0;
     let expectedAffected = 0;
+    // Get the county FIPS codes
+    let fipsCodes = U.getObjectKeys(s.counties.index);
     // Loop over the counties
     for (let county in fipsCodes) {
         let fipsCode = fipsCodes[county];
@@ -1981,13 +2016,9 @@ function scorePlan(s, p, bLog = false, overridesJSON) {
     // Add minority notes
     scorecard.minority.details['majorityMinority'] = M.getMajorityMinority(s);
     scorecard.minority.details['vraPreclearance'] = M.getVRASection5(s);
-    // TODO - KIWYSI
     // Add KIWYSI compactness score
-    if (('kiwysi' in s.config) && (s.config['kiwysi'])) {
-        console.log("Scoring KIWYSI compactness ...");
-        const kiwysiScore = C.scoreKIWYSICompactness(s, bLog);
-        scorecard.compactness.details['kiwysi'] = kiwysiScore;
-    }
+    const kiwysiScore = C.scoreKIWYSICompactness(s, bLog);
+    scorecard.compactness.details['kiwysi'] = kiwysiScore;
     return scorecard;
 }
 exports.scorePlan = scorePlan;