@itwin/core-frontend 5.16.0-dev.4 → 5.16.0-dev.6

package/lib/esm/tile/map/MapLayerSources.js

@@ -51,21 +51,33 @@ export class MapLayerSource {
     transparentBackground;
     userName;
     password;
-    /** List of query parameters that will get appended to the source URL that should be be persisted part of the JSON representation.
+    /** Former name of [[queryParams]], which stores the value; retained as the backing field so existing subclasses
+     * and `delete` keep working.
+     * @deprecated in 5.16. Use [[queryParams]].
      * @beta
     */
     savedQueryParams;
+    /** Non-secret query parameters appended to every request made for the source, persisted as part of the JSON
+     * representation ([[MapLayerSourceProps.queryParams]]). Secrets must never be placed here; the hosting application
+     * injects them per session through a [[MapLayerFetchHandler]].
+     * @beta
+    */
+    // eslint-disable-next-line @typescript-eslint/no-deprecated -- the deprecated field is the storage until its removal.
+    get queryParams() { return this.savedQueryParams; }
+    // eslint-disable-next-line @typescript-eslint/no-deprecated
+    set queryParams(value) { this.savedQueryParams = value; }
     /** List of query parameters that will get appended to the source URL that should *not* be be persisted part of the JSON representation.
+     * @deprecated in 5.16. Register a [[MapLayerFetchHandler]] ([[MapLayerFormatRegistry.addMapLayerFetchHandler]]) to inject secret or per-session parameters, which unlike this field are protected against leaking through redirects; use [[queryParams]] for non-secret parameters.
      * @beta
     */
     unsavedQueryParams;
-    constructor(formatId = "WMS", name, url, baseMap = false, transparentBackground = true, savedQueryParams) {
+    constructor(formatId = "WMS", name, url, baseMap = false, transparentBackground = true, queryParams) {
         this.formatId = formatId;
         this.name = name;
         this.url = url;
         this.baseMap = baseMap;
         this.transparentBackground = transparentBackground;
-        this.savedQueryParams = savedQueryParams;
+        this.queryParams = queryParams;
     }
     static fromJSON(json) {
         if (json === undefined)
@@ -89,7 +101,7 @@ export class MapLayerSource {
         return undefined;
     }
     toJSON() {
-        return { url: this.url, name: this.name, formatId: this.formatId, transparentBackground: this.transparentBackground, queryParams: this.savedQueryParams };
+        return { url: this.url, name: this.name, formatId: this.formatId, transparentBackground: this.transparentBackground, queryParams: this.queryParams };
     }
     toLayerSettings(subLayers) {
         // When MapLayerSetting is created from a MapLayerSource, sub-layers and credentials need to be set separately.
@@ -97,10 +109,12 @@ export class MapLayerSource {
         if (this.userName !== undefined || this.password !== undefined) {
             layerSettings?.setCredentials(this.userName, this.password);
         }
-        if (this.savedQueryParams) {
-            layerSettings.savedQueryParams = { ...this.savedQueryParams };
+        if (this.queryParams) {
+            layerSettings.queryParams = { ...this.queryParams };
         }
+        // eslint-disable-next-line @typescript-eslint/no-deprecated -- kept for backward compatibility until removal.
         if (this.unsavedQueryParams) {
+            // eslint-disable-next-line @typescript-eslint/no-deprecated
             layerSettings.unsavedQueryParams = { ...this.unsavedQueryParams };
         }
         return layerSettings;
@@ -108,14 +122,17 @@ export class MapLayerSource {
     getCredentials() {
         return this.userName && this.password ? { user: this.userName, password: this.password } : undefined;
     }
-    /** Collect all query parameters
-   * @beta
-   */
+    /** The query parameters actually sent with requests: [[queryParams]] overlaid with the deprecated `unsavedQueryParams`
+     * (a key present in both takes the latter's value). Equals a copy of [[queryParams]] once `unsavedQueryParams` is removed.
+     * @beta
+     */
     collectQueryParams() {
         let queryParams = {};
-        if (this.savedQueryParams)
-            queryParams = { ...this.savedQueryParams };
+        if (this.queryParams)
+            queryParams = { ...this.queryParams };
+        // eslint-disable-next-line @typescript-eslint/no-deprecated -- kept for backward compatibility until removal.
         if (this.unsavedQueryParams)
+            // eslint-disable-next-line @typescript-eslint/no-deprecated
             queryParams = { ...queryParams, ...this.unsavedQueryParams };
         return queryParams;
     }

package/lib/esm/tile/map/MapLayerSources.js.map

@@ -1 +1 @@
-{"version":3,"file":"MapLayerSources.js","sourceRoot":"","sources":["../../../../src/tile/map/MapLayerSources.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module MapLayers\r\n */\r\n\r\nimport { compareStrings, expectDefined } from \"@itwin/core-bentley\";\r\nimport {\r\n  BackgroundMapProvider, BackgroundMapType, BaseMapLayerSettings, DeprecatedBackgroundMapProps, ImageMapLayerSettings, MapSubLayerProps,\r\n} from \"@itwin/core-common\";\r\nimport { Point2d } from \"@itwin/core-geometry\";\r\nimport { IModelApp } from \"../../IModelApp\";\r\nimport { IModelConnection } from \"../../IModelConnection\";\r\nimport { request, RequestBasicCredentials } from \"../../request/Request\";\r\nimport { ArcGisUtilities, MapCartoRectangle, MapLayerSourceValidation } from \"../internal\";\r\n\r\n/** Values for return codes from [[MapLayerSource.validateSource]]\r\n * @public\r\n */\r\nexport enum MapLayerSourceStatus {\r\n  /** Layer source is valid */\r\n  Valid,\r\n  /** Authorization has failed when accessing this layer source. */\r\n  InvalidCredentials,\r\n  /** Provided format id could not be resolved in [[MapLayerFormatRegistry]] */\r\n  InvalidFormat,\r\n  /** The tiling schema of the source is not supported */\r\n  InvalidTileTree,\r\n  /** Could not not connect to remote server using the provided URL.*/\r\n  InvalidUrl,\r\n  /** Authorization is required to access this map layer source. */\r\n  RequireAuth,\r\n  /** Map-layer coordinate system is not supported */\r\n  InvalidCoordinateSystem,\r\n  /** Format is not compatible with the URL provided.\r\n   */\r\n  IncompatibleFormat,\r\n  /** Authentication could not be attempted because the source's origin is not trusted\r\n   * (see [MapLayerFormatRegistry.restrictCredentialsToTrustedOrigins]($frontend)). Add the origin to\r\n   * [MapLayerFormatRegistry.trustedCredentialsOrigins]($frontend) rather than prompting for credentials.\r\n   * @beta\r\n   */\r\n  UntrustedOrigin,\r\n}\r\n\r\n/** JSON representation of a map layer source.\r\n * @see [ImageryMapLayerFormatId]($common)\r\n * @public\r\n */\r\nexport interface MapLayerSourceProps {\r\n  /** Identifies the map layers source. Defaults to 'WMS'. */\r\n  formatId?: string;\r\n  /** Name */\r\n  name: string;\r\n  /** URL of the source's endpoint. */\r\n  url: string;\r\n  /** True to indicate background is transparent.  Defaults to 'true'. */\r\n  transparentBackground?: boolean;\r\n  /** Indicate if this source definition should be used as a base map. Defaults to false. */\r\n  baseMap?: boolean;\r\n\r\n  /** List of query parameters that will get appended to the source.\r\n   * @beta\r\n  */\r\n  queryParams?: { [key: string]: string };\r\n}\r\n\r\n/** A source for map layers. These may be catalogued for convenient use by users or applications.\r\n * @public\r\n */\r\nexport class MapLayerSource {\r\n  public formatId: string;\r\n  public name: string;\r\n  public url: string;\r\n  public baseMap = false;\r\n  public transparentBackground?: boolean;\r\n  public userName?: string;\r\n  public password?: string;\r\n\r\n  /** List of query parameters that will get appended to the source URL that should be be persisted part of the JSON representation.\r\n   * @beta\r\n  */\r\n  public savedQueryParams?: { [key: string]: string };\r\n\r\n  /** List of query parameters that will get appended to the source URL that should *not* be be persisted part of the JSON representation.\r\n   * @beta\r\n  */\r\n  public unsavedQueryParams?: { [key: string]: string };\r\n\r\n  private constructor(formatId = \"WMS\", name: string, url: string, baseMap = false, transparentBackground = true, savedQueryParams?: { [key: string]: string}) {\r\n    this.formatId = formatId;\r\n    this.name = name;\r\n    this.url = url;\r\n    this.baseMap = baseMap;\r\n    this.transparentBackground = transparentBackground;\r\n    this.savedQueryParams = savedQueryParams;\r\n  }\r\n\r\n  public static fromJSON(json: MapLayerSourceProps): MapLayerSource | undefined {\r\n    if (json === undefined)\r\n      return undefined;\r\n\r\n    return new MapLayerSource(json.formatId, json.name, json.url, json.baseMap, json.transparentBackground, json.queryParams);\r\n  }\r\n\r\n  public async validateSource(ignoreCache?: boolean): Promise<MapLayerSourceValidation> {\r\n    return IModelApp.mapLayerFormatRegistry.validateSource({source: this, ignoreCache});\r\n  }\r\n\r\n  /** @internal*/\r\n  public static fromBackgroundMapProps(props: DeprecatedBackgroundMapProps) {\r\n    const provider = BackgroundMapProvider.fromBackgroundMapProps(props);\r\n    const layerSettings = BaseMapLayerSettings.fromProvider(provider);\r\n    if (undefined !== layerSettings) {\r\n      const source = MapLayerSource.fromJSON(layerSettings);\r\n      if (source) {\r\n        source.baseMap = true;\r\n        return source;\r\n      }\r\n    }\r\n\r\n    return undefined;\r\n  }\r\n  public toJSON(): Omit<MapLayerSourceProps, \"formatId\"> & {formatId: string}  {\r\n    return { url: this.url, name: this.name, formatId: this.formatId, transparentBackground: this.transparentBackground, queryParams: this.savedQueryParams };\r\n  }\r\n\r\n  public toLayerSettings(subLayers?: MapSubLayerProps[]): ImageMapLayerSettings | undefined {\r\n    // When MapLayerSetting is created from a MapLayerSource, sub-layers and credentials need to be set separately.\r\n    const layerSettings = ImageMapLayerSettings.fromJSON({ ...this, subLayers });\r\n    if (this.userName !== undefined || this.password !== undefined) {\r\n      layerSettings?.setCredentials(this.userName, this.password);\r\n    }\r\n\r\n    if (this.savedQueryParams) {\r\n      layerSettings.savedQueryParams = {...this.savedQueryParams};\r\n    }\r\n\r\n    if (this.unsavedQueryParams) {\r\n      layerSettings.unsavedQueryParams = {...this.unsavedQueryParams};\r\n    }\r\n    return layerSettings;\r\n  }\r\n\r\n  private getCredentials(): RequestBasicCredentials | undefined {\r\n    return this.userName && this.password ? { user: this.userName, password: this.password } : undefined;\r\n  }\r\n\r\n  /** Collect all query parameters\r\n * @beta\r\n */\r\n  public collectQueryParams() {\r\n    let queryParams: {[key: string]: string} = {};\r\n\r\n    if (this.savedQueryParams)\r\n      queryParams = {...this.savedQueryParams};\r\n    if (this.unsavedQueryParams)\r\n      queryParams = {...queryParams, ...this.unsavedQueryParams};\r\n    return queryParams;\r\n  }\r\n\r\n}\r\n\r\n/** A collection of [[MapLayerSource]] objects.\r\n * @beta\r\n */\r\nexport class MapLayerSources {\r\n  private static _instance?: MapLayerSources;\r\n  private constructor(private _sources: MapLayerSource[]) { }\r\n\r\n  public static getInstance() { return MapLayerSources._instance; }\r\n\r\n  public findByName(name: string, baseMap: boolean = false): MapLayerSource | undefined {\r\n    const nameTest = name.toLowerCase();\r\n    for (const source of this._sources)\r\n      if (source.baseMap === baseMap && source.name.toLowerCase().indexOf(nameTest) !== -1)\r\n        return source;\r\n\r\n    return undefined;\r\n  }\r\n  public get layers(): MapLayerSource[] {\r\n    const layers = new Array<MapLayerSource>();\r\n    this._sources.forEach((source) => {\r\n      if (!source.baseMap)\r\n        layers.push(source);\r\n    });\r\n\r\n    return layers;\r\n  }\r\n  public get allSource() { return this._sources; }\r\n  public get bases(): MapLayerSource[] {\r\n    const layers = new Array<MapLayerSource>();\r\n    this._sources.forEach((source) => {\r\n      if (source.baseMap)\r\n        layers.push(source);\r\n    });\r\n\r\n    return layers;\r\n  }\r\n\r\n  private static getBingMapLayerSource(): MapLayerSource[] {\r\n    const mapLayerSources: MapLayerSource[] = [];\r\n    // We know these hard-coded sources are valid, so ! is okay here.\r\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\r\n    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"BingProvider\", providerData: { mapType: BackgroundMapType.Street } })!);\r\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\r\n    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"BingProvider\", providerData: { mapType: BackgroundMapType.Aerial } })!);\r\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\r\n    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"BingProvider\", providerData: { mapType: BackgroundMapType.Hybrid } })!);\r\n    return mapLayerSources;\r\n  }\r\n\r\n  private static getMapBoxLayerSource(): MapLayerSource[] {\r\n    const mapLayerSources: MapLayerSource[] = [];\r\n    // We know these hard-coded sources are valid, so ! is okay here.\r\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\r\n    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"MapBoxProvider\", providerData: { mapType: BackgroundMapType.Street } })!);\r\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\r\n    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"MapBoxProvider\", providerData: { mapType: BackgroundMapType.Aerial } })!);\r\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\r\n    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"MapBoxProvider\", providerData: { mapType: BackgroundMapType.Hybrid } })!);\r\n    return mapLayerSources;\r\n  }\r\n\r\n  public static async create(iModel?: IModelConnection, queryForPublicSources = false, addMapBoxSources = false): Promise<MapLayerSources> {\r\n    if (!queryForPublicSources && MapLayerSources._instance)\r\n      return MapLayerSources._instance;\r\n\r\n    if (!iModel)\r\n      iModel = IModelApp.viewManager.selectedView ? IModelApp.viewManager.selectedView.iModel : undefined;\r\n\r\n    let sourceRange = MapCartoRectangle.createMaximum();\r\n    if (iModel) {\r\n      const projectCenter = expectDefined(iModel.projectExtents.localXYZToWorld(.5, .5, .5));\r\n      const cartoCenter = iModel.spatialToCartographicFromEcef(projectCenter);\r\n      const globeRange = MapCartoRectangle.createMaximum();\r\n      const nearDelta = Point2d.create(globeRange.xLength() / 100, globeRange.yLength() / 100);\r\n      sourceRange = MapCartoRectangle.fromRadians(cartoCenter.longitude - nearDelta.x, cartoCenter.latitude - nearDelta.y, cartoCenter.longitude + nearDelta.x, cartoCenter.latitude + nearDelta.y);\r\n    }\r\n\r\n    const sources = new Array<MapLayerSource>();\r\n    const urlSet = new Set<string>();\r\n    const addSource = ((source: MapLayerSource) => {\r\n      if (!urlSet.has(source.url)) {\r\n        sources.push(source);\r\n        urlSet.add(source.url);\r\n      }\r\n    });\r\n\r\n    this.getBingMapLayerSource().forEach((source) => {\r\n      addSource(source);\r\n    });\r\n\r\n    if (addMapBoxSources) {\r\n      this.getMapBoxLayerSource().forEach((source) => {\r\n        addSource(source);\r\n      });\r\n    }\r\n\r\n    if (queryForPublicSources) {\r\n      const sourcesJson = await request(`${IModelApp.publicPath}assets/MapLayerSources.json`, \"json\");\r\n\r\n      for (const sourceJson of sourcesJson) {\r\n        const source = MapLayerSource.fromJSON(sourceJson);\r\n        if (source)\r\n          addSource(source);\r\n      }\r\n\r\n      (await ArcGisUtilities.getSourcesFromQuery(sourceRange)).forEach((queriedSource) => addSource(queriedSource));\r\n    }\r\n\r\n    sources.sort((a: MapLayerSource, b: MapLayerSource) => compareStrings(a.name.toLowerCase(), b.name.toLowerCase()));\r\n\r\n    const mapLayerSources = new MapLayerSources(sources);\r\n    MapLayerSources._instance = mapLayerSources;\r\n\r\n    return mapLayerSources;\r\n  }\r\n  public static async addSourceToMapLayerSources(mapLayerSource?: MapLayerSource): Promise<MapLayerSources | undefined> {\r\n    if (!MapLayerSources._instance || !mapLayerSource) {\r\n      return undefined;\r\n    }\r\n    MapLayerSources._instance._sources = MapLayerSources._instance._sources.filter((source) => {\r\n      return !(source.name === mapLayerSource.name || source.url === mapLayerSource.url);\r\n    });\r\n\r\n    MapLayerSources._instance._sources.push(mapLayerSource);\r\n    MapLayerSources._instance._sources.sort((a: MapLayerSource, b: MapLayerSource) => compareStrings(a.name.toLowerCase(), b.name.toLowerCase()));\r\n    return MapLayerSources._instance;\r\n  }\r\n\r\n  public static removeLayerByName(name: string): boolean {\r\n    if (!MapLayerSources._instance) {\r\n      return false;\r\n    }\r\n\r\n    // For now we only rely on the name\r\n    const lengthBeforeRemove = MapLayerSources._instance._sources.length;\r\n    MapLayerSources._instance._sources = MapLayerSources._instance._sources.filter((source) => {\r\n      return (source.name !== name);\r\n    });\r\n    return (lengthBeforeRemove !== MapLayerSources._instance._sources.length);\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"MapLayerSources.js","sourceRoot":"","sources":["../../../../src/tile/map/MapLayerSources.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module MapLayers\r\n */\r\n\r\nimport { compareStrings, expectDefined } from \"@itwin/core-bentley\";\r\nimport {\r\n  BackgroundMapProvider, BackgroundMapType, BaseMapLayerSettings, DeprecatedBackgroundMapProps, ImageMapLayerSettings, MapSubLayerProps,\r\n} from \"@itwin/core-common\";\r\nimport { Point2d } from \"@itwin/core-geometry\";\r\nimport { IModelApp } from \"../../IModelApp\";\r\nimport { IModelConnection } from \"../../IModelConnection\";\r\nimport { request, RequestBasicCredentials } from \"../../request/Request\";\r\nimport { ArcGisUtilities, MapCartoRectangle, MapLayerSourceValidation } from \"../internal\";\r\n\r\n/** Values for return codes from [[MapLayerSource.validateSource]]\r\n * @public\r\n */\r\nexport enum MapLayerSourceStatus {\r\n  /** Layer source is valid */\r\n  Valid,\r\n  /** Authorization has failed when accessing this layer source. */\r\n  InvalidCredentials,\r\n  /** Provided format id could not be resolved in [[MapLayerFormatRegistry]] */\r\n  InvalidFormat,\r\n  /** The tiling schema of the source is not supported */\r\n  InvalidTileTree,\r\n  /** Could not not connect to remote server using the provided URL.*/\r\n  InvalidUrl,\r\n  /** Authorization is required to access this map layer source. */\r\n  RequireAuth,\r\n  /** Map-layer coordinate system is not supported */\r\n  InvalidCoordinateSystem,\r\n  /** Format is not compatible with the URL provided.\r\n   */\r\n  IncompatibleFormat,\r\n  /** Authentication could not be attempted because the source's origin is not trusted\r\n   * (see [MapLayerFormatRegistry.restrictCredentialsToTrustedOrigins]($frontend)). Add the origin to\r\n   * [MapLayerFormatRegistry.trustedCredentialsOrigins]($frontend) rather than prompting for credentials.\r\n   * @beta\r\n   */\r\n  UntrustedOrigin,\r\n}\r\n\r\n/** JSON representation of a map layer source.\r\n * @see [ImageryMapLayerFormatId]($common)\r\n * @public\r\n */\r\nexport interface MapLayerSourceProps {\r\n  /** Identifies the map layers source. Defaults to 'WMS'. */\r\n  formatId?: string;\r\n  /** Name */\r\n  name: string;\r\n  /** URL of the source's endpoint. */\r\n  url: string;\r\n  /** True to indicate background is transparent.  Defaults to 'true'. */\r\n  transparentBackground?: boolean;\r\n  /** Indicate if this source definition should be used as a base map. Defaults to false. */\r\n  baseMap?: boolean;\r\n\r\n  /** List of query parameters that will get appended to the source.\r\n   * @beta\r\n  */\r\n  queryParams?: { [key: string]: string };\r\n}\r\n\r\n/** A source for map layers. These may be catalogued for convenient use by users or applications.\r\n * @public\r\n */\r\nexport class MapLayerSource {\r\n  public formatId: string;\r\n  public name: string;\r\n  public url: string;\r\n  public baseMap = false;\r\n  public transparentBackground?: boolean;\r\n  public userName?: string;\r\n  public password?: string;\r\n\r\n  /** Former name of [[queryParams]], which stores the value; retained as the backing field so existing subclasses\r\n   * and `delete` keep working.\r\n   * @deprecated in 5.16. Use [[queryParams]].\r\n   * @beta\r\n  */\r\n  public savedQueryParams?: { [key: string]: string };\r\n\r\n  /** Non-secret query parameters appended to every request made for the source, persisted as part of the JSON\r\n   * representation ([[MapLayerSourceProps.queryParams]]). Secrets must never be placed here; the hosting application\r\n   * injects them per session through a [[MapLayerFetchHandler]].\r\n   * @beta\r\n  */\r\n  // eslint-disable-next-line @typescript-eslint/no-deprecated -- the deprecated field is the storage until its removal.\r\n  public get queryParams(): { [key: string]: string } | undefined { return this.savedQueryParams; }\r\n  // eslint-disable-next-line @typescript-eslint/no-deprecated\r\n  public set queryParams(value: { [key: string]: string } | undefined) { this.savedQueryParams = value; }\r\n\r\n  /** List of query parameters that will get appended to the source URL that should *not* be be persisted part of the JSON representation.\r\n   * @deprecated in 5.16. Register a [[MapLayerFetchHandler]] ([[MapLayerFormatRegistry.addMapLayerFetchHandler]]) to inject secret or per-session parameters, which unlike this field are protected against leaking through redirects; use [[queryParams]] for non-secret parameters.\r\n   * @beta\r\n  */\r\n  public unsavedQueryParams?: { [key: string]: string };\r\n\r\n  private constructor(formatId = \"WMS\", name: string, url: string, baseMap = false, transparentBackground = true, queryParams?: { [key: string]: string}) {\r\n    this.formatId = formatId;\r\n    this.name = name;\r\n    this.url = url;\r\n    this.baseMap = baseMap;\r\n    this.transparentBackground = transparentBackground;\r\n    this.queryParams = queryParams;\r\n  }\r\n\r\n  public static fromJSON(json: MapLayerSourceProps): MapLayerSource | undefined {\r\n    if (json === undefined)\r\n      return undefined;\r\n\r\n    return new MapLayerSource(json.formatId, json.name, json.url, json.baseMap, json.transparentBackground, json.queryParams);\r\n  }\r\n\r\n  public async validateSource(ignoreCache?: boolean): Promise<MapLayerSourceValidation> {\r\n    return IModelApp.mapLayerFormatRegistry.validateSource({source: this, ignoreCache});\r\n  }\r\n\r\n  /** @internal*/\r\n  public static fromBackgroundMapProps(props: DeprecatedBackgroundMapProps) {\r\n    const provider = BackgroundMapProvider.fromBackgroundMapProps(props);\r\n    const layerSettings = BaseMapLayerSettings.fromProvider(provider);\r\n    if (undefined !== layerSettings) {\r\n      const source = MapLayerSource.fromJSON(layerSettings);\r\n      if (source) {\r\n        source.baseMap = true;\r\n        return source;\r\n      }\r\n    }\r\n\r\n    return undefined;\r\n  }\r\n  public toJSON(): Omit<MapLayerSourceProps, \"formatId\"> & {formatId: string}  {\r\n    return { url: this.url, name: this.name, formatId: this.formatId, transparentBackground: this.transparentBackground, queryParams: this.queryParams };\r\n  }\r\n\r\n  public toLayerSettings(subLayers?: MapSubLayerProps[]): ImageMapLayerSettings | undefined {\r\n    // When MapLayerSetting is created from a MapLayerSource, sub-layers and credentials need to be set separately.\r\n    const layerSettings = ImageMapLayerSettings.fromJSON({ ...this, subLayers });\r\n    if (this.userName !== undefined || this.password !== undefined) {\r\n      layerSettings?.setCredentials(this.userName, this.password);\r\n    }\r\n\r\n    if (this.queryParams) {\r\n      layerSettings.queryParams = {...this.queryParams};\r\n    }\r\n\r\n    // eslint-disable-next-line @typescript-eslint/no-deprecated -- kept for backward compatibility until removal.\r\n    if (this.unsavedQueryParams) {\r\n      // eslint-disable-next-line @typescript-eslint/no-deprecated\r\n      layerSettings.unsavedQueryParams = {...this.unsavedQueryParams};\r\n    }\r\n    return layerSettings;\r\n  }\r\n\r\n  private getCredentials(): RequestBasicCredentials | undefined {\r\n    return this.userName && this.password ? { user: this.userName, password: this.password } : undefined;\r\n  }\r\n\r\n  /** The query parameters actually sent with requests: [[queryParams]] overlaid with the deprecated `unsavedQueryParams`\r\n   * (a key present in both takes the latter's value). Equals a copy of [[queryParams]] once `unsavedQueryParams` is removed.\r\n   * @beta\r\n   */\r\n  public collectQueryParams() {\r\n    let queryParams: {[key: string]: string} = {};\r\n\r\n    if (this.queryParams)\r\n      queryParams = {...this.queryParams};\r\n    // eslint-disable-next-line @typescript-eslint/no-deprecated -- kept for backward compatibility until removal.\r\n    if (this.unsavedQueryParams)\r\n      // eslint-disable-next-line @typescript-eslint/no-deprecated\r\n      queryParams = {...queryParams, ...this.unsavedQueryParams};\r\n    return queryParams;\r\n  }\r\n\r\n}\r\n\r\n/** A collection of [[MapLayerSource]] objects.\r\n * @beta\r\n */\r\nexport class MapLayerSources {\r\n  private static _instance?: MapLayerSources;\r\n  private constructor(private _sources: MapLayerSource[]) { }\r\n\r\n  public static getInstance() { return MapLayerSources._instance; }\r\n\r\n  public findByName(name: string, baseMap: boolean = false): MapLayerSource | undefined {\r\n    const nameTest = name.toLowerCase();\r\n    for (const source of this._sources)\r\n      if (source.baseMap === baseMap && source.name.toLowerCase().indexOf(nameTest) !== -1)\r\n        return source;\r\n\r\n    return undefined;\r\n  }\r\n  public get layers(): MapLayerSource[] {\r\n    const layers = new Array<MapLayerSource>();\r\n    this._sources.forEach((source) => {\r\n      if (!source.baseMap)\r\n        layers.push(source);\r\n    });\r\n\r\n    return layers;\r\n  }\r\n  public get allSource() { return this._sources; }\r\n  public get bases(): MapLayerSource[] {\r\n    const layers = new Array<MapLayerSource>();\r\n    this._sources.forEach((source) => {\r\n      if (source.baseMap)\r\n        layers.push(source);\r\n    });\r\n\r\n    return layers;\r\n  }\r\n\r\n  private static getBingMapLayerSource(): MapLayerSource[] {\r\n    const mapLayerSources: MapLayerSource[] = [];\r\n    // We know these hard-coded sources are valid, so ! is okay here.\r\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\r\n    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"BingProvider\", providerData: { mapType: BackgroundMapType.Street } })!);\r\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\r\n    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"BingProvider\", providerData: { mapType: BackgroundMapType.Aerial } })!);\r\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\r\n    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"BingProvider\", providerData: { mapType: BackgroundMapType.Hybrid } })!);\r\n    return mapLayerSources;\r\n  }\r\n\r\n  private static getMapBoxLayerSource(): MapLayerSource[] {\r\n    const mapLayerSources: MapLayerSource[] = [];\r\n    // We know these hard-coded sources are valid, so ! is okay here.\r\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\r\n    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"MapBoxProvider\", providerData: { mapType: BackgroundMapType.Street } })!);\r\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\r\n    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"MapBoxProvider\", providerData: { mapType: BackgroundMapType.Aerial } })!);\r\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\r\n    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"MapBoxProvider\", providerData: { mapType: BackgroundMapType.Hybrid } })!);\r\n    return mapLayerSources;\r\n  }\r\n\r\n  public static async create(iModel?: IModelConnection, queryForPublicSources = false, addMapBoxSources = false): Promise<MapLayerSources> {\r\n    if (!queryForPublicSources && MapLayerSources._instance)\r\n      return MapLayerSources._instance;\r\n\r\n    if (!iModel)\r\n      iModel = IModelApp.viewManager.selectedView ? IModelApp.viewManager.selectedView.iModel : undefined;\r\n\r\n    let sourceRange = MapCartoRectangle.createMaximum();\r\n    if (iModel) {\r\n      const projectCenter = expectDefined(iModel.projectExtents.localXYZToWorld(.5, .5, .5));\r\n      const cartoCenter = iModel.spatialToCartographicFromEcef(projectCenter);\r\n      const globeRange = MapCartoRectangle.createMaximum();\r\n      const nearDelta = Point2d.create(globeRange.xLength() / 100, globeRange.yLength() / 100);\r\n      sourceRange = MapCartoRectangle.fromRadians(cartoCenter.longitude - nearDelta.x, cartoCenter.latitude - nearDelta.y, cartoCenter.longitude + nearDelta.x, cartoCenter.latitude + nearDelta.y);\r\n    }\r\n\r\n    const sources = new Array<MapLayerSource>();\r\n    const urlSet = new Set<string>();\r\n    const addSource = ((source: MapLayerSource) => {\r\n      if (!urlSet.has(source.url)) {\r\n        sources.push(source);\r\n        urlSet.add(source.url);\r\n      }\r\n    });\r\n\r\n    this.getBingMapLayerSource().forEach((source) => {\r\n      addSource(source);\r\n    });\r\n\r\n    if (addMapBoxSources) {\r\n      this.getMapBoxLayerSource().forEach((source) => {\r\n        addSource(source);\r\n      });\r\n    }\r\n\r\n    if (queryForPublicSources) {\r\n      const sourcesJson = await request(`${IModelApp.publicPath}assets/MapLayerSources.json`, \"json\");\r\n\r\n      for (const sourceJson of sourcesJson) {\r\n        const source = MapLayerSource.fromJSON(sourceJson);\r\n        if (source)\r\n          addSource(source);\r\n      }\r\n\r\n      (await ArcGisUtilities.getSourcesFromQuery(sourceRange)).forEach((queriedSource) => addSource(queriedSource));\r\n    }\r\n\r\n    sources.sort((a: MapLayerSource, b: MapLayerSource) => compareStrings(a.name.toLowerCase(), b.name.toLowerCase()));\r\n\r\n    const mapLayerSources = new MapLayerSources(sources);\r\n    MapLayerSources._instance = mapLayerSources;\r\n\r\n    return mapLayerSources;\r\n  }\r\n  public static async addSourceToMapLayerSources(mapLayerSource?: MapLayerSource): Promise<MapLayerSources | undefined> {\r\n    if (!MapLayerSources._instance || !mapLayerSource) {\r\n      return undefined;\r\n    }\r\n    MapLayerSources._instance._sources = MapLayerSources._instance._sources.filter((source) => {\r\n      return !(source.name === mapLayerSource.name || source.url === mapLayerSource.url);\r\n    });\r\n\r\n    MapLayerSources._instance._sources.push(mapLayerSource);\r\n    MapLayerSources._instance._sources.sort((a: MapLayerSource, b: MapLayerSource) => compareStrings(a.name.toLowerCase(), b.name.toLowerCase()));\r\n    return MapLayerSources._instance;\r\n  }\r\n\r\n  public static removeLayerByName(name: string): boolean {\r\n    if (!MapLayerSources._instance) {\r\n      return false;\r\n    }\r\n\r\n    // For now we only rely on the name\r\n    const lengthBeforeRemove = MapLayerSources._instance._sources.length;\r\n    MapLayerSources._instance._sources = MapLayerSources._instance._sources.filter((source) => {\r\n      return (source.name !== name);\r\n    });\r\n    return (lengthBeforeRemove !== MapLayerSources._instance._sources.length);\r\n  }\r\n}\r\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/core-frontend",
-  "version": "5.16.0-dev.4",
+  "version": "5.16.0-dev.6",
   "description": "iTwin.js frontend components",
   "main": "lib/cjs/core-frontend.js",
   "module": "lib/esm/core-frontend.js",
@@ -23,14 +23,14 @@
     "url": "http://www.bentley.com"
   },
   "peerDependencies": {
-    "@itwin/appui-abstract": "5.16.0-dev.4",
-    "@itwin/core-geometry": "5.16.0-dev.4",
-    "@itwin/core-quantity": "5.16.0-dev.4",
-    "@itwin/core-common": "5.16.0-dev.4",
-    "@itwin/ecschema-metadata": "5.16.0-dev.4",
-    "@itwin/core-orbitgt": "5.16.0-dev.4",
-    "@itwin/core-bentley": "5.16.0-dev.4",
-    "@itwin/ecschema-rpcinterface-common": "5.16.0-dev.4"
+    "@itwin/appui-abstract": "5.16.0-dev.6",
+    "@itwin/core-orbitgt": "5.16.0-dev.6",
+    "@itwin/core-quantity": "5.16.0-dev.6",
+    "@itwin/ecschema-metadata": "5.16.0-dev.6",
+    "@itwin/core-common": "5.16.0-dev.6",
+    "@itwin/core-bentley": "5.16.0-dev.6",
+    "@itwin/core-geometry": "5.16.0-dev.6",
+    "@itwin/ecschema-rpcinterface-common": "5.16.0-dev.6"
   },
   "//devDependencies": [
     "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install",
@@ -48,21 +48,21 @@
     "@vitest/coverage-v8": "^4.1.10",
     "cpx2": "^8.0.0",
     "eslint": "^9.31.0",
-    "playwright": "~1.56.1",
+    "playwright": "~1.64.1",
     "rimraf": "^6.0.1",
     "sinon": "^17.0.2",
     "typescript": "~5.6.2",
     "vite": "^6.4.4",
     "vitest": "^4.1.10",
-    "@itwin/appui-abstract": "5.16.0-dev.4",
-    "@itwin/build-tools": "5.16.0-dev.4",
-    "@itwin/core-geometry": "5.16.0-dev.4",
-    "@itwin/core-common": "5.16.0-dev.4",
-    "@itwin/core-orbitgt": "5.16.0-dev.4",
-    "@itwin/core-quantity": "5.16.0-dev.4",
-    "@itwin/core-bentley": "5.16.0-dev.4",
-    "@itwin/ecschema-rpcinterface-common": "5.16.0-dev.4",
-    "@itwin/ecschema-metadata": "5.16.0-dev.4"
+    "@itwin/core-bentley": "5.16.0-dev.6",
+    "@itwin/core-common": "5.16.0-dev.6",
+    "@itwin/core-geometry": "5.16.0-dev.6",
+    "@itwin/build-tools": "5.16.0-dev.6",
+    "@itwin/appui-abstract": "5.16.0-dev.6",
+    "@itwin/core-quantity": "5.16.0-dev.6",
+    "@itwin/ecschema-metadata": "5.16.0-dev.6",
+    "@itwin/ecschema-rpcinterface-common": "5.16.0-dev.6",
+    "@itwin/core-orbitgt": "5.16.0-dev.6"
   },
   "//dependencies": [
     "NOTE: these dependencies should be only for things that DO NOT APPEAR IN THE API",
@@ -73,8 +73,8 @@
     "@loaders.gl/draco": "^4.4.5",
     "fuse.js": "^3.3.0",
     "wms-capabilities": "0.6.0",
-    "@itwin/core-i18n": "5.16.0-dev.4",
-    "@itwin/webgl-compatibility": "5.16.0-dev.4"
+    "@itwin/core-i18n": "5.16.0-dev.6",
+    "@itwin/webgl-compatibility": "5.16.0-dev.6"
   },
   "scripts": {
     "build": "npm run -s copy:public && npm run -s build:cjs && npm run -s build:esm && npm run -s build:workers && npm run -s copy:draco",