@dra2020/baseclient 1.0.97 → 1.0.99

package/dist/poly/union.d.ts

@@ -2,6 +2,7 @@ import * as FSM from '../fsm/all';
 import * as Poly from './poly';
 import * as Q from './quad';
 export declare function polyIntersects(p1: any, p2: any): boolean;
+export declare function polyIntersectArea(p1: any, p2: any): number;
 export declare function polyDifference(main: any, parts: any[]): any;
 declare class FsmDifference extends FSM.Fsm {
     accum: any;

package/lib/geo/geo.ts

@@ -443,8 +443,12 @@ export class GeoMultiCollection
         let map: GeoFeatureMap = {};
         this.all.map = map;
         this.forEachEntry(e => {
-            let col = this._col(e); // this ensures we convert feature geometry from topo to polygon
-            col.features.forEach(f => { map[String(f.properties.id)] = f });
+            let col = this._col(e); // convert feature geometry from topo to polygon
+            col.features.forEach(f => {
+                let id = f.properties.id;
+                if (! this.hidden[id])
+                  map[id] = f;
+              });
           });
       }
     }

package/lib/poly/union.ts

@@ -59,6 +59,30 @@ export function polyIntersects(p1: any, p2: any): boolean
   return bIntersects;
 }
 
+export function polyIntersectArea(p1: any, p2: any): number
+{
+  let pp1 = Poly.polyNormalize(p1);
+  let pp2 = Poly.polyNormalize(p2);
+  let area: number = 0;
+
+  PP.polyPackEachRing(pp1, (buffer1: Float64Array, iPoly1: number, iRing1: number, iOffset1: number, nPoints1: number) => {
+      if (iRing1 == 0)
+      {
+        let c1 = unpackCoords(buffer1, iOffset1, nPoints1);
+        PP.polyPackEachRing(pp2, (buffer2: Float64Array, iPoly2: number, iRing2: number, iOffset2: number, nPoints2: number) => {
+            if (iRing2 == 0)
+            {
+              let c2 = unpackCoords(buffer2, iOffset2, nPoints2);
+              let result = _intersection(c1, c2);
+              if (result && result.length > 0)
+                area += Poly.polyArea(result);
+            }
+          });
+      }
+    });
+  return area;
+}
+
 export function polyDifference(main: any, parts: any[]): any
 {
   main = PP.polyUnpack(coords(main));

package/package.json

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