@dra2020/baseclient 1.0.109 → 1.0.111

package/dist/baseclient.js

@@ -2660,6 +2660,14 @@ class GeoMultiCollection {
         }
         return e.topo;
     }
+    _length(e) {
+        if (e == null)
+            return 0;
+        return e.col ? e.col.features.length
+            : e.map ? Util.countKeys(e.map)
+                : e.topo ? Util.countKeys(e.topo.objects)
+                    : 0;
+    }
     colOf(tag) { return this._col(this.entries[tag]); }
     mapOf(tag) { return this._map(this.entries[tag]); }
     topoOf(tag) { return this._topo(this.entries[tag]); }
@@ -2719,6 +2727,25 @@ class GeoMultiCollection {
         return this.all.map;
     }
     allTopo() {
+        if (this.nEntries == 0)
+            return null;
+        if (!this.all.topo) {
+            // optimise case where one entry
+            let n = this.nEntries;
+            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 {
+                // Old-style, goes through map (to filter hidden) and then collection
+                this.all.topo = geoCollectionToTopoNonNull(this.allCol());
+            }
+        }
+        return this.all.topo;
+    }
+    allNewTopo() {
         if (this.nEntries == 0)
             return null;
         if (!this.all.topo) {
@@ -2734,8 +2761,9 @@ class GeoMultiCollection {
                 // 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 topoarray = Object.values(this.entries).map((e) => { return { topology: this._topo(e), filterout: this.hidden }; });
-                this.all.topo = Poly.topoSplice(topoarray);
+                let topoarray = Object.values(this.entries).filter((e) => this._length(e) > 0)
+                    .map((e) => { return { topology: this._topo(e), filterout: this.hidden }; });
+                this.all.topo = topoarray.length == 0 ? null : topoarray.length == 1 ? topoarray[0].topology : Poly.topoSplice(topoarray);
             }
         }
         return this.all.topo;
@@ -2787,14 +2815,7 @@ class GeoMultiCollection {
     }
     get length() {
         let n = 0;
-        this.forEachEntry(e => {
-            if (e.col)
-                n += e.col.features.length;
-            else if (e.map)
-                n += Util.countKeys(e.map);
-            else if (e.topo)
-                n += Util.countKeys(e.topo.objects);
-        });
+        this.forEachEntry(e => n += this._length(e));
         return n;
     }
     // Use forEach in preference to iteration using this function