@dra2020/baseclient 1.0.6 → 1.0.9

package/dist/fsm/fsm.d.ts

@@ -63,6 +63,7 @@ export declare class FsmOnDone extends Fsm {
 }
 export declare class FsmSleep extends Fsm {
     delay: number;
+    timeoutHandle: any;
     constructor(env: FsmEnvironment, delay: number);
     tick(): void;
 }

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

@@ -83,6 +83,8 @@ export interface SessionProps {
     loadFailed: boolean;
     accessMap: AccessMap;
     revisions: RevisionList;
+    expunged?: boolean;
+    expungeDate?: string;
     xprops?: {
         [prop: string]: string;
     };

package/lib/fsm/fsm.ts

@@ -291,6 +291,7 @@ export class FsmOnDone extends Fsm
 export class FsmSleep extends Fsm
 {
   delay: number;
+  timeoutHandle: any;
 
   constructor(env: FsmEnvironment, delay: number)
     {
@@ -300,10 +301,19 @@ export class FsmSleep extends Fsm
 
   tick(): void
     {
-      if (this.ready && this.state === FSM_STARTING)
+      // This allows canceling by simply setting state to done
+      if (this.done && this.timeoutHandle !== undefined)
+      {
+        clearTimeout(this.timeoutHandle);
+        delete this.timeoutHandle;
+      }
+      else if (this.ready && this.state === FSM_STARTING)
       {
         this.setState(FSM_PENDING);
-        setTimeout(() => { this.setState(FSM_DONE); }, this.delay);
+        this.timeoutHandle = setTimeout(() => {
+            delete this.timeoutHandle;
+            this.setState(FSM_DONE)
+          }, this.delay);
       }
     }
 }

package/lib/geo/geo.ts

@@ -218,10 +218,8 @@ export class GeoMultiCollection
       if (n == 1)
         this.all.col = this._col(this.nthEntry(0));
       else
-      {
-        this.all.col = { type: 'FeatureCollection', features: [] };
-        this.forEach(f => { this.all.col.features.push(f) });
-      }
+        // Going from map to collection guarantees that any duplicates are removed
+        this.all.col = geoMapToCollection(this.allMap());
     }
     return this.all.col;
   }
@@ -236,7 +234,11 @@ export class GeoMultiCollection
       if (n == 1)
         this.all.map = this._map(this.nthEntry(0));
       else
-        this.all.map = geoCollectionToMap(this.allCol());
+      {
+        let map: GeoFeatureMap = {};
+        this.all.map = map;
+        this.forEach(f => { map[String(f.properties.id)] = f });
+      }
     }
     return this.all.map;
   }

package/lib/ot-js/otsession.ts

@@ -111,6 +111,8 @@ export interface SessionProps
 	loadFailed: boolean;
   accessMap: AccessMap;
   revisions: RevisionList;
+  expunged?: boolean;
+  expungeDate?: string;
   xprops?: { [prop: string]: string };
 }
 

package/package.json

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