@dra2020/baseclient 1.0.47 → 1.0.50

package/dist/poly/topo.d.ts

@@ -8,6 +8,7 @@ export declare function topoToFeature(topo: Topo, geoid: string): any;
 export declare function topoToCollection(topo: Topo): any;
 export interface SimplifyOptions {
     minArea?: number;
+    log?: boolean;
 }
 export declare function topoSimplifyCollection(col: any, options?: SimplifyOptions): any;
 export declare function topoMerge(topo: Topo, geoids: string[]): any;

package/lib/poly/polylabel.ts

@@ -21,16 +21,66 @@ export function polyDistance(poly: any, x: number, y: number): number
   let pp = P.polyNormalize(poly);
   if (pp == null) return 0;
 
-  let forEachPointPair = (iter: any) => {
-      PP.polyPackEachRing(pp, (b: Float64Array, iPoly, iRing: number, iOffset: number, nPoints: number) => {
-          let iFirst = iOffset;
-          let iLast = iOffset + nPoints * 2;
-          let iSecond = iLast - 2;
-          for (; iFirst < iLast; iSecond = iFirst, iFirst += 2)
-            iter(iPoly, iRing, b[iFirst], b[iFirst+1], b[iSecond], b[iSecond+1]);
-        });
-    };
-  return pointToPolygonDist(x, y, forEachPointPair);
+  // First find if it is contained in one of the outer polygons, or outside all outer polygons
+  let iContaining = -1;
+  let maxOutside = - Infinity;
+  let minInside = Infinity;
+  let noholes = true;
+  PP.polyPackEachRing(pp, (b: Float64Array, iPoly: number, iRing: number, iOffset: number, nPoints: number) => {
+      // If we have determined we are inside this polygon, keep track of whether it has holes
+      if (iContaining == iPoly && iRing > 0)
+        noholes = false;
+      // Don't process rings
+      if (iRing > 0) return;
+      // OK, get distance
+      let forEachPointPair = (iter: any) => {
+          PP.polyPackEachRing(pp, (b: Float64Array, iInteriorPoly: number, iRing: number, iOffset: number, nPoints: number) => {
+              if (iRing || iInteriorPoly != iPoly) return;
+              let iFirst = iOffset;
+              let iLast = iOffset + nPoints * 2;
+              let iSecond = iLast - 2;
+              for (; iFirst < iLast; iSecond = iFirst, iFirst += 2)
+                iter(b[iFirst], b[iFirst+1], b[iSecond], b[iSecond+1]);
+            });
+        };
+      let dist = pointToPolygonDist(x, y, forEachPointPair);
+      // If inside, is it closest inside (deal with multipolygons that self-contain - think filled donut)
+      if (dist > 0 && dist < minInside)
+      {
+        iContaining = iPoly;
+        minInside = dist;
+        noholes = true;
+      }
+      else if (dist < 0)
+        maxOutside = Math.max(maxOutside, dist);
+    });
+  if (iContaining < 0)
+    return maxOutside;
+  if (noholes)
+    return minInside;
+
+  // OK, now need to worry about holes in the polygon it is contained in
+  PP.polyPackEachRing(pp, (b: Float64Array, iPoly: number, iRing: number, iOffset: number, nPoints: number) => {
+      // Only want to look at the holes for the containing polygon
+      if (iPoly != iContaining || iRing == 0) return;
+      // Compute distance to those holes
+      let forEachPointPair = (iter: any) => {
+          PP.polyPackEachRing(pp, (b: Float64Array, iInteriorPoly: number, iRing: number, iOffset: number, nPoints: number) => {
+              if (iInteriorPoly != iContaining || iRing == 0) return;
+              let iFirst = iOffset;
+              let iLast = iOffset + nPoints * 2;
+              let iSecond = iLast - 2;
+              for (; iFirst < iLast; iSecond = iFirst, iFirst += 2)
+                iter(b[iFirst], b[iFirst+1], b[iSecond], b[iSecond+1]);
+            });
+        };
+      // Negate distance since dealing with holes
+      let dist = - pointToPolygonDist(x, y, forEachPointPair);
+      // We take the min to either get a negative value (inside hole) or a smaller positive value
+      // (outside hole but close to hole boundary).
+      minInside = Math.min(minInside, dist);
+    });
+  return minInside;
 }
 
 //
@@ -69,7 +119,7 @@ export function polyLabel(poly: any, precision?: number, debug?: boolean): PolyL
           let iLast = iOffset + nPoints * 2;
           let iSecond = iLast - 2;
           for (; iFirst < iLast; iSecond = iFirst, iFirst += 2)
-            iter(iPoly, iRing, b[iFirst], b[iFirst+1], b[iSecond], b[iSecond+1]);
+            iter(b[iFirst], b[iFirst+1], b[iSecond], b[iSecond+1]);
         });
     };
 
@@ -164,38 +214,15 @@ class Cell
 // signed distance from point to polygon outline (negative if point is outside)
 function pointToPolygonDist(x: number, y: number, forEachPointPair: any): number
 {
-  let iPolyLast = -1;
-  let iRingLast = -1;
   let inside = false;
-  let thisInside = false;
-  let useInside = false;
-  let isHole = false;
-  let minDistSq: number = Infinity;
+  let minDistSq = Infinity;
 
-  forEachPointPair((iPoly: number, iRing: number, ax: number, ay: number, bx: number, by: number) => {
-      if (iPoly != iPolyLast || iRing != iRingLast)
-      {
-        if (useInside)
-          inside = isHole ? ! thisInside : thisInside;
-        iPolyLast = iPoly;
-        iRingLast = iRing;
-        thisInside = false;
-        useInside = false;
-        isHole = false;
-      }
+  forEachPointPair((ax: number, ay: number, bx: number, by: number) => {
       if ((ay > y !== by > y) && (x < (bx - ax) * (y - ay) / (by - ay) + ax))
-        thisInside = !thisInside;
+        inside = !inside;
 
-      let thisDistSq = getSegDistSq(x, y, ax, ay, bx, by);
-      if (thisDistSq < minDistSq)
-      {
-        minDistSq = thisDistSq;
-        useInside = true;
-        isHole = iRing != 0;
-      }
+      minDistSq = Math.min(minDistSq, getSegDistSq(x, y, ax, ay, bx, by));
     });
-  if (useInside)
-    inside = isHole ? ! thisInside : thisInside;
 
   return (inside ? 1 : -1) * Math.sqrt(minDistSq);
 }
@@ -209,7 +236,7 @@ function getCentroidCell(forEachPointPair: any): Cell
   let fx: number;
   let fy: number;
 
-  forEachPointPair((iPoly: number, iRing: number, ax: number, ay: number, bx: number, by: number) => {
+  forEachPointPair((ax: number, ay: number, bx: number, by: number) => {
       if (fx === undefined) fx = ax, fy = ay;
       let f: number = ax * by - bx * ay;
       x += (ax + bx) * f;

package/lib/poly/topo.ts

@@ -215,13 +215,14 @@ function intpt(f: any): { x: number, y: number }
 export interface SimplifyOptions
 {
   minArea?: number,
+  log?: boolean,
 }
 
 const DefaultSimplifyOptions: SimplifyOptions = { minArea: 500 };
 
-function log(s: string): void
+function log(emitlog: boolean, s: string): void
 {
-  console.log(s);
+  if (emitlog) console.log(s);
 }
 
 //
@@ -248,10 +249,10 @@ export function topoSimplifyCollection(col: any, options?: SimplifyOptions): any
   let elapsedTotal = new Util.Elapsed();
   let elapsed = new Util.Elapsed();
   let topo = topoFromCollection(col);
-  log(`topoSimplifyCollection: fromCollection: ${Math.round(elapsed.ms())}ms`);
+  log(options.log, `topoSimplifyCollection: fromCollection: ${Math.round(elapsed.ms())}ms`);
   elapsed.start();
   topo = TopoSimplify.presimplify(topo, TopoSimplify['sphericalTriangleArea']);
-  log(`topoSimplifyCollection: presimplify: ${Math.round(elapsed.ms())}ms`);
+  log(options.log, `topoSimplifyCollection: presimplify: ${Math.round(elapsed.ms())}ms`);
   elapsed.start();
 
   // Keep iterating on removing simplification from degenerate shapes
@@ -313,6 +314,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,24 +323,25 @@ 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
               {
                 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 of intpt problem`);
+                log(options.log, `topoSimplifyCollection: ${f.properties.id}: increasing feature fidelity because intpt dist is ${d}`);
               }
             }
           }
         }
       });
-    log(`topoSimplifyCollection: pass ${nTries}: ${nBad} (${nTiny} tiny) of ${col.features.length} features are degenerate`);
+    log(options.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;
-      log(`topoSimplifyCollection: pass ${nTries}: reducing weight limit to ${keepweight}`);
+      log(options.log, `topoSimplifyCollection: pass ${nTries}: reducing weight limit to ${keepweight}`);
     }
     nBadLast = nBad;
 
@@ -354,7 +357,7 @@ export function topoSimplifyCollection(col: any, options?: SimplifyOptions): any
     nTries++;
   }
 
-  log(`topoSimplifyCollection: total elapsed time: ${bigTimeString(elapsedTotal.ms())}`);
+  log(options.log, `topoSimplifyCollection: total elapsed time: ${bigTimeString(elapsedTotal.ms())}`);
 
   return col;
 }

package/package.json

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