@dra2020/baseclient 1.0.98 → 1.0.100

package/dist/geo/geo.d.ts

@@ -10,7 +10,11 @@ export declare type GeoCentroidMap = {
         y: number;
     };
 };
+export declare type HideMap = {
+    [id: string]: boolean;
+};
 export declare function dumpMetrics(): void;
+export declare function hidemapConcat(...args: HideMap[]): HideMap;
 export interface NormalizeOptions {
     joinPolygons?: boolean;
     checkRewind?: boolean;
@@ -44,7 +48,7 @@ export declare function geoMapEqual(m1: GeoFeatureMap, m2: GeoFeatureMap): boole
 export declare class GeoMultiCollection {
     entries: GeoEntryMap;
     all: GeoEntry;
-    hidden: any;
+    hidden: HideMap;
     stamp: number;
     constructor(tag?: string, topo?: Poly.Topo, col?: GeoFeatureCollection, map?: GeoFeatureMap);
     empty(): void;
@@ -65,6 +69,7 @@ export declare class GeoMultiCollection {
     allCol(): GeoFeatureCollection;
     allMap(): GeoFeatureMap;
     allTopo(): Poly.Topo;
+    hideSetAll(hm: HideMap): void;
     hide(id: any): void;
     show(id: any): void;
     showAll(): void;

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

@@ -7,6 +7,7 @@ export type GeoFeature = geojson.Feature;
 export type GeoFeatureArray = GeoFeature[];
 export type GeoFeatureCollection = geojson.FeatureCollection;
 export type GeoCentroidMap = { [geoid: string]: { x: number, y: number } };
+export type HideMap = { [id: string]: boolean };
 
 // Tracing/debugging aid
 let metrics: { [action: string]: { count: number, total: number } } = {};
@@ -26,6 +27,15 @@ export function dumpMetrics(): void
     });
 }
 
+export function hidemapConcat(...args: HideMap[]): HideMap
+{
+  let hm: HideMap = {};
+
+  for (let i = 0; i < args.length; i++)
+    if (args[i]) Object.keys(args[i]).forEach(id => hm[id] = true);
+  return hm;
+}
+
 export interface NormalizeOptions
 {
   joinPolygons?: boolean,
@@ -241,7 +251,7 @@ export class GeoMultiCollection
 {
   entries: GeoEntryMap;
   all: GeoEntry;
-  hidden: any;
+  hidden: HideMap;
   stamp: number;
 
   constructor(tag?: string, topo?: Poly.Topo, col?: GeoFeatureCollection, map?: GeoFeatureMap)
@@ -475,6 +485,16 @@ export class GeoMultiCollection
     return this.all.topo;
   }
 
+  hideSetAll(hm: HideMap): void
+  {
+    // Prevents onChange when resetting to same value
+    if (! Util.shallowEqual(this.hidden, hm))
+    {
+      this.showAll();
+      this.hide(hm);
+    }
+  }
+
   hide(id: any): void
   {
     if (id)

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.98",
+  "version": "1.0.100",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",