@dra2020/baseclient 1.0.113 → 1.0.115

package/dist/baseclient.js

@@ -2727,6 +2727,11 @@ class GeoMultiCollection {
         return this.all.map;
     }
     allTopo() {
+        // Note that you can't actually switch between allNewTopo and allOldTopo
+        // without calling _onChange between the calls to reset the 'all' tag.
+        return this.allNewTopo();
+    }
+    allOldTopo() {
         if (this.nEntries == 0)
             return null;
         if (!this.all.topo) {
@@ -2751,20 +2756,24 @@ class GeoMultiCollection {
         if (!this.all.topo) {
             // optimise case where one entry
             let n = this.nEntries;
+            let e = 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 {
+            else if (e.topo) {
                 // Old-style, goes through map (to filter hidden) and then collection
                 // this.all.topo = geoCollectionToTopoNonNull(this.allCol());
                 // New style, use splice on packed topologies
+                let filterout = Util.isEmpty(this.hidden) ? null : this.hidden; // splice function requires NULL for empty
                 let topoarray = Object.values(this.entries).filter((e) => this._length(e) > 0)
-                    .map((e) => { return { topology: this._topo(e), filterout: this.hidden }; });
+                    .map((e) => { return { topology: this._topo(e), filterout }; });
                 this.all.topo = topoarray.length == 0 ? null : topoarray.length == 1 ? topoarray[0].topology : Poly.topoSplice(topoarray);
             }
+            else
+                // Old-style, goes through map (to filter hidden) and then collection
+                this.all.topo = geoCollectionToTopoNonNull(this.allCol());
         }
         return this.all.topo;
     }