@dra2020/district-analytics 11.5.2 → 12.0.0

package/dist/district-analytics.js

@@ -231,7 +231,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.Graph = exports.invertPlan = exports.Plan = exports.State = exports.Counties = exports.inferSelectedMinority = exports.Features = exports.Districts = void 0;
+exports.Graph = exports.invertPlan = exports.Plan = exports.State = exports.Counties = exports.fieldForFeature = exports.geoIDForFeature = exports.Features = exports.inferSelectedMinority = exports.Districts = void 0;
 const G = __importStar(__webpack_require__(/*! @dra2020/dra-graph */ "@dra2020/dra-graph"));
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
@@ -388,7 +388,10 @@ class Districts {
                             // ACCUMULATE VALUES
                             // Total population of each feature
                             // NOTE - This result is used more than once
-                            featurePop = outerThis._session.features.fieldForFeature(f, "CENSUS" /* CENSUS */, "Tot" /* TotalPop */);
+                            // 03-27-21
+                            const dkCENSUS = outerThis._session.features._keys["CENSUS" /* CENSUS */];
+                            featurePop = fieldForFeature(f, dkCENSUS, "Tot" /* 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
@@ -406,15 +409,15 @@ class Districts {
                             // Democratic and Republican vote totals
                             // 10-22-2020 - Added Other votes
                             // 10-24-2020 - Added guard against inconsistent election data
-                            const featureDem = outerThis._session.features.fieldForFeature(f, "ELECTION" /* ELECTION */, "D" /* DemVotes */);
-                            const featureRep = outerThis._session.features.fieldForFeature(f, "ELECTION" /* ELECTION */, "R" /* RepVotes */);
-                            const featureTot = outerThis._session.features.fieldForFeature(f, "ELECTION" /* ELECTION */, "Tot" /* TotalVotes */);
+                            // 03-27-2021
+                            const dkELECTION = outerThis._session.features._keys["ELECTION" /* ELECTION */];
+                            const featureDem = fieldForFeature(f, dkELECTION, "D" /* DemVotes */);
+                            // const featureDem = outerThis._session.features.fieldForFeature(f, T.Dataset.ELECTION, T.FeatureField.DemVotes);
+                            const featureRep = fieldForFeature(f, dkELECTION, "R" /* RepVotes */);
+                            const featureTot = fieldForFeature(f, dkELECTION, "Tot" /* TotalVotes */);
                             demVotes += featureDem;
                             repVotes += featureRep;
                             totVotes += featureTot;
-                            // demVotes += outerThis._session.features.fieldForFeature(f, T.Dataset.ELECTION, T.FeatureField.DemVotes);
-                            // repVotes += outerThis._session.features.fieldForFeature(f, T.Dataset.ELECTION, T.FeatureField.RepVotes);
-                            // totVotes += outerThis._session.features.fieldForFeature(f, T.Dataset.ELECTION, T.FeatureField.TotalVotes);
                             // NOTE: Unless you grab the values above before accumulating them,
                             //   you can't accumulate othVotes for districts. You must calculate
                             //   them by implication later.
@@ -424,13 +427,16 @@ class Districts {
                                     console.log("Statistics: Inconsistent election data for precinct:", geoID, featureDem, featureRep, featureTot);
                             }
                             // 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 */);
+                            // 03-27-21
+                            const dkVAP = outerThis._session.features._keys["VAP" /* VAP */];
+                            totalVAP += fieldForFeature(f, dkVAP, "Tot" /* TotalPop */);
+                            // totalVAP += outerThis._session.features.fieldForFeature(f, T.Dataset.VAP, T.FeatureField.TotalPop);
+                            whitePop += fieldForFeature(f, dkVAP, "Wh" /* WhitePop */);
+                            blackPop += fieldForFeature(f, dkVAP, "BlC" /* BlackPop */);
+                            hispanicPop += fieldForFeature(f, dkVAP, "His" /* HispanicPop */);
+                            pacificPop += fieldForFeature(f, dkVAP, "PacC" /* PacificPop */);
+                            asianPop += fieldForFeature(f, dkVAP, "AsnC" /* AsianPop */);
+                            nativePop += fieldForFeature(f, dkVAP, "NatC" /* NativePop */);
                         }
                     }
                     else {
@@ -651,26 +657,31 @@ class Districts {
                     let f = outerThis._session.features.featureByIndex(featureID);
                     if (!(f == undefined)) {
                         // Calculate the Dem two-party vote
-                        const featureDem = outerThis._session.features.fieldForFeature(f, "ELECTION" /* ELECTION */, "D" /* DemVotes */);
-                        const featureRep = outerThis._session.features.fieldForFeature(f, "ELECTION" /* ELECTION */, "R" /* RepVotes */);
-                        // const featureTot = outerThis._session.features.fieldForFeature(f, T.Dataset.ELECTION, T.FeatureField.TotalVotes);
+                        // 03-27-21
+                        const dkELECTION = outerThis._session.features._keys["ELECTION" /* ELECTION */];
+                        const featureDem = fieldForFeature(f, dkELECTION, "D" /* DemVotes */);
+                        const featureRep = fieldForFeature(f, dkELECTION, "R" /* RepVotes */);
+                        // const featureRep = outerThis._session.features.fieldForFeature(f, T.Dataset.ELECTION, T.FeatureField.RepVotes);
                         if ((featureDem + featureRep) > 0) {
                             const pctDem = featureDem / (featureDem + featureRep);
                             // Calculate the VAP/CVAP percentages by demographic
-                            const totalVAP = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "Tot" /* TotalPop */);
+                            // 03-27-21
+                            const dkVAP = outerThis._session.features._keys["VAP" /* VAP */];
+                            const totalVAP = fieldForFeature(f, dkVAP, "Tot" /* TotalPop */);
+                            // const totalVAP = outerThis._session.features.fieldForFeature(f, T.Dataset.VAP, T.FeatureField.TotalPop);
                             if (totalVAP > 0) {
                                 // Gather all points, for debugging purposes ...
-                                const hispanicVAP = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "His" /* HispanicPop */);
-                                const blackVAP = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "BlC" /* BlackPop */);
-                                const pacificVAP = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "PacC" /* PacificPop */);
-                                const asianVAP = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "AsnC" /* AsianPop */);
-                                const nativeVAP = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "NatC" /* NativePop */);
+                                const hispanicVAP = fieldForFeature(f, dkVAP, "His" /* HispanicPop */);
+                                const blackVAP = fieldForFeature(f, dkVAP, "BlC" /* BlackPop */);
+                                const pacificVAP = fieldForFeature(f, dkVAP, "PacC" /* PacificPop */);
+                                const asianVAP = fieldForFeature(f, dkVAP, "AsnC" /* AsianPop */);
+                                const nativeVAP = fieldForFeature(f, dkVAP, "NatC" /* NativePop */);
                                 const pctHispanic = hispanicVAP / totalVAP;
                                 const pctBlack = blackVAP / totalVAP;
                                 const pctPacific = pacificVAP / totalVAP;
                                 const pctAsian = asianVAP / totalVAP;
                                 const pctNative = nativeVAP / totalVAP;
-                                const whiteVAP = outerThis._session.features.fieldForFeature(f, "VAP" /* VAP */, "Wh" /* WhitePop */);
+                                const whiteVAP = fieldForFeature(f, dkVAP, "Wh" /* WhitePop */);
                                 const minorityVAP = totalVAP - whiteVAP;
                                 const pctMinority = minorityVAP / totalVAP;
                                 let pctComparison = whiteVAP / totalVAP;
@@ -754,6 +765,22 @@ class Districts {
     }
 }
 exports.Districts = Districts;
+function inferSelectedMinority(groups) {
+    if (groups.hispanic)
+        return 'Hispanic';
+    if (groups.black)
+        return 'Black';
+    if (groups.pacific)
+        return 'Pacific';
+    if (groups.asian)
+        return 'Asian';
+    if (groups.native)
+        return 'Native';
+    if (groups.minority)
+        return 'Minority';
+    return 'No minority selected!';
+}
+exports.inferSelectedMinority = inferSelectedMinority;
 // CLASSES, ETC. FOR FEATURE & COUNTY DATA
 // Wrap data by feature, to abstract the specifics of the internal structure
 class Features {
@@ -765,49 +792,61 @@ class Features {
     }
     nFeatures() { return this._data.features.length; }
     featureByIndex(i) { return this._data.features[i]; }
-    geoIDForFeature(f) {
-        // 12-02-2020 - Switched to using ids vs. geoids per Terry
-        if (f.properties && f.properties['id']) {
-            return f.properties['id'];
-            // GEOIDs will be one of these properties
-            // const value = f.properties['GEOID10'] || f.properties['GEOID20'] || f.properties['GEOID'];
-            // return value;
-        }
-        else {
-            console.log("This feature does not have an id property:", f);
-            throw "Feature with no id property.";
-        }
-    }
-    fieldForFeature(f, dt, fk) {
-        const dk = this._keys[dt];
-        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;
+    /* 03/27/21 - Moved to top-level & exported:
+    geoIDForFeature(f: any): string
+    {
+      // 12-02-2020 - Switched to using ids vs. geoids per Terry
+      if (f.properties && f.properties['id'])
+      {
+        return f.properties['id'];
+        // GEOIDs will be one of these properties
+        // const value = f.properties['GEOID10'] || f.properties['GEOID20'] || f.properties['GEOID'];
+  
+        // return value;
+      }
+      else
+      {
+        console.log("This feature does not have an id property:", f);
+        throw "Feature with no id property.";
+      }
+    }
+    fieldForFeature(f: any, dt: T.Dataset, fk: string): any
+    {
+      const dk: string = this._keys[dt];
+  
+      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;
+          }
         }
-        else
-            result = _getFeatures(f, dk, fk);
-        return result;
+        // result = (_getFeatures(f, dk, (fk === 'D' ? 'D12' : 'R12')) + _getFeatures(f, dk, (fk === 'D' ? 'D16' : 'R16'))) / 2;
+      }
+      else
+        result = _getFeatures(f, dk, fk);
+  
+      return result;
     }
+    */
     resetDataset(d, k) {
         this._keys[d] = k;
         // NOTE - RECALC: Does anything need to be recalc'd now when a dataset is changed?
@@ -815,29 +854,60 @@ class Features {
     mapGeoIDsToFeatureIDs() {
         for (let i = 0; i < this._session.features.nFeatures(); i++) {
             let f = this._session.features.featureByIndex(i);
-            let geoID = this._session.features.geoIDForFeature(f);
+            // 03-27-21
+            let geoID = geoIDForFeature(f);
+            // let geoID: string = this._session.features.geoIDForFeature(f);
             this._featureIDs[geoID] = i;
         }
     }
     featureID(i) { return this._featureIDs[i]; }
 }
 exports.Features = Features;
-function inferSelectedMinority(groups) {
-    if (groups.hispanic)
-        return 'Hispanic';
-    if (groups.black)
-        return 'Black';
-    if (groups.pacific)
-        return 'Pacific';
-    if (groups.asian)
-        return 'Asian';
-    if (groups.native)
-        return 'Native';
-    if (groups.minority)
-        return 'Minority';
-    return 'No minority selected!';
+function geoIDForFeature(f) {
+    // 12-02-2020 - Switched to using ids vs. geoids per Terry
+    if (f.properties && f.properties['id']) {
+        return f.properties['id'];
+        // GEOIDs will be one of these properties
+        // const value = f.properties['GEOID10'] || f.properties['GEOID20'] || f.properties['GEOID'];
+        // return value;
+    }
+    else {
+        console.log("This feature does not have an id property:", f);
+        throw "Feature with no id property.";
+    }
+}
+exports.geoIDForFeature = geoIDForFeature;
+function fieldForFeature(f, dk /* dt: T.Dataset */, fk) {
+    // const dk: string = this._keys[dt];
+    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
+        result = _getFeatures(f, dk, fk);
+    return result;
 }
-exports.inferSelectedMinority = inferSelectedMinority;
+exports.fieldForFeature = fieldForFeature;
 // NOTE - This accessor is cloned from fGetW() in dra-client/restrict.ts
 //  f is a direct GeoJSON feature
 //  p is a geoID
@@ -965,7 +1035,9 @@ function invertPlan(plan, s, bLog = false) {
     if (!(s == undefined)) {
         for (let i = 0; i < s.features.nFeatures(); i++) {
             let f = s.features.featureByIndex(i);
-            let geoID = s.features.geoIDForFeature(f);
+            // 03-27-21
+            let geoID = geoIDForFeature(f);
+            // let geoID: string = s.features.geoIDForFeature(f);
             // If the feature is NOT explicitly assigned to a district, add the geoID
             // to the dummy unassigned district 0.
             if (!(U.keyExists(geoID, plan)))
@@ -1445,12 +1517,15 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.inferSelectedMinority = void 0;
+exports.inferSelectedMinority = exports.fieldForFeature = exports.geoIDForFeature = void 0;
 __exportStar(__webpack_require__(/*! ./_api */ "./src/_api.ts"), exports);
-__exportStar(__webpack_require__(/*! ./results */ "./src/results.ts"), exports);
-__exportStar(__webpack_require__(/*! ./types */ "./src/types.ts"), exports);
 var _data_1 = __webpack_require__(/*! ./_data */ "./src/_data.ts");
+Object.defineProperty(exports, "geoIDForFeature", ({ enumerable: true, get: function () { return _data_1.geoIDForFeature; } }));
+Object.defineProperty(exports, "fieldForFeature", ({ enumerable: true, get: function () { return _data_1.fieldForFeature; } }));
 Object.defineProperty(exports, "inferSelectedMinority", ({ enumerable: true, get: function () { return _data_1.inferSelectedMinority; } }));
+__exportStar(__webpack_require__(/*! ./results */ "./src/results.ts"), exports);
+__exportStar(__webpack_require__(/*! ./types */ "./src/types.ts"), exports);
+__exportStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"), exports);
 
 
 /***/ }),
@@ -1586,6 +1661,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.doPreprocessData = void 0;
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
+const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
 // NOTE - Do preprocessing separately, so the constructor returns quickly.
 function doPreprocessData(s, bLog = false) {
     // If necessary, do one-time preprocessing
@@ -1633,10 +1709,15 @@ function doPreprocessCensus(s, bLog = false) {
     // NOTE - This works w/o GEOIDs, because you're looping over all features.
     for (let i = 0; i < s.features.nFeatures(); i++) {
         let f = s.features.featureByIndex(i);
-        let geoID = s.features.geoIDForFeature(f);
+        // 03-27-21
+        let geoID = D.geoIDForFeature(f);
+        // let geoID: string = s.features.geoIDForFeature(f);
         // Skip water-only features
         if (!(U.isWaterOnly(geoID))) {
-            let value = s.features.fieldForFeature(f, "CENSUS" /* CENSUS */, "Tot" /* TotalPop */);
+            // 03-27-21
+            const dk = s.features._keys["CENSUS" /* CENSUS */];
+            let value = D.fieldForFeature(f, dk, "Tot" /* TotalPop */);
+            // let value: number = s.features.fieldForFeature(f, T.Dataset.CENSUS, T.FeatureField.TotalPop);
             // Sum total population across the state
             s.state.totalPop += value;
             // Get the county FIPS code for the feature
@@ -2210,6 +2291,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.depthof = exports.deepCopy = exports.shallowCopy = exports.countEnumValues = exports.objectContains = exports.arrayContains = exports.getSelectObjectKeys = exports.getNumericObjectKeys = exports.getObjectKeys = exports.isArrayEmpty = exports.isSetEmpty = exports.isObjectEmpty = exports.keyExists = exports.andArray = exports.initArray = exports.maxArray = exports.minArray = exports.avgArray = exports.sumArray = exports.trim = exports.isUninhabited = exports.isWaterOnly = exports.parseGeoID = exports.getDistrict = exports.isOutOfState = exports.isInState = void 0;
 const DT = __importStar(__webpack_require__(/*! @dra2020/dra-types */ "@dra2020/dra-types"));
+const _data_1 = __webpack_require__(/*! ./_data */ "./src/_data.ts");
 const S = __importStar(__webpack_require__(/*! ./settings */ "./src/settings.ts"));
 // PLAN HELPERS
 // Is a "neighbor" in state?
@@ -2274,7 +2356,10 @@ exports.isWaterOnly = isWaterOnly;
 function isUninhabited(geoID, s) {
     const featureID = s.features.featureID(geoID);
     const f = s.features.featureByIndex(featureID);
-    const totalPop = s.features.fieldForFeature(f, "CENSUS" /* CENSUS */, "Tot" /* TotalPop */);
+    // 03-27-21
+    const dk = s.features._keys["CENSUS" /* CENSUS */];
+    const totalPop = _data_1.fieldForFeature(f, dk, "Tot" /* TotalPop */);
+    // const totalPop = s.features.fieldForFeature(f, T.Dataset.CENSUS, T.FeatureField.TotalPop);
     let bUninhabited = (totalPop > 0) ? false : true;
     // HACK for Kentucky's atypical data, so the official map shows as complete
     const geoIDparts = parseGeoID(geoID);