@dra2020/baseclient 1.0.18 → 1.0.21

package/dist/poly/all.d.ts

@@ -13,3 +13,4 @@ export * from './polyround';
 export * from './topo';
 export * from './selfintersect';
 export * from './shamos';
+export * from './pointinpoly';

package/dist/poly/pointinpoly.d.ts

@@ -0,0 +1 @@
+export declare function polyContainsPoint(poly: any, x: number, y: number): boolean;

package/dist/util/bintrie.d.ts

@@ -70,7 +70,12 @@ export declare class BinTrie {
     static fromBuffer(coder: Coder, ab: ArrayBuffer): BinTrie;
     get(key: string): string;
 }
+export interface BinTrieOptions {
+    dedup?: boolean;
+    verbose?: boolean;
+}
 export declare class BinTrieBuilder {
+    options: BinTrieOptions;
     coder: Coder;
     root: UnpackedNode;
     vtb: ValueTableBuilder;
@@ -78,7 +83,7 @@ export declare class BinTrieBuilder {
     ab: ArrayBuffer;
     u8: Uint8Array;
     i32: Int32Array;
-    constructor(coder: Coder);
+    constructor(coder: Coder, options?: BinTrieOptions);
     nodeCount(node: UnpackedNode): number;
     nodeBranching(node: UnpackedNode, counts: number[]): number;
     nodeValueCount(node: UnpackedNode): number;
@@ -88,6 +93,6 @@ export declare class BinTrieBuilder {
     getUnpacked(key: string): string;
     packNode(node: UnpackedNode, byteOffset: number): number;
     toBinary(): void;
-    static fromMap(coder: Coder, o: StringMap): BinTrie;
+    static fromMap(coder: Coder, o: StringMap, options?: BinTrieOptions): BinTrie;
 }
 export {};

package/lib/poly/all.ts

@@ -13,3 +13,4 @@ export * from './polyround';
 export * from './topo';
 export * from './selfintersect';
 export * from './shamos';
+export * from './pointinpoly';

package/lib/poly/pointinpoly.ts

@@ -0,0 +1,29 @@
+import * as PP from './polypack';
+
+export function polyContainsPoint(poly: any, x: number, y: number): boolean
+{
+  let pp = PP.polyPack(poly);
+  if (pp == null) return false;
+  let bFound = false;
+  let bInside = false;
+
+  PP.polyPackEachRing(pp, (b: Float64Array, iPoly: number, iRing: number, iOffset: number, nPoints: number) => {
+      if (bFound) return;
+      let inside = false;
+      let iEnd = iOffset + (nPoints - 1) * 2;
+      for (let i = iOffset, j = iEnd; i < iEnd; j = i, i += 2)
+      {
+        let xi = b[i], yi = b[i+1];
+        let xj = b[j], yj = b[j+1];
+        let intersect = ((yi > y) !== (yj > y))
+                        && (x < (xj - xi) * (y - yi) / (yj - yi) + xi);
+        if (intersect) inside = !inside;
+      }
+      if (inside)
+      {
+        bFound = iRing > 0;   // if inside a hole, don't need to process further
+        bInside = iRing == 0; // not inside if inside a hole
+      }
+    });
+  return bInside;
+}

package/lib/util/bintrie.ts

@@ -1,3 +1,5 @@
+import * as U from './util';
+
 //
 // Packed format Trie for mapping string to string
 //  Assumptions:
@@ -343,8 +345,16 @@ export class BinTrie
   }
 }
 
+export interface BinTrieOptions
+{
+  dedup?: boolean,
+  verbose?: boolean,
+}
+let DefaultOptions: BinTrieOptions = { dedup: true, verbose: false };
+
 export class BinTrieBuilder
 {
+  options: BinTrieOptions;
   coder: Coder;
   root: UnpackedNode;
   vtb: ValueTableBuilder;
@@ -353,9 +363,10 @@ export class BinTrieBuilder
   u8: Uint8Array;
   i32: Int32Array;
 
-  constructor(coder: Coder)
+  constructor(coder: Coder, options?: BinTrieOptions)
   {
     this.coder = coder;
+    this.options = U.shallowAssignImmutable(DefaultOptions, options);
   }
 
   // Building
@@ -542,9 +553,9 @@ export class BinTrieBuilder
   }
 
   // Building
-  static fromMap(coder: Coder, o: StringMap): BinTrie
+  static fromMap(coder: Coder, o: StringMap, options?: BinTrieOptions): BinTrie
   {
-    let btb = new BinTrieBuilder(coder);
+    let btb = new BinTrieBuilder(coder, options);
     btb.vtb = ValueTableBuilder.fromStrings(coder, Object.values(o));
     btb.vt = ValueTable.fromBuffer(coder, btb.vtb.ab, 0, btb.vtb.ab.byteLength);
     let keys = Object.keys(o);
@@ -563,7 +574,8 @@ export class BinTrieBuilder
       });
 
     // dedup (collapse branches pointing to same value)
-    btb.dedup(btb.root);
+    if (btb.options.dedup)
+      btb.dedup(btb.root);
 
     // validate
     keys.forEach(k => {
@@ -596,7 +608,8 @@ export class BinTrieBuilder
         }
       });
 
-    console.log(`bintrie: total size: ${btb.u8.length}, value table size: ${btb.vtb.u8.length}`);
+    if (btb.options.verbose)
+      console.log(`bintrie: total size: ${btb.u8.length}, value table size: ${btb.vtb.u8.length}`);
 
     return bt;
   }

package/package.json

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