@dra2020/baseclient 1.0.49 → 1.0.52

package/dist/baseclient.js

@@ -1345,18 +1345,31 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.geoIntersect = exports.geoIntersectOptions = exports.GeoMultiCollection = exports.geoMapEqual = exports.geoEqual = exports.geoTopoToCollectionNonNull = exports.geoTopoToCollection = exports.geoCollectionToTopoNonNull = exports.geoCollectionToTopo = exports.geoMapToCollectionNonNull = exports.geoMapToCollection = exports.geoCollectionToMap = exports.geoEnsureID = void 0;
+exports.geoIntersect = exports.geoIntersectOptions = exports.GeoMultiCollection = exports.geoMapEqual = exports.geoEqual = exports.geoTopoToCollectionNonNull = exports.geoTopoToCollection = exports.geoCollectionToTopoNonNull = exports.geoCollectionToTopo = exports.geoMapToCollectionNonNull = exports.geoMapToCollection = exports.geoCollectionToMap = exports.geoNormalizeCollection = exports.geoNormalizeFeature = exports.geoEnsureID = void 0;
 const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 const Poly = __importStar(__webpack_require__(/*! ../poly/all */ "./lib/poly/all.ts"));
-function geoEnsureID(col) {
+const NormalizeAll = { joinPolygons: true, checkRewind: true, ensureID: true };
+// set the canonical 'id' property from the best property value.
+// if joinPolygons is true, we do not enforce uniqueness.
+//
+function geoEnsureID(col, options) {
+    options = Util.shallowAssignImmutable({}, options);
     let prop;
-    const props = ['id', 'GEOID', 'GEOID10', 'GEOID20', 'GEOID30'];
+    const props = ['id', 'GEOID', 'GEOID10', 'GEOID20', 'GEOID30', 'DISTRICT', 'DISTRICTNO', 'DISTRICTNAME'];
     if (col && col.features && col.features.length > 0) {
         let f = col.features[0];
         if (f.properties.id !== undefined)
-            return;
-        props.forEach(p => { if (prop === undefined && f.properties[p] !== undefined)
-            prop = p; });
+            return; // short-cut - assume if 'id' is set, we're all good.
+        props.forEach(p => {
+            if (prop === undefined)
+                if (f.properties[p] !== undefined)
+                    prop = p;
+                else {
+                    p = p.toLowerCase();
+                    if (f.properties[p] !== undefined)
+                        prop = p;
+                }
+        });
         if (prop)
             col.features.forEach(f => { f.properties.id = f.properties[prop]; });
         else {
@@ -1366,6 +1379,77 @@ function geoEnsureID(col) {
     }
 }
 exports.geoEnsureID = geoEnsureID;
+function geoNormalizeFeature(f, options) {
+    options = Util.shallowAssignImmutable({}, options);
+    if (f && f.geometry && f.geometry.type === 'MultiPolygon' && f.geometry.coordinates) {
+        let multiPoly = f.geometry.coordinates;
+        // Convert degenerate MultiPolygon to Polygon
+        if (multiPoly.length == 1) {
+            f.geometry.type = 'Polygon';
+            f.geometry.coordinates = multiPoly[0];
+        }
+    }
+    else 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];
+    }
+    else if (options.checkRewind)
+        // Various tools do not guarantee valid GeoJSON winding rules. Verify it since internal processing
+        // assumes it is correct.
+        Poly.featureRewind(f);
+    return f;
+}
+exports.geoNormalizeFeature = geoNormalizeFeature;
+function onlyPolygons(col) {
+    if (col && Array.isArray(col.features))
+        for (let i = 0; i < col.features.length; i++) {
+            let f = col.features[i];
+            if (f.geometry && f.geometry.type === 'MultiPolygon')
+                return false;
+        }
+    return true;
+}
+function mergePolygon(f1, f2) {
+    if (!f1)
+        return f2;
+    if (!f2)
+        return f1;
+    if (f1.geometry.type !== 'Polygon' && f1.geometry.type !== 'MultiPolygon')
+        return f1;
+    if (f2.geometry.type !== 'Polygon' && f2.geometry.type !== 'MultiPolygon')
+        return f2;
+    if (f1.geometry.type === 'Polygon') {
+        f1.geometry.type = 'MultiPolygon';
+        if (f2.geometry.type === 'Polygon')
+            f1.geometry.coordinates = [f1.geometry.coordinates, f2.geometry.coordinates];
+        else
+            f1.geometry.coordinates = [f1.geometry.coordinates, ...f2.geometry.coordinates];
+    }
+    else {
+        if (f2.geometry.type === 'Polygon')
+            f1.geometry.coordinates.push(f2.geometry.coordinates);
+        else
+            f1.geometry.coordinates = [...f1.geometry.coordinates, ...f2.geometry.coordinates];
+    }
+    return f1;
+}
+function geoNormalizeCollection(col, options) {
+    options = Util.shallowAssignImmutable(NormalizeAll, options);
+    // Normalize individual features
+    if (col && Array.isArray(col.features))
+        col.features.forEach((f) => geoNormalizeFeature(f, options));
+    // Ensure ID
+    if (options.ensureID)
+        geoEnsureID(col, options);
+    // Merge polygons into multi-polygons based on id?
+    if (options.ensureID && options.joinPolygons && onlyPolygons(col)) {
+        let map = {};
+        col.features.forEach(f => { let id = f.properties.id; map[id] = mergePolygon(map[id], f); });
+        col.features = Object.values(map);
+    }
+    return col;
+}
+exports.geoNormalizeCollection = geoNormalizeCollection;
 function geoCollectionToMap(col) {
     if (col == null)
         return null;
@@ -8551,8 +8635,9 @@ function intpt(f) {
     return { x: x, y: y };
 }
 const DefaultSimplifyOptions = { minArea: 500 };
-function log(s) {
-    console.log(s);
+function log(emitlog, s) {
+    if (emitlog)
+        console.log(s);
 }
 //
 // topoSimplifyCollection:
@@ -8576,10 +8661,10 @@ function topoSimplifyCollection(col, options) {
     let elapsedTotal = new Util.Elapsed();
     let elapsed = new Util.Elapsed();
     let topo = topoFromCollection(col);
-    log(`topoSimplifyCollection: fromCollection: ${Math.round(elapsed.ms())}ms`);
+    log(options.log, `topoSimplifyCollection: fromCollection: ${Math.round(elapsed.ms())}ms`);
     elapsed.start();
     topo = TopoSimplify.presimplify(topo, TopoSimplify['sphericalTriangleArea']);
-    log(`topoSimplifyCollection: presimplify: ${Math.round(elapsed.ms())}ms`);
+    log(options.log, `topoSimplifyCollection: presimplify: ${Math.round(elapsed.ms())}ms`);
     elapsed.start();
     // Keep iterating on removing simplification from degenerate shapes
     let nTries = 1;
@@ -8644,17 +8729,17 @@ function topoSimplifyCollection(col, options) {
                             keepTiny.set(f, f);
                             keepArcs(topo, oOld.arcs, 0); // keeps all points to avoid reprocessing these tiny shapes
                             nBad++, nTiny++;
-                            log(`topoSimplifyCollection: ${f.properties.id}: increasing feature fidelity because intpt dist is ${d}`);
+                            log(options.log, `topoSimplifyCollection: ${f.properties.id}: increasing feature fidelity because intpt dist is ${d}`);
                         }
                     }
                 }
             }
         });
-        log(`topoSimplifyCollection: pass ${nTries}: ${nBad} (${nTiny} tiny) of ${col.features.length} features are degenerate`);
+        log(options.log, `topoSimplifyCollection: pass ${nTries}: ${nBad} (${nTiny} tiny) of ${col.features.length} features are degenerate`);
         // If not making progress, keep more points
         if (nBad >= nBadLast) {
             keepweight /= 10;
-            log(`topoSimplifyCollection: pass ${nTries}: reducing weight limit to ${keepweight}`);
+            log(options.log, `topoSimplifyCollection: pass ${nTries}: reducing weight limit to ${keepweight}`);
         }
         nBadLast = nBad;
         if (nBad && nTries > MAX_TRIES)
@@ -8666,7 +8751,7 @@ function topoSimplifyCollection(col, options) {
         }
         nTries++;
     }
-    log(`topoSimplifyCollection: total elapsed time: ${bigTimeString(elapsedTotal.ms())}`);
+    log(options.log, `topoSimplifyCollection: total elapsed time: ${bigTimeString(elapsedTotal.ms())}`);
     return col;
 }
 exports.topoSimplifyCollection = topoSimplifyCollection;
@@ -9166,6 +9251,7 @@ __exportStar(__webpack_require__(/*! ./countedhash */ "./lib/util/countedhash.ts
 __exportStar(__webpack_require__(/*! ./indexedarray */ "./lib/util/indexedarray.ts"), exports);
 __exportStar(__webpack_require__(/*! ./gradient */ "./lib/util/gradient.ts"), exports);
 __exportStar(__webpack_require__(/*! ./bintrie */ "./lib/util/bintrie.ts"), exports);
+__exportStar(__webpack_require__(/*! ./bitset */ "./lib/util/bitset.ts"), exports);
 
 
 /***/ }),
@@ -9627,6 +9713,65 @@ class BinTrieBuilder {
 exports.BinTrieBuilder = BinTrieBuilder;
 
 
+/***/ }),
+
+/***/ "./lib/util/bitset.ts":
+/*!****************************!*\
+  !*** ./lib/util/bitset.ts ***!
+  \****************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ListToBitset = void 0;
+const BitLookup = [1, 2, 4, 8, 16, 32, 64, 128];
+class ListToBitset {
+    constructor(list) {
+        this.list = list;
+        this.index = {};
+        this.size = Math.floor((this.list.length + 7) / 8);
+        this.list.forEach((s, i) => { this.index[s] = i; });
+    }
+    toBits(l) {
+        let ab = new ArrayBuffer(this.size);
+        let u8 = new Uint8Array(ab);
+        if (l)
+            l.forEach(s => {
+                let n = this.index[s];
+                let i = Math.floor(n / 8);
+                u8[i] |= BitLookup[n % 8];
+            });
+        return u8;
+    }
+    toList(u8) {
+        let list = [];
+        for (let i = 0; i < u8.length; i++) {
+            let u = u8[i];
+            if (u) {
+                if (u & 1)
+                    list.push(this.list[i * 8 + 0]);
+                if (u & 2)
+                    list.push(this.list[i * 8 + 1]);
+                if (u & 4)
+                    list.push(this.list[i * 8 + 2]);
+                if (u & 8)
+                    list.push(this.list[i * 8 + 3]);
+                if (u & 16)
+                    list.push(this.list[i * 8 + 4]);
+                if (u & 32)
+                    list.push(this.list[i * 8 + 5]);
+                if (u & 64)
+                    list.push(this.list[i * 8 + 6]);
+                if (u & 128)
+                    list.push(this.list[i * 8 + 7]);
+            }
+        }
+        return list;
+    }
+}
+exports.ListToBitset = ListToBitset;
+
+
 /***/ }),
 
 /***/ "./lib/util/countedhash.ts":