@dra2020/baseclient 1.0.45 → 1.0.48

package/dist/baseclient.js

@@ -8350,7 +8350,6 @@ 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");
-const pointinpoly_1 = __webpack_require__(/*! ./pointinpoly */ "./lib/poly/pointinpoly.ts");
 function getGEOID(f) {
     if (f.features && f.features.length)
         f = f.features[0];
@@ -8499,7 +8498,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);
@@ -8522,7 +8521,7 @@ function intpt(f) {
 }
 const DefaultSimplifyOptions = { minArea: 500 };
 function log(s) {
-    //console.log(s);
+    console.log(s);
 }
 //
 // topoSimplifyCollection:
@@ -8601,16 +8600,20 @@ function topoSimplifyCollection(col, options) {
                 }
                 if (!bDecided) {
                     let pp = PP.polyPackTopoArcs(testtopo, arcs);
+                    P.polyRewindRings(pp);
                     if (shamos_1.selfIntersectFast(pp)) {
                         keepArcs(topo, oOld.arcs, keepweight);
                         nBad++;
                     }
                     else {
                         let { x, y } = intpt(f);
-                        if (x && y && !pointinpoly_1.polyContainsPoint(pp, x, y)) {
-                            keepArcs(topo, oOld.arcs, keepweight);
-                            nBad++;
-                            log(`topoSimplifyCollection: ${f.properties.id}: increasing feature fidelity because of intpt problem`);
+                        let d = PL.polyDistance(pp, x, y);
+                        if (d < 0.00001) // d is negative if outside the polygon, so that qualifies here
+                         {
+                            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 intpt dist is ${d}`);
                         }
                     }
                 }