@dra2020/baseclient 1.0.26 → 1.0.29

package/dist/baseclient.js

@@ -1429,6 +1429,7 @@ class GeoMultiCollection {
             this.add(tag, topo, col, map);
     }
     empty() {
+        this.all = { tag: 'all' };
         this.entries = {};
         this.hidden = {};
         this._onChange();
@@ -1469,7 +1470,8 @@ class GeoMultiCollection {
         }
     }
     _onChange() {
-        this.all = { tag: 'all' };
+        if (this.all.topo || this.all.col || this.all.map)
+            this.all = { tag: 'all' };
         this.stamp++;
     }
     _col(e) {
@@ -1560,28 +1562,34 @@ class GeoMultiCollection {
     }
     hide(id) {
         if (id) {
-            if (typeof id === 'string')
-                this.hidden[id] = true;
+            if (typeof id === 'string') {
+                if (!this.hidden[id]) {
+                    this.hidden[id] = true;
+                    this._onChange();
+                }
+            }
             else if (Array.isArray(id))
-                id.forEach((i) => { this.hidden[i] = true; });
+                id.forEach((i) => this.hide(i));
             else if (typeof id === 'object')
                 for (let p in id)
                     if (id.hasOwnProperty(p))
-                        this.hidden[p] = true;
-            this._onChange();
+                        this.hide(p);
         }
     }
     show(id) {
         if (id) {
-            if (typeof id === 'string')
-                delete this.hidden[id];
+            if (typeof id === 'string') {
+                if (this.hidden[id]) {
+                    delete this.hidden[id];
+                    this._onChange();
+                }
+            }
             else if (Array.isArray(id))
-                id.forEach((i) => { delete this.hidden[i]; });
+                id.forEach((i) => this.show(i));
             else if (typeof id === 'object')
                 for (let p in id)
                     if (id.hasOwnProperty(p))
-                        delete this.hidden[p];
-            this._onChange();
+                        this.show(p);
         }
     }
     showAll() {
@@ -4655,6 +4663,7 @@ __exportStar(__webpack_require__(/*! ./topo */ "./lib/poly/topo.ts"), exports);
 __exportStar(__webpack_require__(/*! ./selfintersect */ "./lib/poly/selfintersect.ts"), exports);
 __exportStar(__webpack_require__(/*! ./shamos */ "./lib/poly/shamos.ts"), exports);
 __exportStar(__webpack_require__(/*! ./pointinpoly */ "./lib/poly/pointinpoly.ts"), exports);
+__exportStar(__webpack_require__(/*! ./mapto */ "./lib/poly/mapto.ts"), exports);
 
 
 /***/ }),
@@ -4740,7 +4749,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.boundboxContains = exports.boundboxIntersects = exports.boundboxArea = exports.boundboxPoly = exports.boundbox = exports.boundboxExtend = exports.clipLon = exports.boundboxCY = exports.boundboxCX = exports.boundboxHeight = exports.boundboxWidth = void 0;
+exports.boundboxContains = exports.boundboxIntersects = exports.boundboxArea = exports.boundboxEmpty = exports.boundboxPoly = exports.boundbox = exports.boundboxExtend = exports.clipLon = exports.boundboxCY = exports.boundboxCX = exports.boundboxHeight = exports.boundboxWidth = void 0;
 const P = __importStar(__webpack_require__(/*! ./poly */ "./lib/poly/poly.ts"));
 function boundboxWidth(bb) { return Math.abs(bb.right - bb.left); }
 exports.boundboxWidth = boundboxWidth;
@@ -4797,7 +4806,7 @@ function boundbox(poly, bbox) {
                 boundbox(poly[i], bbox);
         }
         // single point
-        else
+        else if (Array.isArray(poly) && poly.length >= 2)
             boundboxExtend(bbox, poly[0], poly[1]);
     }
     return bbox;
@@ -4807,6 +4816,10 @@ function boundboxPoly(bb) {
     return [[[bb.left, bb.top], [bb.left, bb.bottom], [bb.right, bb.bottom], [bb.right, bb.top], [bb.left, bb.top]]];
 }
 exports.boundboxPoly = boundboxPoly;
+function boundboxEmpty(bb) {
+    return !bb || bb.left === undefined || P.polyArea(boundboxPoly(bb)) == 0;
+}
+exports.boundboxEmpty = boundboxEmpty;
 function boundboxArea(poly) {
     return P.polyArea(boundboxPoly(boundbox(poly)));
 }
@@ -5329,6 +5342,88 @@ if (typeof module !== 'undefined') {
 */
 
 
+/***/ }),
+
+/***/ "./lib/poly/mapto.ts":
+/*!***************************!*\
+  !*** ./lib/poly/mapto.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.polyMapTo = void 0;
+const PL = __importStar(__webpack_require__(/*! ./polylabel */ "./lib/poly/polylabel.ts"));
+const BB = __importStar(__webpack_require__(/*! ./boundbox */ "./lib/poly/boundbox.ts"));
+const pointinpoly_1 = __webpack_require__(/*! ./pointinpoly */ "./lib/poly/pointinpoly.ts");
+function setLabels(c) {
+    c.features.forEach(f => {
+        if (f.properties.labelx === undefined) {
+            let { x, y } = PL.polyLabel(f);
+            f.properties.labelx = x;
+            f.properties.labely = y;
+        }
+    });
+}
+// polyMapTo:
+//
+//  Given a set of underlying blocks (or precincts), map them to the district (or any other feature)
+//  they are contained in.
+//
+//  If a block maps to multiple districts or no district, it is left out of the result.
+//
+//  Note that the algorithm is to see where the centroid of the block overlaps. So a block
+//  could potentially overlap multiple districts and this would return only the one containing
+//  the centroid.
+//
+//  The thinking is that if you want fine granularity, use real blocks as the base collection.
+//  If you provide precincts, you will get a result on precinct granularity.
+//
+//  The return value is an object that maps the block feature ids to the district feature id.
+//
+function polyMapTo(districts, blocks) {
+    let map = {};
+    // Cache labelx, labely if necessary
+    setLabels(blocks);
+    // Cache district boundboxes for quick containment exclusion
+    let bbDistricts = districts.features.map(f => BB.boundbox(f));
+    // Walk over blocks, mapping centroid to district
+    blocks.features.forEach(fBlock => {
+        let x = fBlock.properties.labelx;
+        let y = fBlock.properties.labely;
+        let fIn = [];
+        districts.features.forEach((fDistrict, i) => {
+            if (BB.boundboxContains(bbDistricts[i], x, y))
+                if (pointinpoly_1.polyContainsPoint(fDistrict, x, y))
+                    fIn.push(fDistrict);
+        });
+        if (fIn.length == 1)
+            map[fBlock.properties.id] = fIn[0].properties.id;
+    });
+    return map;
+}
+exports.polyMapTo = polyMapTo;
+
+
 /***/ }),
 
 /***/ "./lib/poly/matrix.ts":
@@ -5782,7 +5877,7 @@ function polyContainsPoint(poly, x, y) {
             return;
         let inside = false;
         let iEnd = iOffset + (nPoints - 1) * 2;
-        for (let i = iOffset, j = iEnd; i < iEnd; j = i, i += 2) {
+        for (let i = iOffset, j = iEnd; i <= iEnd; j = i, i += 2) {
             let xi = b[i], yi = b[i + 1];
             let xj = b[j], yj = b[j + 1];
             let intersect = ((yi > y) !== (yj > y))