@dra2020/baseclient 1.0.44 → 1.0.47

package/dist/baseclient.js

@@ -6862,11 +6862,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.polyLabel = void 0;
+exports.polyLabel = exports.polyDistance = void 0;
 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"));
 //
+// polyDistance: return (smallest) distance to polygon edge.
+//    Positive value indicates point is in poly, negative indicates point is outside.
+//
+function polyDistance(poly, x, y) {
+    let pp = P.polyNormalize(poly);
+    if (pp == null)
+        return 0;
+    let forEachPointPair = (iter) => {
+        PP.polyPackEachRing(pp, (b, iPoly, iRing, iOffset, nPoints) => {
+            let iFirst = iOffset;
+            let iLast = iOffset + nPoints * 2;
+            let iSecond = iLast - 2;
+            for (; iFirst < iLast; iSecond = iFirst, iFirst += 2)
+                iter(iPoly, iRing, b[iFirst], b[iFirst + 1], b[iSecond], b[iSecond + 1]);
+        });
+    };
+    return pointToPolygonDist(x, y, forEachPointPair);
+}
+exports.polyDistance = polyDistance;
+//
 // polyLabel: given polygon, return contained point furthest from any edge, and that distance
 //
 function polyLabel(poly, precision, debug) {
@@ -6902,7 +6922,7 @@ function polyLabel(poly, precision, debug) {
             let iLast = iOffset + nPoints * 2;
             let iSecond = iLast - 2;
             for (; iFirst < iLast; iSecond = iFirst, iFirst += 2)
-                iter(b[iFirst], b[iFirst + 1], b[iSecond], b[iSecond + 1]);
+                iter(iPoly, iRing, b[iFirst], b[iFirst + 1], b[iSecond], b[iSecond + 1]);
         });
     };
     // find the bounding box of the outer ring
@@ -6976,13 +6996,34 @@ class Cell {
 }
 // signed distance from point to polygon outline (negative if point is outside)
 function pointToPolygonDist(x, y, forEachPointPair) {
+    let iPolyLast = -1;
+    let iRingLast = -1;
     let inside = false;
+    let thisInside = false;
+    let useInside = false;
+    let isHole = false;
     let minDistSq = Infinity;
-    forEachPointPair((ax, ay, bx, by) => {
+    forEachPointPair((iPoly, iRing, ax, ay, bx, by) => {
+        if (iPoly != iPolyLast || iRing != iRingLast) {
+            if (useInside)
+                inside = isHole ? !thisInside : thisInside;
+            iPolyLast = iPoly;
+            iRingLast = iRing;
+            thisInside = false;
+            useInside = false;
+            isHole = false;
+        }
         if ((ay > y !== by > y) && (x < (bx - ax) * (y - ay) / (by - ay) + ax))
-            inside = !inside;
-        minDistSq = Math.min(minDistSq, getSegDistSq(x, y, ax, ay, bx, by));
+            thisInside = !thisInside;
+        let thisDistSq = getSegDistSq(x, y, ax, ay, bx, by);
+        if (thisDistSq < minDistSq) {
+            minDistSq = thisDistSq;
+            useInside = true;
+            isHole = iRing != 0;
+        }
     });
+    if (useInside)
+        inside = isHole ? !thisInside : thisInside;
     return (inside ? 1 : -1) * Math.sqrt(minDistSq);
 }
 // get polygon centroid
@@ -6992,7 +7033,7 @@ function getCentroidCell(forEachPointPair) {
     let y = 0;
     let fx;
     let fy;
-    forEachPointPair((ax, ay, bx, by) => {
+    forEachPointPair((iPoly, iRing, ax, ay, bx, by) => {
         if (fx === undefined)
             fx = ax, fy = ay;
         let f = ax * by - bx * ay;
@@ -8458,7 +8499,7 @@ function misMatchObject(o1, o2) {
         return true;
     return (o1.type === 'MultiPolygon') ? misMatchMulti(o1.arcs, o2.arcs) : misMatchPoly(o1.arcs, o2.arcs);
 }
-const MAX_TRIES = 25;
+const MAX_TRIES = 30;
 function bigTimeString(ms) {
     let seconds = Math.trunc(ms / 1000);
     let minutes = Math.trunc(seconds / 60);
@@ -8481,7 +8522,7 @@ function intpt(f) {
 }
 const DefaultSimplifyOptions = { minArea: 500 };
 function log(s) {
-    //console.log(s);
+    console.log(s);
 }
 //
 // topoSimplifyCollection:
@@ -8567,8 +8608,9 @@ function topoSimplifyCollection(col, options) {
                     else {
                         let { x, y } = intpt(f);
                         if (x && y && !pointinpoly_1.polyContainsPoint(pp, x, y)) {
-                            keepArcs(topo, oOld.arcs, keepweight);
-                            nBad++;
+                            keepTiny.set(f, f);
+                            keepArcs(topo, oOld.arcs, 0); // keeps all points to avoid reprocessing these tiny shapes
+                            nBad++, nTiny++;
                             log(`topoSimplifyCollection: ${f.properties.id}: increasing feature fidelity because of intpt problem`);
                         }
                     }