@dra2020/baseclient 1.0.61 → 1.0.64

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

@@ -775,7 +775,7 @@ export function featureRewind(f: any, options?: RewindOptions): any
       let iPoly: number;
       for (; iWinding < windings.length; iWinding++)
       {
-        let good = misWound(windings[iWinding]);
+        let good = !misWound(windings[iWinding]);
         if (!good && iWinding == 0) // First is miswound - no good
           break;
         if (good)
@@ -801,7 +801,7 @@ export function featureRewind(f: any, options?: RewindOptions): any
   let polys = f.geometry.coordinates;
   windings = polyRingWindings(f);
   windings.forEach((w: Winding) => {
-      let good = misWound(w);
+      let good = !misWound(w);
       if (!good)
       {
         let ring = polys[w.iPoly][w.iRing];

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.61",
+  "version": "1.0.64",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",