@dra2020/baseclient 1.0.34 → 1.0.37

package/dist/baseclient.js

@@ -1345,7 +1345,7 @@ 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.geoTopoToCollection = exports.geoCollectionToTopo = 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.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) {
@@ -1375,25 +1375,39 @@ function geoCollectionToMap(col) {
 }
 exports.geoCollectionToMap = geoCollectionToMap;
 function geoMapToCollection(map) {
-    if (map == null || Util.countKeys(map) == 0)
+    if (Util.countKeys(map) == 0)
+        return null;
+    return geoMapToCollectionNonNull(map);
+}
+exports.geoMapToCollection = geoMapToCollection;
+function geoMapToCollectionNonNull(map) {
+    if (map == null)
         return null;
     let col = { type: 'FeatureCollection', features: [] };
     Object.keys(map).forEach((geoid) => { col.features.push(map[geoid]); });
     return col;
 }
-exports.geoMapToCollection = geoMapToCollection;
+exports.geoMapToCollectionNonNull = geoMapToCollectionNonNull;
 function geoCollectionToTopo(col) {
     let topo = Poly.topoFromCollection(col);
     Poly.topoPack(topo);
     return topo;
 }
 exports.geoCollectionToTopo = geoCollectionToTopo;
+function geoCollectionToTopoNonNull(col) {
+    return geoCollectionToTopo(col);
+}
+exports.geoCollectionToTopoNonNull = geoCollectionToTopoNonNull;
 function geoTopoToCollection(topo) {
     let col = Poly.topoToCollection(topo);
     Poly.featurePack(col);
     return col;
 }
 exports.geoTopoToCollection = geoTopoToCollection;
+function geoTopoToCollectionNonNull(topo) {
+    return geoTopoToCollection(topo);
+}
+exports.geoTopoToCollectionNonNull = geoTopoToCollectionNonNull;
 function geoEqual(m1, m2) {
     let n1 = m1 ? m1.length : 0;
     let n2 = m2 ? m2.length : 0;
@@ -1483,9 +1497,9 @@ class GeoMultiCollection {
             return null;
         if (!e.col) {
             if (e.map)
-                e.col = geoMapToCollection(e.map);
+                e.col = geoMapToCollectionNonNull(e.map);
             else if (e.topo)
-                e.col = geoTopoToCollection(e.topo);
+                e.col = geoTopoToCollectionNonNull(e.topo);
         }
         return e.col;
     }
@@ -1496,7 +1510,7 @@ class GeoMultiCollection {
             if (e.col)
                 e.map = geoCollectionToMap(e.col);
             else if (e.topo) {
-                e.col = geoTopoToCollection(e.topo);
+                e.col = geoTopoToCollectionNonNull(e.topo);
                 e.map = geoCollectionToMap(e.col);
             }
         }
@@ -1507,10 +1521,10 @@ class GeoMultiCollection {
             return null;
         if (!e.topo) {
             if (e.col)
-                e.topo = geoCollectionToTopo(e.col);
+                e.topo = geoCollectionToTopoNonNull(e.col);
             else if (e.map) {
-                e.col = geoMapToCollection(e.map);
-                e.topo = geoCollectionToTopo(e.col);
+                e.col = geoMapToCollectionNonNull(e.map);
+                e.topo = geoCollectionToTopoNonNull(e.col);
             }
         }
         return e.topo;
@@ -1531,7 +1545,7 @@ class GeoMultiCollection {
                 this.all.col = this._col(this.nthEntry(0));
             else
                 // Going from map to collection guarantees that any duplicates are removed
-                this.all.col = geoMapToCollection(this.allMap());
+                this.all.col = geoMapToCollectionNonNull(this.allMap());
         }
         return this.all.col;
     }
@@ -1560,7 +1574,7 @@ class GeoMultiCollection {
             if (n == 1)
                 this.all.topo = this._topo(this.nthEntry(0));
             else
-                this.all.topo = geoCollectionToTopo(this.allCol());
+                this.all.topo = geoCollectionToTopoNonNull(this.allCol());
         }
         return this.all.topo;
     }
@@ -5376,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");
@@ -5407,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;
 }
@@ -8264,12 +8291,15 @@ function getGEOID(f) {
         f = f.features[0];
     else if (Array.isArray(f))
         f = f[0];
+    else
+        return '';
     if (f.properties.id !== undefined)
         return 'id';
     if (f.properties.GEOID !== undefined)
         return 'GEOID';
     if (f.properties.GEOID10 !== undefined)
         return 'GEOID10';
+    return '';
 }
 function topoFromCollection(col) {
     if (col == null)
@@ -8278,7 +8308,11 @@ function topoFromCollection(col) {
     let prop = getGEOID(col);
     let objects = {};
     col.features.forEach((f) => objects[f.properties[prop]] = f);
-    let topo = TopoServer.topology(objects);
+    let topo;
+    if (Util.isEmpty(objects))
+        topo = { objects: objects };
+    else
+        topo = TopoServer.topology(objects);
     PP.featureRepack(col, save);
     if (col.datasets)
         topo.datasets = col.datasets;
@@ -8342,10 +8376,11 @@ function topoToFeature(topo, geoid) {
 exports.topoToFeature = topoToFeature;
 function topoToCollection(topo) {
     let col = { type: 'FeatureCollection', features: [] };
-    Object.keys(topo.objects).forEach((geoid) => {
-        col.features.push(topoToFeature(topo, geoid));
-    });
-    if (topo.datasets)
+    if (topo)
+        Object.keys(topo.objects).forEach((geoid) => {
+            col.features.push(topoToFeature(topo, geoid));
+        });
+    if (topo && topo.datasets)
         col.datasets = topo.datasets;
     return col;
 }