@dra2020/baseclient 1.0.162 → 1.0.164

package/dist/all/all.d.ts

@@ -28,3 +28,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/dist/baseclient.js

@@ -53,7 +53,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.Detail = exports.DataFlow = exports.Colors = exports.CSV = exports.Emit = exports.G = exports.FilterExpr = exports.OTE = exports.OT = exports.LogClient = exports.LogAbstract = exports.Poly = exports.FSM = exports.Context = exports.Util = void 0;
+exports.Control = exports.Detail = exports.DataFlow = exports.Colors = exports.CSV = exports.Emit = exports.G = exports.FilterExpr = exports.OTE = exports.OT = exports.LogClient = exports.LogAbstract = exports.Poly = exports.FSM = exports.Context = exports.Util = void 0;
 // Client and Server
 const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 exports.Util = Util;
@@ -85,6 +85,8 @@ const DataFlow = __importStar(__webpack_require__(/*! ../dataflow/all */ "./lib/
 exports.DataFlow = DataFlow;
 const Detail = __importStar(__webpack_require__(/*! ../detail/all */ "./lib/detail/all.ts"));
 exports.Detail = Detail;
+const Control = __importStar(__webpack_require__(/*! ../control/all */ "./lib/control/all.ts"));
+exports.Control = Control;
 
 
 /***/ }),
@@ -729,6 +731,45 @@ function create() {
 }
 
 
+/***/ }),
+
+/***/ "./lib/control/all.ts":
+/*!****************************!*\
+  !*** ./lib/control/all.ts ***!
+  \****************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+__exportStar(__webpack_require__(/*! ./control */ "./lib/control/control.ts"), exports);
+
+
+/***/ }),
+
+/***/ "./lib/control/control.ts":
+/*!********************************!*\
+  !*** ./lib/control/control.ts ***!
+  \********************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+
 /***/ }),
 
 /***/ "./lib/csv/all.ts":
@@ -2702,16 +2743,20 @@ const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all
 const Poly = __importStar(__webpack_require__(/*! ../poly/all */ "./lib/poly/all.ts"));
 // Tracing/debugging aid
 let metrics = {};
+const MinRecordTotal = 500;
 function record(action, total) {
-    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;
+    }
 }
 function dumpMetrics() {
     Object.keys(metrics).forEach(action => {
         console.log(`G.${action}: count: ${metrics[action].count}, total: ${metrics[action].total}`);
     });
+    metrics = {};
 }
 function hidemapConcat(...args) {
     let hm = {};
@@ -6594,6 +6639,7 @@ __exportStar(__webpack_require__(/*! ./shamos */ "./lib/poly/shamos.ts"), export
 __exportStar(__webpack_require__(/*! ./pointinpoly */ "./lib/poly/pointinpoly.ts"), exports);
 __exportStar(__webpack_require__(/*! ./mapto */ "./lib/poly/mapto.ts"), exports);
 __exportStar(__webpack_require__(/*! ./featurecleanholes */ "./lib/poly/featurecleanholes.ts"), exports);
+__exportStar(__webpack_require__(/*! ./polyhash */ "./lib/poly/polyhash.ts"), exports);
 
 
 /***/ }),
@@ -7488,14 +7534,19 @@ function setLabels(c) {
 //
 //  The return value is an object that maps the block feature ids to the district feature id.
 //
-function polyMapToByCentroid(districts, centroids) {
+function polyMapToByCentroid(districts, centroids, control) {
     let map = {};
     // Cache district boundboxes for quick containment exclusion
     let fs = districts.features;
     let bbDistricts = fs.map(f => BB.boundbox(f));
     let aDistricts = 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, k) => {
+        canceled = canceled || (control === null || control === void 0 ? void 0 : control.isCanceled());
+        if (canceled)
+            return;
         let x = centroids[blockid].x;
         let y = centroids[blockid].y;
         let fIn = [];
@@ -7516,17 +7567,19 @@ function polyMapToByCentroid(districts, centroids) {
                     iLow = fIn[i];
             map[blockid] = fs[iLow].properties.id;
         }
+        if (control)
+            control.statusUpdate(k, keys.length);
     });
-    return map;
+    return canceled ? undefined : map;
 }
-function polyMapTo(districts, blocks) {
+function polyMapTo(districts, blocks, control) {
     // Cache labelx, labely if necessary
     setLabels(blocks);
     let centroids = {};
     blocks.features.forEach(f => {
         centroids[f.properties.id] = { x: f.properties.labelx, y: f.properties.labely };
     });
-    return polyMapToByCentroid(districts, centroids);
+    return polyMapToByCentroid(districts, centroids, control);
 }
 
 
@@ -9015,6 +9068,98 @@ function topoFromBuffer(coder, ab) {
 }
 
 
+/***/ }),
+
+/***/ "./lib/poly/polyhash.ts":
+/*!******************************!*\
+  !*** ./lib/poly/polyhash.ts ***!
+  \******************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.polyHash32 = polyHash32;
+const P = __importStar(__webpack_require__(/*! ./poly */ "./lib/poly/poly.ts"));
+const PP = __importStar(__webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts"));
+// 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.).
+//
+function polyHash32(poly, seed = 0) {
+    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) {
+        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, iPoly, iRing, iOffset, nPoints) => {
+        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;
+}
+
+
 /***/ }),
 
 /***/ "./lib/poly/polylabel.ts":
@@ -12375,6 +12520,11 @@ class Elapsed {
         if (this.tDur)
             this.tDur = undefined;
     }
+    restart() {
+        if (this.tStart === undefined)
+            this.start();
+        delete this.tDur;
+    }
     end() {
         if (this.tStart === undefined)
             this.start();
@@ -12391,6 +12541,11 @@ class Elapsed {
         else
             return this.tDur;
     }
+    mscur() {
+        let ms = this.ms();
+        this.restart();
+        return ms;
+    }
     nano() {
         if (this.tDur === undefined)
             this.end();
@@ -12399,6 +12554,11 @@ class Elapsed {
         else
             return this.tDur * 1000000;
     }
+    nanocur() {
+        let nano = this.nano();
+        this.restart();
+        return nano;
+    }
 }
 exports.Elapsed = Elapsed;
 class MultiTimer {