@dra2020/baseclient 1.0.9 → 1.0.12

package/dist/filterexpr/filterexpr.d.ts

@@ -58,6 +58,9 @@ export declare class FilterExpr {
     set(expr: string): void;
     test(o: any, types?: any): boolean;
     asString(): string;
+    containsClause(expr: string): boolean;
+    addClause(expr: string): void;
+    removeClause(expr: string): void;
     asStringClause(clause: Clause): string;
     testClause(o: any, types: any, clause: Clause, prop?: string, relation?: TokType): boolean;
 }

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

@@ -20,6 +20,7 @@ export declare const FilterRecent: number;
 export declare const FilterTrash: number;
 export declare const FilterPublic: number;
 export declare const FilterOfficial: number;
+export declare const FilterCOI: number;
 export declare const FilterCount: number;
 export declare type Filter = number;
 export declare const PermNone: number;

package/lib/filterexpr/filterexpr.ts

@@ -484,6 +484,45 @@ function wordyDate(s: string): string
   return s;
 }
 
+function clauseEqual(c1: Clause, c2: Clause): boolean
+{
+  if (c1 == null && c2 == null) return true;
+  if (c1 == null || c2 == null) return false;
+  if (c1.op.tt === c2.op.tt)
+  {
+    if (c1.op.tt === TokType.Text)
+      return c1.op.text === c2.op.text;
+    else
+      return clauseEqual(c1.operand1, c2.operand1) && clauseEqual(c1.operand2, c2.operand2);
+  }
+  else
+    return false;
+}
+
+function containsClause(c: Clause, s: Clause): boolean
+{
+  if (clauseEqual(c, s))
+    return true;
+  if (c == null || s == null) return false;
+  return containsClause(c.operand1, s) || containsClause(c.operand2, s);
+}
+
+function removeClause(c: Clause, s: Clause): Clause
+{
+  if (c == null || (c.op.tt === TokType.Text && c.op.tt !== s.op.tt))
+    return c;
+  else if (clauseEqual(c, s))
+    return null;
+  else
+  {
+    c.operand1 = removeClause(c.operand1, s);
+    c.operand2 = removeClause(c.operand2, s);
+    if ((c.op.tt === TokType.And || c.op.tt === TokType.Or) && (c.operand1 == null || c.operand2 == null))
+      return c.operand1 || c.operand2;
+    return c;
+  }
+}
+
 export class FilterExpr
 {
   lexer: Lexer;
@@ -512,12 +551,47 @@ export class FilterExpr
     return this.asStringClause(this.parser.clause);
   }
 
+  containsClause(expr: string): boolean
+  {
+    let sub = new FilterExpr(this.lexer.coder, expr);
+    return containsClause(this.parser.clause, sub.parser.clause);
+  }
+
+  addClause(expr: string): void
+  {
+    let sub = new FilterExpr(this.lexer.coder, expr);
+    if (! containsClause(this.parser.clause, sub.parser.clause))
+    {
+      if (this.parser.clause)
+        this.parser.clauses = [ { op: { tt: TokType.And }, operand1: this.parser.clause, operand2: sub.parser.clause } ];
+      else
+        this.parser.clauses = [ sub.parser.clause ];
+    }
+  }
+
+  removeClause(expr: string): void
+  {
+    if (this.containsClause(expr))
+    {
+      let sub = new FilterExpr(this.lexer.coder, expr);
+      this.parser.clauses = [ removeClause(this.parser.clause, sub.parser.clause) ];
+    }
+  }
+
   asStringClause(clause: Clause): string
   {
     if (clause == null) return '';
-    if (clause.op.tt == TokType.Text) return `'${clause.op.text}'`;
+    if (clause.op.tt == TokType.Text)
+    {
+      this.lexer.set(clause.op.text);
+      if (this.lexer.tokens.length == 1 && this.lexer.tokens[0].tt === TokType.Text)
+        return clause.op.text;
+      else
+        return `'${clause.op.text}'`;
+    }
     let a: string[] = [];
-    a.push('(');
+    if (clause !== this.parser.clause)
+      a.push('(');
     switch (clause.op.tt)
     {
       case TokType.And:
@@ -535,8 +609,7 @@ export class FilterExpr
         a.push(this.asStringClause(clause.operand1));
         break;
       case TokType.Colon:
-        a.push(this.asStringClause(clause.operand1));
-        a.push(':');
+        a.push(`${this.asStringClause(clause.operand1)}:`);
         a.push(this.asStringClause(clause.operand2));
         break;
       case TokType.Equal:
@@ -551,7 +624,8 @@ export class FilterExpr
       default:
         throw 'Unexpected token in asString';
     }
-    a.push(')');
+    if (clause !== this.parser.clause)
+      a.push(')');
     return a.join(' ');
   }
 

package/lib/ot-js/otsession.ts

@@ -23,7 +23,8 @@ export const FilterRecent: number = 3;
 export const FilterTrash: number = 4;
 export const FilterPublic: number = 5;
 export const FilterOfficial: number = 6;
-export const FilterCount: number = 7;
+export const FilterCOI: number = 7;
+export const FilterCount: number = 8;
 export type Filter = number;
 
 // Permissions

package/lib/poly/polypack.ts

@@ -221,7 +221,8 @@ export function polyPack(coords: any, prepack?: PolyPack): PolyPack
 
   // Transparently handle polygon or multi-polygon
   let depth = Util.depthof(coords);
-  if (depth == 3) coords = [ [ coords ] ];
+  if (depth == 2) coords = [ [ [ coords ] ] ];
+  else if (depth == 3) coords = [ [ coords ] ];
   else if (depth == 4) coords = [ coords ];
 
   let nFloats = polyPackSize(coords);
@@ -374,9 +375,18 @@ export function featureUnpack(f: any): any
   if (f && f.geometry && f.geometry.packed !== undefined)
   {
     f.geometry.coordinates = polyUnpack(f.geometry.packed);
+    let depth = Util.depthof(f.geometry.coordinates);
     // Check for oops, optimized away the multipolygon in polyUnpack
-    if (f.geometry.type === 'MultiPolygon' && Util.depthof(f.geometry.coordinates) === 4)
+    if (f.geometry.type === 'MultiPolygon' && depth === 4)
       f.geometry.coordinates = [ f.geometry.coordinates ];
+    else if (f.geometry.type === 'Point' && depth != 2)
+    {
+      while (depth > 2)
+      {
+        f.geometry.coordinates = f.geometry.coordinates[0];
+        depth = Util.depthof(f.geometry.coordinates);
+      }
+    }
     delete f.geometry.packed;
   }
   else if (f.type && f.type === 'FeatureCollection' && f.features)

package/package.json

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