@dra2020/baseclient 1.0.92 → 1.0.94

package/dist/geo/geo.d.ts

@@ -52,6 +52,7 @@ export declare class GeoMultiCollection {
     nthEntry(n: number): GeoEntry;
     add(tag: string, topo: Poly.Topo, col: GeoFeatureCollection, map: GeoFeatureMap): void;
     addMulti(multi: GeoMultiCollection): void;
+    addAll(tag: string, multi: GeoMultiCollection): void;
     remove(tag: string): void;
     _onChange(): void;
     _col(e: GeoEntry): GeoFeatureCollection;

package/dist/geo/multiblockmapping.d.ts

@@ -12,10 +12,12 @@ interface Entry {
 export declare function reverseBlockMapping(bm: BlockMapping): ReverseBlockMapping;
 export declare class MultiBlockMapping {
     entries: Entry[];
+    stamp: number;
     constructor(tag?: string, bm?: BlockMapping);
     add(tag: string, bm: BlockMapping): void;
     remove(tag: string): void;
     map(blockid: string): string;
+    multimap(blockid: string): string[];
     bmOf(tag: string): BlockMapping;
     mapmain(blockid: string): string;
     rev(geoid: string): string[];

package/lib/geo/geo.ts

@@ -294,6 +294,30 @@ export class GeoMultiCollection
     }
   }
 
+  // Add the "all" collection from the passed in multi, but do not force compute of any things not computed yet.
+  addAll(tag: string, multi: GeoMultiCollection): void
+  {
+    let nEntries = Util.countKeys(multi.entries);
+    if (nEntries)
+    {
+      // Make sure all collection is created
+      if (!multi.all.topo && !multi.all.col && !multi.all.map)
+      {
+        // Create cheapest one (collection if I need to create, otherwise copy from single entry)
+        if (nEntries > 1)
+          multi.allCol();
+        else
+        {
+          let e = multi.nthEntry(0);
+          multi.all.topo = e.topo;
+          multi.all.col = e.col;
+          multi.all.map = e.map;
+        }
+      }
+      this.add(tag, multi.all.topo, multi.all.col, multi.all.map);
+    }
+  }
+
   remove(tag: string): void
   {
     let entry = this.entries[tag];

package/lib/geo/multiblockmapping.ts

@@ -24,10 +24,12 @@ export function reverseBlockMapping(bm: BlockMapping): ReverseBlockMapping
 export class MultiBlockMapping
 {
   entries: Entry[];
+  stamp: number;
 
   constructor(tag?: string, bm?: BlockMapping)
   {
     this.entries = [];
+    this.stamp = Math.trunc(Math.random() * Number.MAX_SAFE_INTEGER / 2);
     if (tag && bm)
       this.entries.push({ tag, bm });
   }
@@ -37,13 +39,17 @@ export class MultiBlockMapping
     this.entries.forEach(e => { if (e.tag === tag) { e.bm = bm; delete e.rbm; bm = null } });
     if (bm)
       this.entries.push({ tag, bm });
+    this.stamp++;
   }
 
   remove(tag: string): void
   {
     for (let i = this.entries.length-1; i >= 0; i--)
       if (this.entries[i].tag === tag)
+      {
+        this.stamp++;
         this.entries.splice(i, 1);
+      }
   }
 
   map(blockid: string): string
@@ -58,6 +64,13 @@ export class MultiBlockMapping
     return undefined;
   }
 
+  multimap(blockid: string): string[]
+  {
+    let a: string[] = [];
+    this.entries.forEach(e => { if (e.bm[blockid]) a.push(e.bm[blockid]) });
+    return a;
+  }
+
   bmOf(tag: string): BlockMapping
   {
     let e = this.entries.find(e => e.tag === tag);

package/package.json

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