@dra2020/baseclient 1.0.16 → 1.0.17

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