bruce-models 4.0.2 → 4.0.4

package/dist/bruce-models.umd.js

@@ -7691,12 +7691,16 @@
                     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
                         });
@@ -7924,7 +7928,7 @@
          * @returns
          */
         function GetFileUrl(params) {
-            let { api, tilesetId, file } = params;
+            let { api, tilesetId, file, cacheToken, legacy, viaCdn } = params;
             if (!tilesetId) {
                 throw ("Tileset ID is required.");
             }
@@ -7934,7 +7938,23 @@
             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;
         /**
@@ -7959,6 +7979,7 @@
         /**
          * Returns file url for a file + tileset.
          * @param params
+         * @deprecated Use GetFileUrl instead.
          * @returns
          */
         function GetPublicFileUrl(params) {
@@ -7979,9 +8000,7 @@
                 }
                 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;
         /**
@@ -11384,7 +11403,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "4.0.2";
+    const VERSION = "4.0.4";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;