@dra2020/baseclient 1.0.109 → 1.0.111

package/dist/geo/geo.d.ts

@@ -62,6 +62,7 @@ export declare class GeoMultiCollection {
     _col(e: GeoEntry): GeoFeatureCollection;
     _map(e: GeoEntry): GeoFeatureMap;
     _topo(e: GeoEntry): Poly.Topo;
+    _length(e: GeoEntry): number;
     colOf(tag: string): GeoFeatureCollection;
     mapOf(tag: string): GeoFeatureMap;
     topoOf(tag: string): Poly.Topo;
@@ -69,6 +70,7 @@ export declare class GeoMultiCollection {
     allCol(): GeoFeatureCollection;
     allMap(): GeoFeatureMap;
     allTopo(): Poly.Topo;
+    allNewTopo(): Poly.Topo;
     hideSetAll(hm: HideMap): void;
     hide(id: any): void;
     show(id: any): void;

package/lib/geo/geo.ts

@@ -396,6 +396,15 @@ export class GeoMultiCollection
     return e.topo;
   }
 
+  _length(e: GeoEntry): number
+  {
+    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: string): GeoFeatureCollection { return this._col(this.entries[tag]); }
   mapOf(tag: string): GeoFeatureMap { return this._map(this.entries[tag]); }
   topoOf(tag: string): Poly.Topo { return this._topo(this.entries[tag]); }
@@ -466,6 +475,29 @@ export class GeoMultiCollection
   }
 
   allTopo(): Poly.Topo
+  {
+    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(): Poly.Topo
   {
     if (this.nEntries == 0) return null;
     if (! this.all.topo)
@@ -484,9 +516,9 @@ export 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: GeoEntry) =>
-          { return { topology: this._topo(e), filterout: this.hidden } });
-        this.all.topo = Poly.topoSplice(topoarray);
+        let topoarray = Object.values(this.entries).filter((e: GeoEntry) => this._length(e) > 0)
+          .map((e: GeoEntry) => { 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;
@@ -552,14 +584,7 @@ export class GeoMultiCollection
   get length(): number
   {
     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;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.109",
+  "version": "1.0.111",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",