@dra2020/baseclient 1.0.4 → 1.0.7

package/dist/baseclient.js

@@ -1375,10 +1375,9 @@ class GeoMultiCollection {
             let n = this.nEntries;
             if (n == 1)
                 this.all.col = this._col(this.nthEntry(0));
-            else {
-                this.all.col = { type: 'FeatureCollection', features: [] };
-                this.forEach(f => { this.all.col.features.push(f); });
-            }
+            else
+                // Going from map to collection guarantees that any duplicates are removed
+                this.all.col = geoMapToCollection(this.allMap());
         }
         return this.all.col;
     }
@@ -1390,8 +1389,11 @@ class GeoMultiCollection {
             let n = this.nEntries;
             if (n == 1)
                 this.all.map = this._map(this.nthEntry(0));
-            else
-                this.all.map = geoCollectionToMap(this.allCol());
+            else {
+                let map = {};
+                this.all.map = map;
+                this.forEach(f => { map[String(f.properties.id)] = f; });
+            }
         }
         return this.all.map;
     }
@@ -7949,24 +7951,14 @@ function ringsCancel(outerPoly, innerRing) {
 function correctGeometry(f) {
     if (f && f.geometry && f.geometry.type === 'MultiPolygon' && f.geometry.coordinates) {
         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) {
             f.geometry.type = 'Polygon';
             f.geometry.coordinates = multiPoly[0];
         }
     }
+    // TopoJSON does not guarantee proper winding order which messes up later processing. Fix it.
+    P.featureRewind(f);
     return f;
 }
 function topoContiguity(topo) {
@@ -8060,6 +8052,9 @@ function bigTimeString(ms) {
     return `${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
 }
 const DefaultSimplifyOptions = { minArea: 500 };
+function log(s) {
+    //console.log(s);
+}
 //
 // topoSimplifyCollection:
 //    This implements our simplification strategy for block/precinct level shapes. The basic idea is to
@@ -8082,10 +8077,10 @@ function topoSimplifyCollection(col, options) {
     let elapsedTotal = new Util.Elapsed();
     let elapsed = new Util.Elapsed();
     let topo = topoFromCollection(col);
-    console.log(`topoSimplifyCollection: fromCollection: ${Math.round(elapsed.ms())}ms`);
+    log(`topoSimplifyCollection: fromCollection: ${Math.round(elapsed.ms())}ms`);
     elapsed.start();
     topo = TopoSimplify.presimplify(topo, TopoSimplify['sphericalTriangleArea']);
-    console.log(`topoSimplifyCollection: presimplify: ${Math.round(elapsed.ms())}ms`);
+    log(`topoSimplifyCollection: presimplify: ${Math.round(elapsed.ms())}ms`);
     elapsed.start();
     // Keep iterating on removing simplification from degenerate shapes
     let nTries = 1;
@@ -8141,11 +8136,11 @@ function topoSimplifyCollection(col, options) {
                 }
             }
         });
-        console.log(`topoSimplifyCollection: pass ${nTries}: ${nBad} (${nTiny} tiny) of ${col.features.length} features are degenerate`);
+        log(`topoSimplifyCollection: pass ${nTries}: ${nBad} (${nTiny} tiny) of ${col.features.length} features are degenerate`);
         // If not making progress, keep more points
         if (nBad >= nBadLast) {
             keepweight /= 10;
-            console.log(`topoSimplifyCollection: pass ${nTries}: reducing weight limit to ${keepweight}`);
+            log(`topoSimplifyCollection: pass ${nTries}: reducing weight limit to ${keepweight}`);
         }
         nBadLast = nBad;
         if (nBad && nTries > MAX_TRIES)
@@ -8157,7 +8152,7 @@ function topoSimplifyCollection(col, options) {
         }
         nTries++;
     }
-    console.log(`topoSimplifyCollection: total elapsed time: ${bigTimeString(elapsedTotal.ms())}`);
+    log(`topoSimplifyCollection: total elapsed time: ${bigTimeString(elapsedTotal.ms())}`);
     return col;
 }
 exports.topoSimplifyCollection = topoSimplifyCollection;
@@ -8166,27 +8161,7 @@ function topoMerge(topo, geoids) {
         return null;
     let objects = [];
     geoids.forEach((geoid) => objects.push(topo.objects[geoid]));
-    let f = 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) });
 }
 exports.topoMerge = topoMerge;
 function topoMergeFeatures(topo, features) {