@dra2020/baseclient 1.0.89 → 1.0.91

package/dist/geo/geo.d.ts

@@ -10,6 +10,7 @@ export declare type GeoCentroidMap = {
         y: number;
     };
 };
+export declare function dumpMetrics(): void;
 export interface NormalizeOptions {
     joinPolygons?: boolean;
     checkRewind?: boolean;
@@ -72,6 +73,7 @@ export declare class GeoMultiCollection {
     forEach(cb: FeatureFunc): void;
     map(cb: (f: GeoFeature) => GeoFeature): GeoFeature[];
     isHidden(id: string): boolean;
+    findNoHide(id: string): GeoFeature;
     find(id: string): GeoFeature;
     filter(test: (f: GeoFeature) => boolean): GeoMultiCollection;
 }

package/lib/geo/geo.ts

@@ -8,6 +8,24 @@ export type GeoFeatureArray = GeoFeature[];
 export type GeoFeatureCollection = geojson.FeatureCollection;
 export type GeoCentroidMap = { [geoid: string]: { x: number, y: number } };
 
+// Tracing/debugging aid
+let metrics: { [action: string]: { count: number, total: number } } = {};
+
+function record(action: string, total: number): void
+{
+  if (metrics[action] === undefined)
+    metrics[action] = { count: 0, total: 0 };
+  metrics[action].count++;
+  metrics[action].total += total;
+}
+
+export function dumpMetrics(): void
+{
+  Object.keys(metrics).forEach(action => {
+      console.log(`G.${action}: count: ${metrics[action].count}, total: ${metrics[action].total}`);
+    });
+}
+
 export interface NormalizeOptions
 {
   joinPolygons?: boolean,
@@ -128,6 +146,7 @@ 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;
@@ -144,6 +163,7 @@ 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;
 }
 
@@ -151,6 +171,7 @@ export function geoCollectionToTopo(col: GeoFeatureCollection): Poly.Topo
 {
   let topo = Poly.topoFromCollection(col);
   Poly.topoPack(topo);
+  record('coltotopo', col.features.length);
   return topo;
 }
 
@@ -163,6 +184,7 @@ export function geoTopoToCollection(topo: Poly.Topo): GeoFeatureCollection
 {
   let col = Poly.topoToCollection(topo);
   Poly.featurePack(col);
+  record('topotocol', col.features.length);
   return col;
 }
 
@@ -519,11 +541,8 @@ export class GeoMultiCollection
     return this.hidden[id] !== undefined;
   }
 
-  find(id: string): GeoFeature
+  findNoHide(id: string): GeoFeature
   {
-    if (this.hidden[id] !== undefined)
-      return undefined;
-
     let entries = Object.values(this.entries);
     for (let i = 0; i < entries.length; i++)
     {
@@ -531,10 +550,17 @@ export class GeoMultiCollection
       if (map[id])
         return map[id];
     }
-
     return undefined;
   }
 
+  find(id: string): GeoFeature
+  {
+    if (this.hidden[id] !== undefined)
+      return undefined;
+
+    return this.findNoHide(id);
+  }
+
   filter(test: (f: GeoFeature) => boolean): GeoMultiCollection
   {
     let m = new GeoMultiCollection();

package/package.json

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