@dra2020/baseclient 1.0.113 → 1.0.115

package/dist/geo/geo.d.ts

@@ -70,6 +70,7 @@ export declare class GeoMultiCollection {
     allCol(): GeoFeatureCollection;
     allMap(): GeoFeatureMap;
     allTopo(): Poly.Topo;
+    allOldTopo(): Poly.Topo;
     allNewTopo(): Poly.Topo;
     hideSetAll(hm: HideMap): void;
     hide(id: any): void;

package/lib/geo/geo.ts

@@ -475,6 +475,13 @@ export class GeoMultiCollection
   }
 
   allTopo(): Poly.Topo
+  {
+    // 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(): Poly.Topo
   {
     if (this.nEntries == 0) return null;
     if (! this.all.topo)
@@ -504,22 +511,26 @@ export class GeoMultiCollection
     {
       // 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: GeoEntry) => this._length(e) > 0)
-          .map((e: GeoEntry) => { return { topology: this._topo(e), filterout: this.hidden } });
+          .map((e: GeoEntry) => { 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;
   }

package/package.json

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