bruce-models 4.2.3 → 4.2.5

package/dist/bruce-models.es5.js

@@ -1449,8 +1449,8 @@ var BruceApi;
                             env: this.env
                         });
                     }
-                    const { account } = yield Account.Get({
-                        accountId: this.accountId,
+                    const { account } = yield Account.GetBySubdomain({
+                        subdomain: this.accountId,
                         api: guardian
                     });
                     // Precalculated URLs exist.
@@ -1594,13 +1594,16 @@ var BruceApi;
             if (!this.cdnBaseUrl) {
                 return null;
             }
-            let cdnUrl = this.cdnBaseUrl + url;
-            if (!urlParams) {
-                urlParams = new URLSearchParams();
+            const tmp = new URL(this.cdnBaseUrl);
+            if (urlParams && urlParams instanceof URLSearchParams) {
+                urlParams.forEach((value, key) => {
+                    tmp.searchParams.append(key, value);
+                });
             }
-            urlParams.set("accountId", this.accountId);
-            cdnUrl += "?" + urlParams.toString();
-            return cdnUrl;
+            if (url) {
+                tmp.pathname += url;
+            }
+            return tmp.toString();
         }
         /**
          * Warning: This will cancel the init process.
@@ -1937,9 +1940,7 @@ class ApiGetters {
             this.bruce[key] = new BruceApi.Api({
                 accountId,
                 env,
-                // We'll load regional config if the accountId matches the default accountId.
-                // We'll also load if it no default is known.
-                loadConfig: loadConfig != null ? loadConfig : (this.accountId == accountId || !this.accountId),
+                loadConfig: loadConfig != null ? true : loadConfig,
                 loadWebSocket: loadWebSocket,
                 guardian: this.GetGuardianApi({
                     env
@@ -1962,10 +1963,7 @@ class ApiGetters {
             getApi: (accountId, env) => {
                 return this.GetBruceApi({
                     accountId,
-                    env,
-                    // We'll load regional config if the accountId matches the default accountId.
-                    // We'll also load if it no default is known.
-                    loadConfig: this.accountId == accountId || !this.accountId
+                    env
                 });
             }
         };
@@ -3843,18 +3841,18 @@ var Entity;
             }
             let totalCount;
             let entities = [];
-            if (analysis || expandRelations || (viaCdn && api.EntityCdnUrl)) {
+            if (analysis || expandRelations || (viaCdn && api.GetCdnBaseUrl())) {
                 let url;
                 if (analysis) {
                     url = new URL(api.GetBaseUrl() + "entities/summary");
                 }
-                else if (viaCdn && api.EntityCdnUrl) {
-                    url = new URL(api.EntityCdnUrl);
+                else if (viaCdn && api.GetCdnBaseUrl()) {
+                    url = new URL(api.ConstructCdnUrl("entities"));
                 }
                 else {
                     url = new URL(api.GetBaseUrl() + "entities");
                 }
-                const urlParams = new URLSearchParams(url.search);
+                const urlParams = url.searchParams;
                 urlParams.set("cacheToken", String(viaCdnCacheToken ? viaCdnCacheToken : 0));
                 if (body.SortOrder) {
                     urlParams.set("SortOrder", body.SortOrder);
@@ -3901,7 +3899,7 @@ var Entity;
                 if (schemaId) {
                     urlParams.set("schema", schemaId);
                 }
-                const urlStr = url.toString() + "?" + urlParams.toString();
+                const urlStr = url.toString();
                 const data = yield api.get(urlStr, Api.PrepReqParams(reqParams));
                 if (!analysis) {
                     entities = data.Items;
@@ -3910,7 +3908,7 @@ var Entity;
             }
             else {
                 const url = new URL(api.GetBaseUrl() + (analysis ? "entities/summary" : "entities"));
-                const urlParams = new URLSearchParams(url.search);
+                const urlParams = url.searchParams;
                 if (expandRelations) {
                     urlParams.append("$expand", "relation");
                 }
@@ -3920,7 +3918,7 @@ var Entity;
                 if (schemaId) {
                     urlParams.set("schema", schemaId);
                 }
-                const urlStr = url.toString() + "?" + urlParams.toString();
+                const urlStr = url.toString();
                 const data = yield api.post(urlStr, body, Api.PrepReqParams(reqParams));
                 if (!analysis) {
                     entities = data.Items;
@@ -4667,22 +4665,39 @@ var Bounds;
             minLongitude: null
         };
         const points = [];
-        if (entity.location) {
-            points.push(entity.location);
+        const location = Entity.GetValue({
+            entity: entity,
+            path: ["location"]
+        });
+        if (location) {
+            points.push(location);
         }
-        if (entity.geometry) {
-            if (entity.geometry.Point) {
-                points.push(...Geometry.ParsePoints(entity.geometry.Point));
+        const geometry = Entity.GetValue({
+            entity: entity,
+            path: ["geometry"]
+        });
+        const processGeometry = (geometry, depth = 0) => {
+            if (!geometry || depth > 5) {
+                return;
             }
-            if (entity.geometry.LineString) {
-                points.push(...Geometry.ParsePoints(entity.geometry.LineString));
+            if (geometry.Point) {
+                points.push(...Geometry.ParsePoints(geometry.Point));
             }
-            if (entity.geometry.Polygon) {
-                for (const ring of entity.geometry.Polygon) {
+            if (geometry.LineString) {
+                points.push(...Geometry.ParsePoints(geometry.LineString));
+            }
+            if (geometry.Polygon) {
+                for (const ring of geometry.Polygon) {
                     points.push(...Geometry.ParsePoints(ring.LinearRing));
                 }
             }
-        }
+            if (geometry.MultiGeometry) {
+                for (const multiGeometry of geometry.MultiGeometry) {
+                    processGeometry(multiGeometry, depth + 1);
+                }
+            }
+        };
+        processGeometry(geometry);
         for (const point of points) {
             if (bounds.maxLatitude == null || point.latitude > bounds.maxLatitude) {
                 bounds.maxLatitude = point.latitude;
@@ -9260,7 +9275,9 @@ var Tileset;
             if (!viaCdnCacheToken) {
                 viaCdnCacheToken = 0;
             }
-            return cdnBaseUrl + `tileset/file/${tilesetId}/${file}?accountId=${api.AccountId}&cacheToken=${viaCdnCacheToken}`;
+            const urlParams = new URLSearchParams();
+            urlParams.append("cacheToken", String(viaCdnCacheToken));
+            return api.ConstructCdnUrl(`tileset/file/${tilesetId}/${file}`, urlParams);
         }
         return api.GetBaseUrl() + `tileset/file/${tilesetId}/${file}`;
     }
@@ -13225,7 +13242,7 @@ var DataSource;
 })(DataSource || (DataSource = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "4.2.3";
+const VERSION = "4.2.5";
 
 export { VERSION, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityCoords, EntityTypeVisualSettings, EntityAttribute, EntityHistoricData, Comment, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, Account, AccountInvite, AccountFeatures, AccountLimits, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, ImportCad, ImportCsv, ImportJson, ImportKml, ImportedFile, Markup, Uploader, Plugin, ENVIRONMENT, DataSource };
 //# sourceMappingURL=bruce-models.es5.js.map