@dra2020/baseclient 1.0.40 → 1.0.41

package/dist/baseclient.js

@@ -8309,6 +8309,7 @@ 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];
@@ -8464,6 +8465,20 @@ function bigTimeString(ms) {
     seconds -= minutes * 60;
     return `${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
 }
+function intpt(f) {
+    let x = 0, y = 0;
+    for (let p in ['INTPTLON20', 'INTPTLON10', 'INTPTLON', 'labelx'])
+        if (f.properties[p] && !isNaN(Number(f.properties[p]))) {
+            x = Number(f.properties[p]);
+            break;
+        }
+    for (let p in ['INTPTLAT20', 'INTPTLAT10', 'INTPTLAT', 'labely'])
+        if (f.properties[p] && !isNaN(Number(f.properties[p]))) {
+            y = Number(f.properties[p]);
+            break;
+        }
+    return { x: x, y: y };
+}
 const DefaultSimplifyOptions = { minArea: 500 };
 function log(s) {
     //console.log(s);
@@ -8545,7 +8560,8 @@ function topoSimplifyCollection(col, options) {
                 }
                 if (!bDecided) {
                     let pp = PP.polyPackTopoArcs(testtopo, arcs);
-                    if (shamos_1.selfIntersectFast(pp)) {
+                    let { x, y } = intpt(f);
+                    if (shamos_1.selfIntersectFast(pp) || (x && y && !pointinpoly_1.polyContainsPoint(pp, x, y))) {
                         keepArcs(topo, oOld.arcs, keepweight);
                         nBad++;
                     }