@dra2020/baseclient 1.0.106 → 1.0.108

package/dist/poly/topo.d.ts

@@ -6,6 +6,11 @@ export declare type Topo = any;
 export declare function topoFromCollection(col: any): Topo;
 export declare function topoContiguity(topo: Topo): any;
 export declare function topoToFeature(topo: Topo, geoid: string): any;
+export declare type TopoSpliceEntry = {
+    topology: Topo;
+    filterout?: any;
+};
+export declare function topoSplice(topoarray: TopoSpliceEntry[]): Topo;
 export declare function topoToCollection(topo: Topo): any;
 export interface SimplifyOptions {
     minArea?: number;

package/lib/geo/geo.ts

@@ -390,6 +390,7 @@ export class GeoMultiCollection
       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);
       }
     }
@@ -480,7 +481,15 @@ export class GeoMultiCollection
         this.all.map = this.all.map || e.map;
       }
       else
-        this.all.topo = geoCollectionToTopoNonNull(this.allCol());
+      {
+        // 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: GeoEntry) =>
+          { return { topology: this._topo(e), filterout: this.hidden } });
+        this.all.topo = Poly.topoSplice(topoarray);
+      }
     }
     return this.all.topo;
   }

package/lib/poly/topo.ts

@@ -96,6 +96,14 @@ export function topoToFeature(topo: Topo, geoid: string): any
   return correctGeometry(TopoClient.feature(topo, topo.objects[geoid]));
 }
 
+export type TopoSpliceEntry = { topology: Topo, filterout?: any };
+
+export function topoSplice(topoarray: TopoSpliceEntry[]): Topo
+{
+  if (topoarray) topoarray.forEach(e => topoPack(e.topology));
+  return TopoClient.splice(topoarray);
+}
+
 export function topoToCollection(topo: Topo): any
 {
   let col: any = { type: 'FeatureCollection', features: [] };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.106",
+  "version": "1.0.108",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",
@@ -40,7 +40,7 @@
     "webpack-cli": "^4.9.1"
   },
   "dependencies": {
-    "@dra2020/topojson-client": "^3.2.9",
+    "@dra2020/topojson-client": "^3.2.11",
     "@dra2020/topojson-server": "^3.0.103",
     "@dra2020/topojson-simplify": "^3.0.102",
     "diff-match-patch": "^1.0.5",