bruce-models 4.5.9 → 4.6.1

package/dist/bruce-models.es5.js

@@ -1055,9 +1055,6 @@ var BruceApi;
          * @param params
          */
         ConstructUrl(params) {
-            if (!(params === null || params === void 0 ? void 0 : params.url)) {
-                return null;
-            }
             if ((params === null || params === void 0 ? void 0 : params.cdn) && this.cdnBaseUrl) {
                 return this.ConstructCdnUrl(params.url, params.urlParams);
             }
@@ -1078,15 +1075,34 @@ var BruceApi;
             if (!tmp.pathname.endsWith("/")) {
                 tmp.pathname += "/";
             }
+            let split;
             if (params === null || params === void 0 ? void 0 : params.url) {
+                // Ensure we're only adding the path.
+                // The baseUrl could have included query params so have this extra logic.
+                split = params.url.split("?");
                 // Ensure the url does not start with a slash.
                 // This is because the base url already has a slash at the end.
-                if (params.url.startsWith("/")) {
-                    params.url = params.url.substring(1);
+                let path = split[0];
+                if (path.startsWith("/")) {
+                    path = path.substring(1);
+                }
+                tmp.pathname += path;
+            }
+            let full = tmp.toString();
+            // Append the query string if any exist.
+            if (split && split.length > 1) {
+                const query = split[1].split("&");
+                for (let q of query) {
+                    if (full.includes("?")) {
+                        full += "&";
+                    }
+                    else {
+                        full += "?";
+                    }
+                    full += q;
                 }
-                tmp.pathname += params.url;
             }
-            return tmp.toString();
+            return full;
         }
         /**
          * Returns a url routed through the API's CDN.
@@ -1117,12 +1133,24 @@ var BruceApi;
                 tmp.pathname += "/";
             }
             if (url) {
+                // Ensure we're only adding the path.
+                // The baseUrl could have included query params so have this extra logic.
+                let split = url.split("?");
                 // Ensure the url does not start with a slash.
                 // This is because the base url already has a slash at the end.
-                if (url.startsWith("/")) {
-                    url = url.substring(1);
+                let path = split[0];
+                if (path.startsWith("/")) {
+                    path = url.substring(1);
+                }
+                tmp.pathname += path;
+                // Append the query string if any exist.
+                if (split.length > 1) {
+                    const query = split[1].split("&");
+                    for (let q of query) {
+                        const parts = q.split("=");
+                        tmp.searchParams.append(parts[0], parts[1]);
+                    }
                 }
-                tmp.pathname += url;
             }
             return tmp.toString();
         }
@@ -1134,8 +1162,14 @@ var BruceApi;
          */
         SetBaseUrl(url) {
             this.baseUrl = url;
-            if (!this.baseUrl.endsWith("/")) {
-                this.baseUrl += "/";
+            // If we're setting a valid URL then we'll ensure it ends with a slash.
+            if (this.baseUrl && (this.baseUrl.startsWith("http://") || this.baseUrl.startsWith("https://"))) {
+                // Parsing into URL object to avoid adding a "/" after query params.
+                const full = new URL(this.baseUrl);
+                if (!full.pathname.endsWith("/")) {
+                    full.pathname += "/";
+                }
+                this.baseUrl = full.toString();
             }
             this.loadCancelled = true;
         }
@@ -13734,7 +13768,7 @@ var DataSource;
 })(DataSource || (DataSource = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "4.5.9";
+const VERSION = "4.6.1";
 
 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, EntityTableView, 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