@dra2020/baseclient 1.0.9 → 1.0.12

package/dist/baseclient.js

@@ -597,6 +597,40 @@ function wordyDate(s) {
     // But this is close enough to match what gets displayed by "prettyDate" while also letting selection by month year
     return s;
 }
+function clauseEqual(c1, c2) {
+    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, s) {
+    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, s) {
+    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;
+    }
+}
 class FilterExpr {
     constructor(coder, expr) {
         this.lexer = new Lexer(coder);
@@ -614,13 +648,38 @@ class FilterExpr {
     asString() {
         return this.asStringClause(this.parser.clause);
     }
+    containsClause(expr) {
+        let sub = new FilterExpr(this.lexer.coder, expr);
+        return containsClause(this.parser.clause, sub.parser.clause);
+    }
+    addClause(expr) {
+        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) {
+        if (this.containsClause(expr)) {
+            let sub = new FilterExpr(this.lexer.coder, expr);
+            this.parser.clauses = [removeClause(this.parser.clause, sub.parser.clause)];
+        }
+    }
     asStringClause(clause) {
         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 = [];
-        a.push('(');
+        if (clause !== this.parser.clause)
+            a.push('(');
         switch (clause.op.tt) {
             case TokType.And:
                 a.push(this.asStringClause(clause.operand1));
@@ -637,8 +696,7 @@ 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:
@@ -653,7 +711,8 @@ class FilterExpr {
             default:
                 throw 'Unexpected token in asString';
         }
-        a.push(')');
+        if (clause !== this.parser.clause)
+            a.push(')');
         return a.join(' ');
     }
     testClause(o, types, clause, prop, relation) {
@@ -4328,7 +4387,7 @@ exports.OTServerEngine = OTServerEngine;
 
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.SessionFilterFunction = exports.accessMapFindUser = exports.accessFindUser = exports.ServerStateMaintenance = exports.ServerStateRunning = exports.PermAll = exports.PermEdit = exports.PermAdmin = exports.PermOwner = exports.PermWrite = exports.PermRead = exports.PermNone = exports.FilterCount = exports.FilterOfficial = exports.FilterPublic = exports.FilterTrash = exports.FilterRecent = exports.FilterMyPublic = exports.FilterSharedWithMe = exports.FilterMyMaps = exports.EClockAnomaly = exports.EMaintenance = exports.ENoAccess = exports.ENoPerm = exports.ELoadFailed = exports.EBadRequest = exports.ENoUser = exports.EClockReset = exports.EClockFailure = exports.EClockSeen = exports.ENoSession = exports.ERetry = exports.EFull = exports.EFail = exports.ESuccess = void 0;
+exports.SessionFilterFunction = exports.accessMapFindUser = exports.accessFindUser = exports.ServerStateMaintenance = exports.ServerStateRunning = exports.PermAll = exports.PermEdit = exports.PermAdmin = exports.PermOwner = exports.PermWrite = exports.PermRead = exports.PermNone = exports.FilterCount = exports.FilterCOI = exports.FilterOfficial = exports.FilterPublic = exports.FilterTrash = exports.FilterRecent = exports.FilterMyPublic = exports.FilterSharedWithMe = exports.FilterMyMaps = exports.EClockAnomaly = exports.EMaintenance = exports.ENoAccess = exports.ENoPerm = exports.ELoadFailed = exports.EBadRequest = exports.ENoUser = exports.EClockReset = exports.EClockFailure = exports.EClockSeen = exports.ENoSession = exports.ERetry = exports.EFull = exports.EFail = exports.ESuccess = void 0;
 // Errors
 exports.ESuccess = 0; // Generic success
 exports.EFail = 1; // Generic failure
@@ -4353,7 +4412,8 @@ exports.FilterRecent = 3;
 exports.FilterTrash = 4;
 exports.FilterPublic = 5;
 exports.FilterOfficial = 6;
-exports.FilterCount = 7;
+exports.FilterCOI = 7;
+exports.FilterCount = 8;
 // Permissions
 exports.PermNone = 0; // No permissions
 exports.PermRead = 1; // Can view
@@ -6879,7 +6939,9 @@ function polyPack(coords, prepack) {
         coords = coords.geometry.coordinates;
     // Transparently handle polygon or multi-polygon
     let depth = Util.depthof(coords);
-    if (depth == 3)
+    if (depth == 2)
+        coords = [[[coords]]];
+    else if (depth == 3)
         coords = [[coords]];
     else if (depth == 4)
         coords = [coords];
@@ -7006,9 +7068,16 @@ exports.featurePack = featurePack;
 function featureUnpack(f) {
     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) {