@dra2020/baseclient 1.0.5 → 1.0.8

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/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/poly/topo.ts

@@ -184,6 +184,11 @@ export interface SimplifyOptions
 
 const DefaultSimplifyOptions: SimplifyOptions = { minArea: 500 };
 
+function log(s: string): void
+{
+  //console.log(s);
+}
+
 //
 // topoSimplifyCollection:
 //    This implements our simplification strategy for block/precinct level shapes. The basic idea is to
@@ -208,10 +213,10 @@ export function topoSimplifyCollection(col: any, options?: SimplifyOptions): any
   let elapsedTotal = new Util.Elapsed();
   let elapsed = new Util.Elapsed();
   let topo = topoFromCollection(col);
-  console.log(`topoSimplifyCollection: fromCollection: ${Math.round(elapsed.ms())}ms`);
+  log(`topoSimplifyCollection: fromCollection: ${Math.round(elapsed.ms())}ms`);
   elapsed.start();
   topo = TopoSimplify.presimplify(topo, TopoSimplify['sphericalTriangleArea']);
-  console.log(`topoSimplifyCollection: presimplify: ${Math.round(elapsed.ms())}ms`);
+  log(`topoSimplifyCollection: presimplify: ${Math.round(elapsed.ms())}ms`);
   elapsed.start();
 
   // Keep iterating on removing simplification from degenerate shapes
@@ -276,13 +281,13 @@ export function topoSimplifyCollection(col: any, options?: SimplifyOptions): any
           }
         }
       });
-    console.log(`topoSimplifyCollection: pass ${nTries}: ${nBad} (${nTiny} tiny) of ${col.features.length} features are degenerate`);
+    log(`topoSimplifyCollection: pass ${nTries}: ${nBad} (${nTiny} tiny) of ${col.features.length} features are degenerate`);
 
     // If not making progress, keep more points
     if (nBad >= nBadLast)
     {
       keepweight /= 10;
-      console.log(`topoSimplifyCollection: pass ${nTries}: reducing weight limit to ${keepweight}`);
+      log(`topoSimplifyCollection: pass ${nTries}: reducing weight limit to ${keepweight}`);
     }
     nBadLast = nBad;
 
@@ -298,7 +303,7 @@ export function topoSimplifyCollection(col: any, options?: SimplifyOptions): any
     nTries++;
   }
 
-  console.log(`topoSimplifyCollection: total elapsed time: ${bigTimeString(elapsedTotal.ms())}`);
+  log(`topoSimplifyCollection: total elapsed time: ${bigTimeString(elapsedTotal.ms())}`);
 
   return col;
 }

package/package.json

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