@dra2020/baseclient 1.0.25 → 1.0.28

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() {
@@ -4740,7 +4748,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 +4805,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 +4815,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)));
 }
@@ -4816,7 +4828,7 @@ function boundboxIntersects(bb1, bb2) {
 }
 exports.boundboxIntersects = boundboxIntersects;
 function boundboxContains(bb, x, y) {
-    return !(bb.left >= x || bb.right < x || bb.top >= y || bb.bottom < y);
+    return !(bb.left >= x || bb.right < x || bb.top <= y || bb.bottom > y);
 }
 exports.boundboxContains = boundboxContains;
 
@@ -5782,7 +5794,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))