@dra2020/baseclient 1.0.34 → 1.0.37

package/dist/geo/geo.d.ts

@@ -13,8 +13,11 @@ export declare type GeoCentroidMap = {
 export declare function geoEnsureID(col: GeoFeatureCollection): void;
 export declare function geoCollectionToMap(col: GeoFeatureCollection): GeoFeatureMap;
 export declare function geoMapToCollection(map: GeoFeatureMap): GeoFeatureCollection;
+export declare function geoMapToCollectionNonNull(map: GeoFeatureMap): GeoFeatureCollection;
 export declare function geoCollectionToTopo(col: GeoFeatureCollection): Poly.Topo;
+export declare function geoCollectionToTopoNonNull(col: GeoFeatureCollection): Poly.Topo;
 export declare function geoTopoToCollection(topo: Poly.Topo): GeoFeatureCollection;
+export declare function geoTopoToCollectionNonNull(topo: Poly.Topo): GeoFeatureCollection;
 export interface GeoFeatureMap {
     [id: string]: GeoFeature;
 }

package/lib/geo/geo.ts

@@ -38,7 +38,13 @@ export function geoCollectionToMap(col: GeoFeatureCollection): GeoFeatureMap
 
 export function geoMapToCollection(map: GeoFeatureMap): GeoFeatureCollection
 {
-  if (map == null || Util.countKeys(map) == 0) return null;
+  if (Util.countKeys(map) == 0) return null;
+  return geoMapToCollectionNonNull(map);
+}
+
+export function geoMapToCollectionNonNull(map: GeoFeatureMap): GeoFeatureCollection
+{
+  if (map == null) return null;
   let col: GeoFeatureCollection = { type: 'FeatureCollection', features: [] };
   Object.keys(map).forEach((geoid: string) => { col.features.push(map[geoid]) });
   return col;
@@ -51,6 +57,11 @@ export function geoCollectionToTopo(col: GeoFeatureCollection): Poly.Topo
   return topo;
 }
 
+export function geoCollectionToTopoNonNull(col: GeoFeatureCollection): Poly.Topo
+{
+  return geoCollectionToTopo(col);
+}
+
 export function geoTopoToCollection(topo: Poly.Topo): GeoFeatureCollection
 {
   let col = Poly.topoToCollection(topo);
@@ -58,6 +69,11 @@ export function geoTopoToCollection(topo: Poly.Topo): GeoFeatureCollection
   return col;
 }
 
+export function geoTopoToCollectionNonNull(topo: Poly.Topo): GeoFeatureCollection
+{
+  return geoTopoToCollection(topo);
+}
+
 export interface GeoFeatureMap
 {
   [id: string]: GeoFeature;  // Maps id to GeoFeature
@@ -183,9 +199,9 @@ export class GeoMultiCollection
     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;
   }
@@ -199,7 +215,7 @@ export class GeoMultiCollection
         e.map = geoCollectionToMap(e.col);
       else if (e.topo)
       {
-        e.col = geoTopoToCollection(e.topo);
+        e.col = geoTopoToCollectionNonNull(e.topo);
         e.map = geoCollectionToMap(e.col);
       }
     }
@@ -212,11 +228,11 @@ export class GeoMultiCollection
     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;
@@ -242,7 +258,7 @@ export 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;
   }
@@ -276,7 +292,7 @@ export 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;
   }

package/lib/poly/mapto.ts

@@ -38,22 +38,35 @@ export function polyMapToByCentroid(districts: G.GeoFeatureCollection, centroids
   let map: any = {};
 
   // Cache district boundboxes for quick containment exclusion
-  let bbDistricts: BB.BoundBox[] = districts.features.map(f => BB.boundbox(f));
+  let fs: G.GeoFeature[] = districts.features;
+  let bbDistricts: BB.BoundBox[] = fs.map(f => BB.boundbox(f));
+  let aDistricts: number[] = 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: G.GeoFeature[] = [];
-      districts.features.forEach((fDistrict: G.GeoFeature, i: number) => {
+      let fIn: number[] = [];
+      fs.forEach((fDistrict: G.GeoFeature, i: number) => {
           if (BB.boundboxContains(bbDistricts[i], x, y))
             if (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;

package/lib/poly/topo.ts

@@ -19,11 +19,16 @@ export type Topo = any;
 
 function getGEOID(f: any): string
 {
-  if (f.features && f.features.length) f = f.features[0];
-  else if (Array.isArray(f)) f = f[0];
+  if (f.features && f.features.length)
+    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 '';
 }
 
 export function topoFromCollection(col: any): Topo
@@ -33,10 +38,14 @@ export function topoFromCollection(col: any): Topo
   let prop = getGEOID(col);
   let objects: any = {};
   col.features.forEach((f: any) => objects[f.properties[prop]] = f);
-  let topo = TopoServer.topology(objects);
+  let topo: any;
+  if (Util.isEmpty(objects))
+    topo = { objects: objects }
+  else
+    topo = TopoServer.topology(objects);
   PP.featureRepack(col, save);
   if (col.datasets)
-    (topo as any).datasets = col.datasets;
+    topo.datasets = col.datasets;
   return topo;
 }
 
@@ -109,10 +118,11 @@ export function topoToFeature(topo: Topo, geoid: string): any
 export function topoToCollection(topo: Topo): any
 {
   let col: any = { type: 'FeatureCollection', features: [] };
-  Object.keys(topo.objects).forEach((geoid: string) => {
-      col.features.push(topoToFeature(topo, geoid));
-    });
-  if (topo.datasets) col.datasets = topo.datasets;
+  if (topo)
+    Object.keys(topo.objects).forEach((geoid: string) => {
+        col.features.push(topoToFeature(topo, geoid));
+      });
+  if (topo && topo.datasets) col.datasets = topo.datasets;
   return col;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.34",
+  "version": "1.0.37",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",
@@ -40,6 +40,9 @@
     "webpack-cli": "^4.4.0"
   },
   "dependencies": {
+    "@dra2020/baseclient": "^1.0.36",
+    "@dra2020/baseserver": "^1.0.21",
+    "@dra2020/dra-types": "^1.8.26",
     "@dra2020/topojson-client": "^3.2.7",
     "@dra2020/topojson-server": "^3.0.103",
     "@dra2020/topojson-simplify": "^3.0.102",