@dra2020/baseclient 1.0.40 → 1.0.43

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 of ['INTPTLON20','INTPTLON10','INTPTLON','labelx'])
+    if (f.properties[p] && !isNaN(Number(f.properties[p])))
+    {
+      x = Number(f.properties[p]);
+      break;
+    }
+  for (let p of ['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,
@@ -202,7 +221,7 @@ const DefaultSimplifyOptions: SimplifyOptions = { minArea: 500 };
 
 function log(s: string): void
 {
-  //console.log(s);
+  console.log(s);
 }
 
 //
@@ -299,6 +318,17 @@ export function topoSimplifyCollection(col: any, options?: SimplifyOptions): any
               keepArcs(topo, oOld.arcs, keepweight);
               nBad++;
             }
+            else
+            {
+              let {x,y} = intpt(f);
+              if (x && y && !polyContainsPoint(pp, x, y))
+              {
+                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}: preserving full feature because of intpt problem`);
+              }
+            }
           }
         }
       });

package/package.json

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