@dra2020/dra-analytics 4.1.4 → 4.1.5

package/dist/lib/compactness/compactness.d.ts

@@ -1,4 +1,5 @@
 import * as GeoJSON from 'geojson';
 import * as T from '../types/all';
+export declare function excessivelyFragmented(shapes: GeoJSON.FeatureCollection): boolean;
 export declare function makeCompactnessScorecard(shapes: GeoJSON.FeatureCollection, bLog?: boolean): T.CompactnessScorecard;
 export declare function calcCompactness(shapes: GeoJSON.FeatureCollection): T.CompactnessJSONReady;

package/dist/lib/compactness/features.d.ts

@@ -7,4 +7,6 @@ export declare function calcBoundingBox(poly: any): number;
 export declare function calcPolsbyPopper(area: number, perimeter: number): number;
 export declare function calcConvexHullFeature(area: number, chArea: number): number;
 export declare function calcSchwartzberg(area: number, perimeter: number): number;
-export declare function featureizePoly(poly: any, options?: Poly.PolyOptions): T.CompactnessFeatures;
+export declare function featureizePoly(poly: any, options?: Poly.PolyOptions, { bKIWYSIFeatures }?: {
+    bKIWYSIFeatures?: boolean;
+}): T.CompactnessFeatures;

package/dist/lib/minority/minority.d.ts

@@ -1,10 +1,10 @@
 import * as T from '../types/all';
 declare const enum Demographic {
-    Minority = 0,
-    Black = 1,
-    Hispanic = 2,
-    Pacific = 3,
-    Asian = 4,
+    Minority = 0,// 'Minority'
+    Black = 1,// 'Black'
+    Hispanic = 2,// 'Hispanic'
+    Pacific = 3,// 'Pacific'
+    Asian = 4,// 'Asian'
     Native = 5
 }
 export declare function makeMinorityScorecard(statewideDemos: T.Demographics, demosByDistrict: T.Demographics[], bLog?: boolean): T.MinorityScorecard;

package/lib/compactness/compactness.ts

@@ -10,6 +10,28 @@ import {scoreFeatureSet} from './kiwysi';
 import * as T from '../types/all';
 import {ratePolsby, rateReock} from '../rate/dra-ratings';
 
+export function excessivelyFragmented(shapes: GeoJSON.FeatureCollection): boolean
+{
+  const threshold: number = 20;
+  let fragments: number = 0;
+  for (let i = 0; i < shapes.features.length; i++)
+  {
+    const f: any = shapes.features[i];
+    if (f.geometry.type == 'MultiPolygon')
+    {
+      fragments += f.geometry.coordinates.length;
+    }
+  }
+  const avgFragmentation: number = fragments / shapes.features.length;
+
+  if (avgFragmentation > threshold)
+  {
+    console.log(`Average fragmentation (${avgFragmentation}) exceeds threshold (${threshold}).`);
+    return true;
+  }
+
+  return false;
+}
 
 // Use this to get average Reock, Polsby-Popper, and KIWYSI compactness and by district for a set of shapes
 // This is used by DRA
@@ -23,13 +45,17 @@ export function makeCompactnessScorecard(shapes: GeoJSON.FeatureCollection, bLog
   let totPolsby: number = 0;
   let totKIWYSI: number = 0;
 
+  // 12-11-24: Skip featurization for KIWYSI compactness, when the districts in a map are too fragmented on average
+  const bKIWYSIFeatures: boolean = excessivelyFragmented(shapes) ? false : true;
+
   // For returning compactness by district to DRA
   // Note, these use the Cartesian (flat earth) measurements
   let byDistrict: T.Compactness[] = [];
 
   for (let i = 0; i < shapes.features.length; i++)
   {
-    const features: T.CompactnessFeatures = featureizePoly(shapes.features[i], options);
+    const f: any = shapes.features[i];
+    const features: T.CompactnessFeatures = featureizePoly(f, options, {bKIWYSIFeatures: bKIWYSIFeatures});
 
     const reockFlat: number = features.reockFlat;
     const polsbyFlat: number = features.polsbyFlat;
@@ -40,7 +66,7 @@ export function makeCompactnessScorecard(shapes: GeoJSON.FeatureCollection, bLog
     const normalizedReock: number = rateReock(reockFlat);
     const normalizedPolsby: number = ratePolsby(polsbyFlat);
 
-    let kiwysiRank: number = scoreFeatureSet(features, pca);
+    let kiwysiRank: number = bKIWYSIFeatures ? scoreFeatureSet(features, pca) : 100;
     // Constrain values to the range [1–100]
     kiwysiRank = Math.min(Math.max(kiwysiRank, 1), 100);
     // Raw KIWYSI scores ("ranks") are 1–100 where smaller is better

package/lib/compactness/features.ts

@@ -230,7 +230,7 @@ export function calcSchwartzberg(area: number, perimeter: number): number
 
 // CALCULATE THE 7 COMPACTNESS "FEATURES" FOR A POLYGON FOR THE KIWYSI COMPACTNESS MODEL
 
-export function featureizePoly(poly: any, options?: Poly.PolyOptions): T.CompactnessFeatures
+export function featureizePoly(poly: any, options?: Poly.PolyOptions, {bKIWYSIFeatures = true}: {bKIWYSIFeatures?: boolean} = {}): T.CompactnessFeatures
 {
   if (options === undefined) options = Poly.DefaultOptions;
 
@@ -247,15 +247,17 @@ export function featureizePoly(poly: any, options?: Poly.PolyOptions): T.Compact
   const hullArea: number = Poly.polyArea(ch);
 
   const result: T.CompactnessFeatures = {
+    // 12-10-24: Skip featurization for KIWYSI compactness, when MultiPolygons are too fragmented
     // For the "correct" geodesic calculations that the KIWYSI AI uses
-    sym_x: calcXSymmetry(poly),
-    sym_y: calcYSymmetry(poly),
-    reock: calcReock(area, diameter),
-    bbox: calcBoundingBox(poly),
-    polsby: calcPolsbyPopper(area, perimeter),
-    hull: calcConvexHullFeature(area, hullArea),
-    schwartzberg: calcSchwartzberg(area, perimeter),
-
+    sym_x: bKIWYSIFeatures ? calcXSymmetry(poly) : 0.0,
+    sym_y: bKIWYSIFeatures ? calcYSymmetry(poly) : 0.0,
+    reock: bKIWYSIFeatures ? calcReock(area, diameter) : 0.0,
+    bbox: bKIWYSIFeatures ? calcBoundingBox(poly) : 0.0,
+    polsby: bKIWYSIFeatures ? calcPolsbyPopper(area, perimeter) : 0.0,
+    hull: bKIWYSIFeatures ? calcConvexHullFeature(area, hullArea) : 0.0,
+    schwartzberg: bKIWYSIFeatures ? calcSchwartzberg(area, perimeter) : 0.0,
+
+    // But still do the basic calculations for Reock and Polsby-Popper
     // For the Cartesian (flat earth) calculations that are typically done
     reockFlat: calcReock(areaFlat, diameterFlat),
     polsbyFlat: calcPolsbyPopper(areaFlat, perimeterFlat)

package/lib/graph/connected.ts

@@ -13,7 +13,7 @@ export function isConnected(featureIDs: T.FeatureGroup, graph: T.ContiguityGraph
 
   // Start processing with the first feature in the set
   let iter = featureIDs.values();
-  toProcess.push(iter.next().value);
+  toProcess.push(iter.next().value as string);
 
   // While there are features in the set that haven't been processed,
   // i.e., stop when you've visited all the features in the set

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/dra-analytics",
-  "version": "4.1.4",
+  "version": "4.1.5",
   "description": "DRA analytics",
   "main": "dist/dra-analytics.js",
   "types": "./dist/lib/all/all.d.ts",
@@ -32,7 +32,7 @@
   },
   "homepage": "https://github.com/dra2020/dra-analytics#readme",
   "devDependencies": {
-    "@types/geojson": "^7946.0.10",
+    "@types/geojson": "^7946.0.16",
     "@types/jest": "^29.5.1",
     "@types/node": "^18.11.17",
     "@types/yargs": "^11.1.8",
@@ -41,15 +41,15 @@
     "json-loader": "^0.5.7",
     "prettier": "^2.8.8",
     "shapefile": "^0.6.6",
-    "source-map-loader": "^4.0.1",
+    "source-map-loader": "^5.0.0",
     "ts-jest": "^29.1.0",
-    "ts-loader": "^9.4.2",
+    "ts-loader": "^9.5.2",
     "tsify": "^5.0.4",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "^4.9.4",
-    "webpack": "^5.82.0",
-    "webpack-cli": "^5.1.0"
+    "typescript": "^5.8.3",
+    "webpack": "^5.99.5",
+    "webpack-cli": "^6.0.1"
   },
   "dependencies": {
     "@dra2020/baseclient": "^1.0.153",