@dra2020/baseclient 1.0.62 → 1.0.65

package/lib/geo/geo.ts

@@ -56,25 +56,7 @@ export function geoNormalizeFeature(f: any, options?: NormalizeOptions): GeoFeat
 {
   options = Util.shallowAssignImmutable({}, options);
 
-  if (f && f.geometry && f.geometry.type === 'MultiPolygon' && f.geometry.coordinates)
-  {
-    let multiPoly = f.geometry.coordinates;
-
-    // Convert degenerate MultiPolygon to Polygon
-    if (multiPoly.length == 1)
-    {
-      f.geometry.type = 'Polygon';
-      f.geometry.coordinates = multiPoly[0];
-    }
-  }
-  else if (f && f.geometry && f.geometry.type === 'Point' && f.geometry.coordinates)
-  {
-    while (Array.isArray(f.geometry.coordinates[0]))
-      f.geometry.coordinates = f.geometry.coordinates[0];
-  }
-  else if (options.checkRewind)
-    // Various tools do not guarantee valid GeoJSON winding rules. Verify it since internal processing
-    // assumes it is correct.
+  if (options.checkRewind)
     Poly.featureRewind(f);
 
   return f;

package/lib/poly/poly.ts

@@ -762,26 +762,35 @@ export function featureRewind(f: any, options?: RewindOptions): any
   // Only applies to multi-polygons with no holes
   let d = Util.depthof(f.geometry.coordinates);
   let windings = polyRingWindings(f);
-  if (options.validateHoles && d === 5 && windings.length)
+  if (options.validateHoles && d === 5 && windings.length > 1)
   {
-    // If there are explicit holes, don't look for implicit ones
-    let nHoles = 0; windings.forEach(w => { if (w.iRing) nHoles++ });
-    if (nHoles == 0 && !misWound(windings[0]))
+    // First winding needs to be correct so we have a poly to add holes to
+    if (!misWound(windings[0]))
     {
-      // Looking for pattern: of (G (B*))*
-      // To convert to ((GH*))*
-      let iWinding = 0;
+      // Flatten everything out and then rebuild hole structure based on windings
+      let nHoles = 0; windings.forEach(w => { nHoles += w.iRing ? 1 : 0 });
+      if (nHoles)
+      {
+        let c: any[] = [];
+        f.geometry.coordinates.forEach((poly: any) => {
+            poly.forEach((ring: any) => {
+                c.push([ring]);
+              });
+          });
+        f.geometry.coordinates = c;
+        windings = polyRingWindings(f);
+      }
+
       let polys = f.geometry.coordinates;
-      let iPoly: number;
-      for (; iWinding < windings.length; iWinding++)
+      let iPoly = 0;
+      for (let iWinding = 0; iWinding < windings.length; iWinding++)
       {
         let good = !misWound(windings[iWinding]);
-        if (!good && iWinding == 0) // First is miswound - no good
-          break;
         if (good)
           iPoly = iWinding;
         else
         {
+          // If hole, add to previous poly
           polys[iPoly].push(polys[iWinding][0]);
           polys[iWinding] = null;
         }

package/lib/poly/topo.ts

@@ -65,28 +65,7 @@ function ringsCancel(outerPoly: any, innerRing: any): boolean
 
 function correctGeometry(f: any): any
 {
-  if (f && f.geometry && f.geometry.type === 'MultiPolygon' && f.geometry.coordinates)
-  {
-    let multiPoly = f.geometry.coordinates;
-
-    // Convert degenerate MultiPolygon to Polygon
-    if (multiPoly.length == 1)
-    {
-      f.geometry.type = 'Polygon';
-      f.geometry.coordinates = multiPoly[0];
-    }
-  }
-
-  if (f && f.geometry && f.geometry.type === 'Point' && f.geometry.coordinates)
-  {
-    while (Array.isArray(f.geometry.coordinates[0]))
-      f.geometry.coordinates = f.geometry.coordinates[0];
-  }
-  else
-    // TopoJSON does not guarantee proper winding order which messes up later processing. Fix it.
-    P.featureRewind(f, { validateHoles: false } );
-
-  return f;
+  return P.featureRewind(f, { validateHoles: false } );
 }
 
 export function topoContiguity(topo: Topo): any

package/package.json

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