@dra2020/baseclient 1.0.116 → 1.0.118

package/dist/ot-js/otsession.d.ts

@@ -29,6 +29,7 @@ export declare const PermRead: number;
 export declare const PermWrite: number;
 export declare const PermOwner: number;
 export declare const PermAdmin: number;
+export declare const PermVersion: number;
 export declare const PermEdit: number;
 export declare const PermAll: number;
 export declare type Permission = number;
@@ -49,6 +50,7 @@ export interface Revision {
     id: string;
     modifyTime: any;
     label?: string;
+    editcache?: string;
 }
 export declare type RevisionList = Revision[];
 export interface SessionUser {

package/lib/ot-js/otsession.ts

@@ -34,6 +34,7 @@ export const PermRead: number = 1;      // Can view
 export const PermWrite: number = 2;     // Can modify
 export const PermOwner: number = 4;     // Can change deleted, published, access permissions
 export const PermAdmin: number = 8;     // Can administer site
+export const PermVersion: number = 16;  // Can view a specific version
 export const PermEdit: number = (PermWrite|PermOwner);
 export const PermAll: number = (PermRead|PermWrite|PermOwner|PermAdmin);
 export type Permission = number;
@@ -64,8 +65,9 @@ export interface Access
 export interface Revision
 {
   id: string;
-  modifyTime: any;  // JSON date
-  label?: string;   // optional label
+  modifyTime: any;    // JSON date
+  label?: string;     // optional label
+  editcache?: string; // optional editcache key
 }
 
 export type RevisionList = Revision[];

package/lib/poly/pointinpoly.ts

@@ -4,20 +4,15 @@ 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;
   let iCurPoly = -1;
   let bCurInside = false;
 
   PP.polyPackEachRing(pp, (b: Float64Array, iPoly: number, iRing: number, iOffset: number, nPoints: number) => {
-      if (bFound) return;
       if (iRing == 0)
       {
         if (iCurPoly >= 0 && bCurInside)
-        {
           bInside = true;
-          bFound = true;
-        }
         iCurPoly = iPoly;
         bCurInside = false;
       }

package/lib/poly/polypack.ts

@@ -357,6 +357,24 @@ export function featurePack(f: any, prepack?: PolyPack): any
   }
   else if (f && f.type === 'FeatureCollection' && f.features)
   {
+    // Empty?
+    if (f.features.length == 0) return f;
+
+    // Already packed or packed incorrectly?
+    let ff: any = f.features[0];
+    if (ff && ff.geometry && ff.geometry.packed)
+    {
+      // Already packed
+      if (ArrayBuffer.isView(ff.geometry.packed.buffer))
+        return f;
+      // Improperly packed (buffer converted to object - convert back to buffer
+      let o: any = ff.geometry.packed.buffer;
+      let b = new Float64Array(Util.countKeys(o));
+      for (const i in o) b[Number(i)] = o[i];
+      f.features.forEach((ff: any) => ff.geometry.packed.buffer = b);
+      return f;
+    }
+
     // Allocate one large buffer
     let nFloats: number = 0;
     let i: number;

package/lib/poly/union.ts

@@ -66,19 +66,13 @@ export function polyIntersectArea(p1: any, p2: any): number
   let area: number = 0;
 
   PP.polyPackEachRing(pp1, (buffer1: Float64Array, iPoly1: number, iRing1: number, iOffset1: number, nPoints1: number) => {
-      if (iRing1 == 0)
-      {
-        let c1 = unpackCoords(buffer1, iOffset1, nPoints1);
-        PP.polyPackEachRing(pp2, (buffer2: Float64Array, iPoly2: number, iRing2: number, iOffset2: number, nPoints2: number) => {
-            if (iRing2 == 0)
-            {
-              let c2 = unpackCoords(buffer2, iOffset2, nPoints2);
-              let result = _intersection(c1, c2);
-              if (result && result.length > 0)
-                area += Poly.polyArea(result);
-            }
-          });
-      }
+      let c1 = unpackCoords(buffer1, iOffset1, nPoints1);
+      PP.polyPackEachRing(pp2, (buffer2: Float64Array, iPoly2: number, iRing2: number, iOffset2: number, nPoints2: number) => {
+          let c2 = unpackCoords(buffer2, iOffset2, nPoints2);
+          let result = _intersection(c1, c2);
+          if (result && result.length > 0)
+            area += Poly.polyArea(result) * ((!iRing1 == !iRing2) ? 1 : -1);
+        });
     });
   return area;
 }

package/package.json

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