@dra2020/baseclient 1.0.116 → 1.0.118

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Dave's Redistricting, LLC.
+Copyright (c) 2021-2023 Dave's Redistricting, LLC.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/baseclient.js

@@ -5795,7 +5795,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.FilterMyGroups = 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;
+exports.SessionFilterFunction = exports.accessMapFindUser = exports.accessFindUser = exports.ServerStateMaintenance = exports.ServerStateRunning = exports.PermAll = exports.PermEdit = exports.PermVersion = exports.PermAdmin = exports.PermOwner = exports.PermWrite = exports.PermRead = exports.PermNone = exports.FilterCount = exports.FilterMyGroups = 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
@@ -5829,6 +5829,7 @@ exports.PermRead = 1; // Can view
 exports.PermWrite = 2; // Can modify
 exports.PermOwner = 4; // Can change deleted, published, access permissions
 exports.PermAdmin = 8; // Can administer site
+exports.PermVersion = 16; // Can view a specific version
 exports.PermEdit = (exports.PermWrite | exports.PermOwner);
 exports.PermAll = (exports.PermRead | exports.PermWrite | exports.PermOwner | exports.PermAdmin);
 // Server State
@@ -7297,18 +7298,13 @@ function polyContainsPoint(poly, x, y) {
     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, iPoly, iRing, iOffset, nPoints) => {
-        if (bFound)
-            return;
         if (iRing == 0) {
-            if (iCurPoly >= 0 && bCurInside) {
+            if (iCurPoly >= 0 && bCurInside)
                 bInside = true;
-                bFound = true;
-            }
             iCurPoly = iPoly;
             bCurInside = false;
         }
@@ -8903,6 +8899,23 @@ function featurePack(f, prepack) {
         return f.geometry.packed;
     }
     else if (f && f.type === 'FeatureCollection' && f.features) {
+        // Empty?
+        if (f.features.length == 0)
+            return f;
+        // Already packed or packed incorrectly?
+        let ff = 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 = 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) => ff.geometry.packed.buffer = b);
+            return f;
+        }
         // Allocate one large buffer
         let nFloats = 0;
         let i;
@@ -10359,17 +10372,13 @@ function polyIntersectArea(p1, p2) {
     let pp2 = Poly.polyNormalize(p2);
     let area = 0;
     PP.polyPackEachRing(pp1, (buffer1, iPoly1, iRing1, iOffset1, nPoints1) => {
-        if (iRing1 == 0) {
-            let c1 = unpackCoords(buffer1, iOffset1, nPoints1);
-            PP.polyPackEachRing(pp2, (buffer2, iPoly2, iRing2, iOffset2, nPoints2) => {
-                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, iPoly2, iRing2, iOffset2, nPoints2) => {
+            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;
 }