@dra2020/baseclient 1.0.30 → 1.0.33

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;
@@ -5880,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) {
@@ -5893,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;