bruce-models 6.9.2 → 6.9.4

package/dist/bruce-models.es5.js

@@ -3686,7 +3686,7 @@ var Entity;
      */
     function Get(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, entityId, scenario, migrated, schemaId, req: reqParams, expandLocation, expandRelations, expandAttachments, expandLODs, entityTypeId, historicFrom, historicKey, historicTo, historicPoint } = params;
+            let { api, entityId, scenario, migrated, schemaId, req: reqParams, expandLocation, expandRelations, expandAttachments, expandLODs, expandComments, expandEntityType, expand: expandStr, entityTypeId, historicFrom, historicKey, historicTo, historicPoint } = params;
             if (!entityId) {
                 throw ("Entity ID is required.");
             }
@@ -3704,6 +3704,9 @@ var Entity;
                 expandRelations,
                 expandAttachments,
                 expandLODs,
+                expandComments,
+                expandEntityType,
+                expand: expandStr,
                 historicFrom,
                 historicKey,
                 historicTo,
@@ -3734,6 +3737,24 @@ var Entity;
                         }
                         expand += "attachment";
                     }
+                    if (expandEntityType) {
+                        if (expand) {
+                            expand += ",";
+                        }
+                        expand += "EntityType";
+                    }
+                    if (expandComments) {
+                        if (expand) {
+                            expand += ",";
+                        }
+                        expand += "comment";
+                    }
+                    if (expandStr) {
+                        if (expand) {
+                            expand += ",";
+                        }
+                        expand += expandStr;
+                    }
                     if (expand) {
                         urlParams.append("Expand", expand);
                     }
@@ -3787,7 +3808,7 @@ var Entity;
      */
     function GetListByIds(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, entityIds, scenario, migrated, schemaId, req: reqParams, expandAttachments, expandLODs, expandRelations, expandLocation, historicFrom, historicKey, historicTo, historicPoint, expandSources, expandImports, maxSearchTimeSec } = params;
+            let { api, entityIds, scenario, migrated, schemaId, req: reqParams, expandAttachments, expandLODs, expandRelations, expandLocation, expandSources, expandImports, expandComments, expandEntityType, expand: expandStr, historicFrom, historicKey, historicTo, historicPoint, maxSearchTimeSec } = params;
             if (!entityIds.length) {
                 throw ("Entity IDs are required.");
             }
@@ -3805,13 +3826,16 @@ var Entity;
                 expandSources,
                 expandAttachments,
                 expandLODs,
+                expandComments,
+                expandEntityType,
+                expand: expandStr,
                 entityTypeId: null,
                 historicFrom: historicFrom,
                 historicKey: historicKey,
                 historicTo: historicTo,
                 historicPoint: historicPoint,
                 schemaId: schemaId,
-                scenario: scenario
+                scenario: scenario,
             };
             const crashRiskReqs = [];
             const reqIds = [];
@@ -3861,6 +3885,30 @@ var Entity;
                     reqData["Expand"] = "attachment";
                 }
             }
+            if (expandEntityType) {
+                if (reqData["Expand"]) {
+                    reqData["Expand"] += ",EntityType";
+                }
+                else {
+                    reqData["Expand"] = "EntityType";
+                }
+            }
+            if (expandComments) {
+                if (reqData["Expand"]) {
+                    reqData["Expand"] += ",comment";
+                }
+                else {
+                    reqData["Expand"] = "comment";
+                }
+            }
+            if (expandStr) {
+                if (reqData["Expand"]) {
+                    reqData["Expand"] += `,${expandStr}`;
+                }
+                else {
+                    reqData["Expand"] = expandStr;
+                }
+            }
             if (expandLODs) {
                 reqData["LODType"] = "*";
             }
@@ -4330,7 +4378,7 @@ var Entity;
     function GetList(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, filter, scenario, migrated, schemaId, req: reqParams, viaCdn, viaCdnCacheToken, analysis, expandRelations, expandImports, historicFrom, historicKey, historicTo, historicPoint, expandLocation, expandSources, maxSearchTimeSec } = params;
+            let { api, filter, scenario, migrated, schemaId, req: reqParams, viaCdn, viaCdnCacheToken, analysis, expandRelations, expandImports, expandLocation, expandSources, expandComments, expandEntityType, expand: expandStr, historicFrom, historicKey, historicTo, historicPoint, maxSearchTimeSec } = params;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
@@ -4381,7 +4429,7 @@ var Entity;
                 ExpandSources: expandSources,
                 Scenario: scenario
             };
-            if (expandLocation || expandRelations || expandImports) {
+            if (expandLocation || expandRelations || expandImports || expandEntityType || expandComments || expandStr) {
                 let expand = "";
                 if (expandLocation) {
                     expand += "location";
@@ -4398,6 +4446,24 @@ var Entity;
                     }
                     expand += "import";
                 }
+                if (expandEntityType) {
+                    if (expand) {
+                        expand += ",";
+                    }
+                    expand += "EntityType";
+                }
+                if (expandComments) {
+                    if (expand) {
+                        expand += ",";
+                    }
+                    expand += "comment";
+                }
+                if (expandStr) {
+                    if (expand) {
+                        expand += ",";
+                    }
+                    expand += expandStr;
+                }
                 if (expand) {
                     body["Expand"] = expand;
                 }
@@ -4458,6 +4524,24 @@ var Entity;
                     }
                     expand += "Source";
                 }
+                if (expandEntityType) {
+                    if (expand.length) {
+                        expand += ",";
+                    }
+                    expand += "EntityType";
+                }
+                if (expandComments) {
+                    if (expand.length) {
+                        expand += ",";
+                    }
+                    expand += "Comment";
+                }
+                if (expandStr) {
+                    if (expand.length) {
+                        expand += ",";
+                    }
+                    expand += expandStr;
+                }
                 if (expand.length) {
                     urlParams.append("Expand", expand);
                 }
@@ -4521,6 +4605,30 @@ var Entity;
                     }
                     expand += "Import";
                 }
+                if (expandSources) {
+                    if (expand.length) {
+                        expand += ",";
+                    }
+                    expand += "Source";
+                }
+                if (expandEntityType) {
+                    if (expand.length) {
+                        expand += ",";
+                    }
+                    expand += "EntityType";
+                }
+                if (expandComments) {
+                    if (expand.length) {
+                        expand += ",";
+                    }
+                    expand += "Comment";
+                }
+                if (expandStr) {
+                    if (expand.length) {
+                        expand += ",";
+                    }
+                    expand += expandStr;
+                }
                 if (expand.length) {
                     urlParams.append("Expand", expand);
                 }
@@ -4659,7 +4767,7 @@ var Entity;
      * @returns
      */
     function GetCacheKey(params) {
-        let { entityId, scenario: scenarioId, entityTypeId, schemaId, expandLocation, expandRelations, expandImports, expandAttachments, expandLODs, expandSources, historicFrom, historicKey, historicTo, historicPoint } = params;
+        let { entityId, scenario: scenarioId, entityTypeId, schemaId, expandLocation, expandRelations, expandImports, expandAttachments, expandLODs, expandSources, expandEntityType, expandComments, expand, historicFrom, historicKey, historicTo, historicPoint } = params;
         if (!scenarioId) {
             scenarioId = 0;
         }
@@ -4686,6 +4794,7 @@ var Entity;
         key += `${String(Boolean(expandLocation))}${String(Boolean(expandRelations))}${String(Boolean(expandSources))}${String(Boolean(expandImports))}`;
         key += `${String(Boolean(expandAttachments))}${String(Boolean(expandLODs))}`;
         key += `${Api.ECacheKey.EntityHistoricData}${Api.ECacheKey.Id}${historicKey}-${historicFrom}-${historicTo}-${historicPoint}`;
+        key += `${String(Boolean(expandEntityType))}${String(Boolean(expandComments))}${expand || ""}`;
         key += `${Api.ECacheKey.Id}${scenarioId}`;
         return key;
     }
@@ -9431,9 +9540,14 @@ var ClientFile;
                 percent: 100,
                 uploaded: true
             });
-            return {
-                tempFileId: tempFile["TempFile.ID"]
-            };
+            // Keeping any other magic properties in there.
+            // When we upload a plant-3dz file it also returns its 'projects' which is a fun magic side-effect we really need to kill.
+            const res = Object.assign({}, tempFile);
+            if (res["TempFile.ID"]) {
+                res.tempFileId = res["TempFile.ID"];
+                delete res["TempFile.ID"];
+            }
+            return res;
         });
     }
     ClientFile.UploadTemp = UploadTemp;
@@ -16834,7 +16948,7 @@ class NavigatorMcpWebSocketClient {
 }
 
 // This is updated with the package.json version on build.
-const VERSION = "6.9.2";
+const VERSION = "6.9.4";
 
 export { VERSION, Assembly, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, GeoJson, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityCoords, EntityAttribute, EntityHistoricData, EntityTableView, Comment, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, ProjectViewBookmarkGroup, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, UserMfaMethod, Account, AccountInvite, AccountFeatures, AccountLimits, AccountTemplate, AccountType, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, DataLabGroup, ImportAssembly, ImportCad, ImportCsv, ImportJson, ImportGeoJson, ImportKml, ImportedFile, ExportBrz, ExportUsd, Markup, Uploader, Plugin, ENVIRONMENT, DataSource, Scenario, Tracking, NavigatorChatClient, NavigatorMcpWebSocketClient };
 //# sourceMappingURL=bruce-models.es5.js.map