@dra2020/district-analytics 7.1.4 → 7.1.7

package/dist/district-analytics.js

@@ -490,7 +490,8 @@ class Districts {
                         let featureID = outerThis._session.features.featureID(geoID);
                         let f = outerThis._session.features.featureByIndex(featureID);
                         if (f == undefined) {
-                            console.log("Skipping undefined feature in district statistics: GEOID =", geoID, "Feature ID =", featureID);
+                            if (bLog)
+                                console.log("Skipping undefined feature in district statistics: GEOID =", geoID, "Feature ID =", featureID);
                         }
                         else {
                             // ACCUMULATE VALUES
@@ -517,8 +518,10 @@ class Districts {
                             // 4 - MORE ...
                         }
                     }
-                    else
-                        console.log("Skipping water-only feature in district statistics:", geoID);
+                    else {
+                        if (bLog)
+                            console.log("Skipping water-only feature in district statistics:", geoID);
+                    }
                 });
                 // COMPUTE DERIVED VALUES
                 // Population deviation % and equal population (boolean) by district.
@@ -663,8 +666,10 @@ class Districts {
             this.statistics[DistrictField.AsianPct][summaryRow] = stateAsianPop / stateVAPPop;
             this.statistics[DistrictField.NativePct][summaryRow] = stateNativePop / stateVAPPop;
         }
-        console.log(`${nMissingDataset} features with missing datasets.`);
-        console.log(`${nMissingProperty} features with missing properties.`);
+        if (bLog) {
+            console.log(`${nMissingDataset} features with missing datasets.`);
+            console.log(`${nMissingProperty} features with missing properties.`);
+        }
     }
     // NOTE - I did not roll these into district statistics, because creating the
     //   district shapes themselves is the big district-by-district activity, these
@@ -688,6 +693,8 @@ class Features {
         this._session = s;
         this._data = data;
         this._keys = keys;
+        // For debugging PVI
+        // console.log("Election dataset =", this._keys[Dataset.ELECTION]);
     }
     nFeatures() { return this._data.features.length; }
     featureByIndex(i) { return this._data.features[i]; }
@@ -698,8 +705,15 @@ class Features {
         return value;
     }
     fieldForFeature(f, dt, fk) {
-        let dk = this._keys[dt];
-        return _getFeatures(f, dk, 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') {
+            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;
@@ -817,8 +831,8 @@ class Plan {
     //   }
     //   return newPlan;
     // }
-    invertPlan() {
-        this._planByDistrictID = invertPlan(this._planByGeoID, this._session);
+    invertPlan(bLog = false) {
+        this._planByDistrictID = invertPlan(this._planByGeoID, this._session, bLog);
         this.districtIDs = U.getNumericObjectKeys(this._planByDistrictID);
     }
     initializeDistrict(i) { this._planByDistrictID[i] = new Set(); }
@@ -829,7 +843,7 @@ class Plan {
 }
 exports.Plan = Plan;
 // Invert a feature assignment structure to sets of ids by district
-function invertPlan(plan, s) {
+function invertPlan(plan, s, bLog = false) {
     let invertedPlan = {};
     // Add a dummy 'unassigned' district
     invertedPlan[S.NOT_ASSIGNED] = new Set();
@@ -859,7 +873,7 @@ function invertPlan(plan, s) {
         }
         // Add the geoID to the districtID's set
         invertedPlan[districtID].add(geoID);
-        if (U.isWaterOnly(geoID))
+        if (U.isWaterOnly(geoID) && bLog)
             console.log("Water-only feature still in plan!", geoID);
     }
     return invertedPlan;
@@ -1367,7 +1381,7 @@ function doPreprocessData(s, bLog = false) {
         s.bOneTimeProcessingDone = true;
     }
     // Invert the plan by district ID
-    s.plan.invertPlan();
+    s.plan.invertPlan(bLog);
     // Create a map of geoIDs to feature IDs
     s.features.mapGeoIDsToFeatureIDs();
 }
@@ -1407,7 +1421,8 @@ function doPreprocessCensus(s, bLog = false) {
             totalByCounty[countyFIPS] += value;
         }
         else {
-            console.log("Skipping water-only feature in Census preprocessing:", geoID);
+            if (bLog)
+                console.log("Skipping water-only feature in Census preprocessing:", geoID);
         }
     }
     // NOTE - The above could be replaced, if I got totals on county.geojson.