bruce-models 4.6.2 → 4.6.4

package/dist/bruce-models.umd.js

@@ -642,8 +642,21 @@
                 }
             }
             formatApiUri(uri) {
-                const ws = !window.document || window.document.location.protocol === "https:" ? "wss" : "ws";
-                return uri.replace(/^(https|http)/, ws) + "websocket";
+                const wsProtocol = window.document.location.protocol === "https:" ? "wss" : "ws";
+                const currentUrl = new URL(uri);
+                let full = wsProtocol + "://" + currentUrl.host + currentUrl.pathname + "websocket";
+                // Check if we have a queryParam for accountId.
+                const accountId = currentUrl.searchParams.get("accountId");
+                if (accountId) {
+                    if (full.includes("?")) {
+                        full += "&";
+                    }
+                    else {
+                        full += "?";
+                    }
+                    full += "accountId=" + accountId;
+                }
+                return full;
             }
             onOpen(ev) {
                 if (this.env === exports.Api.EEnv.DEV) {
@@ -3921,16 +3934,18 @@
                 // All properties.
                 if (includeUserData != false) {
                     properties = cloneObj(entity);
-                    // We exclude geometry since the geojson is supposed to represent that attribute.
-                    delete properties.geometry;
+                    // The GeoJSON is supposed to represent the geometry attribute.
+                    delete properties.Bruce.VectorGeometry;
+                    delete properties.Bruce.Boundaries;
                 }
                 // Only specific internal properties.
                 else {
+                    const bClone = cloneObj(entity.Bruce);
+                    // The GeoJSON is supposed to represent the geometry attribute.
+                    delete bClone.VectorGeometry;
+                    delete bClone.Boundaries;
                     properties = {
-                        Bruce: entity.Bruce ? cloneObj(entity.Bruce) : null,
-                        location: entity.location ? cloneObj(entity.location) : null,
-                        transform: entity.transform ? cloneObj(entity.transform) : null,
-                        boundaries: entity.boundaries ? cloneObj(entity.boundaries) : null,
+                        Bruce: bClone
                     };
                 }
                 feature.properties = properties;
@@ -3996,10 +4011,10 @@
                 if (!((_a = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _a === void 0 ? void 0 : _a.ID)) {
                     return;
                 }
-                let geometry = entity.geometry;
-                if (!geometry && (((_b = entity.location) === null || _b === void 0 ? void 0 : _b.longitude) && ((_c = entity.location) === null || _c === void 0 ? void 0 : _c.latitude))) {
+                let geometry = entity.Bruce.VectorGeometry;
+                if (!geometry && (((_b = entity.Bruce.Location) === null || _b === void 0 ? void 0 : _b.longitude) && ((_c = entity.Bruce.Location) === null || _c === void 0 ? void 0 : _c.latitude))) {
                     geometry = {
-                        Point: `${entity.location.longitude},${entity.location.latitude}` + (entity.location.altitude != null ? `,${entity.location.altitude}` : ""),
+                        Point: `${entity.Bruce.Location.longitude},${entity.Bruce.Location.latitude}` + (entity.Bruce.Location.altitude != null ? `,${entity.Bruce.Location.altitude}` : ""),
                     };
                 }
                 if (geometry) {
@@ -13510,7 +13525,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "4.6.2";
+    const VERSION = "4.6.4";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;