@dra2020/district-analytics 8.2.0 → 8.2.3

package/dist/district-analytics.js

@@ -1199,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;
@@ -1216,10 +1215,35 @@ 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 shapes = s.districts.getDistrictShapes();
-    const scores = Compactness.scoreShapes(shapes);
+    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;
 }
@@ -1957,9 +1981,13 @@ function scorePlan(s, p, bLog = false, overridesJSON) {
     // Add minority notes
     scorecard.minority.details['majorityMinority'] = M.getMajorityMinority(s);
     scorecard.minority.details['vraPreclearance'] = M.getVRASection5(s);
+    // TODO - KIWYSI
     // Add KIWYSI compactness score
-    const kiwysiScore = C.scoreKIWYSICompactness(s, bLog);
-    scorecard.compactness.details['kiwysi'] = kiwysiScore;
+    if (('kiwysi' in s.config) && (s.config['kiwysi'])) {
+        console.log("Scoring KIWYSI compactness ...");
+        const kiwysiScore = C.scoreKIWYSICompactness(s, bLog);
+        scorecard.compactness.details['kiwysi'] = kiwysiScore;
+    }
     return scorecard;
 }
 exports.scorePlan = scorePlan;