@dra2020/baseclient 1.0.45 → 1.0.48

package/lib/poly/topo.ts

@@ -184,7 +184,7 @@ function misMatchObject(o1: any, o2: any): boolean
   return (o1.type === 'MultiPolygon') ? misMatchMulti(o1.arcs, o2.arcs) : misMatchPoly(o1.arcs, o2.arcs);
 }
 
-const MAX_TRIES = 25;
+const MAX_TRIES = 30;
 
 function bigTimeString(ms: number): string
 {
@@ -221,7 +221,7 @@ const DefaultSimplifyOptions: SimplifyOptions = { minArea: 500 };
 
 function log(s: string): void
 {
-  //console.log(s);
+  console.log(s);
 }
 
 //
@@ -313,6 +313,7 @@ export function topoSimplifyCollection(col: any, options?: SimplifyOptions): any
           if (! bDecided)
           {
             let pp = PP.polyPackTopoArcs(testtopo, arcs);
+            P.polyRewindRings(pp);
             if (selfIntersectFast(pp))
             {
               keepArcs(topo, oOld.arcs, keepweight);
@@ -321,11 +322,13 @@ export function topoSimplifyCollection(col: any, options?: SimplifyOptions): any
             else
             {
               let {x,y} = intpt(f);
-              if (x && y && !polyContainsPoint(pp, x, y))
+              let d = PL.polyDistance(pp, x, y);
+              if (d < 0.00001)  // d is negative if outside the polygon, so that qualifies here
               {
-                keepArcs(topo, oOld.arcs, keepweight);
-                nBad++;
-                log(`topoSimplifyCollection: ${f.properties.id}: increasing feature fidelity because of intpt problem`);
+                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}`);
               }
             }
           }

package/package.json

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