@dra2020/baseclient 1.0.94 → 1.0.96

package/dist/baseclient.js

@@ -2575,21 +2575,25 @@ class GeoMultiCollection {
     }
     // Add the "all" collection from the passed in multi, but do not force compute of any things not computed yet.
     addAll(tag, multi) {
-        let nEntries = Util.countKeys(multi.entries);
-        if (nEntries) {
-            // Make sure all collection is created
-            if (!multi.all.topo && !multi.all.col && !multi.all.map) {
-                // Create cheapest one (collection if I need to create, otherwise copy from single entry)
-                if (nEntries > 1)
-                    multi.allCol();
-                else {
-                    let e = multi.nthEntry(0);
-                    multi.all.topo = e.topo;
-                    multi.all.col = e.col;
-                    multi.all.map = e.map;
+        if (multi == null || Util.isEmpty(multi.entries))
+            this.remove(tag);
+        else {
+            let nEntries = Util.countKeys(multi.entries);
+            if (nEntries) {
+                // Make sure all collection is created
+                if (!multi.all.topo && !multi.all.col && !multi.all.map) {
+                    // Create cheapest one (collection if I need to create, otherwise copy from single entry)
+                    if (nEntries > 1)
+                        multi.allCol();
+                    else {
+                        let e = multi.nthEntry(0);
+                        multi.all.topo = e.topo;
+                        multi.all.col = e.col;
+                        multi.all.map = e.map;
+                    }
                 }
+                this.add(tag, multi.all.topo, multi.all.col, multi.all.map);
             }
-            this.add(tag, multi.all.topo, multi.all.col, multi.all.map);
         }
     }
     remove(tag) {
@@ -2654,8 +2658,12 @@ class GeoMultiCollection {
         if (!this.all.col) {
             // optimise case where one entry
             let n = this.nEntries;
-            if (n == 1)
-                this.all.col = this._col(this.nthEntry(0));
+            if (n == 1) {
+                let e = this.nthEntry(0);
+                this.all.col = this._col(e);
+                this.all.topo = this.all.topo || e.topo;
+                this.all.map = this.all.map || e.map;
+            }
             else {
                 // Going from map to collection guarantees that any duplicates are removed
                 this.all.col = geoMapToCollectionNonNull(this.allMap());
@@ -2675,8 +2683,12 @@ class GeoMultiCollection {
         if (!this.all.map) {
             // optimise case where one entry
             let n = this.nEntries;
-            if (n == 1)
-                this.all.map = this._map(this.nthEntry(0));
+            if (n == 1) {
+                let e = this.nthEntry(0);
+                this.all.map = this._map(e);
+                this.all.topo = this.all.topo || e.topo;
+                this.all.col = this.all.col || e.col;
+            }
             else {
                 let map = {};
                 this.all.map = map;
@@ -2691,8 +2703,12 @@ class GeoMultiCollection {
         if (!this.all.topo) {
             // optimise case where one entry
             let n = this.nEntries;
-            if (n == 1)
-                this.all.topo = this._topo(this.nthEntry(0));
+            if (n == 1) {
+                let e = this.nthEntry(0);
+                this.all.topo = this._topo(e);
+                this.all.col = this.all.col || e.col;
+                this.all.map = this.all.map || e.map;
+            }
             else
                 this.all.topo = geoCollectionToTopoNonNull(this.allCol());
         }
@@ -2786,9 +2802,14 @@ class GeoMultiCollection {
     }
     forEach(cb) {
         this.forEachEntry(e => {
-            let col = this._col(e);
             if (e.col)
-                e.col.features.forEach(f => { if (this.hidden[f.properties.id] === undefined)
+                e.col.features.forEach(f => { if (!this.hidden[f.properties.id])
+                    cb(f); });
+            else if (e.topo)
+                Object.values(e.topo.objects).forEach((f) => { if (!this.hidden[f.properties.id])
+                    cb(f); });
+            else if (e.map)
+                Object.values(e.map).forEach(f => { if (!this.hidden[f.properties.id])
                     cb(f); });
         });
     }