@dra2020/baseclient 1.0.29 → 1.0.32

package/dist/baseclient.js

@@ -1359,6 +1359,10 @@ function geoEnsureID(col) {
             prop = p; });
         if (prop)
             col.features.forEach(f => { f.properties.id = f.properties[prop]; });
+        else {
+            let n = 1;
+            col.features.forEach(f => { f.properties.id = String(n++); });
+        }
     }
 }
 exports.geoEnsureID = geoEnsureID;
@@ -5371,7 +5375,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.polyMapTo = void 0;
+exports.polyMapTo = exports.polyMapToByCentroid = void 0;
 const PL = __importStar(__webpack_require__(/*! ./polylabel */ "./lib/poly/polylabel.ts"));
 const BB = __importStar(__webpack_require__(/*! ./boundbox */ "./lib/poly/boundbox.ts"));
 const pointinpoly_1 = __webpack_require__(/*! ./pointinpoly */ "./lib/poly/pointinpoly.ts");
@@ -5400,16 +5404,14 @@ function setLabels(c) {
 //
 //  The return value is an object that maps the block feature ids to the district feature id.
 //
-function polyMapTo(districts, blocks) {
+function polyMapToByCentroid(districts, centroids) {
     let map = {};
-    // Cache labelx, labely if necessary
-    setLabels(blocks);
     // Cache district boundboxes for quick containment exclusion
     let bbDistricts = districts.features.map(f => BB.boundbox(f));
     // Walk over blocks, mapping centroid to district
-    blocks.features.forEach(fBlock => {
-        let x = fBlock.properties.labelx;
-        let y = fBlock.properties.labely;
+    Object.keys(centroids).forEach(blockid => {
+        let x = centroids[blockid].x;
+        let y = centroids[blockid].y;
         let fIn = [];
         districts.features.forEach((fDistrict, i) => {
             if (BB.boundboxContains(bbDistricts[i], x, y))
@@ -5417,10 +5419,20 @@ function polyMapTo(districts, blocks) {
                     fIn.push(fDistrict);
         });
         if (fIn.length == 1)
-            map[fBlock.properties.id] = fIn[0].properties.id;
+            map[blockid] = fIn[0].properties.id;
     });
     return map;
 }
+exports.polyMapToByCentroid = polyMapToByCentroid;
+function polyMapTo(districts, blocks) {
+    // Cache labelx, labely if necessary
+    setLabels(blocks);
+    let centroids = {};
+    blocks.features.forEach(f => {
+        centroids[f.properties.id] = { x: f.properties.labelx, y: f.properties.labely };
+    });
+    return polyMapToByCentroid(districts, centroids);
+}
 exports.polyMapTo = polyMapTo;
 
 
@@ -5872,9 +5884,19 @@ function polyContainsPoint(poly, x, y) {
         return false;
     let bFound = false;
     let bInside = false;
+    let iCurPoly = -1;
+    let bCurInside = false;
     PP.polyPackEachRing(pp, (b, iPoly, iRing, iOffset, nPoints) => {
         if (bFound)
             return;
+        if (iRing == 0) {
+            if (iCurPoly >= 0 && bCurInside) {
+                bInside = true;
+                bFound = true;
+            }
+            iCurPoly = iPoly;
+            bCurInside = false;
+        }
         let inside = false;
         let iEnd = iOffset + (nPoints - 1) * 2;
         for (let i = iOffset, j = iEnd; i <= iEnd; j = i, i += 2) {
@@ -5885,11 +5907,11 @@ function polyContainsPoint(poly, x, y) {
             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
-        }
+        if (inside)
+            bCurInside = iRing == 0; // not inside if inside a hole
     });
+    if (iCurPoly >= 0 && bCurInside)
+        bInside = true;
     return bInside;
 }
 exports.polyContainsPoint = polyContainsPoint;