@dra2020/baseclient 1.0.153 → 1.0.155

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.153",
+  "version": "1.0.155",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",
@@ -33,10 +33,12 @@
     "@types/node": "20.11.30",
     "@types/object-hash": "^3.0.6",
     "source-map-loader": "^5.0.0",
-    "ts-loader": "^9.5.1",
+    "ts-loader": "^9.5.2",
     "tsify": "^5.0.4",
-    "typescript": "^5.4.3",
-    "webpack": "^5.91.0",
+    "pbkdf2":"^3.1.3",
+    "elliptic": "^6.6.1",
+    "typescript": "^5.8.3",
+    "webpack": "^5.99.5",
     "webpack-cli": "^5.1.4"
   },
   "dependencies": {