@dra2020/baseclient 1.0.95 → 1.0.97

package/dist/baseclient.js

@@ -2658,8 +2658,12 @@ class GeoMultiCollection {
         if (!this.all.col) {
             // optimise case where one entry
             let n = this.nEntries;
-            if (n == 1)
-                this.all.col = this._col(this.nthEntry(0));
+            if (n == 1) {
+                let e = this.nthEntry(0);
+                this.all.col = this._col(e);
+                this.all.topo = this.all.topo || e.topo;
+                this.all.map = this.all.map || e.map;
+            }
             else {
                 // Going from map to collection guarantees that any duplicates are removed
                 this.all.col = geoMapToCollectionNonNull(this.allMap());
@@ -2679,12 +2683,19 @@ class GeoMultiCollection {
         if (!this.all.map) {
             // optimise case where one entry
             let n = this.nEntries;
-            if (n == 1)
-                this.all.map = this._map(this.nthEntry(0));
+            if (n == 1) {
+                let e = this.nthEntry(0);
+                this.all.map = this._map(e);
+                this.all.topo = this.all.topo || e.topo;
+                this.all.col = this.all.col || e.col;
+            }
             else {
                 let map = {};
                 this.all.map = map;
-                this.forEach(f => { map[String(f.properties.id)] = f; });
+                this.forEachEntry(e => {
+                    let col = this._col(e); // this ensures we convert feature geometry from topo to polygon
+                    col.features.forEach(f => { map[String(f.properties.id)] = f; });
+                });
             }
         }
         return this.all.map;
@@ -2695,8 +2706,12 @@ class GeoMultiCollection {
         if (!this.all.topo) {
             // optimise case where one entry
             let n = this.nEntries;
-            if (n == 1)
-                this.all.topo = this._topo(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
                 this.all.topo = geoCollectionToTopoNonNull(this.allCol());
         }
@@ -2790,9 +2805,14 @@ class GeoMultiCollection {
     }
     forEach(cb) {
         this.forEachEntry(e => {
-            let col = this._col(e);
             if (e.col)
-                e.col.features.forEach(f => { if (this.hidden[f.properties.id] === undefined)
+                e.col.features.forEach(f => { if (!this.hidden[f.properties.id])
+                    cb(f); });
+            else if (e.topo)
+                Object.values(e.topo.objects).forEach((f) => { if (!this.hidden[f.properties.id])
+                    cb(f); });
+            else if (e.map)
+                Object.values(e.map).forEach(f => { if (!this.hidden[f.properties.id])
                     cb(f); });
         });
     }