@dra2020/baseclient 1.0.104 → 1.0.108

package/dist/baseclient.js

@@ -2655,6 +2655,7 @@ class GeoMultiCollection {
                 e.topo = geoCollectionToTopoNonNull(e.col);
             else if (e.map) {
                 e.col = geoMapToCollectionNonNull(e.map);
+                console.log(`toposplice: constructing topology for ${e.col.features.length} features`);
                 e.topo = geoCollectionToTopoNonNull(e.col);
             }
         }
@@ -2730,8 +2731,14 @@ class GeoMultiCollection {
                 this.all.col = this.all.col || e.col;
                 this.all.map = this.all.map || e.map;
             }
-            else
-                this.all.topo = geoCollectionToTopoNonNull(this.allCol());
+            else {
+                // Old-style, goes through map (to filter hidden) and then collection
+                // this.all.topo = geoCollectionToTopoNonNull(this.allCol());
+                // New style, use splice on packed topologies
+                console.log(`toposplice: splicing ${this.nEntries} topologies`);
+                let topoarray = Object.values(this.entries).map((e) => { return { topology: this._topo(e), filterout: this.hidden }; });
+                this.all.topo = Poly.topoSplice(topoarray);
+            }
         }
         return this.all.topo;
     }
@@ -9794,7 +9801,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.topoUnpack = exports.topoPack = exports.topoPacked = exports.FsmTopoUnion = exports.topoMergeFeatures = exports.topoMerge = exports.topoSimplifyCollection = exports.topoToCollection = exports.topoToFeature = exports.topoContiguity = exports.topoFromCollection = void 0;
+exports.topoUnpack = exports.topoPack = exports.topoPacked = exports.FsmTopoUnion = exports.topoMergeFeatures = exports.topoMerge = exports.topoSimplifyCollection = exports.topoToCollection = exports.topoSplice = exports.topoToFeature = exports.topoContiguity = exports.topoFromCollection = void 0;
 // Forked version that supports packing
 const TopoClient = __importStar(__webpack_require__(/*! @dra2020/topojson-client */ "@dra2020/topojson-client"));
 // Forked version that fixes self-looping hole problem
@@ -9860,7 +9867,7 @@ function topoContiguity(topo) {
     let objects = Object.values(topo.objects);
     let geoid = getGEOID(objects);
     objects.forEach((o) => { o.properties.id = o.properties[geoid]; });
-    let neighbors = TopoClient.neighbors(objects, true);
+    let neighbors = TopoClient.neighbors(topo, objects, true);
     let result = {};
     result['OUT_OF_STATE'] = [];
     objects.forEach((o, i) => {
@@ -9880,6 +9887,12 @@ function topoToFeature(topo, geoid) {
     return correctGeometry(TopoClient.feature(topo, topo.objects[geoid]));
 }
 exports.topoToFeature = topoToFeature;
+function topoSplice(topoarray) {
+    if (topoarray)
+        topoarray.forEach(e => topoPack(e.topology));
+    return TopoClient.splice(topoarray);
+}
+exports.topoSplice = topoSplice;
 function topoToCollection(topo) {
     let col = { type: 'FeatureCollection', features: [] };
     if (topo)