@dra2020/baseclient 1.0.4 → 1.0.7

package/lib/geo/geo.ts

@@ -218,10 +218,8 @@ export class GeoMultiCollection
       if (n == 1)
         this.all.col = this._col(this.nthEntry(0));
       else
-      {
-        this.all.col = { type: 'FeatureCollection', features: [] };
-        this.forEach(f => { this.all.col.features.push(f) });
-      }
+        // Going from map to collection guarantees that any duplicates are removed
+        this.all.col = geoMapToCollection(this.allMap());
     }
     return this.all.col;
   }
@@ -236,7 +234,11 @@ export class GeoMultiCollection
       if (n == 1)
         this.all.map = this._map(this.nthEntry(0));
       else
-        this.all.map = geoCollectionToMap(this.allCol());
+      {
+        let map: GeoFeatureMap = {};
+        this.all.map = map;
+        this.forEach(f => { map[String(f.properties.id)] = f });
+      }
     }
     return this.all.map;
   }

package/lib/poly/topo.ts

@@ -59,19 +59,6 @@ function correctGeometry(f: any): any
   {
     let multiPoly = f.geometry.coordinates;
 
-    /* Comment this out right now - might have been do to not rewinding merge output
-    // topojson will under certain circumstances return a MultiPolygon with the first Polygon containing holes
-    // that are precisely filled by a subsequent polygon. We make a secondary union pass to try to correct for this.
-    // If we have a really degenerate multipolygon (test above some number of polygons) omit this expensive pass
-    // since cleanup is unlikely.
-    if (multiPoly.length > 1 && multiPoly.length < 50)
-    {
-      let result = Q.unionPolys(multiPoly);
-      if (Util.depthof(result) == 4) result = [ result ];
-      multiPoly = result;
-    }
-    */
-
     // Convert degenerate MultiPolygon to Polygon
     if (multiPoly.length == 1)
     {
@@ -80,6 +67,9 @@ function correctGeometry(f: any): any
     }
   }
 
+  // TopoJSON does not guarantee proper winding order which messes up later processing. Fix it.
+  P.featureRewind(f);
+
   return f;
 }
 
@@ -194,6 +184,11 @@ export interface SimplifyOptions
 
 const DefaultSimplifyOptions: SimplifyOptions = { minArea: 500 };
 
+function log(s: string): void
+{
+  //console.log(s);
+}
+
 //
 // topoSimplifyCollection:
 //    This implements our simplification strategy for block/precinct level shapes. The basic idea is to
@@ -218,10 +213,10 @@ export function topoSimplifyCollection(col: any, options?: SimplifyOptions): any
   let elapsedTotal = new Util.Elapsed();
   let elapsed = new Util.Elapsed();
   let topo = topoFromCollection(col);
-  console.log(`topoSimplifyCollection: fromCollection: ${Math.round(elapsed.ms())}ms`);
+  log(`topoSimplifyCollection: fromCollection: ${Math.round(elapsed.ms())}ms`);
   elapsed.start();
   topo = TopoSimplify.presimplify(topo, TopoSimplify['sphericalTriangleArea']);
-  console.log(`topoSimplifyCollection: presimplify: ${Math.round(elapsed.ms())}ms`);
+  log(`topoSimplifyCollection: presimplify: ${Math.round(elapsed.ms())}ms`);
   elapsed.start();
 
   // Keep iterating on removing simplification from degenerate shapes
@@ -286,13 +281,13 @@ export function topoSimplifyCollection(col: any, options?: SimplifyOptions): any
           }
         }
       });
-    console.log(`topoSimplifyCollection: pass ${nTries}: ${nBad} (${nTiny} tiny) of ${col.features.length} features are degenerate`);
+    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;
-      console.log(`topoSimplifyCollection: pass ${nTries}: reducing weight limit to ${keepweight}`);
+      log(`topoSimplifyCollection: pass ${nTries}: reducing weight limit to ${keepweight}`);
     }
     nBadLast = nBad;
 
@@ -308,7 +303,7 @@ export function topoSimplifyCollection(col: any, options?: SimplifyOptions): any
     nTries++;
   }
 
-  console.log(`topoSimplifyCollection: total elapsed time: ${bigTimeString(elapsedTotal.ms())}`);
+  log(`topoSimplifyCollection: total elapsed time: ${bigTimeString(elapsedTotal.ms())}`);
 
   return col;
 }
@@ -318,28 +313,7 @@ export function topoMerge(topo: Topo, geoids: string[]): any
   if (geoids == null || geoids.length == 0) return null;
   let objects: any[] = [];
   geoids.forEach((geoid) => objects.push(topo.objects[geoid]));
-  let f: any = correctGeometry({ type: 'Feature', properties: {}, geometry: TopoClient.merge(topo, objects) });
-  P.featureRewind(f);
-
-  /* Comment out for now - may be due to merge output needing to be rewound
-  // If I get a bad output from topoMerge, just do more expensive poly union. This can happen if input polygons
-  // are a little funky (in particular, if they double back along the same edge.
-  if (selfIntersectFast(f))
-  {
-    //console.log('topoMerge: patching selfIntersect');
-    let polys: any[] = [];
-    geoids.forEach((geoid) => polys.push(topoToFeature(topo, geoid).geometry.coordinates));
-    let result = Q.unionPolys(polys);
-    let depth = Util.depthof(result);
-    if (depth === 5 && result.length === 1)
-    {
-      depth = 4;
-      result = result[0];
-    }
-    f = { type: 'feature', properties: {}, geometry: { type: depth == 4 ? 'Polygon' : 'MultiPolygon', coordinates: result } };
-  }
-  */
-  return f;
+  return correctGeometry({ type: 'Feature', properties: {}, geometry: TopoClient.merge(topo, objects) });
 }
 
 export function topoMergeFeatures(topo: Topo, features: any[]): any

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",