@dra2020/baseclient 1.0.155 → 1.0.157

package/lib/poly/union.ts

@@ -49,9 +49,16 @@ export function polyIntersects(p1: any, p2: any): boolean
             if (iRing2 == 0)
             {
               let c2 = unpackCoords(buffer2, iOffset2, nPoints2);
-              let result = _intersection(c1, c2);
-              if (result && result.length > 0)
-                bIntersects = true;  
+              try
+              {
+                let result = _intersection(c1, c2);
+                if (result && result.length > 0)
+                  bIntersects = true;  
+              }
+              catch (err)
+              {
+                // Ignore, treat badly formed as non-intersecting
+              }
             }
           });
       }
@@ -69,9 +76,15 @@ export function polyIntersectArea(p1: any, p2: any): number
       let c1 = unpackCoords(buffer1, iOffset1, nPoints1);
       PP.polyPackEachRing(pp2, (buffer2: Float64Array, iPoly2: number, iRing2: number, iOffset2: number, nPoints2: number) => {
           let c2 = unpackCoords(buffer2, iOffset2, nPoints2);
-          let result = _intersection(c1, c2);
-          if (result && result.length > 0)
-            area += Poly.polyArea(result) * ((!iRing1 == !iRing2) ? 1 : -1);
+          try
+          {
+            let result = _intersection(c1, c2);
+            if (result && result.length > 0)
+              area += Poly.polyArea(result) * ((!iRing1 == !iRing2) ? 1 : -1);
+          }
+          catch (err)
+          {
+          }
         });
     });
   return area;

package/lib/util/util.ts

@@ -310,6 +310,35 @@ export function deepEqual(o1: any, o2: any, options?: EqOptions): boolean
   if (typeof o1 !== 'object' || o1 == null) return false;
   if (typeof o2 !== 'object' || o2 == null) return false;
 
+  // Special case Set
+  if (o1 instanceof Set && o2 instanceof Set)
+  {
+    if (o1.size !== o2.size) return false;
+    let eq = true;
+    o1.forEach((k: any) => { if (! o2.has(k)) eq = false });
+    return eq;
+  }
+
+  // Special case Map
+  if (o1 instanceof Map && o2 instanceof Map)
+  {
+    if (o1.size !== o2.size) return false;
+    let eq = true;
+    o1.forEach((v1: any, k1: any) => {
+        if (eq)
+        {
+          if (! o2.has(k1))
+            eq = false;
+          else
+          {
+            let v2 = o2.get(k1);
+            eq = deepEqual(v1, v2, options);
+          }
+        }
+      });
+    return eq;
+  }
+
   // Special case array
   if (Array.isArray(o1))
   {

package/package.json

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