bruce-models 4.0.2 → 4.0.4

package/dist/bruce-models.es5.js

@@ -7854,12 +7854,16 @@ var Tileset;
                 try {
                     const data = yield api.GET("tileset/getList", reqParams);
                     // Convert legacy records.
+                    // Commented out because it spams :)
+                    // Should use the legacy getList perhaps and substitute needed records.
+                    /*
                     for (let i = 0; i < data.length; i++) {
                         const record = data[i];
                         if (record.type == EType.LegacyEntitiesSet || record.type == EType.LegacyStatic || record.type == EType.LegacyExternal) {
-                            data[i] = convertLegacyRec(yield api.GET(`ui.tileset/${record.id}`, reqParams), data[i]);
+                            data[i] = convertLegacyRec(await api.GET(`ui.tileset/${record.id}`, reqParams), data[i]);
                         }
                     }
+                    */
                     res({
                         tilesets: data
                     });
@@ -8087,7 +8091,7 @@ var Tileset;
      * @returns
      */
     function GetFileUrl(params) {
-        let { api, tilesetId, file } = params;
+        let { api, tilesetId, file, cacheToken, legacy, viaCdn } = params;
         if (!tilesetId) {
             throw ("Tileset ID is required.");
         }
@@ -8097,7 +8101,23 @@ var Tileset;
         if (!file) {
             file = "";
         }
-        return api.GetBaseUrl() + `tileset/getFile/${tilesetId}/files/${file}`;
+        let url = null;
+        const cdnBaseUrl = viaCdn ? api.GetCdnBaseUrl() : null;
+        if (cdnBaseUrl) {
+            url = `v3/tilesets/${tilesetId}/files/${legacy ? "" : "files/"}${file}`;
+            const urlParams = new URLSearchParams();
+            if (cacheToken != null) {
+                urlParams.append("cacheToken", String(cacheToken));
+            }
+            url = api.ConstructCdnUrl(url, urlParams);
+        }
+        else {
+            url = api.GetBaseUrl() + `v3/tilesets/${tilesetId}/files/${legacy ? "" : "files/"}${file}`;
+            if (cacheToken != null) {
+                url += `?cacheToken=${cacheToken}`;
+            }
+        }
+        return url;
     }
     Tileset.GetFileUrl = GetFileUrl;
     /**
@@ -8122,6 +8142,7 @@ var Tileset;
     /**
      * Returns file url for a file + tileset.
      * @param params
+     * @deprecated Use GetFileUrl instead.
      * @returns
      */
     function GetPublicFileUrl(params) {
@@ -8142,9 +8163,7 @@ var Tileset;
             }
             return cdnBaseUrl + `tileset/file/${tilesetId}/${file}?accountId=${api.AccountId}&cacheToken=${viaCdnCacheToken}`;
         }
-        else {
-            return api.GetBaseUrl() + `tileset/file/${tilesetId}/${file}`;
-        }
+        return api.GetBaseUrl() + `tileset/file/${tilesetId}/${file}`;
     }
     Tileset.GetPublicFileUrl = GetPublicFileUrl;
     /**
@@ -11643,7 +11662,7 @@ var DataSource;
 })(DataSource || (DataSource = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "4.0.2";
+const VERSION = "4.0.4";
 
 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, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, Account, AccountInvite, AccountFeatures, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, ImportCad, ImportCsv, ImportJson, ImportKml, ImportedFile, Markup, Uploader, Plugin, ENVIRONMENT, DataSource };
 //# sourceMappingURL=bruce-models.es5.js.map