@dra2020/baseclient 1.0.42 → 1.0.45

package/dist/poly/polylabel.d.ts

@@ -3,5 +3,6 @@ interface PolyLabelResult {
     y: number;
     d: number;
 }
+export declare function polyDistance(poly: any, x: number, y: number): number;
 export declare function polyLabel(poly: any, precision?: number, debug?: boolean): PolyLabelResult;
 export {};

package/lib/poly/polylabel.ts

@@ -11,6 +11,28 @@ interface PolyLabelResult
   d: number;
 }
 
+//
+// polyDistance: return (smallest) distance to polygon edge.
+//    Positive value indicates point is in poly, negative indicates point is outside.
+//
+
+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);
+}
+
 //
 // polyLabel: given polygon, return contained point furthest from any edge, and that distance
 //
@@ -47,7 +69,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(b[iFirst], b[iFirst+1], b[iSecond], b[iSecond+1]);
+            iter(iPoly, iRing, b[iFirst], b[iFirst+1], b[iSecond], b[iSecond+1]);
         });
     };
 
@@ -142,15 +164,38 @@ class Cell
 // signed distance from point to polygon outline (negative if point is outside)
 function pointToPolygonDist(x: number, y: number, forEachPointPair: any): number
 {
-  let inside: boolean = false;
+  let iPolyLast = -1;
+  let iRingLast = -1;
+  let inside = false;
+  let thisInside = false;
+  let useInside = false;
+  let isHole = false;
   let minDistSq: number = Infinity;
 
-  forEachPointPair((ax: number, ay: number, bx: number, by: number) => {
+  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;
+      }
       if ((ay > y !== by > y) && (x < (bx - ax) * (y - ay) / (by - ay) + ax))
-        inside = !inside;
-
-      minDistSq = Math.min(minDistSq, getSegDistSq(x, y, ax, ay, bx, by));
+        thisInside = !thisInside;
+
+      let thisDistSq = getSegDistSq(x, y, ax, ay, bx, by);
+      if (thisDistSq < minDistSq)
+      {
+        minDistSq = thisDistSq;
+        useInside = true;
+        isHole = iRing != 0;
+      }
     });
+  if (useInside)
+    inside = isHole ? ! thisInside : thisInside;
 
   return (inside ? 1 : -1) * Math.sqrt(minDistSq);
 }
@@ -164,7 +209,7 @@ function getCentroidCell(forEachPointPair: any): Cell
   let fx: number;
   let fy: number;
 
-  forEachPointPair((ax: number, ay: number, bx: number, by: number) => {
+  forEachPointPair((iPoly: number, iRing: number, 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

@@ -313,12 +313,21 @@ export function topoSimplifyCollection(col: any, options?: SimplifyOptions): any
           if (! bDecided)
           {
             let pp = PP.polyPackTopoArcs(testtopo, arcs);
-            let {x,y} = intpt(f);
-            if (selfIntersectFast(pp) || (x && y && !polyContainsPoint(pp, x, y)))
+            if (selfIntersectFast(pp))
             {
               keepArcs(topo, oOld.arcs, keepweight);
               nBad++;
             }
+            else
+            {
+              let {x,y} = intpt(f);
+              if (x && y && !polyContainsPoint(pp, x, y))
+              {
+                keepArcs(topo, oOld.arcs, keepweight);
+                nBad++;
+                log(`topoSimplifyCollection: ${f.properties.id}: increasing feature fidelity because of intpt problem`);
+              }
+            }
           }
         }
       });

package/package.json

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