@dra2020/baseclient 1.0.6 → 1.0.9

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;
     }