@dra2020/baseclient 1.0.161 → 1.0.163

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;
 
 
 /***/ }),
@@ -97,7 +99,7 @@ exports.Detail = Detail;
 
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.BigPalettes = exports.defaultDistrictsPalette = exports.EthnicBackgroundColor = exports.PartisanDistrictClassicColors = exports.PartisanPrecinctClassicColors = exports.EthnicFewClassicColors = exports.ColorValues = exports.DefaultColorNames = exports.MaxClassicColors = exports.MaxColors = exports.MaxOrderedColors = void 0;
+exports.BigPalettes = exports.defaultDistrictsPalette = exports.EthnicBackgroundColor = exports.PartisanDistrictClassicColors = exports.PartisanPrecinctClassicColors = exports.EthnicFewClassicColors = exports.ColorValues = exports.DefaultColorNames = exports.MaxClassicColors = exports.MaxColors = exports.MaxOrderedColors = exports.ColorBrewerSchemeNames = exports.ColorTable = void 0;
 exports.genColor = genColor;
 exports.orderedColors = orderedColors;
 exports.getPalette = getPalette;
@@ -107,6 +109,8 @@ exports.getPalette = getPalette;
 //    Pastel2, PiYG, PuBu, PuBuGn, PuOr, PuRd, Purples, RdBu, RdGy, RdPu, RdYlBu, RdYlGn, Reds, Set1, Set2, Set3, Spectral,
 //    Wistia, YlGn, YlGnBu, YlOrBr, YlOrRd)
 const colortable_1 = __webpack_require__(/*! ./colortable */ "./lib/colors/colortable.ts");
+Object.defineProperty(exports, "ColorTable", ({ enumerable: true, get: function () { return colortable_1.ColorTable; } }));
+Object.defineProperty(exports, "ColorBrewerSchemeNames", ({ enumerable: true, get: function () { return colortable_1.ColorBrewerSchemeNames; } }));
 exports.MaxOrderedColors = 50;
 exports.MaxColors = exports.MaxOrderedColors * 3; // Tied to orderedColors()
 exports.MaxClassicColors = 55;
@@ -563,7 +567,8 @@ if (name.endsWith('_r')) {
 
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.ColorTable = void 0;
+exports.ColorTable = exports.ColorBrewerSchemeNames = void 0;
+exports.ColorBrewerSchemeNames = ["Accent", "Dark2", "Paired", "Pastel1", "Pastel2", "Set1", "Set2", "Set3", "Blues", "Greens", "Oranges", "Reds", "Purples", "Greys1", "BuGn", "BuPu", "GnBu", "OrRd", "PuBuGn", "YlGn", "Spectral", "RdYlBu", "PiYG", "PRGn", "RdYlGn", "RdGy", "RdBu", "BrBG", "PuOr"];
 exports.ColorTable = {
     "Greys": ["#ffffff", "#fefefe", "#fdfdfd", "#fcfcfc", "#fbfbfb", "#fbfbfb", "#fafafa", "#f9f9f9", "#f8f8f8", "#f7f7f7", "#f7f7f7", "#f6f6f6", "#f5f5f5", "#f4f4f4", "#f3f3f3", "#f3f3f3", "#f2f2f2", "#f1f1f1", "#f0f0f0", "#efefef", "#eeeeee", "#ededed", "#ebebeb", "#eaeaea", "#e9e9e9", "#e8e8e8", "#e6e6e6", "#e5e5e5", "#e4e4e4", "#e3e3e3", "#e2e2e2", "#e0e0e0", "#dfdfdf", "#dedede", "#dddddd", "#dbdbdb", "#dadada", "#d9d9d9", "#d7d7d7", "#d6d6d6", "#d5d5d5", "#d3d3d3", "#d1d1d1", "#d0d0d0", "#cfcfcf", "#cdcdcd", "#cbcbcb", "#cacaca", "#c9c9c9", "#c7c7c7", "#c6c6c6", "#c4c4c4", "#c2c2c2", "#c2c2c2", "#c0c0c0", "#bebebe", "#bcbcbc", "#bbbbbb", "#b8b8b8", "#b6b6b6", "#b5b5b5", "#b2b2b2", "#b0b0b0", "#aeaeae", "#acacac", "#aaaaaa", "#a7a7a7", "#a6a6a6", "#a3a3a3", "#a1a1a1", "#a0a0a0", "#9d9d9d", "#9b9b9b", "#9a9a9a", "#979797", "#959595", "#939393", "#929292", "#8f8f8f", "#8d8d8d", "#8c8c8c", "#8a8a8a", "#888888", "#878787", "#848484", "#828282", "#808080", "#7f7f7f", "#7d7d7d", "#7b7b7b", "#797979", "#777777", "#757575", "#747474", "#727272", "#707070", "#6e6e6e", "#6d6d6d", "#6b6b6b", "#696969", "#676767", "#656565", "#636363", "#626262", "#606060", "#5e5e5e", "#5c5c5c", "#5b5b5b", "#595959", "#575757", "#565656", "#545454", "#525252", "#505050", "#4d4d4d", "#4b4b4b", "#484848", "#464646", "#444444", "#414141", "#3f3f3f", "#3c3c3c", "#3a3a3a", "#383838", "#353535", "#333333", "#303030", "#2e2e2e", "#2c2c2c", "#292929", "#272727", "#252525", "#222222", "#212121", "#1f1f1f", "#1c1c1c", "#1a1a1a", "#191919", "#171717", "#141414", "#131313", "#111111", "#0f0f0f", "#0d0d0d", "#0b0b0b", "#090909", "#060606", "#050505", "#030303", "#010101"],
     "bone": ["#000001", "#020203", "#040405", "#050507", "#070709", "#08080c", "#0a0a0e", "#0b0b0f", "#0d0d12", "#0e0e14", "#0f0f15", "#111118", "#13131a", "#14141b", "#15151e", "#171720", "#191923", "#1a1a24", "#1c1c26", "#1d1d29", "#1e1e2a", "#20202c", "#22222f", "#232330", "#242433", "#262635", "#282837", "#292939", "#2a2a3b", "#2c2c3d", "#2d2d3f", "#2f2f41", "#313144", "#313145", "#333347", "#35354a", "#37374c", "#38384d", "#393950", "#3b3b52", "#3c3c53", "#3e3e56", "#3f3f58", "#404059", "#42425c", "#44445e", "#464661", "#464662", "#484864", "#4a4a67", "#4b4b68", "#4d4d6b", "#4e4e6d", "#4f4f6e", "#515171", "#535373", "#545674", "#555775", "#575977", "#595c79", "#5a5d7a", "#5b5f7b", "#5d627d", "#5e637e", "#606580", "#626881", "#636a83", "#646b84", "#666e86", "#687088", "#697188", "#6a748a", "#6c768c", "#6d778d", "#6f7a8f", "#707c90", "#727e92", "#738093", "#758295", "#778496", "#778697", "#798899", "#7b8a9b", "#7c8c9c", "#7e8e9d", "#7f919f", "#8193a1", "#8294a2", "#8497a4", "#8599a5", "#869aa6", "#889da8", "#8a9faa", "#8ba0ab", "#8ca3ac", "#8ea5ae", "#90a7b0", "#91a9b1", "#93abb2", "#94adb4", "#95afb5", "#97b1b7", "#99b3b9", "#9ab5b9", "#9bb7bb", "#9db9bd", "#9fbcbf", "#a0bdc0", "#a1bfc1", "#a3c2c3", "#a4c3c4", "#a6c5c6", "#a8c7c7", "#aac8c8", "#accaca", "#afcccc", "#b2cece", "#b3cece", "#b6d0d0", "#b9d2d2", "#bad3d3", "#bdd5d5", "#bfd6d6", "#c1d7d7", "#c4d9d9", "#c6dbdb", "#c9dcdc", "#cadddd", "#cddfdf", "#d0e1e1", "#d1e2e2", "#d4e3e3", "#d7e5e5", "#d8e6e6", "#dbe8e8", "#deeaea", "#e0ebeb", "#e2ecec", "#e4eeee", "#e7f0f0", "#e8f1f1", "#ebf2f2", "#eef4f4", "#eff5f5", "#f2f7f7", "#f5f8f8", "#f7fafa", "#f9fbfb", "#fcfdfd", "#feffff"],
@@ -726,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":
@@ -2699,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 = {};
@@ -7485,14 +7533,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 = [];
@@ -7513,17 +7566,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);
 }
 
 
@@ -12372,6 +12427,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();
@@ -12388,6 +12448,11 @@ class Elapsed {
         else
             return this.tDur;
     }
+    mscur() {
+        let ms = this.ms();
+        this.restart();
+        return ms;
+    }
     nano() {
         if (this.tDur === undefined)
             this.end();
@@ -12396,6 +12461,11 @@ class Elapsed {
         else
             return this.tDur * 1000000;
     }
+    nanocur() {
+        let nano = this.nano();
+        this.restart();
+        return nano;
+    }
 }
 exports.Elapsed = Elapsed;
 class MultiTimer {