@dra2020/baseclient 1.0.14 → 1.0.17

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,15 @@ function correctGeometry(f: any): any
     }
   }
 
+  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
+    // TopoJSON does not guarantee proper winding order which messes up later processing. Fix it.
+    P.featureRewind(f);
+
   return f;
 }
 
@@ -194,6 +190,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 +219,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
@@ -240,6 +241,11 @@ export function topoSimplifyCollection(col: any, options?: SimplifyOptions): any
     col.features.forEach((f: any) => {
         let oOld: any = topo.objects[f.properties.id];
         let oNew: any = testtopo.objects[f.properties.id];
+
+        // Ignore points
+        if (f.geometry && f.geometry.type === 'Point')
+          keepTiny.set(f, f);
+
         if (! keepTiny.has(f))
         {
           // Walk through each polygon of a multipolygon separately since I may have a large non-degenerate
@@ -286,13 +292,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 +314,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 +324,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
@@ -392,7 +377,7 @@ class FsmIncrementalUnion extends FSM.Fsm
       let values = Object.values(map);
       this.work = { nUnion: values.length, nDifference: 0, ms: 0 };
       let elapsed = new Util.Elapsed();
-      this.result = topoMergeFeatures(this.key.topo, values);
+      this.result = topoMergeFeatures(this.key.multi.allTopo(), values);
       this.work.ms = elapsed.ms();
       this.map = map;
     }

package/lib/poly/union.ts

@@ -59,6 +59,23 @@ export function polyIntersects(p1: any, p2: any): boolean
   return bIntersects;
 }
 
+export function polyDifference(main: any, parts: any[]): any
+{
+  main = PP.polyUnpack(coords(main));
+
+  // need to explode multipolygon so that "exploded" is a valid multipolygon input to underlying difference routine
+  let exploded: any[] = [];
+  parts.forEach((p: any) => {
+      p = PP.polyUnpack(coords(p));
+      if (Util.depthof(p) == 5)
+        p.forEach((poly: any) => { exploded.push(poly) });
+      else
+        exploded.push(p);
+    });
+
+  return PR.polyRound(_difference(main, exploded));
+}
+
 class FsmDifference extends FSM.Fsm
 {
   accum: any;

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.14",
+  "version": "1.0.17",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
-  "types": "dist/all/allclient.d.ts",
+  "types": "./dist/all/all.d.ts",
   "scripts": {
     "test": "echo \"No test defined.\"",
     "build": "webpack",
@@ -16,7 +16,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/dra2020/base.git"
+    "url": "git+https://github.com/dra2020/baseclient.git"
   },
   "keywords": [
     "Typescript"
@@ -24,26 +24,25 @@
   "author": "Terry Crowley",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/dra2020/base/issues"
+    "url": "https://github.com/dra2020/baseclient/issues"
   },
-  "homepage": "https://github.com/dra2020/base#readme",
+  "homepage": "https://github.com/dra2020/baseclient#readme",
   "devDependencies": {
     "@types/diff-match-patch": "^1.0.32",
     "@types/geojson": "^7946.0.7",
     "@types/node": "12.7.2",
     "@types/object-hash": "^1.3.4",
-    "source-map-loader": "^1.1.3",
-    "ts-loader": "^8.0.12",
+    "source-map-loader": "^2.0.0",
+    "ts-loader": "^8.0.14",
     "tsify": "^5.0.2",
     "typescript": "^4.1.3",
-    "webpack": "^5.10.1",
-    "webpack-cli": "^4.2.0"
+    "webpack": "^5.15.0",
+    "webpack-cli": "^4.4.0"
   },
   "dependencies": {
     "@dra2020/topojson-client": "^3.2.7",
     "@dra2020/topojson-server": "^3.0.103",
     "@dra2020/topojson-simplify": "^3.0.102",
-    "aws-sdk": "^2.825.0",
     "diff-match-patch": "^1.0.5",
     "geojson": "^0.5.0",
     "object-hash": "^2.1.1",

package/dist/all/allclient.d.ts

@@ -1,18 +0,0 @@
-import * as Util from '../util/all';
-export { Util };
-import * as Context from '../context/all';
-export { Context };
-import * as FSM from '../fsm/all';
-export { FSM };
-import * as Poly from '../poly/all';
-export { Poly };
-import * as LogAbstract from '../logabstract/all';
-export { LogAbstract };
-import * as LogClient from '../logclient/all';
-export { LogClient };
-import * as OT from '../ot-js/all';
-export { OT };
-import * as OTE from '../ot-editutil/all';
-export { OTE };
-import { FilterExpr } from '../filterexpr/all';
-export { FilterExpr };