@dra2020/baseclient 1.0.31 → 1.0.34

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

@@ -96,7 +96,8 @@ export declare type LabelUpdate = {
     [name: string]: boolean | null;
 };
 export interface SessionUpdateProps {
-    id: string;
+    id?: string;
+    ids?: string[];
     deleted?: boolean;
     published?: boolean;
     official?: boolean;

package/lib/ot-js/otsession.ts

@@ -124,7 +124,8 @@ export type LabelUpdate = { [name: string]: boolean|null }
 
 export interface SessionUpdateProps
 {
-	id: string;
+	id?: string;
+  ids?: string[];
 	deleted?: boolean;
 	published?: boolean;
 	official?: boolean;

package/lib/poly/pointinpoly.ts

@@ -6,9 +6,21 @@ export function polyContainsPoint(poly: any, x: number, y: number): boolean
   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;
+      }
       let inside = false;
       let iEnd = iOffset + (nPoints - 1) * 2;
       for (let i = iOffset, j = iEnd; i <= iEnd; j = i, i += 2)
@@ -20,10 +32,9 @@ export function polyContainsPoint(poly: any, x: number, y: number): boolean
         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
-      }
+        bCurInside = iRing == 0; // not inside if inside a hole
     });
+  if (iCurPoly >= 0 && bCurInside)
+    bInside = true;
   return bInside;
 }

package/lib/poly/polypack.ts

@@ -349,7 +349,7 @@ export function featurePack(f: any, prepack?: PolyPack): any
     }
     return f.geometry.packed;
   }
-  else if (f.type && f.type === 'FeatureCollection' && f.features)
+  else if (f && f.type === 'FeatureCollection' && f.features)
   {
     // Allocate one large buffer
     let nFloats: number = 0;

package/package.json

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