@dra2020/baseclient 1.0.114 → 1.0.116

package/lib/geo/geo.ts

@@ -511,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/lib/ot-js/otclientengine.ts

@@ -94,8 +94,9 @@ export class OTClientEngine extends OTE.OTEngine
       if (b != this.bReadOnly)
       {
         this.bReadOnly = b;
-        if (this.bReadOnly)
-          this.failbackToServerState();
+        //No longer necessary - especially since we want to allow local edits to be applied for temporary work.
+        //if (this.bReadOnly)
+         // this.failbackToServerState();
       }
     }
 
@@ -307,7 +308,10 @@ export class OTClientEngine extends OTE.OTEngine
 	//
 	addLocalEdit(orig: OTC.OTCompositeResource): void
 		{
-      if (! this.bReadOnly)
+      //Comment out bReadOnly test to now allow changes to be locally applied for readonly sessions, for playing around.
+      //Server still prevents any edits from actually being applied. And clientsession changes
+      //Don't actually send edits as well.
+      //if (! this.bReadOnly)
       {
         try
         {

package/package.json

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