@dra2020/district-analytics 16.0.0 → 16.0.1

package/dist/district-analytics.js

@@ -459,74 +459,76 @@ class Districts {
                 bNotEmpty = true;
                 // ... loop over the geoIDs creating district-by-district statistics 
                 geoIDs.forEach(function (geoID) {
-                    // Skip water-only features
-                    if (!(U.isWaterOnly(geoID))) {
-                        // Map from geoID to feature index
-                        let featureID = outerThis._session.features.featureID(geoID);
-                        let f = outerThis._session.features.featureByIndex(featureID);
-                        if (f == undefined) {
-                            if (bLog)
-                                console.log("Statistics: Skipping undefined feature in district statistics: GEOID =", geoID, "Feature ID =", featureID);
+                    // 01-04-22 -- Removed water-only guard
+                    // // Skip water-only features
+                    // if (!(U.isWaterOnly(geoID)))
+                    // {
+                    // Map from geoID to feature index
+                    let featureID = outerThis._session.features.featureID(geoID);
+                    let f = outerThis._session.features.featureByIndex(featureID);
+                    if (f == undefined) {
+                        if (bLog)
+                            console.log("Statistics: Skipping undefined feature in district statistics: GEOID =", geoID, "Feature ID =", featureID);
+                    }
+                    else {
+                        // ACCUMULATE VALUES
+                        // 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 */);
+                        // featurePop = outerThis._session.features.fieldForFeature(f, T.Dataset.CENSUS, T.FeatureField.TotalPop);
+                        // Total district population
+                        totalPop += 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 {
-                            // ACCUMULATE VALUES
-                            // 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 */);
-                            // featurePop = outerThis._session.features.fieldForFeature(f, T.Dataset.CENSUS, T.FeatureField.TotalPop);
-                            // Total district population
-                            totalPop += 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 {
-                                if (bLog)
-                                    console.log("Statistics: County not recognized:", geoID);
-                            }
-                            // Democratic and Republican vote totals
-                            // 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 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 */);
-                            demVotes += featureDem;
-                            repVotes += featureRep;
-                            totVotes += featureTot;
-                            // NOTE: Unless you grab the values above before accumulating them,
-                            //   you can't accumulate othVotes for districts. You must calculate
-                            //   them by implication later.
-                            if (bLog) {
-                                const bBadElection = (featureDem + featureRep > featureTot) ? true : false;
-                                if (bBadElection)
-                                    console.log("Statistics: Inconsistent election data for precinct:", geoID, featureDem, featureRep, featureTot);
-                            }
-                            // 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 */);
-                            // 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 */);
+                            if (bLog)
+                                console.log("Statistics: County not recognized:", geoID);
                         }
+                        // Democratic and Republican vote totals
+                        // 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 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 */);
+                        demVotes += featureDem;
+                        repVotes += featureRep;
+                        totVotes += featureTot;
+                        // NOTE: Unless you grab the values above before accumulating them,
+                        //   you can't accumulate othVotes for districts. You must calculate
+                        //   them by implication later.
+                        if (bLog) {
+                            const bBadElection = (featureDem + featureRep > featureTot) ? true : false;
+                            if (bBadElection)
+                                console.log("Statistics: Inconsistent election data for precinct:", geoID, featureDem, featureRep, featureTot);
+                        }
+                        // 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 */);
+                        // 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 */);
                     }
-                    else {
-                        if (bLog)
-                            console.log("Statistics: Skipping water-only feature in district statistics:", geoID);
-                    }
+                    // }
+                    // else
+                    // {
+                    //   if (bLog) console.log("Statistics: Skipping water-only feature in district statistics:", geoID);
+                    // }
                 });
                 // COMPUTE DERIVED VALUES
                 // MMD - Generalized the per-district population deviations's for MMD's with variable #'s of reps per district.
@@ -1022,47 +1024,75 @@ exports.fieldForFeature = fieldForFeature;
 //  f is a direct GeoJSON feature
 //  p is a geoID
 function _getFeatures(f, datasetKey, p) {
-    // Shim to load sample data2.json from disk for command-line scaffolding
-    if (f.properties && f.properties['datasets']) {
-        if (!f.properties['datasets'][datasetKey]) {
-            // Feature is missing the dataset
-            nMissingDataset += 1;
-            // console.log(`${nMissingDataset}: Data ${datasetKey} missing for feature ${f} Returning zero.`);
-            return 0;
+    if (!f.properties || !f.properties.datasets)
+        return 0;
+    if (datasetKey && !f.properties.datasets[datasetKey])
+        return 0;
+    let n = datasetKey ? f.properties.datasets[datasetKey][p] : f.properties[p];
+    return !n || isNaN(n) ? 0 : n;
+}
+/* 01-04-22 -- Replaced with the above
+function _getFeatures(f: any, datasetKey: string, p: string): any
+{
+  // Shim to load sample data2.json from disk for command-line scaffolding
+  if (f.properties && f.properties['datasets'])
+  {
+    if (!f.properties['datasets'][datasetKey])
+    {
+      // Feature is missing the dataset
+      nMissingDataset += 1;
+      // console.log(`${nMissingDataset}: Data ${datasetKey} missing for feature ${f} Returning zero.`);
+
+      return 0;
+    }
+
+    return f.properties['datasets'][datasetKey][p];
+  }
+
+  // NOTE - The fGetW() code from dra-client below here ...
+
+  // Direct property?
+  if (f.properties && f.properties[p] !== undefined)
+  {
+    return f.properties[p];
+  }
+
+  // Joined property?
+  let a: any[] = _fGetJoined(f);
+  if (a)
+  {
+    for (let i: number = 0; i < a.length; i++)
+    {
+      let o: any = a[i];
+      if (!datasetKey)
+      {
+        if (o[p] !== undefined)
+        {
+          return o[p];
         }
-        return f.properties['datasets'][datasetKey][p];
-    }
-    // NOTE - The fGetW() code from dra-client below here ...
-    // Direct property?
-    if (f.properties && f.properties[p] !== undefined) {
-        return f.properties[p];
-    }
-    // Joined property?
-    let a = _fGetJoined(f);
-    if (a) {
-        for (let i = 0; i < a.length; i++) {
-            let o = a[i];
-            if (!datasetKey) {
-                if (o[p] !== undefined) {
-                    return o[p];
-                }
-            }
-            else {
-                if (o['datasets'] && o['datasets'][datasetKey]) {
-                    let v = (o['datasets'][datasetKey][p]);
-                    if ((!(v == null)) && (!(v == undefined))) {
-                        return o['datasets'][datasetKey][p];
-                    }
-                }
-            }
+      }
+      else
+      {
+        if (o['datasets'] && o['datasets'][datasetKey])
+        {
+          let v = (o['datasets'][datasetKey][p]);
+          if ((!(v == null)) && (!(v == undefined)))
+          {
+            return o['datasets'][datasetKey][p];
+          }
         }
+      }
     }
-    // Feature is missing the property
-    nMissingProperty += 1;
-    // console.log(`${nMissingProperty}: ${p} value undefined for ${f.properties['GEOID10']}. Returning zero.`);
-    return 0;
-    // return undefined;
+  }
+
+  // Feature is missing the property
+  nMissingProperty += 1;
+  // console.log(`${nMissingProperty}: ${p} value undefined for ${f.properties['GEOID10']}. Returning zero.`);
+
+  return 0;
+  // return undefined;
 }
+*/
 function _fGetJoined(f) {
     return (f.properties && f.properties.joined) ? f.properties.joined : undefined;
 }