@dra2020/baseclient 1.0.22 → 1.0.25

package/dist/baseclient.js

@@ -4740,7 +4740,7 @@ var __importStar = (this && this.__importStar) || function (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;
+exports.boundboxContains = exports.boundboxIntersects = exports.boundboxArea = 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;
@@ -4815,6 +4815,10 @@ function boundboxIntersects(bb1, bb2) {
     return !(bb1.left > bb2.right || bb1.right < bb2.left || bb1.top < bb2.bottom || bb1.bottom > bb2.top);
 }
 exports.boundboxIntersects = boundboxIntersects;
+function boundboxContains(bb, x, y) {
+    return !(bb.left >= x || bb.right < x || bb.top >= y || bb.bottom < y);
+}
+exports.boundboxContains = boundboxContains;
 
 
 /***/ }),
@@ -7445,6 +7449,7 @@ 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"));
+const pointinpoly_1 = __webpack_require__(/*! ./pointinpoly */ "./lib/poly/pointinpoly.ts");
 let _union = undefined;
 let anyPC = PC;
 if (anyPC.union)
@@ -7455,19 +7460,6 @@ if (_union === undefined)
     throw 'Unable to load union function from polygon-clipping';
 ;
 function featureCoords(feature) {
-    /*
-      if (feature.geometry !== undefined)
-      {
-        if (feature.geometry.packed !== undefined)
-          return PP.polyUnpack(feature.geometry.packed);
-        else
-          return feature.geometry.coordinates;
-      }
-      else if (feature.offset !== undefined)
-        return PP.polyUnpack(feature);
-      else
-        return feature;
-    */
     if (feature.geometry !== undefined) {
         if (feature.geometry.packed !== undefined)
             return feature.geometry.packed;
@@ -7504,7 +7496,7 @@ class QuadLevel {
         if (features.length <= options.maxLeafCount || this.level >= options.maxDepth) {
             if (this.level >= options.maxDepth)
                 throw `QuadTree: maximum depth of ${options.maxDepth} exceeded`;
-            this.features = features.map((wp) => wp.p);
+            this.features = features;
             this.children = null;
         }
         else {
@@ -7541,10 +7533,26 @@ class QuadLevel {
     featureInBox(box, f) {
         return BB.boundboxIntersects(box, f.box);
     }
+    featureUnderCoord(coord) {
+        if (!BB.boundboxContains(this.box, coord[0], coord[1]))
+            return null;
+        if (this.features) {
+            let wp = this.features.find(wp => pointinpoly_1.polyContainsPoint(wp.p, coord[0], coord[1]));
+            return wp ? wp.f : null;
+        }
+        else {
+            for (let i = 0; i < this.children.length; i++) {
+                let f = this.children[i].featureUnderCoord(coord);
+                if (f)
+                    return f;
+            }
+            return null;
+        }
+    }
     union() {
         if (this.asyncUnion == null) {
             if (this.children == null)
-                this.asyncUnion = unionPolys(this.features);
+                this.asyncUnion = unionPolys(this.features.map(f => f.p));
             else
                 this.asyncUnion = unionPolys(this.children.map((q) => q.union()));
         }
@@ -7589,7 +7597,7 @@ class FsmQuadTree extends FSM.Fsm {
             this.work.nUnion = features.length;
             this.isempty = features.length == 0;
             // Compute BoundBox for each feature
-            let wrapped = features.map((f) => { return { box: BB.boundbox(f), p: featureCoords(f) }; });
+            let wrapped = features.map((f) => { return { f: f, box: BB.boundbox(f), p: featureCoords(f) }; });
             let box = BB.boundbox(col);
             this.quad = new QuadLevel(this.options, 0, box, wrapped);
         }