@dra2020/baseclient 1.0.38 → 1.0.41

package/dist/poly/poly.d.ts

@@ -50,3 +50,4 @@ export declare function npoints(poly: any): number;
 export declare function polyTransform(poly: any, transformFn: any): any;
 export declare function featureRewind(poly: any): any;
 export declare function polyRewindRings(pp: any, bLog?: boolean): any;
+export declare function polyBadCoordinates(f: any): boolean;

package/dist/util/util.d.ts

@@ -41,7 +41,8 @@ export interface EqOptions {
         [key: string]: boolean;
     };
     unorderedArrays?: boolean;
-    emptyStringIsNull: boolean;
+    emptyStringIsNull?: boolean;
+    epsilon?: number;
 }
 export declare function deepEqual(o1: any, o2: any, options?: EqOptions): boolean;
 export declare function prettyDate(d: Date): string;

package/lib/poly/poly.ts

@@ -766,3 +766,28 @@ function twoTimesArea(x2: number, x1: number, y2: number, y1: number): number
   return (x2 - x1) * (y2 + y1);
 }
 
+function badCoord(c: number): boolean
+{
+  return isNaN(c) || c > 360 || c < -360;
+}
+
+export function polyBadCoordinates(f: any): boolean
+{
+  if (f.type === 'FeatureCollection' && f.features)
+  {
+    for (let i = 0; i < f.features.length; i++)
+      if (polyBadCoordinates(f.features[i])) return true;
+    return false;
+  }
+
+  let pp = polyNormalize(f);
+  let bad = false;
+  if (pp)
+  {
+    PP.polyPackEachPoint(pp, (b: Float64Array, iPoly: number, iRing: number, iOffset: number) => {
+        if (bad) return;
+        bad = badCoord(b[iOffset]) || badCoord(b[iOffset+1]);
+      });
+  }
+  return bad;
+}

package/lib/poly/topo.ts

@@ -14,6 +14,7 @@ import * as Q from './quad';
 import * as PP from './polypack';
 import * as PL from './polylabel';
 import { selfIntersectFast } from './shamos';
+import { polyContainsPoint } from './pointinpoly';
 
 export type Topo = any;
 
@@ -193,6 +194,24 @@ function bigTimeString(ms: number): string
   return `${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
 }
 
+function intpt(f: any): { x: number, y: number }
+{
+  let x = 0, y = 0;
+  for (let p in ['INTPTLON20','INTPTLON10','INTPTLON','labelx'])
+    if (f.properties[p] && !isNaN(Number(f.properties[p])))
+    {
+      x = Number(f.properties[p]);
+      break;
+    }
+  for (let p in ['INTPTLAT20','INTPTLAT10','INTPTLAT','labely'])
+    if (f.properties[p] && !isNaN(Number(f.properties[p])))
+    {
+      y = Number(f.properties[p]);
+      break;
+    }
+  return {x: x, y: y};
+}
+
 export interface SimplifyOptions
 {
   minArea?: number,
@@ -294,7 +313,8 @@ export function topoSimplifyCollection(col: any, options?: SimplifyOptions): any
           if (! bDecided)
           {
             let pp = PP.polyPackTopoArcs(testtopo, arcs);
-            if (selfIntersectFast(pp))
+            let {x,y} = intpt(f);
+            if (selfIntersectFast(pp) || (x && y && !polyContainsPoint(pp, x, y)))
             {
               keepArcs(topo, oOld.arcs, keepweight);
               nBad++;

package/lib/util/util.ts

@@ -264,12 +264,14 @@ export interface EqOptions
 {
   omitKey?: { [key: string]: boolean },
   unorderedArrays?: boolean,
-  emptyStringIsNull: boolean,
+  emptyStringIsNull?: boolean,
+  epsilon?: number,
 }
 
 function exactEqual(o1: any, o2: any, options?: EqOptions): boolean
 {
   if (o1 === o2) return true;
+  if (options && options.epsilon && typeof o1 === 'number' && typeof o2 === 'number' && Math.abs(o1-o2) < options.epsilon) return true;
   if (options && options.emptyStringIsNull)
     if ((o1 == null && o2 == '') || (o2 == null && o1 == ''))
       return true;

package/package.json

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