@dra2020/baseclient 1.0.26 → 1.0.29

package/dist/poly/all.d.ts

@@ -14,3 +14,4 @@ export * from './topo';
 export * from './selfintersect';
 export * from './shamos';
 export * from './pointinpoly';
+export * from './mapto';

package/dist/poly/boundbox.d.ts

@@ -12,6 +12,7 @@ export declare function clipLon(lon: number): number;
 export declare function boundboxExtend(bbox: BoundBox, x: number, y: number): void;
 export declare function boundbox(poly: any, bbox?: BoundBox): BoundBox;
 export declare function boundboxPoly(bb: BoundBox): any;
+export declare function boundboxEmpty(bb: BoundBox): boolean;
 export declare function boundboxArea(poly: any): number;
 export declare function boundboxIntersects(bb1: BoundBox, bb2: BoundBox): boolean;
 export declare function boundboxContains(bb: BoundBox, x: number, y: number): boolean;

package/dist/poly/mapto.d.ts

@@ -0,0 +1,2 @@
+import * as G from '../geo/all';
+export declare function polyMapTo(districts: G.GeoFeatureCollection, blocks: G.GeoFeatureCollection): any;

package/lib/geo/geo.ts

@@ -113,6 +113,7 @@ export class GeoMultiCollection
 
   empty()
   {
+    this.all = { tag: 'all' };
     this.entries = {};
     this.hidden = {};
     this._onChange();
@@ -165,7 +166,8 @@ export class GeoMultiCollection
 
   _onChange(): void
   {
-    this.all = { tag: 'all' };
+    if (this.all.topo || this.all.col || this.all.map)
+      this.all = { tag: 'all' };
     this.stamp++;
   }
 
@@ -278,12 +280,17 @@ export class GeoMultiCollection
     if (id)
     {
       if (typeof id === 'string')
-        this.hidden[id] = true;
+      {
+        if (! this.hidden[id])
+        {
+          this.hidden[id] = true;
+          this._onChange();
+        }
+      }
       else if (Array.isArray(id))
-        id.forEach((i: string) => { this.hidden[i] = true })
+        id.forEach((i: any) => this.hide(i));
       else if (typeof id === 'object')
-        for (let p in id) if (id.hasOwnProperty(p)) this.hidden[p] = true;
-      this._onChange();
+        for (let p in id) if (id.hasOwnProperty(p)) this.hide(p);
     }
   }
 
@@ -292,12 +299,17 @@ export class GeoMultiCollection
     if (id)
     {
       if (typeof id === 'string')
-        delete this.hidden[id];
+      {
+        if (this.hidden[id])
+        {
+          delete this.hidden[id];
+          this._onChange();
+        }
+      }
       else if (Array.isArray(id))
-        id.forEach((i: string) => { delete this.hidden[i] })
+        id.forEach((i: any) => this.show(i))
       else if (typeof id === 'object')
-        for (let p in id) if (id.hasOwnProperty(p)) delete this.hidden[p];
-      this._onChange();
+        for (let p in id) if (id.hasOwnProperty(p)) this.show(p);
     }
   }
 

package/lib/poly/all.ts

@@ -14,3 +14,4 @@ export * from './topo';
 export * from './selfintersect';
 export * from './shamos';
 export * from './pointinpoly';
+export * from './mapto';

package/lib/poly/boundbox.ts

@@ -79,7 +79,7 @@ export function boundbox(poly: any, bbox?: BoundBox): BoundBox
     }
 
     // single point
-    else
+    else if (Array.isArray(poly) && poly.length >= 2)
       boundboxExtend(bbox, poly[0], poly[1]);
   }
 
@@ -91,6 +91,11 @@ export function boundboxPoly(bb: BoundBox): any
   return [ [ [bb.left, bb.top], [bb.left, bb.bottom], [bb.right, bb.bottom], [bb.right, bb.top], [bb.left, bb.top] ] ];
 }
 
+export function boundboxEmpty(bb: BoundBox): boolean
+{
+  return !bb || bb.left === undefined || P.polyArea(boundboxPoly(bb)) == 0;
+}
+
 export function boundboxArea(poly: any): number
 {
   return P.polyArea(boundboxPoly(boundbox(poly)));

package/lib/poly/mapto.ts

@@ -0,0 +1,64 @@
+import * as G from '../geo/all';
+import * as P from './poly';
+import * as PP  from './polypack';
+import * as PL from './polylabel';
+import * as BB from './boundbox';
+import { polyContainsPoint } from './pointinpoly';
+
+function setLabels(c: G.GeoFeatureCollection): void
+{
+  c.features.forEach(f => {
+      if (f.properties.labelx === undefined)
+      {
+        let {x,y} = PL.polyLabel(f);
+        f.properties.labelx = x;
+        f.properties.labely = y;
+      }
+    });
+}
+
+// polyMapTo:
+//
+//  Given a set of underlying blocks (or precincts), map them to the district (or any other feature)
+//  they are contained in.
+//
+//  If a block maps to multiple districts or no district, it is left out of the result.
+//
+//  Note that the algorithm is to see where the centroid of the block overlaps. So a block
+//  could potentially overlap multiple districts and this would return only the one containing
+//  the centroid.
+//
+//  The thinking is that if you want fine granularity, use real blocks as the base collection.
+//  If you provide precincts, you will get a result on precinct granularity.
+//
+//  The return value is an object that maps the block feature ids to the district feature id.
+//
+
+export function polyMapTo(districts: G.GeoFeatureCollection, blocks: G.GeoFeatureCollection): any
+{
+  let map: any = {};
+
+  // Cache labelx, labely if necessary
+  setLabels(blocks);
+
+  // Cache district boundboxes for quick containment exclusion
+  let bbDistricts: BB.BoundBox[] = districts.features.map(f => BB.boundbox(f));
+
+  // Walk over blocks, mapping centroid to district
+  blocks.features.forEach(fBlock => {
+      let x = fBlock.properties.labelx;
+      let y = fBlock.properties.labely;
+
+      let fIn: G.GeoFeature[] = [];
+      districts.features.forEach((fDistrict: G.GeoFeature, i: number) => {
+          if (BB.boundboxContains(bbDistricts[i], x, y))
+            if (polyContainsPoint(fDistrict, x, y))
+              fIn.push(fDistrict);
+        });
+
+      if (fIn.length == 1)
+        map[fBlock.properties.id] = fIn[0].properties.id;
+    });
+
+  return map;
+}

package/lib/poly/pointinpoly.ts

@@ -11,7 +11,7 @@ export function polyContainsPoint(poly: any, x: number, y: number): boolean
       if (bFound) return;
       let inside = false;
       let iEnd = iOffset + (nPoints - 1) * 2;
-      for (let i = iOffset, j = iEnd; i < iEnd; j = i, i += 2)
+      for (let i = iOffset, j = iEnd; i <= iEnd; j = i, i += 2)
       {
         let xi = b[i], yi = b[i+1];
         let xj = b[j], yj = b[j+1];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.26",
+  "version": "1.0.29",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",