@itwin/ecschema-rpcinterface-tests 4.3.0-dev.33 → 4.3.0-dev.35

package/lib/dist/bundled-tests.js

@@ -37269,6 +37269,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @itwin/core-bentley */ "../../core/bentley/lib/esm/core-bentley.js");
 /* harmony import */ var _BackgroundMapProvider__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./BackgroundMapProvider */ "../../core/common/lib/esm/BackgroundMapProvider.js");
+/* eslint-disable deprecation/deprecation */
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
@@ -37402,6 +37403,9 @@ class ImageMapLayerSettings extends MapLayerSettings {
         this.formatId = props.formatId;
         this.url = props.url;
         this.accessKey = props.accessKey;
+        if (props.queryParams) {
+            this.savedQueryParams = { ...props.queryParams };
+        }
         this.subLayers = [];
         if (!props.subLayers)
             return;
@@ -37421,6 +37425,8 @@ class ImageMapLayerSettings extends MapLayerSettings {
         props.formatId = this.formatId;
         if (this.subLayers.length > 0)
             props.subLayers = this.subLayers.map((x) => x.toJSON());
+        if (this.savedQueryParams)
+            props.queryParams = { ...this.savedQueryParams };
         return props;
     }
     /** Create a copy of this MapLayerSettings, optionally modifying some of its properties.
@@ -37433,6 +37439,10 @@ class ImageMapLayerSettings extends MapLayerSettings {
         clone.userName = this.userName;
         clone.password = this.password;
         clone.accessKey = this.accessKey;
+        if (this.unsavedQueryParams)
+            clone.unsavedQueryParams = { ...this.unsavedQueryParams };
+        if (this.savedQueryParams)
+            clone.savedQueryParams = { ...this.savedQueryParams };
         return clone;
     }
     /** @internal */
@@ -37442,6 +37452,12 @@ class ImageMapLayerSettings extends MapLayerSettings {
         props.url = changedProps.url ?? this.url;
         props.accessKey = changedProps.accessKey ?? this.accessKey;
         props.subLayers = changedProps.subLayers ?? this.subLayers;
+        if (changedProps.queryParams) {
+            props.queryParams = { ...changedProps.queryParams };
+        }
+        else if (this.savedQueryParams) {
+            props.queryParams = { ...this.savedQueryParams };
+        }
         return props;
     }
     /** @internal */
@@ -37510,6 +37526,17 @@ class ImageMapLayerSettings extends MapLayerSettings {
         this.userName = userName;
         this.password = password;
     }
+    /** Collect all query parameters
+   * @beta
+   */
+    collectQueryParams() {
+        let queryParams = {};
+        if (this.savedQueryParams)
+            queryParams = { ...this.savedQueryParams };
+        if (this.unsavedQueryParams)
+            queryParams = { ...queryParams, ...this.unsavedQueryParams };
+        return queryParams;
+    }
 }
 /** Normalized representation of a [[ModelMapLayerProps]] for which values have been validated and default values have been applied where explicit values not defined.
  * Model map layers are produced from models, typically from two dimensional geometry that may originate in a GIS system.
@@ -42579,12 +42606,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   ThematicDisplaySensorSettings: () => (/* binding */ ThematicDisplaySensorSettings),
 /* harmony export */   ThematicGradientColorScheme: () => (/* binding */ ThematicGradientColorScheme),
 /* harmony export */   ThematicGradientMode: () => (/* binding */ ThematicGradientMode),
-/* harmony export */   ThematicGradientSettings: () => (/* binding */ ThematicGradientSettings)
+/* harmony export */   ThematicGradientSettings: () => (/* binding */ ThematicGradientSettings),
+/* harmony export */   ThematicGradientTransparencyMode: () => (/* binding */ ThematicGradientTransparencyMode)
 /* harmony export */ });
 /* harmony import */ var _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @itwin/core-bentley */ "../../core/bentley/lib/esm/core-bentley.js");
 /* harmony import */ var _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @itwin/core-geometry */ "../../core/geometry/lib/esm/core-geometry.js");
 /* harmony import */ var _ColorDef__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./ColorDef */ "../../core/common/lib/esm/ColorDef.js");
 /* harmony import */ var _Gradient__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./Gradient */ "../../core/common/lib/esm/Gradient.js");
+/* harmony import */ var _TextureProps__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./TextureProps */ "../../core/common/lib/esm/TextureProps.js");
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
@@ -42596,6 +42625,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 /** A thematic gradient mode used to generate and apply a thematic effect to a scene.
  * @see [[ThematicGradientSettings.mode]]
  * @public
@@ -42612,6 +42642,24 @@ var ThematicGradientMode;
     /** Apply isolines to the scene to achieve an effect similar to a contour map. Can only be used with [[ThematicDisplayMode.Height]]. */
     ThematicGradientMode[ThematicGradientMode["IsoLines"] = 3] = "IsoLines";
 })(ThematicGradientMode || (ThematicGradientMode = {}));
+/** Describes how transparency is computed when applying a thematic gradient to a surface.
+ * Each [[Gradient.KeyColor]] in [[ThematicGradientSettings.customKeys]] has a transparency value.
+ * Each surface to which the gradient is applied has its own transparency.
+ * The transparency mode determines how these two values are combined to compute the final transparency.
+ * @see [[ThematicGradientSettings.transparencyMode]].
+ * @public
+ * @extensions
+ */
+var ThematicGradientTransparencyMode;
+(function (ThematicGradientTransparencyMode) {
+    /** Ignore the gradient's transparency, applying only the surface's own transparency. */
+    ThematicGradientTransparencyMode[ThematicGradientTransparencyMode["SurfaceOnly"] = 0] = "SurfaceOnly";
+    /** The final transparency is computed from the product of the surface and gradient alpha channels.
+     * (Alpha is the inverse of transparency, where `alpha = (255 - transparency) / 255`).
+     * If the gradient color is opaque, this produces the same result as [[SurfaceOnly]].
+     */
+    ThematicGradientTransparencyMode[ThematicGradientTransparencyMode["MultiplySurfaceAndGradient"] = 1] = "MultiplySurfaceAndGradient";
+})(ThematicGradientTransparencyMode || (ThematicGradientTransparencyMode = {}));
 /** A color scheme used to generate the colors of a thematic gradient within an applied range.
  * @see [[ThematicGradientSettings.colorScheme]]
  * @see [[ThematicDisplay.range]]
@@ -42642,24 +42690,32 @@ class ThematicGradientSettings {
     static get margin() { return .001; } // A fixed portion of the gradient for out of range values.
     static get contentRange() { return 1.0 - 2.0 * ThematicGradientSettings.margin; }
     static get contentMax() { return 1.0 - ThematicGradientSettings.margin; }
+    /** @alpha */
+    get textureTransparency() {
+        let transp = _TextureProps__WEBPACK_IMPORTED_MODULE_4__.TextureTransparency.Opaque;
+        if (ThematicGradientColorScheme.Custom === this.colorScheme) {
+            let haveOpaque = false;
+            let haveTransparent = false;
+            for (const key of this.customKeys) {
+                const isOpaque = key.color.isOpaque;
+                haveOpaque = haveOpaque || isOpaque;
+                haveTransparent = haveTransparent || !isOpaque;
+            }
+            if (haveTransparent)
+                transp = haveOpaque ? _TextureProps__WEBPACK_IMPORTED_MODULE_4__.TextureTransparency.Mixed : _TextureProps__WEBPACK_IMPORTED_MODULE_4__.TextureTransparency.Translucent;
+        }
+        if (transp !== _TextureProps__WEBPACK_IMPORTED_MODULE_4__.TextureTransparency.Mixed)
+            if (this.marginColor.isOpaque !== (transp === _TextureProps__WEBPACK_IMPORTED_MODULE_4__.TextureTransparency.Opaque))
+                transp = _TextureProps__WEBPACK_IMPORTED_MODULE_4__.TextureTransparency.Mixed;
+        return transp;
+    }
     equals(other) {
-        if (this.mode !== other.mode)
-            return false;
-        if (this.stepCount !== other.stepCount)
-            return false;
-        if (!this.marginColor.equals(other.marginColor))
-            return false;
-        if (this.colorScheme !== other.colorScheme)
+        if (this.mode !== other.mode || this.stepCount !== other.stepCount || !this.marginColor.equals(other.marginColor)
+            || this.colorScheme !== other.colorScheme || this.customKeys.length !== other.customKeys.length
+            || this.colorMix !== other.colorMix || this.transparencyMode !== other.transparencyMode) {
             return false;
-        if (this.customKeys.length !== other.customKeys.length)
-            return false;
-        if (this.colorMix !== other.colorMix)
-            return false;
-        for (let i = 0; i < this.customKeys.length; i++) {
-            if (!_Gradient__WEBPACK_IMPORTED_MODULE_3__.Gradient.keyColorEquals(this.customKeys[i], other.customKeys[i]))
-                return false;
         }
-        return true;
+        return this.customKeys.every((key, index) => _Gradient__WEBPACK_IMPORTED_MODULE_3__.Gradient.keyColorEquals(key, other.customKeys[index]));
     }
     /** Compares two sets of thematic gradient settings.
      * @param lhs First set of thematic gradient settings to compare
@@ -42680,10 +42736,11 @@ class ThematicGradientSettings {
             return diff;
         if ((diff = (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.compareNumbers)(lhs.customKeys.length, rhs.customKeys.length)) !== 0)
             return diff;
-        for (let i = 0; i < lhs.customKeys.length; i++) {
+        if ((diff = (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.compareNumbers)(lhs.transparencyMode, rhs.transparencyMode)) !== 0)
+            return diff;
+        for (let i = 0; i < lhs.customKeys.length; i++)
             if ((diff = (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.compareNumbers)(lhs.customKeys[i].color.tbgr, rhs.customKeys[i].color.tbgr)) !== 0)
                 return diff;
-        }
         return diff;
     }
     constructor(json) {
@@ -42694,6 +42751,7 @@ class ThematicGradientSettings {
             this.marginColor = _ColorDef__WEBPACK_IMPORTED_MODULE_2__.ColorDef.fromJSON();
             this.colorScheme = ThematicGradientColorScheme.BlueRed;
             this.colorMix = 0.0;
+            this.transparencyMode = ThematicGradientTransparencyMode.SurfaceOnly;
         }
         else {
             this.mode = (json.mode !== undefined && json.mode !== null) ? json.mode : ThematicGradientMode.Smooth;
@@ -42715,6 +42773,7 @@ class ThematicGradientSettings {
                     this.customKeys.push(new _Gradient__WEBPACK_IMPORTED_MODULE_3__.Gradient.KeyColor({ value: keyValue[0], color: _ColorDef__WEBPACK_IMPORTED_MODULE_2__.ColorDef.computeTbgrFromComponents(keyValue[1], keyValue[3], keyValue[2]) }));
             }
             this.colorMix = json.colorMix ?? 0.0;
+            this.transparencyMode = json.transparencyMode ?? ThematicGradientTransparencyMode.SurfaceOnly;
         }
     }
     static fromJSON(json) {
@@ -42733,6 +42792,8 @@ class ThematicGradientSettings {
             props.colorScheme = this.colorScheme;
         if (0 !== this.colorMix)
             props.colorMix = this.colorMix;
+        if (ThematicGradientTransparencyMode.SurfaceOnly !== this.transparencyMode)
+            props.transparencyMode = this.transparencyMode;
         if (this.customKeys.length > 0)
             props.customKeys = this.customKeys.map((key) => { return { value: key.value, color: key.color.toJSON() }; });
         return props;
@@ -42751,6 +42812,7 @@ class ThematicGradientSettings {
             colorScheme: undefined !== changedProps.colorScheme ? changedProps.colorScheme : this.colorScheme,
             customKeys: undefined !== changedProps.customKeys ? changedProps.customKeys : this.customKeys.map((key) => ({ value: key.value, color: key.color.tbgr })),
             colorMix: undefined !== changedProps.colorMix ? changedProps.colorMix : this.colorMix,
+            transparencyMode: changedProps.transparencyMode ?? this.transparencyMode,
         };
         return ThematicGradientSettings.fromJSON(props);
     }
@@ -44580,6 +44642,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   ThematicGradientColorScheme: () => (/* reexport safe */ _ThematicDisplay__WEBPACK_IMPORTED_MODULE_106__.ThematicGradientColorScheme),
 /* harmony export */   ThematicGradientMode: () => (/* reexport safe */ _ThematicDisplay__WEBPACK_IMPORTED_MODULE_106__.ThematicGradientMode),
 /* harmony export */   ThematicGradientSettings: () => (/* reexport safe */ _ThematicDisplay__WEBPACK_IMPORTED_MODULE_106__.ThematicGradientSettings),
+/* harmony export */   ThematicGradientTransparencyMode: () => (/* reexport safe */ _ThematicDisplay__WEBPACK_IMPORTED_MODULE_106__.ThematicGradientTransparencyMode),
 /* harmony export */   TileContentSource: () => (/* reexport safe */ _TileProps__WEBPACK_IMPORTED_MODULE_108__.TileContentSource),
 /* harmony export */   TileFormat: () => (/* reexport safe */ _tile_TileIO__WEBPACK_IMPORTED_MODULE_149__.TileFormat),
 /* harmony export */   TileHeader: () => (/* reexport safe */ _tile_TileIO__WEBPACK_IMPORTED_MODULE_149__.TileHeader),
@@ -100105,6 +100168,7 @@ const extensionExports = {
     ThematicDisplayMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ThematicDisplayMode,
     ThematicGradientColorScheme: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ThematicGradientColorScheme,
     ThematicGradientMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ThematicGradientMode,
+    ThematicGradientTransparencyMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ThematicGradientTransparencyMode,
     Tile: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.Tile,
     TileAdmin: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TileAdmin,
     TileBoundingBoxes: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TileBoundingBoxes,
@@ -123348,7 +123412,8 @@ class SurfaceGeometry extends _MeshGeometry__WEBPACK_IMPORTED_MODULE_7__.MeshGeo
             return target.isReadPixelsInProgress ? opaquePass : "translucent";
         const vf = target.currentViewFlags;
         // When rendering thematic isolines, we need translucency because they have anti-aliasing.
-        if (target.wantThematicDisplay && this.supportsThematicDisplay && target.uniforms.thematic.wantIsoLines)
+        const thematic = target.wantThematicDisplay && this.supportsThematicDisplay ? target.uniforms.thematic.thematicDisplay : undefined;
+        if (thematic && target.uniforms.thematic.wantIsoLines)
             return "translucent";
         // In wireframe, unless fill is explicitly enabled for planar region, surface does not draw
         if (_itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.RenderMode.Wireframe === vf.renderMode && !this.mesh.isTextureAlwaysDisplayed) {
@@ -123360,6 +123425,18 @@ class SurfaceGeometry extends _MeshGeometry__WEBPACK_IMPORTED_MODULE_7__.MeshGeo
         // If transparency disabled by render mode or view flag, always draw opaque.
         if (!vf.transparency || _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.RenderMode.SolidFill === vf.renderMode || _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.RenderMode.HiddenLine === vf.renderMode)
             return opaquePass;
+        // A gradient texture applied by analysis style always fully determines the transparency of the surface.
+        if (this.hasScalarAnimation && undefined !== target.analysisTexture) {
+            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(undefined !== target.analysisStyle?.thematic);
+            switch (target.analysisStyle.thematic.thematicSettings.textureTransparency) {
+                case _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.TextureTransparency.Translucent:
+                    return "translucent";
+                case _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.TextureTransparency.Opaque:
+                    return opaquePass;
+                case _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.TextureTransparency.Mixed:
+                    return `${opaquePass}-translucent`;
+            }
+        }
         // We have 3 sources of alpha: the material, the texture, and the color.
         // Base alpha comes from the material if it overrides it; otherwise from the color.
         // The texture's alpha is multiplied by the base alpha.
@@ -123370,8 +123447,21 @@ class SurfaceGeometry extends _MeshGeometry__WEBPACK_IMPORTED_MODULE_7__.MeshGeo
             hasAlpha = mat.hasTranslucency;
         else
             hasAlpha = this.getColor(target).hasTranslucency;
+        // Thematic gradient can optionally multiply gradient alpha with surface alpha.
+        if (thematic && thematic.gradientSettings.transparencyMode === _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.ThematicGradientTransparencyMode.MultiplySurfaceAndGradient) {
+            switch (thematic.gradientSettings.textureTransparency) {
+                case _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.TextureTransparency.Opaque:
+                    // This surface's alpha gets multiplied by 1 - gradient colors are all opaque.
+                    return hasAlpha ? "translucent" : opaquePass;
+                case _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.TextureTransparency.Translucent:
+                    // This surface's alpha gets multiplied by < 1 - gradient colors are all translucent.
+                    return "translucent";
+                case _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.TextureTransparency.Mixed:
+                    // The gradient contains a mix of translucent and opaque colors.
+                    return hasAlpha ? "translucent" : `${opaquePass}-translucent`;
+            }
+        }
         if (!hasAlpha) {
-            // ###TODO handle TextureTransparency.Mixed; remove Texture.hasTranslucency.
             const tex = this.wantTextures(target, true) ? this.texture : undefined;
             switch (tex?.transparency) {
                 case _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.TextureTransparency.Translucent:
@@ -127854,9 +127944,9 @@ class ThematicUniforms {
         this._colorMix = 0.0;
         this._axis = new Float32Array(3);
         this._sunDirection = new Float32Array(3);
-        this._marginColor = new Float32Array(3);
+        this._marginColor = new _FloatRGBA__WEBPACK_IMPORTED_MODULE_8__.FloatRgba();
         this._displayMode = new Float32Array(1);
-        this._fragSettings = new Float32Array(3); // gradientMode, distanceCutoff, stepCount
+        this._fragSettings = new Float32Array(4); // gradientMode, distanceCutoff, stepCount, > 0.0 if multiply gradient alpha
         this._numSensors = 0;
         this._gradientDimension = _getGradientDimension();
         this.syncKey = 0;
@@ -127930,15 +128020,13 @@ class ThematicUniforms {
         this._updateAxis(this.thematicDisplay.axis, (_itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.ThematicDisplayMode.Slope === this.thematicDisplay.displayMode) ? target.uniforms.frustum.viewMatrix : undefined);
         if (_itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.ThematicDisplayMode.HillShade === this.thematicDisplay.displayMode)
             this._updateSunDirection(this.thematicDisplay.sunDirection, target.uniforms.frustum.viewMatrix);
-        const marginRgb = _FloatRGBA__WEBPACK_IMPORTED_MODULE_8__.FloatRgb.fromColorDef(this.thematicDisplay.gradientSettings.marginColor);
-        this._marginColor[0] = marginRgb.red;
-        this._marginColor[1] = marginRgb.green;
-        this._marginColor[2] = marginRgb.blue;
+        this._marginColor.setColorDef(this.thematicDisplay.gradientSettings.marginColor);
         this._displayMode[0] = this.thematicDisplay.displayMode;
         this._fragSettings[0] = this.thematicDisplay.gradientSettings.mode;
         const sensorSettings = this.thematicDisplay.sensorSettings;
         this._fragSettings[1] = (undefined === sensorSettings) ? 0 : this.thematicDisplay.sensorSettings.distanceCutoff;
         this._fragSettings[2] = Math.min(this.thematicDisplay.gradientSettings.stepCount, this._gradientDimension);
+        this._fragSettings[3] = this.thematicDisplay.gradientSettings.transparencyMode === _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.ThematicGradientTransparencyMode.SurfaceOnly ? 0.0 : 1.0;
         // If we want sensors and have no distance cutoff, then create a global shared sensor texture.
         if (target.wantThematicSensors && !(this._distanceCutoff > 0)) {
             this._numSensors = sensorSettings.sensors.length;
@@ -127963,7 +128051,7 @@ class ThematicUniforms {
     }
     bindMarginColor(uniform) {
         if (!(0,_Sync__WEBPACK_IMPORTED_MODULE_3__.sync)(this, uniform))
-            uniform.setUniform3fv(this._marginColor);
+            this._marginColor.bind(uniform);
     }
     bindDisplayMode(uniform) {
         if (!(0,_Sync__WEBPACK_IMPORTED_MODULE_3__.sync)(this, uniform))
@@ -127971,7 +128059,7 @@ class ThematicUniforms {
     }
     bindFragSettings(uniform) {
         if (!(0,_Sync__WEBPACK_IMPORTED_MODULE_3__.sync)(this, uniform))
-            uniform.setUniform3fv(this._fragSettings);
+            uniform.setUniform4fv(this._fragSettings);
     }
     bindTexture(uniform, unit) {
         (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(undefined !== this._texture);
@@ -135531,16 +135619,12 @@ const discardClassifiedByAlpha = `
   bool isTranslucentPass = kRenderPass_Translucent == u_renderPass;
   return (isOpaquePass && hasAlpha) || (isTranslucentPass && !hasAlpha);
 `;
-const discardByTextureAlpha = `
-  if (isSurfaceBitSet(kSurfaceBit_HasTexture)) {
-    float cutoff = abs(u_alphaCutoff);
-    if (kRenderPass_Translucent == u_renderPass)
-      return u_alphaCutoff > 0.0 && alpha >= cutoff;
-    else
-      return alpha < cutoff;
-  }
-
-  return false;
+const discardByAlphaCutoff = `
+  float cutoff = abs(u_alphaCutoff);
+  if (kRenderPass_Translucent == u_renderPass)
+    return u_alphaCutoff > 0.0 && alpha >= cutoff;
+  else
+    return alpha < cutoff;
 `;
 function addTransparencyDiscard(frag) {
     (0,_RenderPass__WEBPACK_IMPORTED_MODULE_16__.addRenderPass)(frag);
@@ -135555,7 +135639,7 @@ function addTransparencyDiscard(frag) {
             uniform.setUniform1f(cutoff);
         });
     });
-    frag.set(5 /* FragmentShaderComponent.DiscardByAlpha */, discardByTextureAlpha);
+    frag.set(5 /* FragmentShaderComponent.DiscardByAlpha */, discardByAlphaCutoff);
 }
 /** @internal */
 function createSurfaceBuilder(flags) {
@@ -135713,11 +135797,11 @@ vec4 getSensor(int index) {
 // A stepped gradient texture is arranged with single unique color pixels for each step. The dimension of a stepped gradient texture is stepCount.
 // A smooth gradient texture is arranged with blended color pixels across the entire span of the texture. The dimension of a smooth gradient texture is the system's maximum texture size.
 const getColor = `
-vec3 getColor(float ndx) {
+vec4 getColor(float ndx) {
   if (ndx < 0.0 || ndx > 1.0)
     return u_marginColor;
 
-  return TEXTURE(s_texture, vec2(0.0, ndx)).rgb;
+  return TEXTURE(s_texture, vec2(0.0, ndx));
 }
 `;
 // Access a stepped gradient texture at the specified index taking into account isolines.
@@ -135725,12 +135809,12 @@ vec3 getColor(float ndx) {
 // specifically to ensure that the texels sampled result in lines of overall singular colors - no stepping into the
 // neighboring bands.
 const getIsoLineColor = `
-vec3 getIsoLineColor(float ndx, float stepCount) {
+vec4 getIsoLineColor(float ndx, float stepCount) {
   if (ndx < 0.01 || ndx > 0.99)
     return u_marginColor;
 
   ndx += 0.5 / stepCount; // center on step pixels
-  return TEXTURE(s_texture, vec2(0.0, ndx)).rgb;
+  return TEXTURE(s_texture, vec2(0.0, ndx));
 }
 `;
 const fwidth = `\nfloat _universal_fwidth(float coord) { return fwidth(coord); }\n`;
@@ -135796,7 +135880,8 @@ const applyThematicColorPostlude = `
   float gradientMode = u_thematicSettings.x;
   float stepCount = u_thematicSettings.z;
 
-  vec4 rgba = vec4((kThematicGradientMode_IsoLines == gradientMode) ? getIsoLineColor(ndx, stepCount) : getColor(ndx), baseColor.a);
+  vec4 rgba = (kThematicGradientMode_IsoLines == gradientMode) ? getIsoLineColor(ndx, stepCount) : getColor(ndx);
+  rgba.a = baseColor.a * (u_thematicSettings.w > 0.0 ? rgba.a : 1.0);
   rgba = mix(rgba, baseColor, u_thematicColorMix);
 
   if (kThematicGradientMode_IsoLines == gradientMode) {
@@ -135821,7 +135906,8 @@ const applyThematicColorPostludeForPointClouds = `
   float gradientMode = u_thematicSettings.x;
   float stepCount = u_thematicSettings.z;
 
-  vec4 rgba = vec4((kThematicGradientMode_IsoLines == gradientMode) ? getIsoLineColor(ndx, stepCount) : getColor(ndx), baseColor.a);
+  vec4 rgba = (kThematicGradientMode_IsoLines == gradientMode) ? getIsoLineColor(ndx, stepCount) : getColor(ndx);
+  rgba.a = baseColor.a * (u_thematicSettings.w > 0.0 ? rgba.a : 1.0);
   rgba = mix(rgba, baseColor, u_thematicColorMix);
 
   if (kThematicGradientMode_IsoLines == gradientMode) {
@@ -135924,13 +136010,13 @@ function addThematicDisplay(builder, isForPointClouds = false, isForTerrainMesh
             params.target.uniforms.thematic.bindDisplayMode(uniform);
         });
     });
-    frag.addUniform("u_marginColor", 4 /* VariableType.Vec3 */, (prog) => {
+    frag.addUniform("u_marginColor", 5 /* VariableType.Vec4 */, (prog) => {
         prog.addGraphicUniform("u_marginColor", (uniform, params) => {
             params.target.uniforms.thematic.bindMarginColor(uniform);
         });
     });
     // gradientMode, distanceCutoff, stepCount
-    builder.addUniform("u_thematicSettings", 4 /* VariableType.Vec3 */, (prog) => {
+    builder.addUniform("u_thematicSettings", 5 /* VariableType.Vec4 */, (prog) => {
         prog.addGraphicUniform("u_thematicSettings", (uniform, params) => {
             params.target.uniforms.thematic.bindFragSettings(uniform);
         });
@@ -148309,9 +148395,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   ArcGISTileMap: () => (/* binding */ ArcGISTileMap)
 /* harmony export */ });
-/* harmony import */ var _request_Request__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../request/Request */ "../../core/frontend/lib/esm/request/Request.js");
-/* harmony import */ var _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @itwin/core-bentley */ "../../core/bentley/lib/esm/core-bentley.js");
-/* harmony import */ var _internal__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../internal */ "../../core/frontend/lib/esm/tile/internal.js");
+/* harmony import */ var _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @itwin/core-bentley */ "../../core/bentley/lib/esm/core-bentley.js");
+/* harmony import */ var _internal__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../internal */ "../../core/frontend/lib/esm/tile/internal.js");
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
@@ -148321,16 +148406,15 @@ __webpack_require__.r(__webpack_exports__);
  */
 
 
-
 const nonVisibleChildren = [false, false, false, false];
 /** @internal */
 class ArcGISTileMap {
-    constructor(restBaseUrl, settings, nbLods, accessClient) {
+    constructor(restBaseUrl, settings, fetchFunc, nbLods) {
         this.tileMapRequestSize = 32;
         this.fallbackTileMapRequestSize = 2;
-        this._tilesCache = new _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__.Dictionary((lhs, rhs) => (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__.compareStrings)(lhs, rhs));
+        this._tilesCache = new _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.Dictionary((lhs, rhs) => (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.compareStrings)(lhs, rhs));
         this._restBaseUrl = restBaseUrl;
-        this._accessClient = accessClient;
+        this._fetchFunc = fetchFunc;
         this._settings = settings;
         if (nbLods !== undefined && nbLods > 0) {
             this._callQueues = new Array(nbLods).fill(Promise.resolve(nonVisibleChildren));
@@ -148338,19 +148422,8 @@ class ArcGISTileMap {
     }
     async fetchTileMapFromServer(level, row, column, width, height) {
         const tmpUrl = `${this._restBaseUrl}/tilemap/${level}/${row}/${column}/${width}/${height}?f=json`;
-        const urlObj = new URL(tmpUrl);
-        try {
-            if (this._accessClient) {
-                await _internal__WEBPACK_IMPORTED_MODULE_2__.ArcGisUtilities.appendSecurityToken(urlObj, this._accessClient, {
-                    mapLayerUrl: new URL(this._settings.url),
-                    userName: this._settings.userName,
-                    password: this._settings.password,
-                });
-            }
-        }
-        catch {
-        }
-        return (0,_request_Request__WEBPACK_IMPORTED_MODULE_0__.request)(urlObj.toString(), "json");
+        const response = await this._fetchFunc(new URL(tmpUrl));
+        return response.json();
     }
     getAvailableTilesFromCache(tiles) {
         let allTilesFound = true;
@@ -148423,7 +148496,7 @@ class ArcGISTileMap {
                 if (json.adjusted) {
                     // If tilemap size got adjusted, I'm expecting to get adjusted size...
                     // otherwise there is something really odd with this server.
-                    (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__.assert)(json.location?.width !== undefined && json.location?.height !== undefined);
+                    (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(json.location?.width !== undefined && json.location?.height !== undefined);
                     if (json.location?.width !== undefined && json.location?.height !== undefined) {
                         tileMapWidth = json.location?.width;
                         tileMapHeight = json.location?.height;
@@ -148436,7 +148509,7 @@ class ArcGISTileMap {
                         const curColumn = reqColumn + i;
                         const curRow = reqRow + j;
                         // console.log(`Tilemap tile:: ${level},${curRow},${curColumn} => ${avail}`);
-                        this._tilesCache.set(_internal__WEBPACK_IMPORTED_MODULE_2__.QuadId.getTileContentId(level, curColumn, curRow), avail);
+                        this._tilesCache.set(_internal__WEBPACK_IMPORTED_MODULE_1__.QuadId.getTileContentId(level, curColumn, curRow), avail);
                         // Check if actual tile is among the children we are looking for, if so update the availability array.
                         if (curColumn >= queryTiles[0].column && curColumn <= queryTiles[queryTiles.length - 1].column
                             && curRow >= queryTiles[0].row && curRow <= queryTiles[queryTiles.length - 1].row) {
@@ -148451,7 +148524,7 @@ class ArcGISTileMap {
                 // Mark all tilemap tiles to non-available in the cache too
                 for (let j = 0; j < tileMapWidth; j++) {
                     for (let i = 0; i < tileMapHeight; i++) {
-                        this._tilesCache.set(_internal__WEBPACK_IMPORTED_MODULE_2__.QuadId.getTileContentId(level, reqColumn + i, reqRow + j), false);
+                        this._tilesCache.set(_internal__WEBPACK_IMPORTED_MODULE_1__.QuadId.getTileContentId(level, reqColumn + i, reqRow + j), false);
                     }
                 }
             }
@@ -148643,17 +148716,12 @@ class ArcGisUtilities {
     }
     /**
      * Attempt to access an ArcGIS service, and validate its service metadata.
-     * @param url URL of the source to validate.
-     * @param formatId Format Id of the source.
-     * @param capabilitiesFilter List of capabilities 'keyword' that needs to be advertised in the service's metadata
-     * in order to be valid.  For example: 'Map', 'Query', etc
-     * @param userName Username to use for legacy token based security.
-     * @param password Password to use for legacy token based security.
-     * @param ignoreCache Flag to skip cache lookup (i.e. force a new server request)
-     * @return Validation Status. If successful, a list of available sub-layers will also be returned.
-     */
-    static async validateSource(url, formatId, capabilitiesFilter, userName, password, ignoreCache) {
-        const metadata = await this.getServiceJson(url, formatId, userName, password, ignoreCache);
+     * @param source Source to validate.
+     * @param opts Validation options
+    */
+    static async validateSource(args) {
+        const { source, ignoreCache, capabilitiesFilter } = args;
+        const metadata = await this.getServiceJson({ url: source.url, formatId: source.formatId, userName: source.userName, password: source.password, queryParams: source.collectQueryParams(), ignoreCache });
         const json = metadata?.content;
         if (json === undefined) {
             return { status: _internal__WEBPACK_IMPORTED_MODULE_1__.MapLayerSourceStatus.InvalidUrl };
@@ -148663,7 +148731,7 @@ class ArcGisUtilities {
             // and return information needed to initiate the authentification process... the end-user
             // will have to provide his credentials before we can fully validate this source.
             if (json.error.code === ArcGisErrorCode.TokenRequired) {
-                return (userName || password) ? { status: _internal__WEBPACK_IMPORTED_MODULE_1__.MapLayerSourceStatus.InvalidCredentials } : { status: _internal__WEBPACK_IMPORTED_MODULE_1__.MapLayerSourceStatus.RequireAuth };
+                return (source.userName || source.password) ? { status: _internal__WEBPACK_IMPORTED_MODULE_1__.MapLayerSourceStatus.InvalidCredentials } : { status: _internal__WEBPACK_IMPORTED_MODULE_1__.MapLayerSourceStatus.RequireAuth };
             }
             else if (json.error.code === ArcGisErrorCode.InvalidCredentials)
                 return { status: _internal__WEBPACK_IMPORTED_MODULE_1__.MapLayerSourceStatus.InvalidCredentials };
@@ -148714,16 +148782,30 @@ class ArcGisUtilities {
      * @param ignoreCache Flag to skip cache lookup (i.e. force a new server request)
      * @param requireToken Flag to indicate if a token is required
      */
-    static async getServiceJson(url, formatId, userName, password, ignoreCache, requireToken) {
+    static async getServiceJson(args) {
+        const { url, formatId, userName, password, queryParams, ignoreCache, requireToken } = args;
         if (!ignoreCache) {
             const cached = ArcGisUtilities._serviceCache.get(url);
             if (cached !== undefined)
                 return cached;
         }
+        const appendParams = (urlObj, params) => {
+            if (params) {
+                Object.keys(params).forEach((paramKey) => {
+                    if (!urlObj.searchParams.has(paramKey))
+                        urlObj.searchParams.append(paramKey, params[paramKey]);
+                });
+            }
+        };
+        const createUrlObj = () => {
+            const tmpUrl = new URL(url);
+            tmpUrl.searchParams.append("f", "json");
+            appendParams(tmpUrl, queryParams);
+            return tmpUrl;
+        };
         let accessTokenRequired = false;
         try {
-            let tmpUrl = new URL(url);
-            tmpUrl.searchParams.append("f", "json");
+            let tmpUrl = createUrlObj();
             // In some cases, caller might already know token is required, so append it immediately
             if (requireToken) {
                 const accessClient = _IModelApp__WEBPACK_IMPORTED_MODULE_2__.IModelApp.mapLayerFormatRegistry.getAccessClient(formatId);
@@ -148742,8 +148824,7 @@ class ArcGisUtilities {
                 // If token required
                 const accessClient = _IModelApp__WEBPACK_IMPORTED_MODULE_2__.IModelApp.mapLayerFormatRegistry.getAccessClient(formatId);
                 if (accessClient) {
-                    tmpUrl = new URL(url);
-                    tmpUrl.searchParams.append("f", "json");
+                    tmpUrl = createUrlObj();
                     await ArcGisUtilities.appendSecurityToken(tmpUrl, accessClient, { mapLayerUrl: new URL(url), userName, password });
                     response = await fetch(tmpUrl.toString(), { method: "GET" });
                     errorCode = await ArcGisUtilities.checkForResponseErrorCode(response);
@@ -149643,7 +149724,7 @@ class ArcGISImageryProvider extends _internal__WEBPACK_IMPORTED_MODULE_0__.MapLa
     async getServiceJson() {
         let metadata;
         try {
-            metadata = await _internal__WEBPACK_IMPORTED_MODULE_0__.ArcGisUtilities.getServiceJson(this._settings.url, this._settings.formatId, this._settings.userName, this._settings.password);
+            metadata = await _internal__WEBPACK_IMPORTED_MODULE_0__.ArcGisUtilities.getServiceJson({ url: this._settings.url, formatId: this._settings.formatId, userName: this._settings.userName, password: this._settings.password, queryParams: this._settings.collectQueryParams() });
         }
         catch (_e) {
         }
@@ -149672,6 +149753,11 @@ class ArcGISImageryProvider extends _internal__WEBPACK_IMPORTED_MODULE_0__.MapLa
     async fetch(url, options) {
         let errorCode;
         const urlObj = new URL(url);
+        const queryParams = this._settings.collectQueryParams();
+        Object.keys(queryParams).forEach((paramKey) => {
+            if (!urlObj.searchParams.has(paramKey))
+                urlObj.searchParams.append(paramKey, queryParams[paramKey]);
+        });
         if (this._accessTokenRequired && this._accessClient) {
             this._lastAccessToken = await _internal__WEBPACK_IMPORTED_MODULE_0__.ArcGisUtilities.appendSecurityToken(urlObj, this._accessClient, {
                 mapLayerUrl: new URL(this._settings.url),
@@ -149917,7 +150003,10 @@ class ArcGISMapLayerImageryProvider extends _internal__WEBPACK_IMPORTED_MODULE_2
             }
             // Create tile map object only if we are going to request tiles from this server and it support tilemap requests.
             if (this._tileMapSupported) {
-                this._tileMap = new _internal__WEBPACK_IMPORTED_MODULE_2__.ArcGISTileMap(this._settings.url, this._settings, json.tileInfo?.lods?.length, this._accessClient);
+                const fetch = async (url, options) => {
+                    return this.fetch(url, options);
+                };
+                this._tileMap = new _internal__WEBPACK_IMPORTED_MODULE_2__.ArcGISTileMap(this._settings.url, this._settings, fetch, json.tileInfo?.lods?.length);
             }
         }
         // Read range using fullextent from service metadata
@@ -150768,7 +150857,8 @@ class TileUrlImageryProvider extends _internal__WEBPACK_IMPORTED_MODULE_0__.MapL
                 url = `${url}/`;
             url = `${url}{level}/{column}/{row}.png`;
         }
-        return url.replace(levelToken, level.toString()).replace(columnToken, column.toString()).replace(rowToken, row.toString());
+        const tmpUrl = url.replace(levelToken, level.toString()).replace(columnToken, column.toString()).replace(rowToken, row.toString());
+        return this.appendCustomParams(tmpUrl);
     }
 }
 
@@ -150966,7 +151056,8 @@ class WmsMapLayerImageryProvider extends _internal__WEBPACK_IMPORTED_MODULE_3__.
         if (bboxString.length === 0 || crsString.length === 0 || layerString.length === 0)
             return "";
         const crsParamName = this._capabilities?.isVersion13 ? "CRS" : "SRS";
-        return `${this._baseUrl}?SERVICE=WMS&VERSION=${this._capabilities?.version}&REQUEST=GetMap&FORMAT=image%2Fpng&TRANSPARENT=${this.transparentBackgroundString}&LAYERS=${layerString}&WIDTH=${this.tileSize}&HEIGHT=${this.tileSize}&${crsParamName}=${crsString}&STYLES=&BBOX=${bboxString}`;
+        const tmpUrl = `${this._baseUrl}?SERVICE=WMS&VERSION=${this._capabilities?.version}&REQUEST=GetMap&FORMAT=image%2Fpng&TRANSPARENT=${this.transparentBackgroundString}&LAYERS=${layerString}&WIDTH=${this.tileSize}&HEIGHT=${this.tileSize}&${crsParamName}=${crsString}&STYLES=&BBOX=${bboxString}`;
+        return this.appendCustomParams(tmpUrl);
     }
     async getToolTip(strings, quadId, carto, tree) {
         await super.getToolTip(strings, quadId, carto, tree);
@@ -150986,7 +151077,8 @@ class WmsMapLayerImageryProvider extends _internal__WEBPACK_IMPORTED_MODULE_3__.
         const y = Math.floor(.5 + (1.0 - fraction.y) * this.tileSize);
         const coordinateString = this._capabilities?.isVersion13 ? `&i=${x}&j=${y}` : `&x=${x}&y=${y}`;
         const crsParamName = this._capabilities?.isVersion13 ? "CRS" : "SRS";
-        const getFeatureUrl = `${this._baseUrl}?SERVICE=WMS&VERSION=${this._capabilities?.version}&REQUEST=GetFeatureInfo&LAYERS=${layerString}&WIDTH=${this.tileSize}&HEIGHT=${this.tileSize}&${crsParamName}=EPSG%3A3857&BBOX=${bboxString}&QUERY_LAYERS=${layerString}${coordinateString}&info_format=${formatString}`;
+        let getFeatureUrl = `${this._baseUrl}?SERVICE=WMS&VERSION=${this._capabilities?.version}&REQUEST=GetFeatureInfo&LAYERS=${layerString}&WIDTH=${this.tileSize}&HEIGHT=${this.tileSize}&${crsParamName}=EPSG%3A3857&BBOX=${bboxString}&QUERY_LAYERS=${layerString}${coordinateString}&info_format=${formatString}`;
+        getFeatureUrl = this.appendCustomParams(getFeatureUrl);
         return this.toolTipFromUrl(strings, getFeatureUrl);
     }
 }
@@ -151154,10 +151246,11 @@ class WmtsMapLayerImageryProvider extends _internal__WEBPACK_IMPORTED_MODULE_2__
         if (matrixSetAndLimits && matrixSetAndLimits.tileMatrixSet.tileMatrix.length > zoomLevel)
             tileMatrix = matrixSetAndLimits.tileMatrixSet.tileMatrix[zoomLevel].identifier;
         const styleParam = (style?.identifier === undefined ? "" : `&style=${style.identifier}`);
-        if (tileMatrix !== undefined && matrixSetAndLimits !== undefined)
-            return `${this._baseUrl}?Service=WMTS&Version=1.0.0&Request=GetTile&Format=image%2Fpng&layer=${this.displayedLayerName}${styleParam}&TileMatrixSet=${matrixSetAndLimits.tileMatrixSet.identifier}&TileMatrix=${tileMatrix}&TileCol=${column}&TileRow=${row} `;
-        else
-            return "";
+        if (tileMatrix !== undefined && matrixSetAndLimits !== undefined) {
+            const tmpUrl = `${this._baseUrl}?Service=WMTS&Version=1.0.0&Request=GetTile&Format=image%2Fpng&layer=${this.displayedLayerName}${styleParam}&TileMatrixSet=${matrixSetAndLimits.tileMatrixSet.identifier}&TileMatrix=${tileMatrix}&TileCol=${column}&TileRow=${row}`;
+            return this.appendCustomParams(tmpUrl);
+        }
+        return "";
     }
 }
 
@@ -151814,17 +151907,20 @@ class MapLayerFormat {
      * @param _ignoreCache Flag to skip cache lookup (i.e. force a new server request).
      * @returns Validation Status. If successful, a list of available sub-layers may also be returned.
      */
-    static async validateSource(_url, _userName, _password, _ignoreCache) { return { status: _internal__WEBPACK_IMPORTED_MODULE_2__.MapLayerSourceStatus.Valid }; }
+    static async validateSource(_url, _userName, _password, _ignoreCache, _accesKey) { return { status: _internal__WEBPACK_IMPORTED_MODULE_2__.MapLayerSourceStatus.Valid }; }
+    /** Allow a source object to be validated before being attached as a map-layer.
+      * @beta
+    */
+    static async validate(args) {
+        return this.validateSource(args.source.url, args.source.userName, args.source.password, args.ignoreCache);
+    }
     /**
      * Create a [[MapLayerImageryProvider]] that will be used to feed data in a map-layer tile tree.
      * @param _settings The map layer settings to be applied to the imagery provider.
      * @returns Returns the new imagery provider.
      * @beta
      */
-    static createImageryProvider(_settings) {
-        (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(false, "Subclasses must override this method.");
-        return undefined;
-    }
+    static createImageryProvider(_settings) { (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(false); }
     /**
      * Creates a MapLayerTileTreeReference for this map layer format.
      * @param _layerSettings Map layer settings that are applied to the MapLayerTileTreeReference.
@@ -151834,7 +151930,7 @@ class MapLayerFormat {
      * @beta
      */
     static createMapLayerTree(_layerSettings, _layerIndex, _iModel) {
-        (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(false, "Subclasses must override this method.");
+        (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(false);
         return undefined;
     }
 }
@@ -151896,10 +151992,30 @@ class MapLayerFormatRegistry {
         }
         return (format === undefined) ? undefined : format.createImageryProvider(layerSettings);
     }
-    async validateSource(formatId, url, userName, password, ignoreCache) {
-        const entry = this._formats.get(formatId);
-        const format = entry?.type;
-        return (format === undefined) ? { status: _internal__WEBPACK_IMPORTED_MODULE_2__.MapLayerSourceStatus.InvalidFormat } : format.validateSource(url, userName, password, ignoreCache);
+    /** @internal*/
+    async validateSource(formatIdOrArgs, url, userName, password, ignoreCache) {
+        let format;
+        let args;
+        if (typeof formatIdOrArgs == "string" && url !== undefined) {
+            const formatId = formatIdOrArgs;
+            const entry = this._formats.get(formatId);
+            format = entry?.type;
+            if (format !== undefined) {
+                const source = _internal__WEBPACK_IMPORTED_MODULE_2__.MapLayerSource.fromJSON({ name: "", formatId, url });
+                if (source !== undefined) {
+                    args = { source, ignoreCache };
+                    source.userName = userName;
+                    source.password = password;
+                }
+            }
+        }
+        else if (typeof formatIdOrArgs !== "string") {
+            const entry = this._formats.get(formatIdOrArgs.source.formatId);
+            format = entry?.type;
+        }
+        if (!args || !format)
+            return { status: _internal__WEBPACK_IMPORTED_MODULE_2__.MapLayerSourceStatus.InvalidFormat };
+        return format.validate(args);
     }
 }
 
@@ -151936,10 +152052,20 @@ class WmsMapLayerFormat extends ImageryMapLayerFormat {
         return new _internal__WEBPACK_IMPORTED_MODULE_0__.WmsMapLayerImageryProvider(settings);
     }
     static async validateSource(url, userName, password, ignoreCache) {
+        const source = _internal__WEBPACK_IMPORTED_MODULE_0__.MapLayerSource.fromJSON({ name: "", formatId: WmsMapLayerFormat.formatId, url });
+        if (source === undefined)
+            return { status: _internal__WEBPACK_IMPORTED_MODULE_0__.MapLayerSourceStatus.InvalidFormat };
+        source.userName = userName;
+        source.password = password;
+        return WmsMapLayerFormat.validate({ source, ignoreCache });
+    }
+    static async validate(args) {
+        const { source, ignoreCache } = args;
+        const { url, userName, password } = source;
         try {
             let subLayers;
             const maxVisibleSubLayers = 50;
-            const capabilities = await _internal__WEBPACK_IMPORTED_MODULE_0__.WmsCapabilities.create(url, (userName && password ? { user: userName, password } : undefined), ignoreCache);
+            const capabilities = await _internal__WEBPACK_IMPORTED_MODULE_0__.WmsCapabilities.create(url, (userName && password ? { user: userName, password } : undefined), ignoreCache, source.collectQueryParams());
             if (capabilities !== undefined) {
                 subLayers = capabilities.getSubLayers(false);
                 const rootsSubLayer = subLayers?.find((sublayer) => sublayer.parent === undefined);
@@ -151994,9 +152120,19 @@ class WmtsMapLayerFormat extends ImageryMapLayerFormat {
         return new _internal__WEBPACK_IMPORTED_MODULE_0__.WmtsMapLayerImageryProvider(settings);
     }
     static async validateSource(url, userName, password, ignoreCache) {
+        const source = _internal__WEBPACK_IMPORTED_MODULE_0__.MapLayerSource.fromJSON({ name: "", formatId: WmtsMapLayerFormat.formatId, url });
+        if (source === undefined)
+            return { status: _internal__WEBPACK_IMPORTED_MODULE_0__.MapLayerSourceStatus.InvalidFormat };
+        source.userName = userName;
+        source.password = password;
+        return WmtsMapLayerFormat.validate({ source, ignoreCache });
+    }
+    static async validate(args) {
+        const { source, ignoreCache } = args;
+        const { url, userName, password } = source;
         try {
             const subLayers = [];
-            const capabilities = await _internal__WEBPACK_IMPORTED_MODULE_0__.WmtsCapabilities.create(url, (userName && password ? { user: userName, password } : undefined), ignoreCache);
+            const capabilities = await _internal__WEBPACK_IMPORTED_MODULE_0__.WmtsCapabilities.create(url, (userName && password ? { user: userName, password } : undefined), ignoreCache, source.collectQueryParams());
             if (!capabilities)
                 return { status: _internal__WEBPACK_IMPORTED_MODULE_0__.MapLayerSourceStatus.InvalidUrl };
             // Only returns layer that can be published in the Google maps or WGS84 aligned tile trees.
@@ -152043,11 +152179,19 @@ class WmtsMapLayerFormat extends ImageryMapLayerFormat {
 WmtsMapLayerFormat.formatId = "WMTS";
 class ArcGISMapLayerFormat extends ImageryMapLayerFormat {
     static async validateSource(url, userName, password, ignoreCache) {
-        const urlValidation = _internal__WEBPACK_IMPORTED_MODULE_0__.ArcGisUtilities.validateUrl(url, "MapServer");
+        const source = _internal__WEBPACK_IMPORTED_MODULE_0__.MapLayerSource.fromJSON({ name: "", formatId: WmtsMapLayerFormat.formatId, url });
+        if (source === undefined)
+            return { status: _internal__WEBPACK_IMPORTED_MODULE_0__.MapLayerSourceStatus.InvalidFormat };
+        source.userName = userName;
+        source.password = password;
+        return WmtsMapLayerFormat.validate({ source, ignoreCache });
+    }
+    static async validate(args) {
+        const urlValidation = _internal__WEBPACK_IMPORTED_MODULE_0__.ArcGisUtilities.validateUrl(args.source.url, "MapServer");
         if (urlValidation !== _internal__WEBPACK_IMPORTED_MODULE_0__.MapLayerSourceStatus.Valid)
             return { status: urlValidation };
         // Some Map service supporting only tiles don't include the 'Map' capabilities, thus we can't make it mandatory.
-        return _internal__WEBPACK_IMPORTED_MODULE_0__.ArcGisUtilities.validateSource(url, this.formatId, [], userName, password, ignoreCache);
+        return _internal__WEBPACK_IMPORTED_MODULE_0__.ArcGisUtilities.validateSource({ ...args, capabilitiesFilter: [] });
     }
     static createImageryProvider(settings) {
         return new _internal__WEBPACK_IMPORTED_MODULE_0__.ArcGISMapLayerImageryProvider(settings);
@@ -152433,6 +152577,47 @@ class MapLayerImageryProvider {
               ${tileExtent.longitudeRight.toFixed(8)},${tileExtent.latitudeTop.toFixed(8)}`;
         }
     }
+    /** Append custom parameters for settings to provided URL object.
+     *  Make sure custom parameters do no override query parameters already part of the URL (lower case comparison)
+     * @internal
+     */
+    appendCustomParams(url) {
+        if (!this._settings.savedQueryParams && !this._settings.unsavedQueryParams)
+            return url;
+        // create a lower-case array of keys
+        const currentParams = [];
+        const currentUrl = new URL(url);
+        currentUrl.searchParams.forEach((_value, key, _parent) => {
+            currentParams.push(key.toLowerCase());
+        });
+        const urlParamsFromIndexArray = (indexArray, result) => {
+            const urlParams = (result ? result : new URLSearchParams());
+            if (!indexArray)
+                return urlParams;
+            Object.keys(indexArray).forEach((key) => {
+                if (!currentParams.includes(key.toLowerCase()))
+                    urlParams.append(key, indexArray[key]);
+            });
+            return urlParams;
+        };
+        const params = urlParamsFromIndexArray(this._settings.savedQueryParams);
+        urlParamsFromIndexArray(this._settings.unsavedQueryParams, params);
+        const getSeparator = (u) => {
+            let separator = "&";
+            if (u.includes("?")) {
+                if (u.endsWith("?"))
+                    separator = "";
+            }
+            else {
+                separator = "?";
+            }
+            return separator;
+        };
+        if (params.size > 0) {
+            url = `${url}${getSeparator(url)}${params.toString()}`;
+        }
+        return url;
+    }
 }
 
 
@@ -152497,21 +152682,22 @@ var MapLayerSourceStatus;
  * @public
  */
 class MapLayerSource {
-    constructor(formatId = "WMS", name, url, baseMap = false, transparentBackground = true) {
+    constructor(formatId = "WMS", name, url, baseMap = false, transparentBackground = true, savedQueryParams) {
         this.baseMap = false;
         this.formatId = formatId;
         this.name = name;
         this.url = url;
         this.baseMap = baseMap;
         this.transparentBackground = transparentBackground;
+        this.savedQueryParams = savedQueryParams;
     }
     static fromJSON(json) {
         if (json === undefined)
             return undefined;
-        return new MapLayerSource(json.formatId, json.name, json.url, json.baseMap, json.transparentBackground);
+        return new MapLayerSource(json.formatId, json.name, json.url, json.baseMap, json.transparentBackground, json.queryParams);
     }
     async validateSource(ignoreCache) {
-        return _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.mapLayerFormatRegistry.validateSource(this.formatId, this.url, this.userName, this.password, ignoreCache);
+        return _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.mapLayerFormatRegistry.validateSource({ source: this, ignoreCache });
     }
     /** @internal*/
     static fromBackgroundMapProps(props) {
@@ -152527,7 +152713,7 @@ class MapLayerSource {
         return undefined;
     }
     toJSON() {
-        return { url: this.url, name: this.name, formatId: this.formatId, transparentBackground: this.transparentBackground };
+        return { url: this.url, name: this.name, formatId: this.formatId, transparentBackground: this.transparentBackground, queryParams: this.savedQueryParams };
     }
     toLayerSettings(subLayers) {
         // When MapLayerSetting is created from a MapLayerSource, sub-layers and credentials need to be set separately.
@@ -152535,11 +152721,28 @@ class MapLayerSource {
         if (this.userName !== undefined || this.password !== undefined) {
             layerSettings?.setCredentials(this.userName, this.password);
         }
+        if (this.savedQueryParams) {
+            layerSettings.savedQueryParams = { ...this.savedQueryParams };
+        }
+        if (this.unsavedQueryParams) {
+            layerSettings.unsavedQueryParams = { ...this.unsavedQueryParams };
+        }
         return layerSettings;
     }
     getCredentials() {
         return this.userName && this.password ? { user: this.userName, password: this.password } : undefined;
     }
+    /** Collect all query parameters
+   * @beta
+   */
+    collectQueryParams() {
+        let queryParams = {};
+        if (this.savedQueryParams)
+            queryParams = { ...this.savedQueryParams };
+        if (this.unsavedQueryParams)
+            queryParams = { ...queryParams, ...this.unsavedQueryParams };
+        return queryParams;
+    }
 }
 /** A collection of [[MapLayerSource]] objects.
  * @beta
@@ -155616,13 +155819,22 @@ class WmsCapabilities {
         if (_json.Capability)
             this.layer = new WmsCapability.Layer(_json.Capability.Layer, this);
     }
-    static async create(url, credentials, ignoreCache) {
+    static async create(url, credentials, ignoreCache, queryParams) {
         if (!ignoreCache) {
             const cached = WmsCapabilities._capabilitiesCache.get(url);
             if (cached !== undefined)
                 return cached;
         }
-        const xmlCapabilities = await getXml(`${_internal__WEBPACK_IMPORTED_MODULE_2__.WmsUtilities.getBaseUrl(url)}?request=GetCapabilities&service=WMS`, credentials);
+        const tmpUrl = new URL(_internal__WEBPACK_IMPORTED_MODULE_2__.WmsUtilities.getBaseUrl(url));
+        tmpUrl.searchParams.append("request", "GetCapabilities");
+        tmpUrl.searchParams.append("service", "WMS");
+        if (queryParams) {
+            Object.keys(queryParams).forEach((paramKey) => {
+                if (!tmpUrl.searchParams.has(paramKey))
+                    tmpUrl.searchParams.append(paramKey, queryParams[paramKey]);
+            });
+        }
+        const xmlCapabilities = await getXml(tmpUrl.toString(), credentials);
         if (!xmlCapabilities)
             return undefined;
         const capabilities = new WmsCapabilities(new (wms_capabilities__WEBPACK_IMPORTED_MODULE_1___default())().parse(xmlCapabilities));
@@ -156115,13 +156327,22 @@ class WmtsCapabilities {
         const xmlDoc = parser.parseFromString(xmlCapabilities, "text/xml");
         return new WmtsCapabilities(xmlDoc);
     }
-    static async create(url, credentials, ignoreCache) {
+    static async create(url, credentials, ignoreCache, queryParams) {
         if (!ignoreCache) {
             const cached = WmtsCapabilities._capabilitiesCache.get(url);
             if (cached !== undefined)
                 return cached;
         }
-        const xmlCapabilities = await getXml(`${_internal__WEBPACK_IMPORTED_MODULE_2__.WmsUtilities.getBaseUrl(url)}?request=GetCapabilities&service=WMTS`, credentials);
+        const tmpUrl = new URL(_internal__WEBPACK_IMPORTED_MODULE_2__.WmsUtilities.getBaseUrl(url));
+        tmpUrl.searchParams.append("request", "GetCapabilities");
+        tmpUrl.searchParams.append("service", "WMTS");
+        if (queryParams) {
+            Object.keys(queryParams).forEach((paramKey) => {
+                if (!tmpUrl.searchParams.has(paramKey))
+                    tmpUrl.searchParams.append(paramKey, queryParams[paramKey]);
+            });
+        }
+        const xmlCapabilities = await getXml(tmpUrl.toString(), credentials);
         if (!xmlCapabilities)
             return undefined;
         const capabilities = WmtsCapabilities.createFromXml(xmlCapabilities);
@@ -288696,7 +288917,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"@itwin/core-frontend","version":"4.3.0-dev.33","description":"iTwin.js frontend components","main":"lib/cjs/core-frontend.js","module":"lib/esm/core-frontend.js","typings":"lib/cjs/core-frontend","license":"MIT","scripts":{"build":"npm run -s copy:public && npm run -s build:cjs && npm run -s build:esm && npm run -s webpackWorkers && npm run -s copy:workers","build:cjs":"npm run -s copy:js:cjs && tsc 1>&2 --outDir lib/cjs","build:esm":"npm run -s copy:js:esm && tsc 1>&2 --module ES2020 --outDir lib/esm","clean":"rimraf lib .rush/temp/package-deps*.json","copy:public":"cpx \\"./src/public/**/*\\" ./lib/public","copy:js:cjs":"cpx \\"./src/**/*.js\\" ./lib/cjs","copy:js:esm":"cpx \\"./src/**/*.js\\" ./lib/esm","copy:workers":"cpx \\"./lib/workers/webpack/parse-imdl-worker.js\\" ./lib/public/scripts","docs":"betools docs --includes=../../generated-docs/extract --json=../../generated-docs/core/core-frontend/file.json --tsIndexFile=./core-frontend.ts --onlyJson --excludes=webgl/**/*,**/map/*.d.ts,**/tile/*.d.ts,**/*-css.ts","extract-api":"betools extract-api --entry=core-frontend && npm run extract-extension-api","extract-extension-api":"eslint -c extraction.eslint.config.js  \\"./src/**/*.ts\\" 1>&2","lint":"eslint -f visualstudio \\"./src/**/*.ts\\" 1>&2","pseudolocalize":"betools pseudolocalize --englishDir ./src/public/locales/en --out ./public/locales/en-PSEUDO","test":"npm run -s webpackTests && certa -r chrome","cover":"npm -s test","test:debug":"certa -r chrome --debug","webpackTests":"webpack --config ./src/test/utils/webpack.config.js 1>&2 && npm run -s webpackTestWorker","webpackTestWorker":"webpack --config ./src/test/worker/webpack.config.js 1>&2 && cpx \\"./lib/test/test-worker.js\\" ./lib/test","webpackWorkers":"webpack --config ./src/workers/ImdlParser/webpack.config.js 1>&2"},"repository":{"type":"git","url":"https://github.com/iTwin/itwinjs-core.git","directory":"core/frontend"},"keywords":["Bentley","BIM","iModel","digital-twin","iTwin"],"author":{"name":"Bentley Systems, Inc.","url":"http://www.bentley.com"},"peerDependencies":{"@itwin/appui-abstract":"workspace:^4.3.0-dev.33","@itwin/core-bentley":"workspace:^4.3.0-dev.33","@itwin/core-common":"workspace:^4.3.0-dev.33","@itwin/core-geometry":"workspace:^4.3.0-dev.33","@itwin/core-orbitgt":"workspace:^4.3.0-dev.33","@itwin/core-quantity":"workspace:^4.3.0-dev.33"},"//devDependencies":["NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install","NOTE: All tools used by scripts in this package must be listed as devDependencies"],"devDependencies":{"@itwin/appui-abstract":"workspace:*","@itwin/build-tools":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/certa":"workspace:*","@itwin/eslint-plugin":"4.0.0-dev.44","@types/chai":"4.3.1","@types/chai-as-promised":"^7","@types/mocha":"^8.2.2","@types/sinon":"^10.0.15","babel-loader":"~8.2.5","babel-plugin-istanbul":"~6.1.1","chai":"^4.3.10","chai-as-promised":"^7","cpx2":"^3.0.0","eslint":"^8.44.0","glob":"^7.1.2","mocha":"^10.0.0","nyc":"^15.1.0","rimraf":"^3.0.2","sinon":"^15.0.4","source-map-loader":"^4.0.0","typescript":"~5.0.2","typemoq":"^2.1.0","webpack":"^5.76.0"},"//dependencies":["NOTE: these dependencies should be only for things that DO NOT APPEAR IN THE API","NOTE: core-frontend should remain UI technology agnostic, so no react/angular dependencies are allowed"],"dependencies":{"@itwin/cloud-agnostic-core":"^2.1.0","@itwin/object-storage-core":"^2.1.0","@itwin/core-i18n":"workspace:*","@itwin/core-telemetry":"workspace:*","@itwin/webgl-compatibility":"workspace:*","@loaders.gl/core":"^3.1.6","@loaders.gl/draco":"^3.1.6","fuse.js":"^3.3.0","wms-capabilities":"0.4.0"},"nyc":{"extends":"./node_modules/@itwin/build-tools/.nycrc"}}');
+module.exports = JSON.parse('{"name":"@itwin/core-frontend","version":"4.3.0-dev.35","description":"iTwin.js frontend components","main":"lib/cjs/core-frontend.js","module":"lib/esm/core-frontend.js","typings":"lib/cjs/core-frontend","license":"MIT","scripts":{"build":"npm run -s copy:public && npm run -s build:cjs && npm run -s build:esm && npm run -s webpackWorkers && npm run -s copy:workers","build:cjs":"npm run -s copy:js:cjs && tsc 1>&2 --outDir lib/cjs","build:esm":"npm run -s copy:js:esm && tsc 1>&2 --module ES2020 --outDir lib/esm","clean":"rimraf lib .rush/temp/package-deps*.json","copy:public":"cpx \\"./src/public/**/*\\" ./lib/public","copy:js:cjs":"cpx \\"./src/**/*.js\\" ./lib/cjs","copy:js:esm":"cpx \\"./src/**/*.js\\" ./lib/esm","copy:workers":"cpx \\"./lib/workers/webpack/parse-imdl-worker.js\\" ./lib/public/scripts","docs":"betools docs --includes=../../generated-docs/extract --json=../../generated-docs/core/core-frontend/file.json --tsIndexFile=./core-frontend.ts --onlyJson --excludes=webgl/**/*,**/map/*.d.ts,**/tile/*.d.ts,**/*-css.ts","extract-api":"betools extract-api --entry=core-frontend && npm run extract-extension-api","extract-extension-api":"eslint -c extraction.eslint.config.js  \\"./src/**/*.ts\\" 1>&2","lint":"eslint -f visualstudio \\"./src/**/*.ts\\" 1>&2","pseudolocalize":"betools pseudolocalize --englishDir ./src/public/locales/en --out ./public/locales/en-PSEUDO","test":"npm run -s webpackTests && certa -r chrome","cover":"npm -s test","test:debug":"certa -r chrome --debug","webpackTests":"webpack --config ./src/test/utils/webpack.config.js 1>&2 && npm run -s webpackTestWorker","webpackTestWorker":"webpack --config ./src/test/worker/webpack.config.js 1>&2 && cpx \\"./lib/test/test-worker.js\\" ./lib/test","webpackWorkers":"webpack --config ./src/workers/ImdlParser/webpack.config.js 1>&2"},"repository":{"type":"git","url":"https://github.com/iTwin/itwinjs-core.git","directory":"core/frontend"},"keywords":["Bentley","BIM","iModel","digital-twin","iTwin"],"author":{"name":"Bentley Systems, Inc.","url":"http://www.bentley.com"},"peerDependencies":{"@itwin/appui-abstract":"workspace:^4.3.0-dev.35","@itwin/core-bentley":"workspace:^4.3.0-dev.35","@itwin/core-common":"workspace:^4.3.0-dev.35","@itwin/core-geometry":"workspace:^4.3.0-dev.35","@itwin/core-orbitgt":"workspace:^4.3.0-dev.35","@itwin/core-quantity":"workspace:^4.3.0-dev.35"},"//devDependencies":["NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install","NOTE: All tools used by scripts in this package must be listed as devDependencies"],"devDependencies":{"@itwin/appui-abstract":"workspace:*","@itwin/build-tools":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/certa":"workspace:*","@itwin/eslint-plugin":"4.0.0-dev.44","@types/chai":"4.3.1","@types/chai-as-promised":"^7","@types/mocha":"^8.2.2","@types/sinon":"^10.0.15","babel-loader":"~8.2.5","babel-plugin-istanbul":"~6.1.1","chai":"^4.3.10","chai-as-promised":"^7","cpx2":"^3.0.0","eslint":"^8.44.0","glob":"^7.1.2","mocha":"^10.0.0","nyc":"^15.1.0","rimraf":"^3.0.2","sinon":"^15.0.4","source-map-loader":"^4.0.0","typescript":"~5.0.2","typemoq":"^2.1.0","webpack":"^5.76.0"},"//dependencies":["NOTE: these dependencies should be only for things that DO NOT APPEAR IN THE API","NOTE: core-frontend should remain UI technology agnostic, so no react/angular dependencies are allowed"],"dependencies":{"@itwin/cloud-agnostic-core":"^2.1.0","@itwin/object-storage-core":"^2.1.0","@itwin/core-i18n":"workspace:*","@itwin/core-telemetry":"workspace:*","@itwin/webgl-compatibility":"workspace:*","@loaders.gl/core":"^3.1.6","@loaders.gl/draco":"^3.1.6","fuse.js":"^3.3.0","wms-capabilities":"0.4.0"},"nyc":{"extends":"./node_modules/@itwin/build-tools/.nycrc"}}');
 
 /***/ })