@dra2020/district-analytics 8.1.2 → 8.2.2

package/dist/district-analytics.js

@@ -380,6 +380,9 @@ class Districts {
         this._shapes = ds;
         this.statistics = this.initStatistics();
     }
+    getDistrictShapes() {
+        return this._shapes;
+    }
     getDistrictShapeByID(id) {
         // NOTE - Find the district shape by ID (not index)
         // return this._shapes.features[id]; 
@@ -1186,8 +1189,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-// NOTE - This file will NOT be empty, when legacy code is deleted.
 const Poly = __importStar(__webpack_require__(/*! @dra2020/poly */ "@dra2020/poly"));
+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
 // TODO - Create an array, as opposed to a dict
 function extractDistrictProperties(s, bLog = false) {
@@ -1195,13 +1199,12 @@ function extractDistrictProperties(s, bLog = false) {
     for (let i = 1; i <= s.state.nDistricts; i++) {
         const poly = s.districts.getDistrictShapeByID(i);
         // Guard against no shape for empty districts AND null shapes
-        const bNull = Poly.polyNull(poly);
-        if (!bNull) {
+        if (isAShape(poly)) {
             // TODO - OPTIMIZE: Bundle these calls?
             const area = Poly.polyAreaFlat(poly);
             const perimeter = Poly.polyPerimeterFlat(poly);
             const diameter = Poly.polyDiameterFlat(poly);
-            const props = [0, 0, 0]; // TODO - TERRY?!?
+            let props = [0, 0, 0];
             props[0 /* Area */] = area;
             props[1 /* Diameter */] = diameter;
             props[2 /* Perimeter */] = perimeter;
@@ -1212,6 +1215,39 @@ function extractDistrictProperties(s, bLog = false) {
     }
 }
 exports.extractDistrictProperties = extractDistrictProperties;
+function isAShape(poly) {
+    const bPolyUndefined = (poly === undefined) ? true : false;
+    const bNull = (bPolyUndefined) ? true : Poly.polyNull(poly); // TODO
+    const bNoCoordinates = U.isArrayEmpty((poly.geometry.coordinates)) ? true : false;
+    return (!bPolyUndefined && !bNull && !bNoCoordinates);
+}
+// SCORE KIWYSI COMPACTNESS
+function scoreKIWYSICompactness(s, bLog = false) {
+    const rawShapes = s.districts.getDistrictShapes();
+    // Filter the real shapes & throw everything else away
+    let goodShapes = {};
+    goodShapes['type'] = "FeatureCollection";
+    goodShapes['features'] = [];
+    for (let i = 0; i < rawShapes.features.length; i++) {
+        const shape = rawShapes.features[i];
+        if (isAShape(shape)) {
+            const d = Poly.polyDescribe(shape);
+            let f = {
+                type: 'Feature',
+                properties: { districtID: `${i + 1}` },
+                geometry: {
+                    type: (d.npoly > 1) ? 'MultiPolygon' : 'Polygon',
+                    coordinates: shape.geometry.coordinates
+                }
+            };
+            goodShapes.features.push(f);
+        }
+    }
+    const scores = Compactness.scoreShapes(goodShapes);
+    const avgKIWYSIScore = U.avgArray(scores);
+    return avgKIWYSIScore;
+}
+exports.scoreKIWYSICompactness = scoreKIWYSICompactness;
 // SAVE THESE NOTES, IN CASE WE NEED TO REWORK HOW WE PERFORM THESE CALCS.
 // THEY REFLECT HOW I DID THEM IN PYTHON.
 //
@@ -1820,6 +1856,7 @@ const Score = __importStar(__webpack_require__(/*! @dra2020/dra-score */ "@dra20
 const U = __importStar(__webpack_require__(/*! ./utils */ "./src/utils.ts"));
 const D = __importStar(__webpack_require__(/*! ./_data */ "./src/_data.ts"));
 const M = __importStar(__webpack_require__(/*! ./minority */ "./src/minority.ts"));
+const C = __importStar(__webpack_require__(/*! ./compact */ "./src/compact.ts"));
 // PROFILE A PLAN
 function profilePlan(s, bLog = false) {
     const state = s.state.xx;
@@ -1944,6 +1981,9 @@ function scorePlan(s, p, bLog = false, overridesJSON) {
     // Add minority notes
     scorecard.minority.details['majorityMinority'] = M.getMajorityMinority(s);
     scorecard.minority.details['vraPreclearance'] = M.getVRASection5(s);
+    // Add KIWYSI compactness score
+    const kiwysiScore = C.scoreKIWYSICompactness(s, bLog);
+    scorecard.compactness.details['kiwysi'] = kiwysiScore;
     return scorecard;
 }
 exports.scorePlan = scorePlan;
@@ -2568,6 +2608,17 @@ module.exports = JSON.parse("{\"AL\":\"all\",\"AK\":\"all\",\"AZ\":\"all\",\"CA\
 
 /***/ }),
 
+/***/ "@dra2020/compactness":
+/*!***************************************!*\
+  !*** external "@dra2020/compactness" ***!
+  \***************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+module.exports = require("@dra2020/compactness");
+
+/***/ }),
+
 /***/ "@dra2020/dra-score":
 /*!*************************************!*\
   !*** external "@dra2020/dra-score" ***!