@dra2020/baseclient 1.0.36 → 1.0.39

package/dist/baseclient.js

@@ -5390,6 +5390,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.polyMapTo = exports.polyMapToByCentroid = void 0;
+const P = __importStar(__webpack_require__(/*! ./poly */ "./lib/poly/poly.ts"));
 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");
@@ -5421,19 +5422,31 @@ function setLabels(c) {
 function polyMapToByCentroid(districts, centroids) {
     let map = {};
     // Cache district boundboxes for quick containment exclusion
-    let bbDistricts = districts.features.map(f => BB.boundbox(f));
+    let fs = districts.features;
+    let bbDistricts = fs.map(f => BB.boundbox(f));
+    let aDistricts = fs.map(f => P.polyArea(f));
     // Walk over blocks, mapping centroid to district
     Object.keys(centroids).forEach(blockid => {
         let x = centroids[blockid].x;
         let y = centroids[blockid].y;
         let fIn = [];
-        districts.features.forEach((fDistrict, i) => {
+        fs.forEach((fDistrict, i) => {
             if (BB.boundboxContains(bbDistricts[i], x, y))
                 if (pointinpoly_1.polyContainsPoint(fDistrict, x, y))
-                    fIn.push(fDistrict);
+                    fIn.push(i);
         });
         if (fIn.length == 1)
-            map[blockid] = fIn[0].properties.id;
+            map[blockid] = fs[fIn[0]].properties.id;
+        else if (fIn.length > 1) {
+            // Pick district with smallest area since some times we get malformed content that doesn't
+            // reflect holes in districts when one is nested in another. So theory is smaller district
+            // is a hole in containing larger one(s).
+            let iLow = fIn[0];
+            for (let i = 1; i < fIn.length; i++)
+                if (aDistricts[fIn[i]] < aDistricts[iLow])
+                    iLow = fIn[i];
+            map[blockid] = fs[iLow].properties.id;
+        }
     });
     return map;
 }
@@ -6496,6 +6509,7 @@ function featureRewind(poly) {
                 closePoly(poly.geometry.coordinates);
             else if (d === 5)
                 poly.geometry.coordinates.forEach(closePoly);
+            poly.geometry.type = d === 4 ? 'Polygon' : 'MultiPolygon';
         }
         return poly;
     }
@@ -9947,6 +9961,8 @@ exports.partialEqual = partialEqual;
 function exactEqual(o1, o2, options) {
     if (o1 === o2)
         return true;
+    if (options && options.epsilon && typeof o1 === 'number' && typeof o2 === 'number' && Math.abs(o1 - o2) < options.epsilon)
+        return true;
     if (options && options.emptyStringIsNull)
         if ((o1 == null && o2 == '') || (o2 == null && o1 == ''))
             return true;