@dra2020/baseclient 1.0.90 → 1.0.92

package/dist/baseclient.js

@@ -2347,9 +2347,23 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.geoIntersect = exports.geoIntersectOptions = exports.GeoMultiCollection = exports.geoMapEqual = exports.geoEqual = exports.geoTopoToCollectionNonNull = exports.geoTopoToCollection = exports.geoCollectionToTopoNonNull = exports.geoCollectionToTopo = exports.geoMapToCollectionNonNull = exports.geoMapToCollection = exports.geoCollectionToMap = exports.geoNormalizeCollection = exports.geoNormalizeFeature = exports.geoEnsureID = void 0;
+exports.geoIntersect = exports.geoIntersectOptions = exports.GeoMultiCollection = exports.geoMapEqual = exports.geoEqual = exports.geoTopoToCollectionNonNull = exports.geoTopoToCollection = exports.geoCollectionToTopoNonNull = exports.geoCollectionToTopo = exports.geoMapToCollectionNonNull = exports.geoMapToCollection = exports.geoCollectionToMap = exports.geoNormalizeCollection = exports.geoNormalizeFeature = exports.geoEnsureID = exports.dumpMetrics = void 0;
 const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 const Poly = __importStar(__webpack_require__(/*! ../poly/all */ "./lib/poly/all.ts"));
+// Tracing/debugging aid
+let metrics = {};
+function record(action, total) {
+    if (metrics[action] === undefined)
+        metrics[action] = { count: 0, total: 0 };
+    metrics[action].count++;
+    metrics[action].total += total;
+}
+function dumpMetrics() {
+    Object.keys(metrics).forEach(action => {
+        console.log(`G.${action}: count: ${metrics[action].count}, total: ${metrics[action].total}`);
+    });
+}
+exports.dumpMetrics = dumpMetrics;
 const NormalizeAll = { joinPolygons: true, checkRewind: true, ensureID: true };
 // set the canonical 'id' property from the best property value.
 // if joinPolygons is true, we do not enforce uniqueness.
@@ -2465,6 +2479,9 @@ exports.geoMapToCollectionNonNull = geoMapToCollectionNonNull;
 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;
@@ -2475,6 +2492,9 @@ exports.geoCollectionToTopoNonNull = geoCollectionToTopoNonNull;
 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;
@@ -2617,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;
     }