@dra2020/baseclient 1.0.154 → 1.0.156

package/dist/geo/all.d.ts

@@ -2,3 +2,4 @@ export * from './geo';
 export * from './vfeature';
 export * from './flexname';
 export * from './multiblockmapping';
+export * from './ensurecentroid';

package/dist/geo/ensurecentroid.d.ts

@@ -0,0 +1,3 @@
+import * as G from './geo';
+export declare function ensureCentroidInFeature(f: G.GeoFeature): void;
+export declare function ensureCentroidInCollection(col: G.GeoFeatureCollection): void;

package/lib/geo/all.ts

@@ -2,3 +2,4 @@ export * from './geo';
 export * from './vfeature';
 export * from './flexname';
 export * from './multiblockmapping';
+export * from './ensurecentroid';

package/lib/geo/ensurecentroid.ts

@@ -0,0 +1,49 @@
+import * as geojson from 'geojson';
+import * as Util from '../util/all'
+import * as Poly from '../poly/all'
+import * as G from './geo'
+
+function oneNumberOf(f: G.GeoFeature, props: string[]): number
+{
+  for (let i = 0; i < props.length; i++)
+    if (f.properties[props[i]])
+      return Number(f.properties[props[i]]);
+  return 0;
+}
+
+export function ensureCentroidInFeature(f: G.GeoFeature): void
+{
+  if (f.geometry && f.properties.labelx === undefined)
+  {
+    f.properties.labelx = oneNumberOf(f, ['INTPTLON30', 'INTPTLON20','INTPTLON10','INTPTLON']);
+    f.properties.labely = oneNumberOf(f, ['INTPTLAT30', 'INTPTLAT20','INTPTLAT10','INTPTLAT']);
+    if (f.properties.labelx && f.properties.labely)
+      if (! Poly.polyContainsPoint(f, f.properties.labelx, f.properties.labely))
+      {
+        delete f.properties.labelx;
+        delete f.properties.labely;
+      }
+
+    // If internal point not specified, compute it
+    if (!f.properties.labelx || !f.properties.labely)
+    {
+      let result = Poly.polyLabel(f);
+      f.properties.labelx = Util.precisionRound(result.x, 6);
+      f.properties.labely = Util.precisionRound(result.y, 6);
+    }
+
+    delete f.properties.INTPTLAT30;
+    delete f.properties.INTPTLON30;
+    delete f.properties.INTPTLAT20;
+    delete f.properties.INTPTLON20;
+    delete f.properties.INTPTLAT10;
+    delete f.properties.INTPTLON10;
+    delete f.properties.INTPTLAT;
+    delete f.properties.INTPTLON;
+  }
+}
+
+export function ensureCentroidInCollection(col: G.GeoFeatureCollection): void
+{
+  col.features.forEach(ensureCentroidInFeature);
+}

package/lib/util/util.ts

@@ -310,6 +310,35 @@ export function deepEqual(o1: any, o2: any, options?: EqOptions): boolean
   if (typeof o1 !== 'object' || o1 == null) return false;
   if (typeof o2 !== 'object' || o2 == null) return false;
 
+  // Special case Set
+  if (o1 instanceof Set && o2 instanceof Set)
+  {
+    if (o1.size !== o2.size) return false;
+    let eq = true;
+    o1.forEach((k: any) => { if (! o2.has(k)) eq = false });
+    return eq;
+  }
+
+  // Special case Map
+  if (o1 instanceof Map && o2 instanceof Map)
+  {
+    if (o1.size !== o2.size) return false;
+    let eq = true;
+    o1.forEach((v1: any, k1: any) => {
+        if (eq)
+        {
+          if (! o2.has(k1))
+            eq = false;
+          else
+          {
+            let v2 = o2.get(k1);
+            eq = deepEqual(v1, v2, options);
+          }
+        }
+      });
+    return eq;
+  }
+
   // Special case array
   if (Array.isArray(o1))
   {

package/package.json

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