@dra2020/baseclient 1.0.64 → 1.0.67

package/dist/baseclient.js

@@ -5296,7 +5296,7 @@ exports.makeConvexHullGrahamScan = makeConvexHullGrahamScan;
 //   it as an array if [x, y] points, in contrast to polyToExteriorPoints() which
 //   uses the packed format and the poly.ts-private point form.
 function getExteriorPoints(poly) {
-    let pp = poly_1.polyNormalize(poly);
+    let pp = (0, poly_1.polyNormalize)(poly);
     if (pp == null)
         return null;
     let points = [];
@@ -5687,7 +5687,7 @@ function polyMapToByCentroid(districts, centroids) {
         let fIn = [];
         fs.forEach((fDistrict, i) => {
             if (BB.boundboxContains(bbDistricts[i], x, y))
-                if (pointinpoly_1.polyContainsPoint(fDistrict, x, y))
+                if ((0, pointinpoly_1.polyContainsPoint)(fDistrict, x, y))
                     fIn.push(i);
         });
         if (fIn.length == 1)
@@ -5985,7 +5985,7 @@ const M = __importStar(__webpack_require__(/*! ./matrix */ "./lib/poly/matrix.ts
 const X = 0, Y = 1;
 function minimumBoundingRectangle(poly) {
     // Get the convex hull polygon in standard form
-    const ch = poly_1.polyConvexHull(poly);
+    const ch = (0, poly_1.polyConvexHull)(poly);
     // Select the exterior points (outer ring = 0)
     let chExt = ch[0];
     // Close the loop (ring)
@@ -6593,7 +6593,7 @@ exports.polyToExteriorPoints = polyToExteriorPoints;
 function polyConvexHull(poly, altAlgorithm) {
     if (altAlgorithm !== undefined)
         return makeConvexHullMonotoneChain2D(poly);
-    return graham_scan_1.makeConvexHullGrahamScan(poly);
+    return (0, graham_scan_1.makeConvexHullGrahamScan)(poly);
 }
 exports.polyConvexHull = polyConvexHull;
 function makeConvexHullMonotoneChain2D(poly) {
@@ -6814,24 +6814,30 @@ function featureRewind(f, options) {
     // Only applies to multi-polygons with no holes
     let d = Util.depthof(f.geometry.coordinates);
     let windings = polyRingWindings(f);
-    if (options.validateHoles && d === 5 && windings.length) {
-        // If there are explicit holes, don't look for implicit ones
-        let nHoles = 0;
-        windings.forEach(w => { if (w.iRing)
-            nHoles++; });
-        if (nHoles == 0 && !misWound(windings[0])) {
-            // Looking for pattern: of (G (B*))*
-            // To convert to ((GH*))*
-            let iWinding = 0;
+    if (options.validateHoles && d === 5 && windings.length > 1) {
+        // First winding needs to be correct so we have a poly to add holes to
+        if (!misWound(windings[0])) {
+            // Flatten everything out and then rebuild hole structure based on windings
+            let nHoles = 0;
+            windings.forEach(w => { nHoles += w.iRing ? 1 : 0; });
+            if (nHoles) {
+                let c = [];
+                f.geometry.coordinates.forEach((poly) => {
+                    poly.forEach((ring) => {
+                        c.push([ring]);
+                    });
+                });
+                f.geometry.coordinates = c;
+                windings = polyRingWindings(f);
+            }
             let polys = f.geometry.coordinates;
-            let iPoly;
-            for (; iWinding < windings.length; iWinding++) {
+            let iPoly = 0;
+            for (let iWinding = 0; iWinding < windings.length; iWinding++) {
                 let good = !misWound(windings[iWinding]);
-                if (!good && iWinding == 0) // First is miswound - no good
-                    break;
                 if (good)
                     iPoly = iWinding;
                 else {
+                    // If hole, add to previous poly
                     polys[iPoly].push(polys[iWinding][0]);
                     polys[iWinding] = null;
                 }
@@ -6842,10 +6848,13 @@ function featureRewind(f, options) {
         if (f.geometry.coordinates.length == 1) {
             f.geometry.type = 'Polygon';
             f.geometry.coordinates = f.geometry.coordinates[0];
+            d = 4;
         }
     }
     // OK, now go through each ring
     let polys = f.geometry.coordinates;
+    if (d == 4)
+        polys = [polys];
     windings = polyRingWindings(f);
     windings.forEach((w) => {
         let good = !misWound(w);
@@ -7986,7 +7995,7 @@ function polySimplify(poly, tolerance = 0.0001) {
         // p is polygon, array of rings, each ring is array of points which is what gets fed to underlying simplify routine.
         let p = poly[i];
         for (let j = 0; j < p.length; j++)
-            p[j] = simplify_1.simplify(p[j], tolerance, true);
+            p[j] = (0, simplify_1.simplify)(p[j], tolerance, true);
     }
 }
 exports.polySimplify = polySimplify;
@@ -8120,7 +8129,7 @@ class QuadLevel {
         if (!BB.boundboxContains(this.box, coord[0], coord[1]))
             return null;
         if (this.features) {
-            let wp = this.features.find(wp => pointinpoly_1.polyContainsPoint(wp.p, coord[0], coord[1]));
+            let wp = this.features.find(wp => (0, pointinpoly_1.polyContainsPoint)(wp.p, coord[0], coord[1]));
             return wp ? wp.f : null;
         }
         else {
@@ -8962,7 +8971,7 @@ function topoSimplifyCollection(col, options) {
                 if (!bDecided) {
                     let pp = PP.polyPackTopoArcs(testtopo, arcs);
                     P.polyRewindRings(pp);
-                    if (shamos_1.selfIntersectFast(pp)) {
+                    if ((0, shamos_1.selfIntersectFast)(pp)) {
                         keepArcs(topo, oOld.arcs, keepweight);
                         nBad++;
                     }
@@ -10906,7 +10915,7 @@ exports.wrapLon = wrapLon;
   \*******************************************/
 /***/ ((module) => {
 
-module.exports = require("@dra2020/topojson-client");;
+module.exports = require("@dra2020/topojson-client");
 
 /***/ }),
 
@@ -10916,7 +10925,7 @@ module.exports = require("@dra2020/topojson-client");;
   \*******************************************/
 /***/ ((module) => {
 
-module.exports = require("@dra2020/topojson-server");;
+module.exports = require("@dra2020/topojson-server");
 
 /***/ }),
 
@@ -10926,7 +10935,7 @@ module.exports = require("@dra2020/topojson-server");;
   \*********************************************/
 /***/ ((module) => {
 
-module.exports = require("@dra2020/topojson-simplify");;
+module.exports = require("@dra2020/topojson-simplify");
 
 /***/ }),
 
@@ -10936,7 +10945,7 @@ module.exports = require("@dra2020/topojson-simplify");;
   \***********************************/
 /***/ ((module) => {
 
-module.exports = require("diff-match-patch");;
+module.exports = require("diff-match-patch");
 
 /***/ }),
 
@@ -10946,7 +10955,7 @@ module.exports = require("diff-match-patch");;
   \***********************************/
 /***/ ((module) => {
 
-module.exports = require("polygon-clipping");;
+module.exports = require("polygon-clipping");
 
 /***/ }),
 
@@ -10956,7 +10965,7 @@ module.exports = require("polygon-clipping");;
   \****************************/
 /***/ ((module) => {
 
-module.exports = require("splaytree");;
+module.exports = require("splaytree");
 
 /***/ }),
 
@@ -10966,7 +10975,7 @@ module.exports = require("splaytree");;
   \****************************/
 /***/ ((module) => {
 
-module.exports = require("tinyqueue");;
+module.exports = require("tinyqueue");
 
 /***/ })
 
@@ -10978,8 +10987,9 @@ module.exports = require("tinyqueue");;
 /******/ 	// The require function
 /******/ 	function __webpack_require__(moduleId) {
 /******/ 		// Check if module is in cache
-/******/ 		if(__webpack_module_cache__[moduleId]) {
-/******/ 			return __webpack_module_cache__[moduleId].exports;
+/******/ 		var cachedModule = __webpack_module_cache__[moduleId];
+/******/ 		if (cachedModule !== undefined) {
+/******/ 			return cachedModule.exports;
 /******/ 		}
 /******/ 		// Create a new module (and put it into the cache)
 /******/ 		var module = __webpack_module_cache__[moduleId] = {
@@ -10996,10 +11006,13 @@ module.exports = require("tinyqueue");;
 /******/ 	}
 /******/ 	
 /************************************************************************/
-/******/ 	// module exports must be returned from runtime so entry inlining is disabled
+/******/ 	
 /******/ 	// startup
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__("./lib/all/all.ts");
+/******/ 	// This entry module is referenced by other modules so it can't be inlined
+/******/ 	var __webpack_exports__ = __webpack_require__("./lib/all/all.ts");
+/******/ 	
+/******/ 	return __webpack_exports__;
 /******/ })()
 ;
 });