@dra2020/baseclient 1.0.91 → 1.0.93

package/dist/baseclient.js

@@ -2457,7 +2457,6 @@ exports.geoNormalizeCollection = geoNormalizeCollection;
 function geoCollectionToMap(col) {
     if (col == null)
         return null;
-    record('coltomap', col.features.length);
     let map = {};
     col.features.forEach((f) => { map[String(f.properties.id)] = f; });
     return map;
@@ -2474,7 +2473,6 @@ function geoMapToCollectionNonNull(map) {
         return null;
     let col = { type: 'FeatureCollection', features: [] };
     Object.keys(map).forEach((geoid) => { col.features.push(map[geoid]); });
-    record('maptocol', col.features.length);
     return col;
 }
 exports.geoMapToCollectionNonNull = geoMapToCollectionNonNull;
@@ -2482,6 +2480,8 @@ function geoCollectionToTopo(col) {
     let topo = Poly.topoFromCollection(col);
     Poly.topoPack(topo);
     record('coltotopo', col.features.length);
+    if (col.datasets)
+        topo.datasets = col.datasets;
     return topo;
 }
 exports.geoCollectionToTopo = geoCollectionToTopo;
@@ -2493,6 +2493,8 @@ function geoTopoToCollection(topo) {
     let col = Poly.topoToCollection(topo);
     Poly.featurePack(col);
     record('topotocol', col.features.length);
+    if (topo.datasets)
+        col.datasets = topo.datasets;
     return col;
 }
 exports.geoTopoToCollection = geoTopoToCollection;
@@ -2635,9 +2637,16 @@ class GeoMultiCollection {
             let n = this.nEntries;
             if (n == 1)
                 this.all.col = this._col(this.nthEntry(0));
-            else
+            else {
                 // Going from map to collection guarantees that any duplicates are removed
                 this.all.col = geoMapToCollectionNonNull(this.allMap());
+                this.forEachEntry(e => {
+                    if (e.col && e.col.datasets)
+                        this.all.col.datasets = e.col.datasets;
+                    if (e.topo && e.topo.datasets)
+                        this.all.col.datasets = e.topo.datasets;
+                });
+            }
         }
         return this.all.col;
     }
@@ -2873,6 +2882,7 @@ exports.reverseBlockMapping = reverseBlockMapping;
 class MultiBlockMapping {
     constructor(tag, bm) {
         this.entries = [];
+        this.stamp = Math.trunc(Math.random() * Number.MAX_SAFE_INTEGER / 2);
         if (tag && bm)
             this.entries.push({ tag, bm });
     }
@@ -2884,11 +2894,14 @@ class MultiBlockMapping {
         } });
         if (bm)
             this.entries.push({ tag, bm });
+        this.stamp++;
     }
     remove(tag) {
         for (let i = this.entries.length - 1; i >= 0; i--)
-            if (this.entries[i].tag === tag)
+            if (this.entries[i].tag === tag) {
+                this.stamp++;
                 this.entries.splice(i, 1);
+            }
     }
     map(blockid) {
         // Walk backwards to pick up overrides first
@@ -2899,6 +2912,12 @@ class MultiBlockMapping {
         }
         return undefined;
     }
+    multimap(blockid) {
+        let a = [];
+        this.entries.forEach(e => { if (e.bm[blockid])
+            a.push(e.bm[blockid]); });
+        return a;
+    }
     bmOf(tag) {
         let e = this.entries.find(e => e.tag === tag);
         return e ? e.bm : null;