@dra2020/district-analytics 16.1.4 → 16.1.5

package/dist/district-analytics.js

@@ -538,6 +538,7 @@ class Districts {
                     //   if (bLog) console.log("Statistics: Skipping water-only feature in district statistics:", geoID);
                     // }
                 });
+                console.log(`totalVAP: ${totalVAP}, whitePop: ${whitePop}, blackPop: ${blackPop}`);
                 // COMPUTE DERIVED VALUES
                 // MMD - Generalized the per-district population deviations's for MMD's with variable #'s of reps per district.
                 // - The real districts are indexed 1–N.
@@ -977,54 +978,11 @@ function geoIDForFeature(f) {
 }
 exports.geoIDForFeature = geoIDForFeature;
 function fieldForFeature(f, dk /* dt: T.Dataset */, ff) {
-    // const dk: string = this._keys[dt];
-    const fk = T.fieldFromFeatureField(dk, ff);
-    let result = undefined;
-    // 07-31-2020 - Fix to post-process PVI into the expected election composite format.
-    if (dk === 'P16GPR') {
-        // 10-27-2020 - Enabling a 'Tot' result for PVI, now that we're reporting 'Other'
-        switch (fk) {
-            case 'D': {
-                result = (_getFeatures(f, dk, 'D12') + _getFeatures(f, dk, 'D16')) / 2;
-                break;
-            }
-            case 'R': {
-                result = (_getFeatures(f, dk, 'R12') + _getFeatures(f, dk, 'R16')) / 2;
-                break;
-            }
-            case 'Tot': {
-                result = (_getFeatures(f, dk, 'D12') + _getFeatures(f, dk, 'D16') + _getFeatures(f, dk, 'R12') + _getFeatures(f, dk, 'R16')) / 2;
-                break;
-            }
-            default: {
-                console.log("Field not recognized.");
-                break;
-            }
-        }
-        // result = (_getFeatures(f, dk, (fk === 'D' ? 'D12' : 'R12')) + _getFeatures(f, dk, (fk === 'D' ? 'D16' : 'R16'))) / 2;
-    }
-    else if (dk === 'P20GPR') {
-        switch (fk) {
-            case 'D': {
-                result = (_getFeatures(f, 'E16GPR', 'D') + _getFeatures(f, 'E20GPR', 'D')) / 2;
-                break;
-            }
-            case 'R': {
-                result = (_getFeatures(f, 'E16GPR', 'R') + _getFeatures(f, 'E20GPR', 'R')) / 2;
-                break;
-            }
-            case 'Tot': {
-                result = (_getFeatures(f, 'E16GPR', 'D') + _getFeatures(f, 'E20GPR', 'D') + _getFeatures(f, 'E16GPR', 'R') + _getFeatures(f, 'E20GPR', 'R')) / 2;
-                break;
-            }
-            default: {
-                console.log("Field not recognized.");
-                break;
-            }
-        }
-    }
-    else
-        result = _getFeatures(f, dk, fk);
+    // Multiple keys to transparently handle NH and non-NH (e.g. Bl vs BlC) keyed fields
+    // One of the values will always be missing and hence zero.
+    const keys = T.fieldsFromFeatureField(dk, ff);
+    let result = 0;
+    keys.forEach(key => { result += _getFeatures(f, dk, key); });
     return result;
 }
 exports.fieldForFeature = fieldForFeature;
@@ -1034,8 +992,10 @@ exports.fieldForFeature = fieldForFeature;
 function _getFeatures(f, datasetKey, p) {
     if (!f.properties)
         return 0;
+    // This is actual path
     if (f.properties.getDatasetField)
         return f.properties.getDatasetField(f, datasetKey, p);
+    // This is old path looking through full dataset property structure
     if (!f.properties.datasets)
         return 0;
     if (datasetKey && !f.properties.datasets[datasetKey])
@@ -1043,71 +1003,6 @@ function _getFeatures(f, datasetKey, p) {
     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];
-        }
-      }
-      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;
-}
-*/
-function _fGetJoined(f) {
-    return (f.properties && f.properties.joined) ? f.properties.joined : undefined;
-}
 // Wrap data by county, to abstract the specifics of the internal structure
 class Counties {
     constructor(s, data) {
@@ -2505,23 +2400,23 @@ exports.OUT_OF_STATE = "OUT_OF_STATE";
 // TYPE DEFINITIONS
 //
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.fieldFromFeatureField = void 0;
-function fieldFromFeatureField(ds, ff) {
-    switch (ff) {
-        case 0 /* FeatureField.TotalPop */: return "Tot";
-        case 1 /* FeatureField.WhitePop */: return "Wh";
-        case 2 /* FeatureField.BlackPop */: return ds.endsWith("NH") ? "Bl" : "BlC";
-        case 3 /* FeatureField.HispanicPop */: return "His";
-        case 4 /* FeatureField.AsianPop */: return ds.endsWith("NH") ? "Asn" : "AsnC";
-        case 5 /* FeatureField.PacificPop */: return ds.endsWith("NH") ? "Pac" : "PacC";
-        case 6 /* FeatureField.NativePop */: return ds.endsWith("NH") ? "Nat" : "NatC";
-        case 7 /* FeatureField.DemVotes */: return "D";
-        case 8 /* FeatureField.RepVotes */: return "R";
-        // NOTE: "Other" is implied as Tot - D - R
-        case 9 /* FeatureField.TotalVotes */: return "Tot";
-    }
-}
-exports.fieldFromFeatureField = fieldFromFeatureField;
+exports.fieldsFromFeatureField = void 0;
+const FieldsByFeatureField = [
+    ["Tot"],
+    ["Wh"],
+    ["Bl", "BlC"],
+    ["His"],
+    ["Asn", "AsnC"],
+    ["Pac", "PacC"],
+    ["Nat", "NatC"],
+    ["D"],
+    ["R"],
+    ["Tot"]
+];
+function fieldsFromFeatureField(ds, ff) {
+    return FieldsByFeatureField[ff];
+}
+exports.fieldsFromFeatureField = fieldsFromFeatureField;
 
 
 /***/ }),