@dra2020/baseclient 1.0.91 → 1.0.92

package/lib/geo/geo.ts

@@ -146,7 +146,6 @@ export function geoNormalizeCollection(col: GeoFeatureCollection, options?: Norm
 export function geoCollectionToMap(col: GeoFeatureCollection): GeoFeatureMap
 {
   if (col == null) return null;
-  record('coltomap', col.features.length);
   let map: GeoFeatureMap = {};
   col.features.forEach((f: GeoFeature) => { map[String(f.properties.id)] = f; });
   return map;
@@ -163,7 +162,6 @@ export function geoMapToCollectionNonNull(map: GeoFeatureMap): GeoFeatureCollect
   if (map == null) return null;
   let col: GeoFeatureCollection = { type: 'FeatureCollection', features: [] };
   Object.keys(map).forEach((geoid: string) => { col.features.push(map[geoid]) });
-  record('maptocol', col.features.length);
   return col;
 }
 
@@ -172,6 +170,7 @@ export function geoCollectionToTopo(col: GeoFeatureCollection): Poly.Topo
   let topo = Poly.topoFromCollection(col);
   Poly.topoPack(topo);
   record('coltotopo', col.features.length);
+  if ((col as any).datasets) (topo as any).datasets = (col as any).datasets;
   return topo;
 }
 
@@ -185,6 +184,7 @@ export function geoTopoToCollection(topo: Poly.Topo): GeoFeatureCollection
   let col = Poly.topoToCollection(topo);
   Poly.featurePack(col);
   record('topotocol', col.features.length);
+  if ((topo as any).datasets) (col as any).datasets = (topo as any).datasets;
   return col;
 }
 
@@ -376,8 +376,16 @@ export class GeoMultiCollection
       if (n == 1)
         this.all.col = this._col(this.nthEntry(0));
       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 as any).datasets)
+              (this.all.col as any).datasets = (e.col as any).datasets;
+            if (e.topo && (e.topo as any).datasets)
+              (this.all.col as any).datasets = (e.topo as any).datasets;
+          });
+      }
     }
     return this.all.col;
   }

package/package.json

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