@dra2020/baseclient 1.0.36 → 1.0.39

package/dist/util/util.d.ts

@@ -41,7 +41,8 @@ export interface EqOptions {
         [key: string]: boolean;
     };
     unorderedArrays?: boolean;
-    emptyStringIsNull: boolean;
+    emptyStringIsNull?: boolean;
+    epsilon?: number;
 }
 export declare function deepEqual(o1: any, o2: any, options?: EqOptions): boolean;
 export declare function prettyDate(d: Date): string;

package/lib/poly/mapto.ts

@@ -38,22 +38,35 @@ export function polyMapToByCentroid(districts: G.GeoFeatureCollection, centroids
   let map: any = {};
 
   // Cache district boundboxes for quick containment exclusion
-  let bbDistricts: BB.BoundBox[] = districts.features.map(f => BB.boundbox(f));
+  let fs: G.GeoFeature[] = districts.features;
+  let bbDistricts: BB.BoundBox[] = fs.map(f => BB.boundbox(f));
+  let aDistricts: number[] = fs.map(f => P.polyArea(f));
 
   // Walk over blocks, mapping centroid to district
   Object.keys(centroids).forEach(blockid => {
       let x = centroids[blockid].x;
       let y = centroids[blockid].y;
 
-      let fIn: G.GeoFeature[] = [];
-      districts.features.forEach((fDistrict: G.GeoFeature, i: number) => {
+      let fIn: number[] = [];
+      fs.forEach((fDistrict: G.GeoFeature, i: number) => {
           if (BB.boundboxContains(bbDistricts[i], x, y))
             if (polyContainsPoint(fDistrict, x, y))
-              fIn.push(fDistrict);
+              fIn.push(i);
         });
 
       if (fIn.length == 1)
-        map[blockid] = fIn[0].properties.id;
+        map[blockid] = fs[fIn[0]].properties.id;
+      else if (fIn.length > 1)
+      {
+        // Pick district with smallest area since some times we get malformed content that doesn't
+        // reflect holes in districts when one is nested in another. So theory is smaller district
+        // is a hole in containing larger one(s).
+        let iLow = fIn[0];
+        for (let i = 1; i < fIn.length; i++)
+          if (aDistricts[fIn[i]] < aDistricts[iLow])
+            iLow = fIn[i];
+        map[blockid] = fs[iLow].properties.id;
+      }
     });
 
   return map;

package/lib/poly/poly.ts

@@ -683,6 +683,7 @@ export function featureRewind(poly: any): any
       let d = Util.depthof(poly.geometry.coordinates);
       if (d === 4) closePoly(poly.geometry.coordinates);
       else if (d === 5) poly.geometry.coordinates.forEach(closePoly);
+      poly.geometry.type = d === 4 ? 'Polygon' : 'MultiPolygon';
     }
     return poly;
   }

package/lib/util/util.ts

@@ -264,12 +264,14 @@ export interface EqOptions
 {
   omitKey?: { [key: string]: boolean },
   unorderedArrays?: boolean,
-  emptyStringIsNull: boolean,
+  emptyStringIsNull?: boolean,
+  epsilon?: number,
 }
 
 function exactEqual(o1: any, o2: any, options?: EqOptions): boolean
 {
   if (o1 === o2) return true;
+  if (options && options.epsilon && typeof o1 === 'number' && typeof o2 === 'number' && Math.abs(o1-o2) < options.epsilon) return true;
   if (options && options.emptyStringIsNull)
     if ((o1 == null && o2 == '') || (o2 == null && o1 == ''))
       return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.36",
+  "version": "1.0.39",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",
@@ -40,6 +40,9 @@
     "webpack-cli": "^4.4.0"
   },
   "dependencies": {
+    "@dra2020/baseclient": "^1.0.36",
+    "@dra2020/baseserver": "^1.0.21",
+    "@dra2020/dra-types": "^1.8.26",
     "@dra2020/topojson-client": "^3.2.7",
     "@dra2020/topojson-server": "^3.0.103",
     "@dra2020/topojson-simplify": "^3.0.102",