@dra2020/baseclient 1.0.59 → 1.0.62

package/dist/baseclient.js

@@ -223,6 +223,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ParseOne = void 0;
 const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 // Parse CSV. 
 //    Fields are separated by commas or pipe symbol (census uses pipe separators.
@@ -248,6 +249,8 @@ class ParseOne {
         this.coder = coder;
         if (line)
             this.set(line);
+        else
+            this.fields = [];
     }
     set(line) {
         this.fields = [];
@@ -258,31 +261,37 @@ class ParseOne {
         this.infield = false;
         this.nwhite = 0;
         this.quote = 0;
+        this.force = false;
         this.parse();
     }
     get length() { return this.fields.length; }
-    pushtok(force) {
+    pushtok() {
         // Trim trailing whitespace
-        if (!force)
-            this.toklen -= this.nwhite;
-        if (this.toklen || force) {
+        this.toklen -= this.nwhite;
+        if (this.toklen || this.force) {
             this.fields.push(Util.u82s(this.coder, this.tok, 0, this.toklen));
             this.toklen = 0;
         }
         this.infield = false;
         this.nwhite = 0;
         this.quote = 0;
+        this.force = false;
     }
     parse() {
         while (this.n < this.buf.length) {
             let c = this.buf[this.n++];
-            if (this.quote && c === this.quote)
-                this.pushtok(true);
-            else if (c === Comma || c === Pipe)
-                this.pushtok(true);
+            if (this.quote && c === this.quote) {
+                this.quote = 0;
+                this.nwhite = 0;
+            }
+            else if (c === Comma || c === Pipe) {
+                this.force = true;
+                this.pushtok();
+                this.force = true;
+            }
             else if (this.infield) {
                 this.tok[this.toklen++] = c;
-                if (isWhite(c))
+                if (!this.quote && isWhite(c))
                     this.nwhite++;
                 else
                     this.nwhite = 0;
@@ -292,15 +301,18 @@ class ParseOne {
             else if (c === SingleQuote || c === DoubleQuote) {
                 this.quote = c;
                 this.infield = true;
+                this.force = true;
             }
             else {
                 this.infield = true;
                 this.tok[this.toklen++] = c;
+                this.force = true;
             }
         }
-        this.pushtok(false);
+        this.pushtok();
     }
 }
+exports.ParseOne = ParseOne;
 
 
 /***/ }),
@@ -6230,7 +6242,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.polyBadCoordinates = exports.polyRewindRings = exports.featureRewind = exports.polyTransform = exports.npoints = exports.polyDescribe = exports.polyCompactness = exports.makeConvexHullMonotoneChain2D = exports.polyConvexHull = exports.polyToExteriorPoints = exports.polyFromCircle = exports.polyToPolsbyPopperCircle = exports.polyToCircle = exports.Circle = exports.polyPerimeter = exports.polyDiameter = exports.polyArea = exports.polyNull = exports.polyNormalize = exports.polySimpleArea = exports.DefaultOptions = exports.EARTH_RADIUS = exports.DefaultTickOptions = void 0;
+exports.polyBadCoordinates = exports.polyRewindRings = exports.featureRewind = exports.polyRingWindings = exports.polyTransform = exports.npoints = exports.polyDescribe = exports.polyCompactness = exports.makeConvexHullMonotoneChain2D = exports.polyConvexHull = exports.polyToExteriorPoints = exports.polyFromCircle = exports.polyToPolsbyPopperCircle = exports.polyToCircle = exports.Circle = exports.polyPerimeter = exports.polyDiameter = exports.polyArea = exports.polyNull = exports.polyNormalize = exports.polySimpleArea = exports.DefaultOptions = exports.EARTH_RADIUS = exports.DefaultTickOptions = void 0;
 const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 const PP = __importStar(__webpack_require__(/*! ./polypack */ "./lib/poly/polypack.ts"));
 const graham_scan_1 = __webpack_require__(/*! ./graham-scan */ "./lib/poly/graham-scan.ts");
@@ -6750,30 +6762,119 @@ function closePoly(poly) {
     poly.forEach(closeRing);
     return poly;
 }
+function closeFeature(f) {
+    let d = Util.depthof(f.geometry.coordinates);
+    if (d === 4)
+        closePoly(f.geometry.coordinates);
+    if (d === 5)
+        f.geometry.coordinates.forEach(closePoly);
+}
+function canonicalPoint(f, options) {
+    if (options.canonical)
+        if (f && f.geometry && f.geometry.type === 'Point' && f.geometry.coordinates)
+            while (Array.isArray(f.geometry.coordinates[0]))
+                f.geometry.coordinates = f.geometry.coordinates[0];
+    return f;
+}
+;
+function misWound(w) {
+    return (((w.iRing == 0) && (w.direction > 0)) || ((w.iRing > 0) && (w.direction < 0)));
+}
+function polyRingWindings(poly) {
+    let windings = [];
+    let pp = polyNormalize(poly);
+    if (pp == null || pp.buffer == null)
+        return windings;
+    PP.polyPackEachRing(pp, (b, iPoly, iRing, iOffset, nPoints) => {
+        const iStart = iOffset;
+        const iEnd = iStart + (nPoints * 2) - 2;
+        // Determine the winding order of the ring
+        let direction = 0;
+        // Start at the second point
+        iOffset += 2;
+        for (; iOffset <= iEnd; iOffset += 2) {
+            // The previous point
+            let jOffset = iOffset - 2;
+            // Sum over the edges
+            direction += twoTimesArea(b[iOffset], b[jOffset], b[iOffset + 1], b[jOffset + 1]);
+        }
+        // Implicitly close the ring, if necessary
+        if (nPoints > 2 && (b[iStart] != b[iEnd] || b[iStart + 1] != b[iEnd + 1]))
+            direction += twoTimesArea(b[iStart], b[iEnd], b[iStart + 1], b[iEnd + 1]);
+        windings.push({ iPoly: iPoly, iRing: iRing, direction: direction });
+    });
+    return windings;
+}
+exports.polyRingWindings = polyRingWindings;
 // This mutates the passed in feature to ensure it is correctly wound
 // For convenience, passed back the value provided.
-function featureRewind(poly) {
-    let pp = polyNormalize(poly);
-    if (pp == null)
+//
+function featureRewind(f, options) {
+    options = Util.shallowAssignImmutable({ validateHoles: true, validateClose: true, canonical: true }, options);
+    if (!f)
         return null;
-    polyRewindRings(pp);
-    if (poly.type === 'Feature') {
-        if (poly.geometry.packed !== pp) {
-            poly.geometry.coordinates = PP.polyUnpack(pp);
-            // Also make sure first === last coordinate
-            let d = Util.depthof(poly.geometry.coordinates);
-            if (d === 4)
-                closePoly(poly.geometry.coordinates);
-            else if (d === 5)
-                poly.geometry.coordinates.forEach(closePoly);
-            poly.geometry.type = d === 4 ? 'Polygon' : 'MultiPolygon';
-        }
-        return poly;
-    }
-    else if (poly === pp)
-        return pp;
-    else
-        return PP.polyUnpack(pp);
+    // Has to be an unpacked feature
+    if (f.type !== 'Feature')
+        throw 'featureRewind: must be a valid GeoJSON feature';
+    if (!f.geometry || f.geometry.packed)
+        throw 'featureRewind: only valid on unpacked features';
+    // Non polygons are simpler
+    if (f.geometry.type !== 'Polygon' && f.geometry.type !== 'MultiPolygon')
+        return canonicalPoint(f, options);
+    // Make sure polygon is closed (first === last)
+    if (options.validateClose)
+        closeFeature(f);
+    // Check if multi-polygon is really polygon with holes
+    // 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;
+            let polys = f.geometry.coordinates;
+            let iPoly;
+            for (; iWinding < windings.length; iWinding++) {
+                let good = !misWound(windings[iWinding]);
+                if (!good && iWinding == 0) // First is miswound - no good
+                    break;
+                if (good)
+                    iPoly = iWinding;
+                else {
+                    polys[iPoly].push(polys[iWinding][0]);
+                    polys[iWinding] = null;
+                }
+            }
+            f.geometry.coordinates = polys.filter((p) => p != null);
+        }
+        // Degenerate multi-polygon
+        if (f.geometry.coordinates.length == 1) {
+            f.geometry.type = 'Polygon';
+            f.geometry.coordinates = f.geometry.coordinates[0];
+        }
+    }
+    // OK, now go through each ring
+    let polys = f.geometry.coordinates;
+    windings = polyRingWindings(f);
+    windings.forEach((w) => {
+        let good = !misWound(w);
+        if (!good) {
+            let ring = polys[w.iPoly][w.iRing];
+            let iFront = 0;
+            let iBack = ring.length - 1;
+            for (; iFront < iBack; iFront++, iBack--) {
+                let tmp = ring[iFront];
+                ring[iFront] = ring[iBack];
+                ring[iBack] = tmp;
+            }
+        }
+    });
+    return f;
 }
 exports.featureRewind = featureRewind;
 //
@@ -8699,7 +8800,7 @@ function correctGeometry(f) {
     }
     else
         // TopoJSON does not guarantee proper winding order which messes up later processing. Fix it.
-        P.featureRewind(f);
+        P.featureRewind(f, { validateHoles: false });
     return f;
 }
 function topoContiguity(topo) {