bruce-models 6.4.1 → 6.4.2

package/dist/bruce-models.umd.js

@@ -3539,6 +3539,11 @@
     })(exports.EntityHistoricData || (exports.EntityHistoricData = {}));
 
     (function (Entity) {
+        let EOutlineKind;
+        (function (EOutlineKind) {
+            EOutlineKind["Entity"] = "ENTITY";
+            EOutlineKind["Attribute"] = "ATTRIBUTE";
+        })(EOutlineKind = Entity.EOutlineKind || (Entity.EOutlineKind = {}));
         /**
          * Returns an entity record for the given entity id.
          * @param params
@@ -3595,7 +3600,7 @@
                             expand += "attachment";
                         }
                         if (expand) {
-                            urlParams.append("$expand", expand);
+                            urlParams.append("Expand", expand);
                         }
                         if (expandLODs) {
                             urlParams.append("LODType", "*");
@@ -4034,7 +4039,7 @@
                     value = checkForValue(["Bruce", "AssemblyWorldPosition"].concat(path.slice(1)));
                 }
                 else if (path[0] == "tilesetID") {
-                    value = checkForValue(["Bruce", "TilesetIDs"].concat(path.slice(1)));
+                    value = checkForValue(["Bruce", "Tileset.ID"].concat(path.slice(1)));
                 }
                 else if (path[0] == "geometryRadius") {
                     value = checkForValue(["Bruce", "GeometryRadius"].concat(path.slice(1)));
@@ -4062,7 +4067,7 @@
                     else if (path[1] == "AssemblyWorldPosition") {
                         value = checkForValue(["worldPosition"].concat(path.slice(2)));
                     }
-                    else if (path[1] == "TilesetIDs") {
+                    else if (path[1] == "Tileset.ID") {
                         value = checkForValue(["tilesetID"].concat(path.slice(2)));
                     }
                     else if (path[1] == "GeometryRadius") {
@@ -4289,17 +4294,33 @@
                     if (body.PageSize) {
                         urlParams.set("PageSize", String(body.PageSize));
                     }
+                    let expand = "";
                     if (expandRelations) {
-                        urlParams.append("$expand", "relation");
+                        if (expand.length) {
+                            expand += ",";
+                        }
+                        expand += "Relation";
                     }
                     if (expandLocation) {
-                        urlParams.append("$expand", "location");
+                        if (expand.length) {
+                            expand += ",";
+                        }
+                        expand += "Location";
                     }
                     if (expandImports) {
-                        urlParams.append("$expand", "import");
+                        if (expand.length) {
+                            expand += ",";
+                        }
+                        expand += "Import";
                     }
                     if (expandSources) {
-                        urlParams.append("ExpandSources", "true");
+                        if (expand.length) {
+                            expand += ",";
+                        }
+                        expand += "Source";
+                    }
+                    if (expand.length) {
+                        urlParams.append("Expand", expand);
                     }
                     if (historicKey) {
                         urlParams.set("historicKey", historicKey);
@@ -4324,8 +4345,6 @@
                     }
                     urlParams.set("hasMigrated", String(Boolean(migrated)));
                     let url = analysis ? "entities/summary" : "entities";
-                    // Adding url params here because this will avoid making them encoded.
-                    // Our API isn't decoding them properly so $expand is not being recognized.
                     url += "?" + urlParams.toString();
                     const urlStr = api.ConstructUrl({
                         cdn: !analysis && viaCdn,
@@ -4344,14 +4363,27 @@
                 }
                 else {
                     const urlParams = new URLSearchParams();
+                    let expand = "";
                     if (expandRelations) {
-                        urlParams.append("$expand", "relation");
+                        if (expand.length) {
+                            expand += ",";
+                        }
+                        expand += "Relation";
                     }
                     if (expandLocation) {
-                        urlParams.append("$expand", "location");
+                        if (expand.length) {
+                            expand += ",";
+                        }
+                        expand += "Location";
                     }
                     if (expandImports) {
-                        urlParams.append("$expand", "import");
+                        if (expand.length) {
+                            expand += ",";
+                        }
+                        expand += "Import";
+                    }
+                    if (expand.length) {
+                        urlParams.append("Expand", expand);
                     }
                     if (schemaId) {
                         urlParams.set("schema", schemaId);
@@ -15683,7 +15715,7 @@
     })(exports.Tracking || (exports.Tracking = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "6.4.1";
+    const VERSION = "6.4.2";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;