@dra2020/baseclient 1.0.162 → 1.0.164

package/dist/control/all.d.ts

@@ -0,0 +1 @@
+export * from './control';

package/dist/control/control.d.ts

@@ -0,0 +1,4 @@
+export interface Control {
+    isCanceled: () => boolean;
+    statusUpdate: (complete: number, total: number) => void;
+}

package/dist/poly/all.d.ts

@@ -16,3 +16,4 @@ export * from './shamos';
 export * from './pointinpoly';
 export * from './mapto';
 export * from './featurecleanholes';
+export * from './polyhash';

package/dist/poly/mapto.d.ts

@@ -1,3 +1,4 @@
 import * as G from '../geo/all';
-export declare function polyMapToByCentroid(districts: G.GeoFeatureCollection, centroids: G.GeoCentroidMap): any;
-export declare function polyMapTo(districts: G.GeoFeatureCollection, blocks: G.GeoFeatureCollection): any;
+import { Control } from '../control/all';
+export declare function polyMapToByCentroid(districts: G.GeoFeatureCollection, centroids: G.GeoCentroidMap, control?: Control): any;
+export declare function polyMapTo(districts: G.GeoFeatureCollection, blocks: G.GeoFeatureCollection, control?: Control): any;

package/dist/poly/polyhash.d.ts

@@ -0,0 +1 @@
+export declare function polyHash32(poly: any, seed?: number): number;

package/dist/util/util.d.ts

@@ -5,9 +5,12 @@ export declare class Elapsed {
     tDur: any;
     constructor(bStart?: boolean);
     start(): void;
+    restart(): void;
     end(): void;
     ms(): number;
+    mscur(): number;
     nano(): number;
+    nanocur(): number;
 }
 export declare class MultiTimer {
     _overall: Elapsed;

package/lib/all/all.ts

@@ -29,3 +29,5 @@ import * as DataFlow from '../dataflow/all';
 export { DataFlow }
 import * as Detail from '../detail/all';
 export { Detail }
+import * as Control from '../control/all';
+export { Control }

package/lib/control/all.ts

@@ -0,0 +1 @@
+export * from './control';

package/lib/control/control.ts

@@ -0,0 +1,4 @@
+export interface Control {
+  isCanceled: () => boolean,
+  statusUpdate: (complete: number, total: number) => void,
+}

package/lib/geo/geo.ts

@@ -11,13 +11,17 @@ export type HideMap = { [id: string]: boolean };
 
 // Tracing/debugging aid
 let metrics: { [action: string]: { count: number, total: number } } = {};
+const MinRecordTotal = 500;
 
 function record(action: string, total: number): void
 {
-  if (metrics[action] === undefined)
-    metrics[action] = { count: 0, total: 0 };
-  metrics[action].count++;
-  metrics[action].total += total;
+  if (total > MinRecordTotal)
+  {
+    if (metrics[action] === undefined)
+      metrics[action] = { count: 0, total: 0 };
+    metrics[action].count++;
+    metrics[action].total += total;
+  }
 }
 
 export function dumpMetrics(): void
@@ -25,6 +29,7 @@ export function dumpMetrics(): void
   Object.keys(metrics).forEach(action => {
       console.log(`G.${action}: count: ${metrics[action].count}, total: ${metrics[action].total}`);
     });
+  metrics = {};
 }
 
 export function hidemapConcat(...args: HideMap[]): HideMap

package/lib/poly/all.ts

@@ -16,3 +16,4 @@ export * from './shamos';
 export * from './pointinpoly';
 export * from './mapto';
 export * from './featurecleanholes';
+export * from './polyhash';

package/lib/poly/mapto.ts

@@ -4,6 +4,7 @@ import * as PP  from './polypack';
 import * as PL from './polylabel';
 import * as BB from './boundbox';
 import { polyContainsPoint } from './pointinpoly';
+import { Control } from '../control/all';
 
 function setLabels(c: G.GeoFeatureCollection): void
 {
@@ -33,7 +34,7 @@ function setLabels(c: G.GeoFeatureCollection): void
 //
 //  The return value is an object that maps the block feature ids to the district feature id.
 //
-export function polyMapToByCentroid(districts: G.GeoFeatureCollection, centroids: G.GeoCentroidMap): any
+export function polyMapToByCentroid(districts: G.GeoFeatureCollection, centroids: G.GeoCentroidMap, control?: Control): any
 {
   let map: any = {};
 
@@ -43,7 +44,11 @@ export function polyMapToByCentroid(districts: G.GeoFeatureCollection, centroids
   let aDistricts: number[] = fs.map(f => P.polyArea(f));
 
   // Walk over blocks, mapping centroid to district
-  Object.keys(centroids).forEach(blockid => {
+  let canceled = false;
+  let keys = Object.keys(centroids);
+  keys.forEach((blockid: string, k: number) => {
+      canceled = canceled || control?.isCanceled();
+      if (canceled) return;
       let x = centroids[blockid].x;
       let y = centroids[blockid].y;
 
@@ -67,12 +72,14 @@ export function polyMapToByCentroid(districts: G.GeoFeatureCollection, centroids
             iLow = fIn[i];
         map[blockid] = fs[iLow].properties.id;
       }
+
+      if (control) control.statusUpdate(k, keys.length);
     });
 
-  return map;
+  return canceled ? undefined : map;
 }
 
-export function polyMapTo(districts: G.GeoFeatureCollection, blocks: G.GeoFeatureCollection): any
+export function polyMapTo(districts: G.GeoFeatureCollection, blocks: G.GeoFeatureCollection, control?: Control): any
 {
   // Cache labelx, labely if necessary
   setLabels(blocks);
@@ -82,5 +89,5 @@ export function polyMapTo(districts: G.GeoFeatureCollection, blocks: G.GeoFeatur
     centroids[f.properties.id] = { x: f.properties.labelx, y: f.properties.labely }
     });
 
-  return polyMapToByCentroid(districts, centroids);
+  return polyMapToByCentroid(districts, centroids, control);
 }

package/lib/poly/polyhash.ts

@@ -0,0 +1,52 @@
+import * as P from './poly';
+import * as PP from './polypack';
+
+// Hash coordinates to 32 bit number in order to produce a fast (and a little sloppy) equivalence test.
+// Note that this depends on ordering, so an equivalent polygon with different coordinate ordering would
+// not test as equivalent. As a 32 bit number, you can expect collisions when used for large numbers of
+// polygons (e.g. a 700k block set might expect ~57 collisions - TX at 660K gets 62 collisions, e.g.).
+//
+export function polyHash32(poly: any, seed = 0): number
+{
+  let pp = P.polyNormalize(poly);
+  if (!pp) return 0;
+
+  let h = (seed | 0) ^ 0x9e3779b9;
+  const buf = new ArrayBuffer(8);
+  const dv  = new DataView(buf);
+
+  function mix32(x: number): number
+  {
+    x ^= x >>> 16; x = Math.imul(x, 0x7feb352d);
+    x ^= x >>> 15; x = Math.imul(x, 0x846ca68b);
+    x ^= x >>> 16;
+    return x | 0;
+  }
+
+  let l = 0;
+  PP.polyPackEachRing(pp, (b: Float64Array, iPoly: number, iRing: number, iOffset: number, nPoints: number) => {
+      let iEnd = iOffset + (nPoints*2);
+      for (; iOffset < iEnd; iOffset++)
+      {
+        const x = b[iOffset];
+        if (Number.isNaN(x))
+        {
+          dv.setUint32(0, 0x7ff80001, true);
+          dv.setUint32(4, 0, true);
+        }
+        else
+          dv.setFloat64(0, x, true);
+        const lo = dv.getUint32(0, true) | 0;
+        const hi = dv.getUint32(4, true) | 0;
+
+        let z = mix32(lo ^ Math.imul(hi, 0x9e3779b9) ^ Math.imul(l + 1, 0x85ebca6b));
+        h ^= z;
+        h  = mix32(h);
+        l++;
+      }
+    });
+  h ^= l | 0;
+  h  = mix32(h);
+  // return as unsigned 32-bit in a JS number
+  return h >>> 0;
+}

package/lib/util/util.ts

@@ -25,6 +25,12 @@ export class Elapsed
     if (this.tDur) this.tDur = undefined;
   }
 
+  restart(): void
+  {
+    if (this.tStart === undefined) this.start();
+    delete this.tDur;
+  }
+
   end(): void
   {
     if (this.tStart === undefined) this.start();
@@ -43,6 +49,13 @@ export class Elapsed
       return this.tDur;
   }
 
+  mscur(): number
+  {
+    let ms = this.ms();
+    this.restart();
+    return ms;
+  }
+
   nano(): number
   {
     if (this.tDur === undefined) this.end();
@@ -51,6 +64,13 @@ export class Elapsed
     else
       return this.tDur * 1000000;
   }
+
+  nanocur(): number
+  {
+    let nano = this.nano();
+    this.restart();
+    return nano;
+  }
 }
 
 export class MultiTimer

package/package.json

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

package/dist/colors/colortable-test.d.ts

@@ -1,3 +0,0 @@
-export declare var ColorTable: {
-    [key: string]: string[];
-};

package/dist/colors/colortable-test2.d.ts

@@ -1,3 +0,0 @@
-export declare var ColorTable: {
-    [key: string]: string[];
-};