@dra2020/baseclient 1.0.16 → 1.0.19

package/dist/geo/geo.d.ts

@@ -4,6 +4,7 @@ export declare type GeoProperties = geojson.GeoJsonProperties;
 export declare type GeoFeature = geojson.Feature;
 export declare type GeoFeatureArray = GeoFeature[];
 export declare type GeoFeatureCollection = geojson.FeatureCollection;
+export declare function geoEnsureID(col: GeoFeatureCollection): void;
 export declare function geoCollectionToMap(col: GeoFeatureCollection): GeoFeatureMap;
 export declare function geoMapToCollection(map: GeoFeatureMap): GeoFeatureCollection;
 export declare function geoCollectionToTopo(col: GeoFeatureCollection): Poly.Topo;

package/dist/poly/all.d.ts

@@ -13,3 +13,4 @@ export * from './polyround';
 export * from './topo';
 export * from './selfintersect';
 export * from './shamos';
+export * from './pointinpoly';

package/dist/poly/pointinpoly.d.ts

@@ -0,0 +1 @@
+export declare function polyContainsPoint(poly: any, x: number, y: number): boolean;

package/lib/geo/geo.ts

@@ -7,6 +7,21 @@ export type GeoFeature = geojson.Feature;
 export type GeoFeatureArray = GeoFeature[];
 export type GeoFeatureCollection = geojson.FeatureCollection;
 
+export function geoEnsureID(col: GeoFeatureCollection): void
+{
+  let prop: string;
+  const props = ['id', 'GEOID', 'GEOID10', 'GEOID20', 'GEOID30' ];
+
+  if (col && col.features && col.features.length > 0)
+  {
+    let f = col.features[0];
+    if (f.properties.id !== undefined) return;
+    props.forEach(p => { if (prop === undefined && f.properties[p] !== undefined) prop = p; });
+    if (prop)
+      col.features.forEach(f => { f.properties.id = f.properties[prop] });
+  }
+}
+
 export function geoCollectionToMap(col: GeoFeatureCollection): GeoFeatureMap
 {
   if (col == null) return null;

package/lib/poly/all.ts

@@ -13,3 +13,4 @@ export * from './polyround';
 export * from './topo';
 export * from './selfintersect';
 export * from './shamos';
+export * from './pointinpoly';

package/lib/poly/pointinpoly.ts

@@ -0,0 +1,29 @@
+import * as PP from './polypack';
+
+export function polyContainsPoint(poly: any, x: number, y: number): boolean
+{
+  let pp = PP.polyPack(poly);
+  if (pp == null) return false;
+  let bFound = false;
+  let bInside = false;
+
+  PP.polyPackEachRing(pp, (b: Float64Array, iPoly: number, iRing: number, iOffset: number, nPoints: number) => {
+      if (bFound) return;
+      let inside = false;
+      let iEnd = iOffset + (nPoints - 1) * 2;
+      for (let i = iOffset, j = iEnd; i < iEnd; j = i, i += 2)
+      {
+        let xi = b[i], yi = b[i+1];
+        let xj = b[j], yj = b[j+1];
+        let intersect = ((yi > y) !== (yj > y))
+                        && (x < (xj - xi) * (y - yi) / (yj - yi) + xi);
+        if (intersect) inside = !inside;
+      }
+      if (inside)
+      {
+        bFound = iRing > 0;   // if inside a hole, don't need to process further
+        bInside = iRing == 0; // not inside if inside a hole
+      }
+    });
+  return bInside;
+}

package/lib/poly/polybin.ts

@@ -54,9 +54,10 @@ export function packCollection(coder: Util.Coder, col: any): ArrayBuffer
 {
   // Compute size
   let pp = PP.featurePack(col) as PP.PolyPack;
-  let buffer: any = col.features.length ? col.features[0].geometry.packed.buffer : null;  // to restore, below
+  let f: any = col.features.find((f: any) => { return f.geometry.packed ? f.geometry.packed.buffer : null });
+  let buffer: any = f ? f.geometry.packed.buffer : null;
   let size = 16; // int endiness, offset to coordinates, float endiness
-  col.features.forEach((f: any) => { delete f.geometry.packed.buffer; }); // reconstructed when unpacking
+  col.features.forEach((f: any) => { if (f.geometry.packed) delete f.geometry.packed.buffer; }); // reconstructed when unpacking
   let j = JSON.stringify(col);
   size += sizeOfString(coder, j);
   size += pad(size, 8);
@@ -84,7 +85,7 @@ export function packCollection(coder: Util.Coder, col: any): ArrayBuffer
     buf64[foff++] = buf[i];
 
   // Now restore
-  col.features.forEach((f: any) => { f.geometry.packed.buffer = buffer; });
+  col.features.forEach((f: any) => { if (f.geometry.packed) f.geometry.packed.buffer = buffer; });
   PP.featureUnpack(col);
 
   return ab;
@@ -144,7 +145,7 @@ export function unpackCollection(coder: Util.Coder, ab: ArrayBuffer): any
   let offset = 16;
   let j = unpackString(coder, buf8, buf32, offset);
   col = JSON.parse(j);
-  col.features.forEach((f: any) => { f.geometry.packed.buffer = buf64 });
+  col.features.forEach((f: any) => { if (f.geometry.packed) f.geometry.packed.buffer = buf64 });
   return col;
 }
 

package/lib/poly/polypack.ts

@@ -326,7 +326,7 @@ export function polyUnpack(prepack: any): any
 
 export function featurePackSize(f: any): number
 {
-  if (f && f.geometry && f.geometry.coordinates)
+  if (f && f.geometry && f.geometry.coordinates && f.geometry.type !== 'Point')
     return polyPackSize(f.geometry.coordinates);
   return 0;
 }
@@ -335,7 +335,9 @@ export function featurePack(f: any, prepack?: PolyPack): any
 {
   if (f && f.type === 'Feature')
   {
-    if (f.geometry && f.geometry.coordinates)
+    if (f.geometry && f.geometry.type === 'Point')
+      return prepack ? { offset: prepack.offset, length: 0, buffer: prepack.buffer } : { offset: 0, length: 0, buffer: null };
+    else if (f.geometry && f.geometry.coordinates)
     {
       f.geometry.packed = polyPack(f.geometry.coordinates, prepack);
       delete f.geometry.coordinates;

package/package.json

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