@dra2020/baseclient 1.0.5 → 1.0.8

package/dist/baseclient.js

@@ -994,9 +994,17 @@ class FsmSleep extends Fsm {
         this.delay = delay;
     }
     tick() {
-        if (this.ready && this.state === exports.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 === exports.FSM_STARTING) {
             this.setState(exports.FSM_PENDING);
-            setTimeout(() => { this.setState(exports.FSM_DONE); }, this.delay);
+            this.timeoutHandle = setTimeout(() => {
+                delete this.timeoutHandle;
+                this.setState(exports.FSM_DONE);
+            }, this.delay);
         }
     }
 }
@@ -1375,10 +1383,9 @@ class GeoMultiCollection {
             let n = this.nEntries;
             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); });
-            }
+            else
+                // Going from map to collection guarantees that any duplicates are removed
+                this.all.col = geoMapToCollection(this.allMap());
         }
         return this.all.col;
     }
@@ -1390,8 +1397,11 @@ class GeoMultiCollection {
             let n = this.nEntries;
             if (n == 1)
                 this.all.map = this._map(this.nthEntry(0));
-            else
-                this.all.map = geoCollectionToMap(this.allCol());
+            else {
+                let map = {};
+                this.all.map = map;
+                this.forEach(f => { map[String(f.properties.id)] = f; });
+            }
         }
         return this.all.map;
     }
@@ -8050,6 +8060,9 @@ function bigTimeString(ms) {
     return `${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
 }
 const DefaultSimplifyOptions = { minArea: 500 };
+function log(s) {
+    //console.log(s);
+}
 //
 // topoSimplifyCollection:
 //    This implements our simplification strategy for block/precinct level shapes. The basic idea is to
@@ -8072,10 +8085,10 @@ function topoSimplifyCollection(col, options) {
     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
     let nTries = 1;
@@ -8131,11 +8144,11 @@ function topoSimplifyCollection(col, options) {
                 }
             }
         });
-        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;
         if (nBad && nTries > MAX_TRIES)
@@ -8147,7 +8160,7 @@ function topoSimplifyCollection(col, options) {
         }
         nTries++;
     }
-    console.log(`topoSimplifyCollection: total elapsed time: ${bigTimeString(elapsedTotal.ms())}`);
+    log(`topoSimplifyCollection: total elapsed time: ${bigTimeString(elapsedTotal.ms())}`);
     return col;
 }
 exports.topoSimplifyCollection = topoSimplifyCollection;