@dra2020/baseclient 1.0.16 → 1.0.19

package/dist/baseclient.js

@@ -1278,9 +1278,23 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.geoIntersect = exports.geoIntersectOptions = exports.GeoMultiCollection = exports.geoMapEqual = exports.geoEqual = exports.geoTopoToCollection = exports.geoCollectionToTopo = exports.geoMapToCollection = exports.geoCollectionToMap = void 0;
+exports.geoIntersect = exports.geoIntersectOptions = exports.GeoMultiCollection = exports.geoMapEqual = exports.geoEqual = exports.geoTopoToCollection = exports.geoCollectionToTopo = exports.geoMapToCollection = exports.geoCollectionToMap = exports.geoEnsureID = void 0;
 const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 const Poly = __importStar(__webpack_require__(/*! ../poly/all */ "./lib/poly/all.ts"));
+function geoEnsureID(col) {
+    let prop;
+    const props = ['id', 'GEOID', 'GEOID10', 'GEOID20', 'GEOID30'];
+    if (col && col.features && col.features.length > 0) {
+        let f = col.features[0];
+        if (f.properties.id !== undefined)
+            return;
+        props.forEach(p => { if (prop === undefined && f.properties[p] !== undefined)
+            prop = p; });
+        if (prop)
+            col.features.forEach(f => { f.properties.id = f.properties[prop]; });
+    }
+}
+exports.geoEnsureID = geoEnsureID;
 function geoCollectionToMap(col) {
     if (col == null)
         return null;
@@ -4573,6 +4587,7 @@ __exportStar(__webpack_require__(/*! ./polyround */ "./lib/poly/polyround.ts"),
 __exportStar(__webpack_require__(/*! ./topo */ "./lib/poly/topo.ts"), exports);
 __exportStar(__webpack_require__(/*! ./selfintersect */ "./lib/poly/selfintersect.ts"), exports);
 __exportStar(__webpack_require__(/*! ./shamos */ "./lib/poly/shamos.ts"), exports);
+__exportStar(__webpack_require__(/*! ./pointinpoly */ "./lib/poly/pointinpoly.ts"), exports);
 
 
 /***/ }),
@@ -5654,6 +5669,66 @@ export function minimumBoundingRectangle(poly: any): any
 */
 
 
+/***/ }),
+
+/***/ "./lib/poly/pointinpoly.ts":
+/*!*********************************!*\
+  !*** ./lib/poly/pointinpoly.ts ***!
+  \*********************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.polyContainsPoint = void 0;
+const PP = __importStar(__webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts"));
+function polyContainsPoint(poly, x, y) {
+    let pp = PP.polyPack(poly);
+    if (pp == null)
+        return false;
+    let bFound = false;
+    let bInside = false;
+    PP.polyPackEachRing(pp, (b, iPoly, iRing, iOffset, nPoints) => {
+        if (bFound)
+            return;
+        let inside = false;
+        let iEnd = iOffset + (nPoints - 1) * 2;
+        for (let i = iOffset, j = iEnd; i < iEnd; j = i, i += 2) {
+            let xi = b[i], yi = b[i + 1];
+            let xj = b[j], yj = b[j + 1];
+            let intersect = ((yi > y) !== (yj > y))
+                && (x < (xj - xi) * (y - yi) / (yj - yi) + xi);
+            if (intersect)
+                inside = !inside;
+        }
+        if (inside) {
+            bFound = iRing > 0; // if inside a hole, don't need to process further
+            bInside = iRing == 0; // not inside if inside a hole
+        }
+    });
+    return bInside;
+}
+exports.polyContainsPoint = polyContainsPoint;
+
+
 /***/ }),
 
 /***/ "./lib/poly/poly.ts":
@@ -6364,9 +6439,11 @@ function unpackString(coder, buf8, buf32, offset) {
 function packCollection(coder, col) {
     // Compute size
     let pp = PP.featurePack(col);
-    let buffer = col.features.length ? col.features[0].geometry.packed.buffer : null; // to restore, below
+    let f = col.features.find((f) => { return f.geometry.packed ? f.geometry.packed.buffer : null; });
+    let buffer = f ? f.geometry.packed.buffer : null;
     let size = 16; // int endiness, offset to coordinates, float endiness
-    col.features.forEach((f) => { delete f.geometry.packed.buffer; }); // reconstructed when unpacking
+    col.features.forEach((f) => { if (f.geometry.packed)
+        delete f.geometry.packed.buffer; }); // reconstructed when unpacking
     let j = JSON.stringify(col);
     size += sizeOfString(coder, j);
     size += pad(size, 8);
@@ -6392,7 +6469,8 @@ function packCollection(coder, col) {
     for (let i = 0; i < pp.length; i++)
         buf64[foff++] = buf[i];
     // Now restore
-    col.features.forEach((f) => { f.geometry.packed.buffer = buffer; });
+    col.features.forEach((f) => { if (f.geometry.packed)
+        f.geometry.packed.buffer = buffer; });
     PP.featureUnpack(col);
     return ab;
 }
@@ -6444,7 +6522,8 @@ function unpackCollection(coder, ab) {
     let offset = 16;
     let j = unpackString(coder, buf8, buf32, offset);
     col = JSON.parse(j);
-    col.features.forEach((f) => { f.geometry.packed.buffer = buf64; });
+    col.features.forEach((f) => { if (f.geometry.packed)
+        f.geometry.packed.buffer = buf64; });
     return col;
 }
 exports.unpackCollection = unpackCollection;
@@ -7028,14 +7107,16 @@ function polyUnpack(prepack) {
 }
 exports.polyUnpack = polyUnpack;
 function featurePackSize(f) {
-    if (f && f.geometry && f.geometry.coordinates)
+    if (f && f.geometry && f.geometry.coordinates && f.geometry.type !== 'Point')
         return polyPackSize(f.geometry.coordinates);
     return 0;
 }
 exports.featurePackSize = featurePackSize;
 function featurePack(f, prepack) {
     if (f && f.type === 'Feature') {
-        if (f.geometry && f.geometry.coordinates) {
+        if (f.geometry && f.geometry.type === 'Point')
+            return prepack ? { offset: prepack.offset, length: 0, buffer: prepack.buffer } : { offset: 0, length: 0, buffer: null };
+        else if (f.geometry && f.geometry.coordinates) {
             f.geometry.packed = polyPack(f.geometry.coordinates, prepack);
             delete f.geometry.coordinates;
         }