@dra2020/baseclient 1.0.15 → 1.0.18

package/dist/baseclient.js

@@ -4,42 +4,63 @@
 	else if(typeof define === 'function' && define.amd)
 		define([], factory);
 	else if(typeof exports === 'object')
-		exports["base"] = factory();
+		exports["baseclient"] = factory();
 	else
-		root["base"] = factory();
+		root["baseclient"] = factory();
 })(global, function() {
 return /******/ (() => { // webpackBootstrap
 /******/ 	"use strict";
 /******/ 	var __webpack_modules__ = ({
 
-/***/ "./lib/all/allclient.ts":
-/*!******************************!*\
-  !*** ./lib/all/allclient.ts ***!
-  \******************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ "./lib/all/all.ts":
+/*!************************!*\
+  !*** ./lib/all/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;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.FilterExpr = exports.OTE = exports.OT = exports.LogClient = exports.LogAbstract = exports.Poly = exports.FSM = exports.Context = exports.Util = void 0;
+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 = __webpack_require__(/*! ../util/all */ "./lib/util/all.ts");
+const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 exports.Util = Util;
-const Context = __webpack_require__(/*! ../context/all */ "./lib/context/all.ts");
+const Context = __importStar(__webpack_require__(/*! ../context/all */ "./lib/context/all.ts"));
 exports.Context = Context;
-const FSM = __webpack_require__(/*! ../fsm/all */ "./lib/fsm/all.ts");
+const FSM = __importStar(__webpack_require__(/*! ../fsm/all */ "./lib/fsm/all.ts"));
 exports.FSM = FSM;
-const Poly = __webpack_require__(/*! ../poly/all */ "./lib/poly/all.ts");
+const Poly = __importStar(__webpack_require__(/*! ../poly/all */ "./lib/poly/all.ts"));
 exports.Poly = Poly;
-const LogAbstract = __webpack_require__(/*! ../logabstract/all */ "./lib/logabstract/all.ts");
+const LogAbstract = __importStar(__webpack_require__(/*! ../logabstract/all */ "./lib/logabstract/all.ts"));
 exports.LogAbstract = LogAbstract;
-const LogClient = __webpack_require__(/*! ../logclient/all */ "./lib/logclient/all.ts");
+const LogClient = __importStar(__webpack_require__(/*! ../logclient/all */ "./lib/logclient/all.ts"));
 exports.LogClient = LogClient;
-const OT = __webpack_require__(/*! ../ot-js/all */ "./lib/ot-js/all.ts");
+const OT = __importStar(__webpack_require__(/*! ../ot-js/all */ "./lib/ot-js/all.ts"));
 exports.OT = OT;
-const OTE = __webpack_require__(/*! ../ot-editutil/all */ "./lib/ot-editutil/all.ts");
+const OTE = __importStar(__webpack_require__(/*! ../ot-editutil/all */ "./lib/ot-editutil/all.ts"));
 exports.OTE = OTE;
 const all_1 = __webpack_require__(/*! ../filterexpr/all */ "./lib/filterexpr/all.ts");
 Object.defineProperty(exports, "FilterExpr", ({ enumerable: true, get: function () { return all_1.FilterExpr; } }));
+const G = __importStar(__webpack_require__(/*! ../geo/all */ "./lib/geo/all.ts"));
+exports.G = G;
 
 
 /***/ }),
@@ -71,12 +92,31 @@ __exportStar(__webpack_require__(/*! ./context */ "./lib/context/context.ts"), e
 /*!********************************!*\
   !*** ./lib/context/context.ts ***!
   \********************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.create = void 0;
-const Util = __webpack_require__(/*! ../util/all */ "./lib/util/all.ts");
+const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 class Context {
     constructor() {
         this.values = {};
@@ -156,12 +196,31 @@ __exportStar(__webpack_require__(/*! ./filterexpr */ "./lib/filterexpr/filterexp
 /*!**************************************!*\
   !*** ./lib/filterexpr/filterexpr.ts ***!
   \**************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.FilterExpr = void 0;
-const Util = __webpack_require__(/*! ../util/all */ "./lib/util/all.ts");
+const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 const Space = 32;
 const Tab = 9;
 const Newline = 10;
@@ -538,6 +597,40 @@ function wordyDate(s) {
     // But this is close enough to match what gets displayed by "prettyDate" while also letting selection by month year
     return s;
 }
+function clauseEqual(c1, c2) {
+    if (c1 == null && c2 == null)
+        return true;
+    if (c1 == null || c2 == null)
+        return false;
+    if (c1.op.tt === c2.op.tt) {
+        if (c1.op.tt === TokType.Text)
+            return c1.op.text === c2.op.text;
+        else
+            return clauseEqual(c1.operand1, c2.operand1) && clauseEqual(c1.operand2, c2.operand2);
+    }
+    else
+        return false;
+}
+function containsClause(c, s) {
+    if (clauseEqual(c, s))
+        return true;
+    if (c == null || s == null)
+        return false;
+    return containsClause(c.operand1, s) || containsClause(c.operand2, s);
+}
+function removeClause(c, s) {
+    if (c == null || (c.op.tt === TokType.Text && c.op.tt !== s.op.tt))
+        return c;
+    else if (clauseEqual(c, s))
+        return null;
+    else {
+        c.operand1 = removeClause(c.operand1, s);
+        c.operand2 = removeClause(c.operand2, s);
+        if ((c.op.tt === TokType.And || c.op.tt === TokType.Or) && (c.operand1 == null || c.operand2 == null))
+            return c.operand1 || c.operand2;
+        return c;
+    }
+}
 class FilterExpr {
     constructor(coder, expr) {
         this.lexer = new Lexer(coder);
@@ -555,13 +648,38 @@ class FilterExpr {
     asString() {
         return this.asStringClause(this.parser.clause);
     }
+    containsClause(expr) {
+        let sub = new FilterExpr(this.lexer.coder, expr);
+        return containsClause(this.parser.clause, sub.parser.clause);
+    }
+    addClause(expr) {
+        let sub = new FilterExpr(this.lexer.coder, expr);
+        if (!containsClause(this.parser.clause, sub.parser.clause)) {
+            if (this.parser.clause)
+                this.parser.clauses = [{ op: { tt: TokType.And }, operand1: this.parser.clause, operand2: sub.parser.clause }];
+            else
+                this.parser.clauses = [sub.parser.clause];
+        }
+    }
+    removeClause(expr) {
+        if (this.containsClause(expr)) {
+            let sub = new FilterExpr(this.lexer.coder, expr);
+            this.parser.clauses = [removeClause(this.parser.clause, sub.parser.clause)];
+        }
+    }
     asStringClause(clause) {
         if (clause == null)
             return '';
-        if (clause.op.tt == TokType.Text)
-            return `'${clause.op.text}'`;
+        if (clause.op.tt == TokType.Text) {
+            this.lexer.set(clause.op.text);
+            if (this.lexer.tokens.length == 1 && this.lexer.tokens[0].tt === TokType.Text)
+                return clause.op.text;
+            else
+                return `'${clause.op.text}'`;
+        }
         let a = [];
-        a.push('(');
+        if (clause !== this.parser.clause)
+            a.push('(');
         switch (clause.op.tt) {
             case TokType.And:
                 a.push(this.asStringClause(clause.operand1));
@@ -578,8 +696,7 @@ class FilterExpr {
                 a.push(this.asStringClause(clause.operand1));
                 break;
             case TokType.Colon:
-                a.push(this.asStringClause(clause.operand1));
-                a.push(':');
+                a.push(`${this.asStringClause(clause.operand1)}:`);
                 a.push(this.asStringClause(clause.operand2));
                 break;
             case TokType.Equal:
@@ -594,7 +711,8 @@ class FilterExpr {
             default:
                 throw 'Unexpected token in asString';
         }
-        a.push(')');
+        if (clause !== this.parser.clause)
+            a.push(')');
         return a.join(' ');
     }
     testClause(o, types, clause, prop, relation) {
@@ -686,13 +804,32 @@ __exportStar(__webpack_require__(/*! ./fsm */ "./lib/fsm/fsm.ts"), exports);
 /*!************************!*\
   !*** ./lib/fsm/fsm.ts ***!
   \************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.FsmArray = exports.FsmLoop = exports.DefaultLoopOptions = exports.FsmTracker = exports.FsmSerializer = exports.FsmSleep = exports.FsmOnDone = exports.Fsm = exports.FsmManager = exports.FSM_CUSTOM9 = exports.FSM_CUSTOM8 = exports.FSM_CUSTOM7 = exports.FSM_CUSTOM6 = exports.FSM_CUSTOM5 = exports.FSM_CUSTOM4 = exports.FSM_CUSTOM3 = exports.FSM_CUSTOM2 = exports.FSM_CUSTOM1 = exports.FSM_RELEASED = exports.FSM_ERROR = exports.FSM_DONE = exports.FSM_PENDING = exports.FSM_STARTING = void 0;
 // Shared libraries
-const Util = __webpack_require__(/*! ../util/all */ "./lib/util/all.ts");
+const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 // States
 exports.FSM_STARTING = 0;
 exports.FSM_PENDING = 1 << 0;
@@ -916,9 +1053,17 @@ class FsmSleep extends Fsm {
         this.delay = delay;
     }
     tick() {
-        if (this.ready && this.state === exports.FSM_STARTING) {
+        // This allows canceling by simply setting state to done
+        if (this.done && this.timeoutHandle !== undefined) {
+            clearTimeout(this.timeoutHandle);
+            delete this.timeoutHandle;
+        }
+        else if (this.ready && this.state === exports.FSM_STARTING) {
             this.setState(exports.FSM_PENDING);
-            setTimeout(() => { this.setState(exports.FSM_DONE); }, this.delay);
+            this.timeoutHandle = setTimeout(() => {
+                delete this.timeoutHandle;
+                this.setState(exports.FSM_DONE);
+            }, this.delay);
         }
     }
 }
@@ -1080,6 +1225,500 @@ class FsmArray extends Fsm {
 exports.FsmArray = FsmArray;
 
 
+/***/ }),
+
+/***/ "./lib/geo/all.ts":
+/*!************************!*\
+  !*** ./lib/geo/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;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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__(/*! ./geo */ "./lib/geo/geo.ts"), exports);
+__exportStar(__webpack_require__(/*! ./vfeature */ "./lib/geo/vfeature.ts"), exports);
+
+
+/***/ }),
+
+/***/ "./lib/geo/geo.ts":
+/*!************************!*\
+  !*** ./lib/geo/geo.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;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.geoIntersect = exports.geoIntersectOptions = exports.GeoMultiCollection = exports.geoMapEqual = exports.geoEqual = exports.geoTopoToCollection = exports.geoCollectionToTopo = exports.geoMapToCollection = exports.geoCollectionToMap = exports.geoEnsureID = void 0;
+const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
+const Poly = __importStar(__webpack_require__(/*! ../poly/all */ "./lib/poly/all.ts"));
+function geoEnsureID(col) {
+    let prop;
+    const props = ['id', 'GEOID', 'GEOID10', 'GEOID20', 'GEOID30'];
+    if (col && col.features && col.features.length > 0) {
+        let f = col.features[0];
+        if (f.properties.id !== undefined)
+            return;
+        props.forEach(p => { if (prop === undefined && f.properties[p] !== undefined)
+            prop = p; });
+        if (prop)
+            col.features.forEach(f => { f.properties.id = f.properties[prop]; });
+    }
+}
+exports.geoEnsureID = geoEnsureID;
+function geoCollectionToMap(col) {
+    if (col == null)
+        return null;
+    let map = {};
+    col.features.forEach((f) => { map[String(f.properties.id)] = f; });
+    return map;
+}
+exports.geoCollectionToMap = geoCollectionToMap;
+function geoMapToCollection(map) {
+    if (map == null || Util.countKeys(map) == 0)
+        return null;
+    let col = { type: 'FeatureCollection', features: [] };
+    Object.keys(map).forEach((geoid) => { col.features.push(map[geoid]); });
+    return col;
+}
+exports.geoMapToCollection = geoMapToCollection;
+function geoCollectionToTopo(col) {
+    let topo = Poly.topoFromCollection(col);
+    Poly.topoPack(topo);
+    return topo;
+}
+exports.geoCollectionToTopo = geoCollectionToTopo;
+function geoTopoToCollection(topo) {
+    let col = Poly.topoToCollection(topo);
+    Poly.featurePack(col);
+    return col;
+}
+exports.geoTopoToCollection = geoTopoToCollection;
+function geoEqual(m1, m2) {
+    let n1 = m1 ? m1.length : 0;
+    let n2 = m2 ? m2.length : 0;
+    if (n1 != n2)
+        return false;
+    if (n1 == 0)
+        return true;
+    let n = 0;
+    let eq = true;
+    m1.forEach(f => { if (eq && !m2.find(f.properties.id))
+        eq = false; });
+    return eq;
+}
+exports.geoEqual = geoEqual;
+function geoMapEqual(m1, m2) {
+    if (m1 == null)
+        return Util.isEmpty(m2);
+    if (m2 == null)
+        return Util.isEmpty(m1);
+    let p;
+    for (p in m1)
+        if (m1.hasOwnProperty(p))
+            if (m1[p] !== m2[p])
+                return false;
+    for (p in m2)
+        if (m2.hasOwnProperty(p))
+            if (m1[p] === undefined)
+                return false;
+    return true;
+}
+exports.geoMapEqual = geoMapEqual;
+class GeoMultiCollection {
+    constructor(tag, topo, col, map) {
+        this.stamp = Math.trunc(Math.random() * Number.MAX_SAFE_INTEGER / 2);
+        this.empty();
+        if (tag)
+            this.add(tag, topo, col, map);
+    }
+    empty() {
+        this.entries = {};
+        this.hidden = {};
+        this._onChange();
+    }
+    get nEntries() { return Util.countKeys(this.entries); }
+    nthEntry(n) {
+        return Util.nthProperty(this.entries, n);
+    }
+    add(tag, topo, col, map) {
+        let entry = this.entries[tag];
+        if (entry === undefined)
+            entry = { tag: tag }, this.entries[tag] = entry;
+        if ((topo && entry.topo !== topo) || (col && entry.col !== col) || (map && entry.map !== map)) {
+            entry.topo = topo;
+            entry.col = col;
+            entry.map = map;
+            this._onChange();
+        }
+        else if (topo == null && col == null && map == null)
+            this.remove(tag);
+    }
+    addMulti(multi) {
+        multi.forEachEntry(e => {
+            this.add(e.tag, e.topo, e.col, e.map);
+        });
+        for (let p in multi.hidden)
+            if (multi.hidden.hasOwnProperty(p)) {
+                this.hidden[p] = true;
+                this._onChange();
+            }
+    }
+    remove(tag) {
+        let entry = this.entries[tag];
+        if (entry) {
+            if (entry.topo || entry.col || entry.map)
+                this._onChange();
+            delete this.entries[tag];
+        }
+    }
+    _onChange() {
+        this.all = { tag: 'all' };
+        this.stamp++;
+    }
+    _col(e) {
+        if (e == null)
+            return null;
+        if (!e.col) {
+            if (e.map)
+                e.col = geoMapToCollection(e.map);
+            else if (e.topo)
+                e.col = geoTopoToCollection(e.topo);
+        }
+        return e.col;
+    }
+    _map(e) {
+        if (e == null)
+            return null;
+        if (!e.map) {
+            if (e.col)
+                e.map = geoCollectionToMap(e.col);
+            else if (e.topo) {
+                e.col = geoTopoToCollection(e.topo);
+                e.map = geoCollectionToMap(e.col);
+            }
+        }
+        return e.map;
+    }
+    _topo(e) {
+        if (e == null)
+            return null;
+        if (!e.topo) {
+            if (e.col)
+                e.topo = geoCollectionToTopo(e.col);
+            else if (e.map) {
+                e.col = geoMapToCollection(e.map);
+                e.topo = geoCollectionToTopo(e.col);
+            }
+        }
+        return e.topo;
+    }
+    colOf(tag) { return this._col(this.entries[tag]); }
+    mapOf(tag) { return this._map(this.entries[tag]); }
+    topoOf(tag) { return this._topo(this.entries[tag]); }
+    forEachEntry(cb) {
+        Object.values(this.entries).forEach(cb);
+    }
+    allCol() {
+        if (this.nEntries == 0)
+            return null;
+        if (!this.all.col) {
+            // optimise case where one entry
+            let n = this.nEntries;
+            if (n == 1)
+                this.all.col = this._col(this.nthEntry(0));
+            else
+                // Going from map to collection guarantees that any duplicates are removed
+                this.all.col = geoMapToCollection(this.allMap());
+        }
+        return this.all.col;
+    }
+    allMap() {
+        if (this.nEntries == 0)
+            return null;
+        if (!this.all.map) {
+            // optimise case where one entry
+            let n = this.nEntries;
+            if (n == 1)
+                this.all.map = this._map(this.nthEntry(0));
+            else {
+                let map = {};
+                this.all.map = map;
+                this.forEach(f => { map[String(f.properties.id)] = f; });
+            }
+        }
+        return this.all.map;
+    }
+    allTopo() {
+        if (this.nEntries == 0)
+            return null;
+        if (!this.all.topo) {
+            // optimise case where one entry
+            let n = this.nEntries;
+            if (n == 1)
+                this.all.topo = this._topo(this.nthEntry(0));
+            else
+                this.all.topo = geoCollectionToTopo(this.allCol());
+        }
+        return this.all.topo;
+    }
+    hide(id) {
+        if (id) {
+            if (typeof id === 'string')
+                this.hidden[id] = true;
+            else if (Array.isArray(id))
+                id.forEach((i) => { this.hidden[i] = true; });
+            else if (typeof id === 'object')
+                for (let p in id)
+                    if (id.hasOwnProperty(p))
+                        this.hidden[p] = true;
+            this._onChange();
+        }
+    }
+    show(id) {
+        if (id) {
+            if (typeof id === 'string')
+                delete this.hidden[id];
+            else if (Array.isArray(id))
+                id.forEach((i) => { delete this.hidden[i]; });
+            else if (typeof id === 'object')
+                for (let p in id)
+                    if (id.hasOwnProperty(p))
+                        delete this.hidden[p];
+            this._onChange();
+        }
+    }
+    showAll() {
+        if (!Util.isEmpty(this.hidden)) {
+            this.hidden = {};
+            this._onChange();
+        }
+    }
+    get length() {
+        let n = 0;
+        this.forEachEntry(e => {
+            if (e.col)
+                n += e.col.features.length;
+            else if (e.map)
+                n += Util.countKeys(e.map);
+            else if (e.topo)
+                n += Util.countKeys(e.topo.objects);
+        });
+        return n;
+    }
+    // Use forEach in preference to iteration using this function
+    nthFeature(n) {
+        let found;
+        if (n >= 0)
+            this.forEachEntry(e => {
+                if (found)
+                    return;
+                let col = this._col(e);
+                if (col)
+                    if (n > col.features.length)
+                        n -= col.features.length;
+                    else
+                        found = col.features[n];
+            });
+        return found;
+    }
+    nthFilteredFeature(n, cb) {
+        let found;
+        this.forEachEntry(e => {
+            if (found)
+                return;
+            let col = this._col(e);
+            if (col)
+                for (let i = 0; !found && i < col.features.length; i++) {
+                    let f = col.features[i];
+                    if (this.hidden[f.properties.id] === undefined && cb(f)) {
+                        if (n === 0) {
+                            found = f;
+                            break;
+                        }
+                        n--;
+                    }
+                }
+        });
+        return found;
+    }
+    forEach(cb) {
+        this.forEachEntry(e => {
+            let col = this._col(e);
+            if (e.col)
+                e.col.features.forEach(f => { if (this.hidden[f.properties.id] === undefined)
+                    cb(f); });
+        });
+    }
+    map(cb) {
+        let features = [];
+        this.forEach((f) => { features.push(cb(f)); });
+        return features;
+    }
+    isHidden(id) {
+        return this.hidden[id] !== undefined;
+    }
+    find(id) {
+        if (this.hidden[id] !== undefined)
+            return undefined;
+        let entries = Object.values(this.entries);
+        for (let i = 0; i < entries.length; i++) {
+            let map = this._map(entries[i]);
+            if (map[id])
+                return map[id];
+        }
+        return undefined;
+    }
+    filter(test) {
+        let m = new GeoMultiCollection();
+        this.forEachEntry(e => {
+            let col = this._col(e);
+            let features = col ? col.features.filter(test) : null;
+            if (features && features.length)
+                m.add(e.tag, null, { type: 'FeatureCollection', features: features }, null);
+        });
+        return m;
+    }
+}
+exports.GeoMultiCollection = GeoMultiCollection;
+var geoIntersectOptions;
+(function (geoIntersectOptions) {
+    geoIntersectOptions[geoIntersectOptions["Intersects"] = 0] = "Intersects";
+    geoIntersectOptions[geoIntersectOptions["Bounds"] = 1] = "Bounds";
+    geoIntersectOptions[geoIntersectOptions["BoundsCenter"] = 2] = "BoundsCenter";
+})(geoIntersectOptions = exports.geoIntersectOptions || (exports.geoIntersectOptions = {}));
+;
+function geoBoxIntersect(x1, x2, opt) {
+    if (x1.left === undefined || x2.left === undefined)
+        return false;
+    let l1 = x1.left;
+    let l2 = x2.left;
+    let r1 = x1.right;
+    let r2 = x2.right;
+    let b1 = x1.top; // flip
+    let b2 = x2.top; // flip
+    let t1 = x1.bottom; // flip
+    let t2 = x2.bottom; // flip
+    let cx2 = l2 + (r2 - l2) / 2;
+    let cy2 = t2 + (b2 - t2) / 2;
+    // Note I flipped top and bottom above when extracting,
+    // in order to make below logic work for normal y axis alignment (0 at top).
+    switch (opt) {
+        case geoIntersectOptions.Intersects:
+            return !(l2 > r1 || r2 < l1 || t2 > b1 || b2 < t1);
+        case geoIntersectOptions.Bounds:
+            return l1 <= l2 && t1 <= t2 && r1 >= r2 && b1 >= b2;
+        case geoIntersectOptions.BoundsCenter:
+            return l1 <= cx2 && t1 <= cy2 && r1 >= cx2 && b1 >= cy2;
+    }
+}
+function geoIntersect(multi, bbox, opt) {
+    let m = {};
+    let bboxPoly = Poly.boundboxPoly(bbox);
+    multi.forEach((f) => {
+        let box = Poly.boundbox(f);
+        if (geoBoxIntersect(bbox, box, opt)) {
+            if (opt !== geoIntersectOptions.Intersects || Poly.polyIntersects(bboxPoly, f))
+                m[f.properties.id] = f;
+        }
+    });
+    let result = new GeoMultiCollection();
+    result.add('result', null, null, m);
+    return result;
+}
+exports.geoIntersect = geoIntersect;
+
+
+/***/ }),
+
+/***/ "./lib/geo/vfeature.ts":
+/*!*****************************!*\
+  !*** ./lib/geo/vfeature.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;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.computeVFeature = void 0;
+const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
+const Poly = __importStar(__webpack_require__(/*! ../poly/all */ "./lib/poly/all.ts"));
+// Given the topology for a precinct, the bintrie mapping and the list of blocks, construct the
+// feature data for the virtual feature.
+//
+function computeVFeature(topoPrecinct, bintrie, blocks) {
+    let contiguity = new Util.IndexedArray();
+    let block_contiguity = new Util.IndexedArray();
+    let f = Poly.topoMerge(topoPrecinct, blocks);
+    f.properties.datasets = {};
+    blocks.forEach(blockid => {
+        let b = topoPrecinct.objects[blockid];
+        if (b.properties.datasets)
+            Util.deepAccum(f.properties.datasets, b.properties.datasets);
+        if (b.properties.contiguity) {
+            b.properties.contiguity.forEach((id) => {
+                contiguity.set(id === 'OUT_OF_STATE' ? id : bintrie.get(id));
+            });
+            b.properties.contiguity.forEach((id) => {
+                block_contiguity.set(id);
+            });
+        }
+    });
+    f.properties.contiguity = contiguity.asArray();
+    f.properties.block_contiguity = block_contiguity.asArray();
+    f.properties.blocks = blocks;
+    return f;
+}
+exports.computeVFeature = computeVFeature;
+
+
 /***/ }),
 
 /***/ "./lib/logabstract/all.ts":
@@ -1109,12 +1748,31 @@ __exportStar(__webpack_require__(/*! ./log */ "./lib/logabstract/log.ts"), expor
 /*!********************************!*\
   !*** ./lib/logabstract/log.ts ***!
   \********************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SyncTimer = exports.AsyncTimer = exports.Timer = void 0;
-const Util = __webpack_require__(/*! ../util/all */ "./lib/util/all.ts");
+const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 class Timer {
     constructor(ilog, kind, o, verbosity = 0) {
         this.ilog = ilog;
@@ -1175,12 +1833,31 @@ __exportStar(__webpack_require__(/*! ./log */ "./lib/logclient/log.ts"), exports
 /*!******************************!*\
   !*** ./lib/logclient/log.ts ***!
   \******************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.create = void 0;
-const Util = __webpack_require__(/*! ../util/all */ "./lib/util/all.ts");
+const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 class LogManager {
     constructor(env) {
         this.env = env;
@@ -1281,13 +1958,32 @@ __exportStar(__webpack_require__(/*! ./otmaputil */ "./lib/ot-editutil/otmaputil
 /*!***************************************!*\
   !*** ./lib/ot-editutil/oteditutil.ts ***!
   \***************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.OTEditUtil = void 0;
-const OT = __webpack_require__(/*! ../ot-js/all */ "./lib/ot-js/all.ts");
-const DMP = __webpack_require__(/*! diff-match-patch */ "diff-match-patch");
+const OT = __importStar(__webpack_require__(/*! ../ot-js/all */ "./lib/ot-js/all.ts"));
+const DMP = __importStar(__webpack_require__(/*! diff-match-patch */ "diff-match-patch"));
 let DiffMatchPatch = new DMP.diff_match_patch();
 let DIFF_DELETE = DMP.DIFF_DELETE;
 let DIFF_INSERT = DMP.DIFF_INSERT;
@@ -1447,13 +2143,32 @@ exports.OTEditUtil = OTEditUtil;
 /*!**************************************!*\
   !*** ./lib/ot-editutil/otmaputil.ts ***!
   \**************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Editor = exports.REPLACE = exports.MERGE = void 0;
-const OT = __webpack_require__(/*! ../ot-js/all */ "./lib/ot-js/all.ts");
-const Util = __webpack_require__(/*! ../util/all */ "./lib/util/all.ts");
+const OT = __importStar(__webpack_require__(/*! ../ot-js/all */ "./lib/ot-js/all.ts"));
+const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 exports.MERGE = 0;
 exports.REPLACE = 1;
 class Editor {
@@ -1646,12 +2361,31 @@ __exportStar(__webpack_require__(/*! ./otsession */ "./lib/ot-js/otsession.ts"),
 /*!******************************!*\
   !*** ./lib/ot-js/otarray.ts ***!
   \******************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.OTArrayResource = exports.OTStringResource = exports.OTArrayLikeResource = exports.OTArrayOperations = exports.OTStringOperations = exports.OTSingleArrayEditor = exports.OpTmpRetain = exports.OpSet = exports.OpCursor = exports.OpRetain = exports.OpDelete = exports.OpInsert = void 0;
-const OT = __webpack_require__(/*! ./ottypes */ "./lib/ot-js/ottypes.ts");
+const OT = __importStar(__webpack_require__(/*! ./ottypes */ "./lib/ot-js/ottypes.ts"));
 const TestUnitSize = 4;
 let TestCounter = 0;
 // Array Ops
@@ -2583,13 +3317,32 @@ function counterValue(ops, c) {
 /*!*************************************!*\
   !*** ./lib/ot-js/otclientengine.ts ***!
   \*************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.OTClientEngine = void 0;
-const OTC = __webpack_require__(/*! ./otcomposite */ "./lib/ot-js/otcomposite.ts");
-const OTE = __webpack_require__(/*! ./otengine */ "./lib/ot-js/otengine.ts");
+const OTC = __importStar(__webpack_require__(/*! ./otcomposite */ "./lib/ot-js/otcomposite.ts"));
+const OTE = __importStar(__webpack_require__(/*! ./otengine */ "./lib/ot-js/otengine.ts"));
 class OTClientEngine extends OTE.OTEngine {
     // Constructor
     constructor(ilog, rid, cid) {
@@ -2833,15 +3586,34 @@ exports.OTClientEngine = OTClientEngine;
 /*!**********************************!*\
   !*** ./lib/ot-js/otcomposite.ts ***!
   \**********************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.OTCompositeResource = exports.clockSeenValue = exports.clockUndoValue = exports.clockInitializeValue = exports.clockFailureValue = exports.clockRandomizeValue = exports.clockTerminateValue = exports.clockInitialValue = void 0;
-const OT = __webpack_require__(/*! ./ottypes */ "./lib/ot-js/ottypes.ts");
-const OTA = __webpack_require__(/*! ./otarray */ "./lib/ot-js/otarray.ts");
-const OTM = __webpack_require__(/*! ./otmap */ "./lib/ot-js/otmap.ts");
-const OTC = __webpack_require__(/*! ./otcounter */ "./lib/ot-js/otcounter.ts");
+const OT = __importStar(__webpack_require__(/*! ./ottypes */ "./lib/ot-js/ottypes.ts"));
+const OTA = __importStar(__webpack_require__(/*! ./otarray */ "./lib/ot-js/otarray.ts"));
+const OTM = __importStar(__webpack_require__(/*! ./otmap */ "./lib/ot-js/otmap.ts"));
+const OTC = __importStar(__webpack_require__(/*! ./otcounter */ "./lib/ot-js/otcounter.ts"));
 exports.clockInitialValue = -1; // Initial value
 exports.clockTerminateValue = -2; // Terminal action from client.
 exports.clockRandomizeValue = -3; // Fill in with random data.
@@ -3032,12 +3804,31 @@ exports.OTCompositeResource = OTCompositeResource;
 /*!********************************!*\
   !*** ./lib/ot-js/otcounter.ts ***!
   \********************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.OTCounterResource = exports.OpCounterDel = exports.OpCounterAdd = void 0;
-const OT = __webpack_require__(/*! ./ottypes */ "./lib/ot-js/ottypes.ts");
+const OT = __importStar(__webpack_require__(/*! ./ottypes */ "./lib/ot-js/ottypes.ts"));
 // This implements OT for a simple map of counters. Instead of a new value replacing the 
 // keyed value, values are added together. This allows a simple accumulating counter.
 // Possible future additions:
@@ -3207,13 +3998,32 @@ exports.OTEngine = OTEngine;
 /*!****************************!*\
   !*** ./lib/ot-js/otmap.ts ***!
   \****************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.OTMapResource = exports.OpMapDel = exports.OpMapSet = void 0;
-const Util = __webpack_require__(/*! ../util/all */ "./lib/util/all.ts");
-const OT = __webpack_require__(/*! ./ottypes */ "./lib/ot-js/ottypes.ts");
+const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
+const OT = __importStar(__webpack_require__(/*! ./ottypes */ "./lib/ot-js/ottypes.ts"));
 // This implements OT for a dictionary of objects. OT is pretty trivial for maps - last wins.
 exports.OpMapSet = 1;
 exports.OpMapDel = 2;
@@ -3327,14 +4137,33 @@ exports.OTMapResource = OTMapResource;
 /*!*************************************!*\
   !*** ./lib/ot-js/otserverengine.ts ***!
   \*************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.OTServerEngine = exports.ClientIDForServer = void 0;
-const OTC = __webpack_require__(/*! ./otcomposite */ "./lib/ot-js/otcomposite.ts");
-const OTS = __webpack_require__(/*! ./otsession */ "./lib/ot-js/otsession.ts");
-const OTE = __webpack_require__(/*! ./otengine */ "./lib/ot-js/otengine.ts");
+const OTC = __importStar(__webpack_require__(/*! ./otcomposite */ "./lib/ot-js/otcomposite.ts"));
+const OTS = __importStar(__webpack_require__(/*! ./otsession */ "./lib/ot-js/otsession.ts"));
+const OTE = __importStar(__webpack_require__(/*! ./otengine */ "./lib/ot-js/otengine.ts"));
 exports.ClientIDForServer = '-Server-';
 class OTServerEngine extends OTE.OTEngine {
     // Constructor
@@ -3572,7 +4401,7 @@ exports.OTServerEngine = OTServerEngine;
 
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.SessionFilterFunction = exports.accessMapFindUser = exports.accessFindUser = exports.ServerStateMaintenance = exports.ServerStateRunning = exports.PermAll = exports.PermEdit = exports.PermAdmin = exports.PermOwner = exports.PermWrite = exports.PermRead = exports.PermNone = exports.FilterCount = exports.FilterOfficial = exports.FilterPublic = exports.FilterTrash = exports.FilterRecent = exports.FilterMyPublic = exports.FilterSharedWithMe = exports.FilterMyMaps = exports.EClockAnomaly = exports.EMaintenance = exports.ENoAccess = exports.ENoPerm = exports.ELoadFailed = exports.EBadRequest = exports.ENoUser = exports.EClockReset = exports.EClockFailure = exports.EClockSeen = exports.ENoSession = exports.ERetry = exports.EFull = exports.EFail = exports.ESuccess = void 0;
+exports.SessionFilterFunction = exports.accessMapFindUser = exports.accessFindUser = exports.ServerStateMaintenance = exports.ServerStateRunning = exports.PermAll = exports.PermEdit = exports.PermAdmin = exports.PermOwner = exports.PermWrite = exports.PermRead = exports.PermNone = exports.FilterCount = exports.FilterCOI = exports.FilterOfficial = exports.FilterPublic = exports.FilterTrash = exports.FilterRecent = exports.FilterMyPublic = exports.FilterSharedWithMe = exports.FilterMyMaps = exports.EClockAnomaly = exports.EMaintenance = exports.ENoAccess = exports.ENoPerm = exports.ELoadFailed = exports.EBadRequest = exports.ENoUser = exports.EClockReset = exports.EClockFailure = exports.EClockSeen = exports.ENoSession = exports.ERetry = exports.EFull = exports.EFail = exports.ESuccess = void 0;
 // Errors
 exports.ESuccess = 0; // Generic success
 exports.EFail = 1; // Generic failure
@@ -3597,7 +4426,8 @@ exports.FilterRecent = 3;
 exports.FilterTrash = 4;
 exports.FilterPublic = 5;
 exports.FilterOfficial = 6;
-exports.FilterCount = 7;
+exports.FilterCOI = 7;
+exports.FilterCount = 8;
 // Permissions
 exports.PermNone = 0; // No permissions
 exports.PermRead = 1; // Can view
@@ -3765,13 +4595,32 @@ __exportStar(__webpack_require__(/*! ./shamos */ "./lib/poly/shamos.ts"), export
 /*!***************************!*\
   !*** ./lib/poly/blend.ts ***!
   \***************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.blend = void 0;
-const Util = __webpack_require__(/*! ../util/all */ "./lib/util/all.ts");
-const PP = __webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts");
+const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
+const PP = __importStar(__webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts"));
 // Takes array of polygon or multi-polygon coordinate structures and returns a single multi-polygon
 // structure. The coordinates may be passed in using packed format.
 function blend(polys) {
@@ -3800,12 +4649,31 @@ exports.blend = blend;
 /*!******************************!*\
   !*** ./lib/poly/boundbox.ts ***!
   \******************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.boundboxIntersects = exports.boundboxArea = exports.boundboxPoly = exports.boundbox = exports.boundboxExtend = exports.clipLon = exports.boundboxCY = exports.boundboxCX = exports.boundboxHeight = exports.boundboxWidth = void 0;
-const P = __webpack_require__(/*! ./poly */ "./lib/poly/poly.ts");
+const P = __importStar(__webpack_require__(/*! ./poly */ "./lib/poly/poly.ts"));
 function boundboxWidth(bb) { return Math.abs(bb.right - bb.left); }
 exports.boundboxWidth = boundboxWidth;
 function boundboxHeight(bb) { return Math.abs(bb.bottom - bb.top); }
@@ -3887,16 +4755,35 @@ exports.boundboxIntersects = boundboxIntersects;
 /*!*******************************!*\
   !*** ./lib/poly/cartesian.ts ***!
   \*******************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
 //
 // GEO-FEATURES UTILITIES
 //
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.polyDiameterFlat = exports.polyPerimeterFlat = exports.polyAreaFlat = exports.polyParts = void 0;
-const P = __webpack_require__(/*! ./poly */ "./lib/poly/poly.ts");
-const PP = __webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts");
+const P = __importStar(__webpack_require__(/*! ./poly */ "./lib/poly/poly.ts"));
+const PP = __importStar(__webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts"));
 // HELPER
 function bufferToRing(b, s, nPoints) {
     let r = [];
@@ -4001,7 +4888,7 @@ exports.polyDiameterFlat = polyDiameterFlat;
 /*!*********************************!*\
   !*** ./lib/poly/graham-scan.ts ***!
   \*********************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
 //
@@ -4012,10 +4899,29 @@ exports.polyDiameterFlat = polyDiameterFlat;
  * https://www.tutorialspoint.com/Graham-Scan-Algorithm <<< pseudo code
  * http://brian3kb.github.io/graham_scan_js/ <<< basis for this implementation
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.makeConvexHullGrahamScan = void 0;
 const poly_1 = __webpack_require__(/*! ./poly */ "./lib/poly/poly.ts");
-const PP = __webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts");
+const PP = __importStar(__webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts"));
 function makeConvexHullGrahamScan(poly, options) {
     let points = getExteriorPoints(poly);
     if (points == null)
@@ -4554,12 +5460,31 @@ function protect(condition, message) {
 /*!******************************!*\
   !*** ./lib/poly/minbound.ts ***!
   \******************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
 //
 // MINIMUM BOUNDING RECTANGLE - aka minimum area rectangle -or- smallest enclosing rectangle
 //
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.minimumBoundingRectangle = void 0;
 //
@@ -4594,7 +5519,7 @@ MBR <- function(p) {
 // THIS RE-IMPLEMENTS THE R IN TYPESCRIPT, USING CUSTOM MATRIX OPERATIONS
 //
 const poly_1 = __webpack_require__(/*! ./poly */ "./lib/poly/poly.ts");
-const M = __webpack_require__(/*! ./matrix */ "./lib/poly/matrix.ts");
+const M = __importStar(__webpack_require__(/*! ./matrix */ "./lib/poly/matrix.ts"));
 // For point addressing
 const X = 0, Y = 1;
 function minimumBoundingRectangle(poly) {
@@ -4749,13 +5674,32 @@ export function minimumBoundingRectangle(poly: any): any
 /*!**************************!*\
   !*** ./lib/poly/poly.ts ***!
   \**************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.polyRewindRings = exports.featureRewind = exports.polyTransform = exports.npoints = exports.polyDescribe = exports.polyCompactness = exports.makeConvexHullMonotoneChain2D = exports.polyConvexHull = exports.polyToExteriorPoints = exports.polyFromCircle = exports.polyToPolsbyPopperCircle = exports.polyToCircle = exports.Circle = exports.polyPerimeter = exports.polyDiameter = exports.polyArea = exports.polyNull = exports.polyNormalize = exports.polySimpleArea = exports.DefaultOptions = exports.EARTH_RADIUS = exports.DefaultTickOptions = void 0;
-const Util = __webpack_require__(/*! ../util/all */ "./lib/util/all.ts");
-const PP = __webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts");
+const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
+const PP = __importStar(__webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts"));
 const graham_scan_1 = __webpack_require__(/*! ./graham-scan */ "./lib/poly/graham-scan.ts");
 exports.DefaultTickOptions = { maxLeafCount: 256, maxDepth: 20, tickStep: 1 };
 // Internal utilities
@@ -5365,14 +6309,33 @@ function twoTimesArea(x2, x1, y2, y1) {
 /*!*****************************!*\
   !*** ./lib/poly/polybin.ts ***!
   \*****************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.topoFromBuffer = exports.topoToBuffer = exports.unpackCollection = exports.packCollection = void 0;
-const Util = __webpack_require__(/*! ../util/all */ "./lib/util/all.ts");
-const PP = __webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts");
-const T = __webpack_require__(/*! ./topo */ "./lib/poly/topo.ts");
+const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
+const PP = __importStar(__webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts"));
+const T = __importStar(__webpack_require__(/*! ./topo */ "./lib/poly/topo.ts"));
 // Packed Buffer format:
 //
 //  (strings are packed as UTF8 bytes, padded to 4 byte boundary)
@@ -5415,9 +6378,11 @@ function unpackString(coder, buf8, buf32, offset) {
 function packCollection(coder, col) {
     // Compute size
     let pp = PP.featurePack(col);
-    let buffer = col.features.length ? col.features[0].geometry.packed.buffer : null; // to restore, below
+    let f = col.features.find((f) => { return f.geometry.packed ? f.geometry.packed.buffer : null; });
+    let buffer = f ? f.geometry.packed.buffer : null;
     let size = 16; // int endiness, offset to coordinates, float endiness
-    col.features.forEach((f) => { delete f.geometry.packed.buffer; }); // reconstructed when unpacking
+    col.features.forEach((f) => { if (f.geometry.packed)
+        delete f.geometry.packed.buffer; }); // reconstructed when unpacking
     let j = JSON.stringify(col);
     size += sizeOfString(coder, j);
     size += pad(size, 8);
@@ -5443,7 +6408,8 @@ function packCollection(coder, col) {
     for (let i = 0; i < pp.length; i++)
         buf64[foff++] = buf[i];
     // Now restore
-    col.features.forEach((f) => { f.geometry.packed.buffer = buffer; });
+    col.features.forEach((f) => { if (f.geometry.packed)
+        f.geometry.packed.buffer = buffer; });
     PP.featureUnpack(col);
     return ab;
 }
@@ -5495,7 +6461,8 @@ function unpackCollection(coder, ab) {
     let offset = 16;
     let j = unpackString(coder, buf8, buf32, offset);
     col = JSON.parse(j);
-    col.features.forEach((f) => { f.geometry.packed.buffer = buf64; });
+    col.features.forEach((f) => { if (f.geometry.packed)
+        f.geometry.packed.buffer = buf64; });
     return col;
 }
 exports.unpackCollection = unpackCollection;
@@ -5570,14 +6537,36 @@ exports.topoFromBuffer = topoFromBuffer;
 /*!*******************************!*\
   !*** ./lib/poly/polylabel.ts ***!
   \*******************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.polyLabel = void 0;
-const tinyqueue_1 = __webpack_require__(/*! tinyqueue */ "tinyqueue");
-const P = __webpack_require__(/*! ./poly */ "./lib/poly/poly.ts");
-const PP = __webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts");
+const tinyqueue_1 = __importDefault(__webpack_require__(/*! tinyqueue */ "tinyqueue"));
+const P = __importStar(__webpack_require__(/*! ./poly */ "./lib/poly/poly.ts"));
+const PP = __importStar(__webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts"));
 //
 // polyLabel: given polygon, return contained point furthest from any edge, and that distance
 //
@@ -5743,13 +6732,32 @@ function getSegDistSq(px, py, ax, ay, bx, by) {
 /*!******************************!*\
   !*** ./lib/poly/polypack.ts ***!
   \******************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.featureUnpackString = exports.featurePackString = exports.featureRepack = exports.featureUnpackTemporarily = exports.featureUnpack = exports.featurePack = exports.featurePackSize = exports.polyUnpack = exports.polyPackCopy = exports.polyPack = exports.polyPackTopoArcs = exports.countArcPoints = exports.countOneArcPoints = exports.countArcRings = exports.countArcPolygons = exports.normalizeArcs = exports.polyPacked = exports.polyPackCountPoints = exports.polyPackEachPoint = exports.polyPackEachRing = exports.polyPackSize = void 0;
 // Shared libraries
-const Util = __webpack_require__(/*! ../util/all */ "./lib/util/all.ts");
+const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 function polyPackSize(coords) {
     // Null feature?
     if (coords == null || (coords.length !== undefined && coords.length == 0))
@@ -5949,7 +6957,9 @@ function polyPack(coords, prepack) {
         coords = coords.geometry.coordinates;
     // Transparently handle polygon or multi-polygon
     let depth = Util.depthof(coords);
-    if (depth == 3)
+    if (depth == 2)
+        coords = [[[coords]]];
+    else if (depth == 3)
         coords = [[coords]];
     else if (depth == 4)
         coords = [coords];
@@ -6036,14 +7046,16 @@ function polyUnpack(prepack) {
 }
 exports.polyUnpack = polyUnpack;
 function featurePackSize(f) {
-    if (f && f.geometry && f.geometry.coordinates)
+    if (f && f.geometry && f.geometry.coordinates && f.geometry.type !== 'Point')
         return polyPackSize(f.geometry.coordinates);
     return 0;
 }
 exports.featurePackSize = featurePackSize;
 function featurePack(f, prepack) {
     if (f && f.type === 'Feature') {
-        if (f.geometry && f.geometry.coordinates) {
+        if (f.geometry && f.geometry.type === 'Point')
+            return prepack ? { offset: prepack.offset, length: 0, buffer: prepack.buffer } : { offset: 0, length: 0, buffer: null };
+        else if (f.geometry && f.geometry.coordinates) {
             f.geometry.packed = polyPack(f.geometry.coordinates, prepack);
             delete f.geometry.coordinates;
         }
@@ -6076,9 +7088,16 @@ exports.featurePack = featurePack;
 function featureUnpack(f) {
     if (f && f.geometry && f.geometry.packed !== undefined) {
         f.geometry.coordinates = polyUnpack(f.geometry.packed);
+        let depth = Util.depthof(f.geometry.coordinates);
         // Check for oops, optimized away the multipolygon in polyUnpack
-        if (f.geometry.type === 'MultiPolygon' && Util.depthof(f.geometry.coordinates) === 4)
+        if (f.geometry.type === 'MultiPolygon' && depth === 4)
             f.geometry.coordinates = [f.geometry.coordinates];
+        else if (f.geometry.type === 'Point' && depth != 2) {
+            while (depth > 2) {
+                f.geometry.coordinates = f.geometry.coordinates[0];
+                depth = Util.depthof(f.geometry.coordinates);
+            }
+        }
         delete f.geometry.packed;
     }
     else if (f.type && f.type === 'FeatureCollection' && f.features) {
@@ -6153,13 +7172,32 @@ exports.featureUnpackString = featureUnpackString;
 /*!*******************************!*\
   !*** ./lib/poly/polyround.ts ***!
   \*******************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.polyRound = void 0;
-const Util = __webpack_require__(/*! ../util/all */ "./lib/util/all.ts");
-const PP = __webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts");
+const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
+const PP = __importStar(__webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts"));
 // Round feature geometry to 6 decimal precision
 function polyRound(o) {
     if (o) {
@@ -6192,12 +7230,31 @@ exports.polyRound = polyRound;
 /*!**********************************!*\
   !*** ./lib/poly/polysimplify.ts ***!
   \**********************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.polySimplify = void 0;
-const Util = __webpack_require__(/*! ../util/all */ "./lib/util/all.ts");
+const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 const simplify_1 = __webpack_require__(/*! ./simplify */ "./lib/poly/simplify.ts");
 function polySimplify(poly, tolerance = 0.0001) {
     if (poly == null)
@@ -6226,21 +7283,40 @@ exports.polySimplify = polySimplify;
 /*!**************************!*\
   !*** ./lib/poly/quad.ts ***!
   \**************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.FsmQuadTree = exports.DefaultQuadOptions = exports.unionPolys = void 0;
 // Public libraries
-const PC = __webpack_require__(/*! polygon-clipping */ "polygon-clipping");
+const PC = __importStar(__webpack_require__(/*! polygon-clipping */ "polygon-clipping"));
 // Shared libraries
-const Util = __webpack_require__(/*! ../util/all */ "./lib/util/all.ts");
-const FSM = __webpack_require__(/*! ../fsm/all */ "./lib/fsm/all.ts");
+const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
+const FSM = __importStar(__webpack_require__(/*! ../fsm/all */ "./lib/fsm/all.ts"));
 // Local libraries
-const Poly = __webpack_require__(/*! ./poly */ "./lib/poly/poly.ts");
-const PP = __webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts");
-const BB = __webpack_require__(/*! ./boundbox */ "./lib/poly/boundbox.ts");
-const PR = __webpack_require__(/*! ./polyround */ "./lib/poly/polyround.ts");
+const Poly = __importStar(__webpack_require__(/*! ./poly */ "./lib/poly/poly.ts"));
+const PP = __importStar(__webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts"));
+const BB = __importStar(__webpack_require__(/*! ./boundbox */ "./lib/poly/boundbox.ts"));
+const PR = __importStar(__webpack_require__(/*! ./polyround */ "./lib/poly/polyround.ts"));
 let _union = undefined;
 let anyPC = PC;
 if (anyPC.union)
@@ -6435,13 +7511,32 @@ exports.FsmQuadTree = FsmQuadTree;
 /*!***********************************!*\
   !*** ./lib/poly/selfintersect.ts ***!
   \***********************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.selfIntersect = void 0;
-const P = __webpack_require__(/*! ./poly */ "./lib/poly/poly.ts");
-const PP = __webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts");
+const P = __importStar(__webpack_require__(/*! ./poly */ "./lib/poly/poly.ts"));
+const PP = __importStar(__webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts"));
 // Given three colinear points p, q, r, the function checks if
 // point q lies on line segment 'pr'
 function onSegment(px, py, qx, qy, rx, ry) {
@@ -6523,13 +7618,35 @@ exports.selfIntersect = selfIntersect;
 /*!****************************!*\
   !*** ./lib/poly/shamos.ts ***!
   \****************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.selfIntersectFast = void 0;
-const P = __webpack_require__(/*! ./poly */ "./lib/poly/poly.ts");
-const PP = __webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts");
+const P = __importStar(__webpack_require__(/*! ./poly */ "./lib/poly/poly.ts"));
+const PP = __importStar(__webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts"));
 // Adapted from rowanwins/shamos-hoey 
 /*
 MIT License
@@ -6555,8 +7672,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 // External libraries
-const tinyqueue_1 = __webpack_require__(/*! tinyqueue */ "tinyqueue");
-const splaytree_1 = __webpack_require__(/*! splaytree */ "splaytree");
+const tinyqueue_1 = __importDefault(__webpack_require__(/*! tinyqueue */ "tinyqueue"));
+const splaytree_1 = __importDefault(__webpack_require__(/*! splaytree */ "splaytree"));
 class Event {
     constructor(x, y) {
         this.x = x;
@@ -6853,22 +7970,41 @@ exports.simplify = simplify;
 /*!**************************!*\
   !*** ./lib/poly/topo.ts ***!
   \**************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.topoUnpack = exports.topoPack = exports.topoPacked = exports.FsmTopoUnion = exports.topoMergeFeatures = exports.topoMerge = exports.topoSimplifyCollection = exports.topoToCollection = exports.topoToFeature = exports.topoContiguity = exports.topoFromCollection = void 0;
 // Forked version that supports packing
-const TopoClient = __webpack_require__(/*! @dra2020/topojson-client */ "@dra2020/topojson-client");
+const TopoClient = __importStar(__webpack_require__(/*! @dra2020/topojson-client */ "@dra2020/topojson-client"));
 // Forked version that fixes self-looping hole problem
-const TopoServer = __webpack_require__(/*! @dra2020/topojson-server */ "@dra2020/topojson-server");
+const TopoServer = __importStar(__webpack_require__(/*! @dra2020/topojson-server */ "@dra2020/topojson-server"));
 // Forked version that fixes performance problem
-const TopoSimplify = __webpack_require__(/*! @dra2020/topojson-simplify */ "@dra2020/topojson-simplify");
-const Util = __webpack_require__(/*! ../util/all */ "./lib/util/all.ts");
-const FSM = __webpack_require__(/*! ../fsm/all */ "./lib/fsm/all.ts");
-const P = __webpack_require__(/*! ./poly */ "./lib/poly/poly.ts");
-const PP = __webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts");
-const PL = __webpack_require__(/*! ./polylabel */ "./lib/poly/polylabel.ts");
+const TopoSimplify = __importStar(__webpack_require__(/*! @dra2020/topojson-simplify */ "@dra2020/topojson-simplify"));
+const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
+const FSM = __importStar(__webpack_require__(/*! ../fsm/all */ "./lib/fsm/all.ts"));
+const P = __importStar(__webpack_require__(/*! ./poly */ "./lib/poly/poly.ts"));
+const PP = __importStar(__webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts"));
+const PL = __importStar(__webpack_require__(/*! ./polylabel */ "./lib/poly/polylabel.ts"));
 const shamos_1 = __webpack_require__(/*! ./shamos */ "./lib/poly/shamos.ts");
 function getGEOID(f) {
     if (f.features && f.features.length)
@@ -6912,24 +8048,19 @@ function ringsCancel(outerPoly, innerRing) {
 function correctGeometry(f) {
     if (f && f.geometry && f.geometry.type === 'MultiPolygon' && f.geometry.coordinates) {
         let multiPoly = f.geometry.coordinates;
-        /* Comment this out right now - might have been do to not rewinding merge output
-        // topojson will under certain circumstances return a MultiPolygon with the first Polygon containing holes
-        // that are precisely filled by a subsequent polygon. We make a secondary union pass to try to correct for this.
-        // If we have a really degenerate multipolygon (test above some number of polygons) omit this expensive pass
-        // since cleanup is unlikely.
-        if (multiPoly.length > 1 && multiPoly.length < 50)
-        {
-          let result = Q.unionPolys(multiPoly);
-          if (Util.depthof(result) == 4) result = [ result ];
-          multiPoly = result;
-        }
-        */
         // Convert degenerate MultiPolygon to Polygon
         if (multiPoly.length == 1) {
             f.geometry.type = 'Polygon';
             f.geometry.coordinates = multiPoly[0];
         }
     }
+    if (f && f.geometry && f.geometry.type === 'Point' && f.geometry.coordinates) {
+        while (Array.isArray(f.geometry.coordinates[0]))
+            f.geometry.coordinates = f.geometry.coordinates[0];
+    }
+    else
+        // TopoJSON does not guarantee proper winding order which messes up later processing. Fix it.
+        P.featureRewind(f);
     return f;
 }
 function topoContiguity(topo) {
@@ -7023,6 +8154,9 @@ function bigTimeString(ms) {
     return `${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
 }
 const DefaultSimplifyOptions = { minArea: 500 };
+function log(s) {
+    //console.log(s);
+}
 //
 // topoSimplifyCollection:
 //    This implements our simplification strategy for block/precinct level shapes. The basic idea is to
@@ -7045,10 +8179,10 @@ function topoSimplifyCollection(col, options) {
     let elapsedTotal = new Util.Elapsed();
     let elapsed = new Util.Elapsed();
     let topo = topoFromCollection(col);
-    console.log(`topoSimplifyCollection: fromCollection: ${Math.round(elapsed.ms())}ms`);
+    log(`topoSimplifyCollection: fromCollection: ${Math.round(elapsed.ms())}ms`);
     elapsed.start();
     topo = TopoSimplify.presimplify(topo, TopoSimplify['sphericalTriangleArea']);
-    console.log(`topoSimplifyCollection: presimplify: ${Math.round(elapsed.ms())}ms`);
+    log(`topoSimplifyCollection: presimplify: ${Math.round(elapsed.ms())}ms`);
     elapsed.start();
     // Keep iterating on removing simplification from degenerate shapes
     let nTries = 1;
@@ -7065,6 +8199,9 @@ function topoSimplifyCollection(col, options) {
         col.features.forEach((f) => {
             let oOld = topo.objects[f.properties.id];
             let oNew = testtopo.objects[f.properties.id];
+            // Ignore points
+            if (f.geometry && f.geometry.type === 'Point')
+                keepTiny.set(f, f);
             if (!keepTiny.has(f)) {
                 // Walk through each polygon of a multipolygon separately since I may have a large non-degenerate
                 // shape combined with degenerate smaller shapes that I want to identify. I do not examine holes
@@ -7104,11 +8241,11 @@ function topoSimplifyCollection(col, options) {
                 }
             }
         });
-        console.log(`topoSimplifyCollection: pass ${nTries}: ${nBad} (${nTiny} tiny) of ${col.features.length} features are degenerate`);
+        log(`topoSimplifyCollection: pass ${nTries}: ${nBad} (${nTiny} tiny) of ${col.features.length} features are degenerate`);
         // If not making progress, keep more points
         if (nBad >= nBadLast) {
             keepweight /= 10;
-            console.log(`topoSimplifyCollection: pass ${nTries}: reducing weight limit to ${keepweight}`);
+            log(`topoSimplifyCollection: pass ${nTries}: reducing weight limit to ${keepweight}`);
         }
         nBadLast = nBad;
         if (nBad && nTries > MAX_TRIES)
@@ -7120,7 +8257,7 @@ function topoSimplifyCollection(col, options) {
         }
         nTries++;
     }
-    console.log(`topoSimplifyCollection: total elapsed time: ${bigTimeString(elapsedTotal.ms())}`);
+    log(`topoSimplifyCollection: total elapsed time: ${bigTimeString(elapsedTotal.ms())}`);
     return col;
 }
 exports.topoSimplifyCollection = topoSimplifyCollection;
@@ -7129,27 +8266,7 @@ function topoMerge(topo, geoids) {
         return null;
     let objects = [];
     geoids.forEach((geoid) => objects.push(topo.objects[geoid]));
-    let f = correctGeometry({ type: 'Feature', properties: {}, geometry: TopoClient.merge(topo, objects) });
-    P.featureRewind(f);
-    /* Comment out for now - may be due to merge output needing to be rewound
-    // If I get a bad output from topoMerge, just do more expensive poly union. This can happen if input polygons
-    // are a little funky (in particular, if they double back along the same edge.
-    if (selfIntersectFast(f))
-    {
-      //console.log('topoMerge: patching selfIntersect');
-      let polys: any[] = [];
-      geoids.forEach((geoid) => polys.push(topoToFeature(topo, geoid).geometry.coordinates));
-      let result = Q.unionPolys(polys);
-      let depth = Util.depthof(result);
-      if (depth === 5 && result.length === 1)
-      {
-        depth = 4;
-        result = result[0];
-      }
-      f = { type: 'feature', properties: {}, geometry: { type: depth == 4 ? 'Polygon' : 'MultiPolygon', coordinates: result } };
-    }
-    */
-    return f;
+    return correctGeometry({ type: 'Feature', properties: {}, geometry: TopoClient.merge(topo, objects) });
 }
 exports.topoMerge = topoMerge;
 function topoMergeFeatures(topo, features) {
@@ -7187,7 +8304,7 @@ class FsmIncrementalUnion extends FSM.Fsm {
             let values = Object.values(map);
             this.work = { nUnion: values.length, nDifference: 0, ms: 0 };
             let elapsed = new Util.Elapsed();
-            this.result = topoMergeFeatures(this.key.topo, values);
+            this.result = topoMergeFeatures(this.key.multi.allTopo(), values);
             this.work.ms = elapsed.ms();
             this.map = map;
         }
@@ -7290,18 +8407,37 @@ exports.topoUnpack = topoUnpack;
 /*!***************************!*\
   !*** ./lib/poly/union.ts ***!
   \***************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.FsmUnion = exports.polyIntersects = void 0;
-const PC = __webpack_require__(/*! polygon-clipping */ "polygon-clipping");
-const Util = __webpack_require__(/*! ../util/all */ "./lib/util/all.ts");
-const FSM = __webpack_require__(/*! ../fsm/all */ "./lib/fsm/all.ts");
-const Poly = __webpack_require__(/*! ./poly */ "./lib/poly/poly.ts");
-const Q = __webpack_require__(/*! ./quad */ "./lib/poly/quad.ts");
-const PP = __webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts");
-const PR = __webpack_require__(/*! ./polyround */ "./lib/poly/polyround.ts");
+exports.FsmUnion = exports.polyDifference = exports.polyIntersects = void 0;
+const PC = __importStar(__webpack_require__(/*! polygon-clipping */ "polygon-clipping"));
+const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
+const FSM = __importStar(__webpack_require__(/*! ../fsm/all */ "./lib/fsm/all.ts"));
+const Poly = __importStar(__webpack_require__(/*! ./poly */ "./lib/poly/poly.ts"));
+const Q = __importStar(__webpack_require__(/*! ./quad */ "./lib/poly/quad.ts"));
+const PP = __importStar(__webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts"));
+const PR = __importStar(__webpack_require__(/*! ./polyround */ "./lib/poly/polyround.ts"));
 // Confusion on how polygon-clipping exposes its interface - be flexible
 let _union = undefined;
 let _difference = undefined;
@@ -7353,6 +8489,20 @@ function polyIntersects(p1, p2) {
     return bIntersects;
 }
 exports.polyIntersects = polyIntersects;
+function polyDifference(main, parts) {
+    main = PP.polyUnpack(coords(main));
+    // need to explode multipolygon so that "exploded" is a valid multipolygon input to underlying difference routine
+    let exploded = [];
+    parts.forEach((p) => {
+        p = PP.polyUnpack(coords(p));
+        if (Util.depthof(p) == 5)
+            p.forEach((poly) => { exploded.push(poly); });
+        else
+            exploded.push(p);
+    });
+    return PR.polyRound(_difference(main, exploded));
+}
+exports.polyDifference = polyDifference;
 class FsmDifference extends FSM.Fsm {
     constructor(env, accum, polys) {
         super(env);
@@ -8984,7 +10134,7 @@ module.exports = require("tinyqueue");;
 /******/ 	// module exports must be returned from runtime so entry inlining is disabled
 /******/ 	// startup
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__("./lib/all/allclient.ts");
+/******/ 	return __webpack_require__("./lib/all/all.ts");
 /******/ })()
 ;
 });