@dra2020/district-analytics 11.1.1 → 11.2.0

package/dist/district-analytics.js

@@ -43,7 +43,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.AnalyticsSession = void 0;
-const Poly = __importStar(__webpack_require__(/*! @dra2020/poly */ "@dra2020/poly"));
+const baseclient_1 = __webpack_require__(/*! @dra2020/baseclient */ "@dra2020/baseclient");
 const Score = __importStar(__webpack_require__(/*! @dra2020/dra-score */ "@dra2020/dra-score"));
 const preprocess_1 = __webpack_require__(/*! ./preprocess */ "./src/preprocess.ts");
 const analyze_1 = __webpack_require__(/*! ./analyze */ "./src/analyze.ts");
@@ -160,7 +160,7 @@ class AnalyticsSession {
                     // If a district has a shape & it is not contiguous, by definition,
                     // it will be a Multipolygon, i.e., it will have multiple pieces, some
                     // possibly embedded w/in other districts. Get & add all the pieces.
-                    const districtParts = Poly.polyParts(poly);
+                    const districtParts = baseclient_1.Poly.polyParts(poly);
                     discontiguousDistrictFeatures.features.push(...districtParts.features);
                     // discontiguousDistrictFeatures.features.push(poly);
                 }
@@ -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.Features = exports.Districts = void 0;
+exports.Graph = exports.invertPlan = exports.Plan = exports.State = exports.Counties = exports.inferSelectedMinority = exports.Features = 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"));
@@ -633,23 +633,9 @@ class Districts {
         // let dataDump: any[] = [];  // For testing
         // Gather [demographic %, D %] points for the selected district ID
         let i = districtID;
-        // HACK - If comparing a minority group to everyone else (vs. just White),
+        // HACK - For comparing a minority group to everyone else (vs. just White),
         //   infer the *single* minority group that has been selected.
-        let compareTo = 'white';
-        if (groups.invertSelection) {
-            if (groups.hispanic)
-                compareTo = 'not-hispanic';
-            else if (groups.black)
-                compareTo = 'not-black';
-            else if (groups.pacific)
-                compareTo = 'not-pacific';
-            else if (groups.asian)
-                compareTo = 'not-asian';
-            else if (groups.native)
-                compareTo = 'not-native';
-            else if (groups.minority)
-                compareTo = 'not-minority'; // same as 'white'
-        }
+        const selectedMinority = inferSelectedMinority(groups);
         // HACK - Because "this" gets ghosted inside the forEach loop below
         let outerThis = this;
         // Get the geoIDs assigned to the district
@@ -689,33 +675,33 @@ class Districts {
                                 const pctMinority = minorityVAP / totalVAP;
                                 let pctComparison = whiteVAP / totalVAP;
                                 if (groups.invertSelection) {
-                                    switch (compareTo) {
-                                        case 'not-hispanic': {
+                                    switch (selectedMinority) {
+                                        case 'Hispanic': {
                                             pctComparison = (totalVAP - hispanicVAP) / totalVAP;
                                             break;
                                         }
-                                        case 'not-black': {
+                                        case 'Black': {
                                             pctComparison = (totalVAP - blackVAP) / totalVAP;
                                             break;
                                         }
-                                        case 'not-pacific': {
+                                        case 'Pacific': {
                                             pctComparison = (totalVAP - pacificVAP) / totalVAP;
                                             break;
                                         }
-                                        case 'not-asian': {
+                                        case 'Asian': {
                                             pctComparison = (totalVAP - asianVAP) / totalVAP;
                                             break;
                                         }
-                                        case 'not-native': {
+                                        case 'Native': {
                                             pctComparison = (totalVAP - nativeVAP) / totalVAP;
                                             break;
                                         }
-                                        case 'not-minority': {
+                                        case 'Minority': {
                                             pctComparison = (totalVAP - minorityVAP) / totalVAP;
                                             break;
                                         }
                                         default: {
-                                            console.log("Compare-to group not recognized.");
+                                            console.log("Selected minority not recognized!");
                                             break;
                                         }
                                     }
@@ -836,6 +822,22 @@ class Features {
     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!';
+}
+exports.inferSelectedMinority = inferSelectedMinority;
 // NOTE - This accessor is cloned from fGetW() in dra-client/restrict.ts
 //  f is a direct GeoJSON feature
 //  p is a geoID
@@ -1280,7 +1282,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.scoreKIWYSICompactness = exports.extractDistrictProperties = void 0;
-const Poly = __importStar(__webpack_require__(/*! @dra2020/poly */ "@dra2020/poly"));
+const baseclient_1 = __webpack_require__(/*! @dra2020/baseclient */ "@dra2020/baseclient");
 const Compactness = __importStar(__webpack_require__(/*! @dra2020/compactness */ "@dra2020/compactness"));
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 // HELPER TO EXTRACT PROPERTIES OF DISTRICT SHAPES
@@ -1290,9 +1292,9 @@ function extractDistrictProperties(s, bLog = false) {
         const poly = s.districts.getDistrictShapeByID(i);
         // Guard against no shape for empty districts AND null shapes
         if (isAShape(poly)) {
-            const area = Poly.polyAreaFlat(poly);
-            const perimeter = Poly.polyPerimeterFlat(poly);
-            const diameter = Poly.polyDiameterFlat(poly);
+            const area = baseclient_1.Poly.polyAreaFlat(poly);
+            const perimeter = baseclient_1.Poly.polyPerimeterFlat(poly);
+            const diameter = baseclient_1.Poly.polyDiameterFlat(poly);
             let props = [0, 0, 0];
             props[0 /* Area */] = area;
             props[1 /* Diameter */] = diameter;
@@ -1306,7 +1308,7 @@ exports.extractDistrictProperties = extractDistrictProperties;
 function isAShape(poly) {
     if (poly == null)
         return false;
-    if (Poly.polyNull(poly))
+    if (baseclient_1.Poly.polyNull(poly))
         return false;
     return poly.geometry && poly.geometry.coordinates && !U.isArrayEmpty(poly.geometry.coordinates);
 }
@@ -1320,7 +1322,7 @@ function scoreKIWYSICompactness(s, bLog = false) {
     for (let i = 0; i < rawShapes.features.length; i++) {
         const shape = rawShapes.features[i];
         if (isAShape(shape)) {
-            const d = Poly.polyDescribe(shape);
+            const d = baseclient_1.Poly.polyDescribe(shape);
             let f = {
                 type: 'Feature',
                 properties: { districtID: `${i + 1}` },
@@ -1437,9 +1439,12 @@ 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;
 __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, "inferSelectedMinority", ({ enumerable: true, get: function () { return _data_1.inferSelectedMinority; } }));
 
 
 /***/ }),
@@ -1502,10 +1507,17 @@ function getVRASection5(s) {
 exports.getVRASection5 = getVRASection5;
 // RPV - pulled into a separate component 11-17-2020
 function doAnalyzeRacialPolarization(s, districtID, groups, bLog = false) {
-    // At least one minority group must be specified
-    if (!(groups.black || groups.hispanic || groups.pacific || groups.asian || groups.native))
+    // Make sure that a minority is specified
+    if (!(groups.black || groups.hispanic || groups.pacific || groups.asian || groups.native || groups.minority))
         return undefined;
     const points = s.districts.extractVotesByDemographic(districtID, groups, bLog);
+    // Make sure the district is not empty & there are enough points
+    if (points === undefined)
+        return undefined;
+    if (points.comparison === undefined)
+        return undefined;
+    if (points.comparison.length <= 10)
+        return undefined;
     return RPV.analyzeRacialVoting(points, districtID, groups);
 }
 exports.doAnalyzeRacialPolarization = doAnalyzeRacialPolarization;
@@ -2393,14 +2405,39 @@ function deepCopy(src) {
         return src;
 }
 exports.deepCopy = deepCopy;
+function depthof(a) {
+    if (a === null || a === undefined)
+        return 1;
+    switch (typeof a) {
+        default: return 1;
+        case 'number': return 1;
+        case 'boolean': return 1;
+        case 'string': return 1;
+        case 'object':
+            {
+                let d = 0;
+                if (Array.isArray(a))
+                    return a.length > 0 ? (1 + depthof(a[0])) : 2; // still return 2 for empty array
+                else if (Buffer && Buffer.isBuffer(a))
+                    return 2;
+                else if (a.hasOwnProperty === undefined)
+                    return 1;
+                else {
+                    for (var key in a)
+                        if (a.hasOwnProperty(key))
+                            return 1 + depthof(a[key]);
+                    return 2; // or 2 for empty object
+                }
+            }
+    }
+}
+exports.depthof = depthof;
 /* TriState
 export function mapBooleanToTriState(bool: boolean): T.TriState
 {
   return (bool) ? T.TriState.Green : T.TriState.Red;
 }
 */
-var util_1 = __webpack_require__(/*! @dra2020/util */ "@dra2020/util");
-Object.defineProperty(exports, "depthof", ({ enumerable: true, get: function () { return util_1.depthof; } }));
 
 
 /***/ }),
@@ -2617,6 +2654,16 @@ module.exports = JSON.parse("{\"AL\":\"all\",\"AK\":\"all\",\"AZ\":\"all\",\"CA\
 
 /***/ }),
 
+/***/ "@dra2020/baseclient":
+/*!**************************************!*\
+  !*** external "@dra2020/baseclient" ***!
+  \**************************************/
+/***/ ((module) => {
+
+module.exports = require("@dra2020/baseclient");;
+
+/***/ }),
+
 /***/ "@dra2020/compactness":
 /*!***************************************!*\
   !*** external "@dra2020/compactness" ***!
@@ -2657,16 +2704,6 @@ module.exports = require("@dra2020/dra-types");;
 
 /***/ }),
 
-/***/ "@dra2020/poly":
-/*!********************************!*\
-  !*** external "@dra2020/poly" ***!
-  \********************************/
-/***/ ((module) => {
-
-module.exports = require("@dra2020/poly");;
-
-/***/ }),
-
 /***/ "@dra2020/racial-voting":
 /*!*****************************************!*\
   !*** external "@dra2020/racial-voting" ***!
@@ -2675,16 +2712,6 @@ module.exports = require("@dra2020/poly");;
 
 module.exports = require("@dra2020/racial-voting");;
 
-/***/ }),
-
-/***/ "@dra2020/util":
-/*!********************************!*\
-  !*** external "@dra2020/util" ***!
-  \********************************/
-/***/ ((module) => {
-
-module.exports = require("@dra2020/util");;
-
 /***/ })
 
 /******/ 	});