@dra2020/baseclient 1.0.39 → 1.0.42

package/dist/baseclient.js

@@ -5973,7 +5973,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.polyRewindRings = exports.featureRewind = exports.polyTransform = exports.npoints = exports.polyDescribe = exports.polyCompactness = exports.makeConvexHullMonotoneChain2D = exports.polyConvexHull = exports.polyToExteriorPoints = exports.polyFromCircle = exports.polyToPolsbyPopperCircle = exports.polyToCircle = exports.Circle = exports.polyPerimeter = exports.polyDiameter = exports.polyArea = exports.polyNull = exports.polyNormalize = exports.polySimpleArea = exports.DefaultOptions = exports.EARTH_RADIUS = exports.DefaultTickOptions = void 0;
+exports.polyBadCoordinates = exports.polyRewindRings = exports.featureRewind = exports.polyTransform = exports.npoints = exports.polyDescribe = exports.polyCompactness = exports.makeConvexHullMonotoneChain2D = exports.polyConvexHull = exports.polyToExteriorPoints = exports.polyFromCircle = exports.polyToPolsbyPopperCircle = exports.polyToCircle = exports.Circle = exports.polyPerimeter = exports.polyDiameter = exports.polyArea = exports.polyNull = exports.polyNormalize = exports.polySimpleArea = exports.DefaultOptions = exports.EARTH_RADIUS = exports.DefaultTickOptions = void 0;
 const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 const PP = __importStar(__webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts"));
 const graham_scan_1 = __webpack_require__(/*! ./graham-scan */ "./lib/poly/graham-scan.ts");
@@ -6578,6 +6578,28 @@ exports.polyRewindRings = polyRewindRings;
 function twoTimesArea(x2, x1, y2, y1) {
     return (x2 - x1) * (y2 + y1);
 }
+function badCoord(c) {
+    return isNaN(c) || c > 360 || c < -360;
+}
+function polyBadCoordinates(f) {
+    if (f.type === 'FeatureCollection' && f.features) {
+        for (let i = 0; i < f.features.length; i++)
+            if (polyBadCoordinates(f.features[i]))
+                return true;
+        return false;
+    }
+    let pp = polyNormalize(f);
+    let bad = false;
+    if (pp) {
+        PP.polyPackEachPoint(pp, (b, iPoly, iRing, iOffset) => {
+            if (bad)
+                return;
+            bad = badCoord(b[iOffset]) || badCoord(b[iOffset + 1]);
+        });
+    }
+    return bad;
+}
+exports.polyBadCoordinates = polyBadCoordinates;
 
 
 /***/ }),
@@ -8287,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];
@@ -8442,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 of ['INTPTLON20', 'INTPTLON10', 'INTPTLON', 'labelx'])
+        if (f.properties[p] && !isNaN(Number(f.properties[p]))) {
+            x = Number(f.properties[p]);
+            break;
+        }
+    for (let p of ['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);
@@ -8523,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++;
                     }