@dra2020/baseclient 1.0.21 → 1.0.24

package/dist/emit/all.d.ts

@@ -0,0 +1 @@
+export * from './emit';

package/dist/emit/emit.d.ts

@@ -0,0 +1,7 @@
+export declare class Emit {
+    onList: any;
+    constructor();
+    on(eventName: string, cb: any): void;
+    emit(eventName: string, arg1?: any, arg2?: any, arg3?: any): void;
+    off(eventName: string, cb: any): void;
+}

package/dist/ot-js/otsession.d.ts

@@ -53,10 +53,12 @@ export declare type RevisionList = Revision[];
 export interface SessionUser {
     id: string;
     name: string;
+    twitterhandle: string;
 }
 export interface ActiveUser {
     id: string;
     name: string;
+    twitterhandle: string;
     active: number;
 }
 export interface SessionUserIndex {

package/dist/poly/boundbox.d.ts

@@ -14,3 +14,4 @@ export declare function boundbox(poly: any, bbox?: BoundBox): BoundBox;
 export declare function boundboxPoly(bb: BoundBox): any;
 export declare function boundboxArea(poly: any): number;
 export declare function boundboxIntersects(bb1: BoundBox, bb2: BoundBox): boolean;
+export declare function boundboxContains(bb: BoundBox, x: number, y: number): boolean;

package/dist/poly/quad.d.ts

@@ -2,6 +2,7 @@ import * as FSM from '../fsm/all';
 import * as Poly from './poly';
 import * as BB from './boundbox';
 export interface WrappedPoly {
+    f: any;
     box: BB.BoundBox;
     p: any;
 }
@@ -24,11 +25,12 @@ declare class QuadLevel {
     options: QuadOptions;
     level: number;
     children: QuadLevel[];
-    features: any[];
+    features: WrappedPoly[];
     box: BB.BoundBox;
     asyncUnion: any;
     constructor(options: QuadOptions, level: number, box: BB.BoundBox, features: WrappedPoly[]);
     private featureInBox;
+    featureUnderCoord(coord: [number, number]): any;
     union(): any;
     get isempty(): boolean;
     tickUnion(tickCounter: TickCounter): void;

package/dist/util/bintrie.d.ts

@@ -69,6 +69,7 @@ export declare class BinTrie {
     constructor(coder: Coder);
     static fromBuffer(coder: Coder, ab: ArrayBuffer): BinTrie;
     get(key: string): string;
+    forEach(cb: (k: string, v: string) => void): void;
 }
 export interface BinTrieOptions {
     dedup?: boolean;

package/lib/all/all.ts

@@ -19,3 +19,5 @@ import { FilterExpr } from '../filterexpr/all';
 export { FilterExpr }
 import * as G from '../geo/all';
 export { G };
+import * as Emit from '../emit/all';
+export { Emit };

package/lib/emit/all.ts

@@ -0,0 +1 @@
+export * from './emit';

package/lib/emit/emit.ts

@@ -0,0 +1,40 @@
+export class Emit
+{
+  onList: any;
+
+  constructor()
+  {
+    this.onList = {};
+  }
+
+  on(eventName: string, cb: any): void
+  {
+    let aCB: any = this.onList[eventName];
+    if (aCB === undefined)
+    {
+      aCB = [];
+      this.onList[eventName] = aCB;
+    }
+    aCB.push(cb);
+  }
+
+  emit(eventName: string, arg1?: any, arg2?: any, arg3?: any): void
+  {
+    let aCB: any[] = this.onList[eventName];
+    if (aCB !== undefined)
+      for (let i: number = 0; i < aCB.length; i++)
+        (aCB[i])(arg1, arg2, arg3);
+  }
+
+  off(eventName: string, cb: any): void
+  {
+    let aCB: any = this.onList[eventName];
+    if (aCB !== undefined)
+      for (let i: number = 0; i < aCB.length; i++)
+        if (aCB[i] === cb)
+        {
+          aCB.splice(i, 1);
+          break;
+        }
+  }
+}

package/lib/ot-js/otsession.ts

@@ -73,12 +73,14 @@ export interface SessionUser
 {
 	id: string;
 	name: string;
+  twitterhandle: string;
 }
 
 export interface ActiveUser
 {
 	id: string;
 	name: string;
+  twitterhandle: string;
 	active: number;
 }
 

package/lib/poly/boundbox.ts

@@ -100,3 +100,8 @@ export function boundboxIntersects(bb1: BoundBox, bb2: BoundBox): boolean
 {
   return !(bb1.left > bb2.right || bb1.right < bb2.left || bb1.top < bb2.bottom || bb1.bottom > bb2.top);
 }
+
+export function boundboxContains(bb: BoundBox, x: number, y: number): boolean
+{
+  return !(bb.left >= x || bb.right < x || bb.top <= y || bb.bottom > y);
+}

package/lib/poly/quad.ts

@@ -10,6 +10,7 @@ import * as Poly from './poly';
 import * as PP from './polypack';
 import * as BB from './boundbox';
 import * as PR from './polyround';
+import { polyContainsPoint } from './pointinpoly';
 
 let _union: any = undefined;
 let anyPC: any = PC;
@@ -17,7 +18,7 @@ if (anyPC.union) _union = anyPC.union;
 if (anyPC.default && anyPC.default.union) _union = anyPC.default.union;
 if (_union === undefined) throw 'Unable to load union function from polygon-clipping';
 
-export interface WrappedPoly { box: BB.BoundBox, p: any };
+export interface WrappedPoly { f: any, box: BB.BoundBox, p: any };
 
 export interface WorkDone
 {
@@ -28,19 +29,6 @@ export interface WorkDone
 
 function featureCoords(feature: any): any
 {
-/*
-  if (feature.geometry !== undefined)
-  {
-    if (feature.geometry.packed !== undefined)
-      return PP.polyUnpack(feature.geometry.packed);
-    else
-      return feature.geometry.coordinates;
-  }
-  else if (feature.offset !== undefined)
-    return PP.polyUnpack(feature);
-  else
-    return feature;
-*/
   if (feature.geometry !== undefined)
   {
     if (feature.geometry.packed !== undefined)
@@ -85,7 +73,7 @@ class QuadLevel
   options: QuadOptions;
   level: number;
   children: QuadLevel[];
-  features: any[];
+  features: WrappedPoly[];
   box: BB.BoundBox;
   asyncUnion: any;
 
@@ -98,7 +86,7 @@ class QuadLevel
     {
       if (this.level >= options.maxDepth)
         throw `QuadTree: maximum depth of ${options.maxDepth} exceeded`;
-      this.features = features.map((wp: WrappedPoly) => wp.p);
+      this.features = features;
       this.children = null;
     }
     else
@@ -143,12 +131,33 @@ class QuadLevel
     return BB.boundboxIntersects(box, f.box);
   }
 
+  featureUnderCoord(coord: [ number, number ]): any
+  {
+    if (! BB.boundboxContains(this.box, coord[0], coord[1]))
+      return null;
+    if (this.features)
+    {
+      let wp = this.features.find(wp => polyContainsPoint(wp.p, coord[0], coord[1]));
+      return wp ? wp.f : null;
+    }
+    else
+    {
+      for (let i = 0; i < this.children.length; i++)
+      {
+        let f = this.children[i].featureUnderCoord(coord);
+        if (f)
+          return f;
+      }
+      return null;
+    }
+  }
+
   union(): any
   {
     if (this.asyncUnion == null)
     {
       if (this.children == null)
-        this.asyncUnion = unionPolys(this.features);
+        this.asyncUnion = unionPolys(this.features.map(f => f.p));
       else
         this.asyncUnion = unionPolys(this.children.map((q: QuadLevel) => q.union()));
     }
@@ -217,7 +226,7 @@ export class FsmQuadTree extends FSM.Fsm
       this.isempty = features.length == 0;
 
       // Compute BoundBox for each feature
-      let wrapped: WrappedPoly[] = features.map((f: any) => { return { box: BB.boundbox(f), p: featureCoords(f) } });
+      let wrapped: WrappedPoly[] = features.map((f: any) => { return { f: f, box: BB.boundbox(f), p: featureCoords(f) } });
 
       let box = BB.boundbox(col);
       this.quad = new QuadLevel(this.options, 0, box, wrapped);

package/lib/util/bintrie.ts

@@ -57,6 +57,8 @@ Util.setCoder({ encoder: new u.TextEncoder(), decoder: new u.TextDecoder('utf-8'
 Util.setCoder({ encoder: new TextEncoder(), decoder: new TextDecoder('utf-8') });
 */
 
+const MaxKeyLength = 128;
+
 export function s2u8(coder: Coder, s: string): Uint8Array
 {
   return coder.encoder.encode(s);
@@ -343,6 +345,23 @@ export class BinTrie
     }
     return undefined;
   }
+
+  forEach(cb: (k: string, v: string) => void)
+  {
+    let keybuf = new Uint8Array(MaxKeyLength);
+    let keylen = 0;
+
+    let processNode = (len: number, byteOffset: number) => {
+        let iOffset = byteOffset >> 2;
+        let n = this.i32[iOffset];
+        byteOffset += 4;
+        for (let j = 0; j < n; j++)
+        {
+          keybuf[keylen++] = this.u8[byteOffset+j];
+        }
+      };
+    processNode(0, 4);
+  }
 }
 
 export interface BinTrieOptions

package/package.json

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