@dra2020/baseclient 1.0.2 → 1.0.5

package/dist/geo/geo.d.ts

@@ -51,10 +51,12 @@ export declare class GeoMultiCollection {
     showAll(): void;
     get length(): number;
     nthFeature(n: number): GeoFeature;
+    nthFilteredFeature(n: number, cb: (f: GeoFeature) => boolean): GeoFeature;
     forEach(cb: FeatureFunc): void;
     map(cb: (f: GeoFeature) => GeoFeature): GeoFeature[];
     isHidden(id: string): boolean;
     find(id: string): GeoFeature;
+    filter(test: (f: GeoFeature) => boolean): GeoMultiCollection;
 }
 export declare enum geoIntersectOptions {
     Intersects = 0,

package/lib/geo/geo.ts

@@ -325,12 +325,37 @@ export class GeoMultiCollection
     return found;
   }
 
-  forEach(cb: FeatureFunc): void
+  nthFilteredFeature(n: number, cb: (f: GeoFeature) => boolean)
   {
+    let found: GeoFeature;
+
     this.forEachEntry(e => {
+        if (found) return;
         let col = this._col(e);
         if (col)
-          col.features.forEach(f => { if (this.hidden[f.properties.id] === undefined) cb(f) })
+          for (let i = 0; !found && i < col.features.length; i++)
+          {
+            let f = col.features[i];
+            if (this.hidden[f.properties.id] === undefined && cb(f))
+            {
+              if (n === 0)
+              {
+                found = f;
+                break;
+              }
+              n--;
+            }
+          }
+      });
+    return found;
+  }
+
+  forEach(cb: FeatureFunc): void
+  {
+    this.forEachEntry(e => {
+        let col = this._col(e);
+        if (e.col)
+          e.col.features.forEach(f => { if (this.hidden[f.properties.id] === undefined) cb(f) })
       });
   }
 
@@ -361,6 +386,18 @@ export class GeoMultiCollection
 
     return undefined;
   }
+
+  filter(test: (f: GeoFeature) => boolean): GeoMultiCollection
+  {
+    let m = new GeoMultiCollection();
+    this.forEachEntry(e => {
+        let col = this._col(e);
+        let features = col ? col.features.filter(test) : null;
+        if (features && features.length)
+          m.add(e.tag, null, { type: 'FeatureCollection', features: features }, null);
+      });
+    return m;
+  }
 }
 
 export enum geoIntersectOptions { Intersects, Bounds, BoundsCenter };

package/lib/poly/topo.ts

@@ -59,19 +59,6 @@ function correctGeometry(f: any): any
   {
     let multiPoly = f.geometry.coordinates;
 
-    /* Comment this out right now - might have been do to not rewinding merge output
-    // topojson will under certain circumstances return a MultiPolygon with the first Polygon containing holes
-    // that are precisely filled by a subsequent polygon. We make a secondary union pass to try to correct for this.
-    // If we have a really degenerate multipolygon (test above some number of polygons) omit this expensive pass
-    // since cleanup is unlikely.
-    if (multiPoly.length > 1 && multiPoly.length < 50)
-    {
-      let result = Q.unionPolys(multiPoly);
-      if (Util.depthof(result) == 4) result = [ result ];
-      multiPoly = result;
-    }
-    */
-
     // Convert degenerate MultiPolygon to Polygon
     if (multiPoly.length == 1)
     {
@@ -80,6 +67,9 @@ function correctGeometry(f: any): any
     }
   }
 
+  // TopoJSON does not guarantee proper winding order which messes up later processing. Fix it.
+  P.featureRewind(f);
+
   return f;
 }
 
@@ -318,28 +308,7 @@ export function topoMerge(topo: Topo, geoids: string[]): any
   if (geoids == null || geoids.length == 0) return null;
   let objects: any[] = [];
   geoids.forEach((geoid) => objects.push(topo.objects[geoid]));
-  let f: any = correctGeometry({ type: 'Feature', properties: {}, geometry: TopoClient.merge(topo, objects) });
-  P.featureRewind(f);
-
-  /* Comment out for now - may be due to merge output needing to be rewound
-  // If I get a bad output from topoMerge, just do more expensive poly union. This can happen if input polygons
-  // are a little funky (in particular, if they double back along the same edge.
-  if (selfIntersectFast(f))
-  {
-    //console.log('topoMerge: patching selfIntersect');
-    let polys: any[] = [];
-    geoids.forEach((geoid) => polys.push(topoToFeature(topo, geoid).geometry.coordinates));
-    let result = Q.unionPolys(polys);
-    let depth = Util.depthof(result);
-    if (depth === 5 && result.length === 1)
-    {
-      depth = 4;
-      result = result[0];
-    }
-    f = { type: 'feature', properties: {}, geometry: { type: depth == 4 ? 'Polygon' : 'MultiPolygon', coordinates: result } };
-  }
-  */
-  return f;
+  return correctGeometry({ type: 'Feature', properties: {}, geometry: TopoClient.merge(topo, objects) });
 }
 
 export function topoMergeFeatures(topo: Topo, features: any[]): any

package/package.json

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