@itwin/core-frontend 3.1.0-dev.7 → 3.2.0-dev.1

package/lib/esm/tile/map/MapLayerSources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MapLayerSources.d.ts","sourceRoot":"","sources":["../../../../src/tile/map/MapLayerSources.ts"],"names":[],"mappings":"AAIA;;GAEG;AAIH,OAAO,EAC2D,4BAA4B,EAAE,gBAAgB,EAAE,gBAAgB,EACjI,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,EAAsC,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAE3F,gBAAgB;AAChB,oBAAY,oBAAoB;IAC9B,KAAK,IAAA;IACL,kBAAkB,IAAA;IAClB,aAAa,IAAA;IACb,eAAe,IAAA;IACf,UAAU,IAAA;IACV,WAAW,IAAA;CACZ;AAED;;GAEG;AACH,UAAU,mBAAmB;IAC3B,2DAA2D;IAC3D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW;IACX,IAAI,EAAE,MAAM,CAAC;IACb,UAAU;IACV,GAAG,EAAE,MAAM,CAAC;IACZ,uEAAuE;IACvE,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,6CAA6C;IAC7C,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,0FAA0F;IAC1F,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,qBAAa,cAAc;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,UAAS;IAChB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAEzB,OAAO;WAUO,QAAQ,CAAC,IAAI,EAAE,mBAAmB,GAAG,cAAc,GAAG,SAAS;IAOhE,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,wBAAwB,CAAC;WAGvE,sBAAsB,CAAC,KAAK,EAAE,4BAA4B;IAajE,MAAM;;;;;;IAIN,eAAe,CAAC,SAAS,CAAC,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,GAAG,SAAS;IAOpF,OAAO,CAAC,cAAc;CAGvB;AAED;;GAEG;AACH,qBAAa,eAAe;IAEN,OAAO,CAAC,QAAQ;IADpC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAkB;IAC3C,OAAO;WAEO,WAAW;IAElB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,GAAG,cAAc,GAAG,SAAS;IAQrF,IAAW,MAAM,IAAI,cAAc,EAAE,CAIpC;IACD,IAAW,SAAS,qBAA4B;IAChD,IAAW,KAAK,IAAI,cAAc,EAAE,CAInC;IAED,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAQpC,OAAO,CAAC,MAAM,CAAC,oBAAoB;WAQf,MAAM,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,qBAAqB,UAAQ,EAAE,gBAAgB,UAAQ,GAAG,OAAO,CAAC,eAAe,CAAC;WAsDpH,0BAA0B,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;WAavG,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;CAYvD"}
+{"version":3,"file":"MapLayerSources.d.ts","sourceRoot":"","sources":["../../../../src/tile/map/MapLayerSources.ts"],"names":[],"mappings":"AAIA;;GAEG;AAGH,OAAO,EAC2D,4BAA4B,EAAE,qBAAqB,EAAE,gBAAgB,EACtI,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,EAAsC,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAE3F,gBAAgB;AAChB,oBAAY,oBAAoB;IAC9B,KAAK,IAAA;IACL,kBAAkB,IAAA;IAClB,aAAa,IAAA;IACb,eAAe,IAAA;IACf,UAAU,IAAA;IACV,WAAW,IAAA;CACZ;AAED;;GAEG;AACH,UAAU,mBAAmB;IAC3B,2DAA2D;IAC3D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW;IACX,IAAI,EAAE,MAAM,CAAC;IACb,UAAU;IACV,GAAG,EAAE,MAAM,CAAC;IACZ,uEAAuE;IACvE,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,6CAA6C;IAC7C,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,0FAA0F;IAC1F,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,qBAAa,cAAc;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,UAAS;IAChB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAEzB,OAAO;WAUO,QAAQ,CAAC,IAAI,EAAE,mBAAmB,GAAG,cAAc,GAAG,SAAS;IAOhE,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,wBAAwB,CAAC;WAGvE,sBAAsB,CAAC,KAAK,EAAE,4BAA4B;IAajE,MAAM;;;;;;IAIN,eAAe,CAAC,SAAS,CAAC,EAAE,gBAAgB,EAAE,GAAG,qBAAqB,GAAG,SAAS;IAUzF,OAAO,CAAC,cAAc;CAGvB;AAED;;GAEG;AACH,qBAAa,eAAe;IAEN,OAAO,CAAC,QAAQ;IADpC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAkB;IAC3C,OAAO;WAEO,WAAW;IAElB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,GAAG,cAAc,GAAG,SAAS;IAQrF,IAAW,MAAM,IAAI,cAAc,EAAE,CAIpC;IACD,IAAW,SAAS,qBAA4B;IAChD,IAAW,KAAK,IAAI,cAAc,EAAE,CAInC;IAED,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAQpC,OAAO,CAAC,MAAM,CAAC,oBAAoB;WAQf,MAAM,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,qBAAqB,UAAQ,EAAE,gBAAgB,UAAQ,GAAG,OAAO,CAAC,eAAe,CAAC;WAsDpH,0BAA0B,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;WAavG,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;CAYvD"}

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

@@ -6,10 +6,10 @@
  * @module MapLayers
  */
 import { compareStrings } from "@itwin/core-bentley";
+import { BackgroundMapProvider, BackgroundMapType, BaseMapLayerSettings, ImageMapLayerSettings, } from "@itwin/core-common";
 import { Point2d } from "@itwin/core-geometry";
-import { BackgroundMapProvider, BackgroundMapType, BaseMapLayerSettings, MapLayerSettings, } from "@itwin/core-common";
-import { getJson } from "../../request/Request";
 import { IModelApp } from "../../IModelApp";
+import { getJson } from "../../request/Request";
 import { ArcGisUtilities, MapCartoRectangle } from "../internal";
 /** @internal */
 export var MapLayerSourceStatus;
@@ -60,8 +60,10 @@ export class MapLayerSource {
     }
     toLayerSettings(subLayers) {
         // When MapLayerSetting is created from a MapLayerSource, sub-layers and credentials need to be set separately.
-        const layerSettings = MapLayerSettings.fromJSON({ ...this, subLayers });
-        layerSettings === null || layerSettings === void 0 ? void 0 : layerSettings.setCredentials(this.userName, this.password);
+        const layerSettings = ImageMapLayerSettings.fromJSON({ ...this, subLayers });
+        if (this.userName !== undefined || this.password !== undefined) {
+            layerSettings === null || layerSettings === void 0 ? void 0 : layerSettings.setCredentials(this.userName, this.password);
+        }
         return layerSettings;
     }
     getCredentials() {

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 } from \"@itwin/core-bentley\";\r\nimport { Point2d } from \"@itwin/core-geometry\";\r\nimport {\r\n  BackgroundMapProvider, BackgroundMapType, BaseMapLayerSettings, DeprecatedBackgroundMapProps, MapLayerSettings, MapSubLayerProps,\r\n} from \"@itwin/core-common\";\r\nimport { getJson, RequestBasicCredentials } from \"../../request/Request\";\r\nimport { IModelApp } from \"../../IModelApp\";\r\nimport { IModelConnection } from \"../../IModelConnection\";\r\n\r\nimport { ArcGisUtilities, MapCartoRectangle, MapLayerSourceValidation } from \"../internal\";\r\n\r\n/** @internal */\r\nexport enum MapLayerSourceStatus {\r\n  Valid,\r\n  InvalidCredentials,\r\n  InvalidFormat,\r\n  InvalidTileTree,\r\n  InvalidUrl,\r\n  RequireAuth,\r\n}\r\n\r\n/** JSON representation of a map layer source.\r\n * @internal\r\n */\r\ninterface 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 */\r\n  url: string;\r\n  /** True to indicate background is transparent.  Defaults to 'true'. */\r\n  transparentBackground?: boolean;\r\n  /** Is a base layer.  Defaults to 'false'. */\r\n  isBase?: boolean;\r\n  /** Indicate if this source definition should be used as a base map. Defaults to false. */\r\n  baseMap?: boolean;\r\n  /** UserName */\r\n  userName?: string;\r\n  /** Password */\r\n  password?: 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 * @internal\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  private constructor(formatId = \"WMS\", name: string, url: string, baseMap = false, transparentBackground = true, userName?: string, password?: 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.userName = userName;\r\n    this.password = password;\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.userName, json.password);\r\n  }\r\n\r\n  public async validateSource(ignoreCache?: boolean): Promise<MapLayerSourceValidation> {\r\n    return IModelApp.mapLayerFormatRegistry.validateSource(this.formatId, this.url, this.getCredentials(), ignoreCache);\r\n  }\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() {\r\n    return { url: this.url, name: this.name, formatId: this.formatId, transparentBackground: this.transparentBackground };\r\n  }\r\n\r\n  public toLayerSettings(subLayers?: MapSubLayerProps[]): MapLayerSettings | undefined {\r\n    // When MapLayerSetting is created from a MapLayerSource, sub-layers and credentials need to be set separately.\r\n    const layerSettings = MapLayerSettings.fromJSON({ ...this, subLayers });\r\n    layerSettings?.setCredentials(this.userName, this.password);\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\r\n/** A collection of [[MapLayerSource]] objects.\r\n * @internal\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) => { if (!source.baseMap) layers.push(source); });\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) => { if (source.baseMap) layers.push(source); });\r\n    return layers;\r\n  }\r\n\r\n  private static getBingMapLayerSource(): MapLayerSource[] {\r\n    const mapLayerSources: MapLayerSource[] = [];\r\n    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"BingProvider\", providerData: { mapType: BackgroundMapType.Street } })!);\r\n    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"BingProvider\", providerData: { mapType: BackgroundMapType.Aerial } })!);\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    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"MapBoxProvider\", providerData: { mapType: BackgroundMapType.Street } })!);\r\n    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"MapBoxProvider\", providerData: { mapType: BackgroundMapType.Aerial } })!);\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.create();\r\n    if (iModel) {\r\n      const projectCenter = iModel.projectExtents.localXYZToWorld(.5, .5, .5)!;\r\n      const cartoCenter = iModel.spatialToCartographicFromEcef(projectCenter);\r\n      const globeRange = MapCartoRectangle.create();\r\n      const nearDelta = Point2d.create(globeRange.xLength() / 100, globeRange.yLength() / 100);\r\n      sourceRange = MapCartoRectangle.create(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 getJson(`${IModelApp.publicPath}assets/MapLayerSources.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 } 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 { getJson, RequestBasicCredentials } from \"../../request/Request\";\r\nimport { ArcGisUtilities, MapCartoRectangle, MapLayerSourceValidation } from \"../internal\";\r\n\r\n/** @internal */\r\nexport enum MapLayerSourceStatus {\r\n  Valid,\r\n  InvalidCredentials,\r\n  InvalidFormat,\r\n  InvalidTileTree,\r\n  InvalidUrl,\r\n  RequireAuth,\r\n}\r\n\r\n/** JSON representation of a map layer source.\r\n * @internal\r\n */\r\ninterface 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 */\r\n  url: string;\r\n  /** True to indicate background is transparent.  Defaults to 'true'. */\r\n  transparentBackground?: boolean;\r\n  /** Is a base layer.  Defaults to 'false'. */\r\n  isBase?: boolean;\r\n  /** Indicate if this source definition should be used as a base map. Defaults to false. */\r\n  baseMap?: boolean;\r\n  /** UserName */\r\n  userName?: string;\r\n  /** Password */\r\n  password?: 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 * @internal\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  private constructor(formatId = \"WMS\", name: string, url: string, baseMap = false, transparentBackground = true, userName?: string, password?: 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.userName = userName;\r\n    this.password = password;\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.userName, json.password);\r\n  }\r\n\r\n  public async validateSource(ignoreCache?: boolean): Promise<MapLayerSourceValidation> {\r\n    return IModelApp.mapLayerFormatRegistry.validateSource(this.formatId, this.url, this.getCredentials(), ignoreCache);\r\n  }\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() {\r\n    return { url: this.url, name: this.name, formatId: this.formatId, transparentBackground: this.transparentBackground };\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    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\r\n/** A collection of [[MapLayerSource]] objects.\r\n * @internal\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) => { if (!source.baseMap) layers.push(source); });\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) => { if (source.baseMap) layers.push(source); });\r\n    return layers;\r\n  }\r\n\r\n  private static getBingMapLayerSource(): MapLayerSource[] {\r\n    const mapLayerSources: MapLayerSource[] = [];\r\n    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"BingProvider\", providerData: { mapType: BackgroundMapType.Street } })!);\r\n    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"BingProvider\", providerData: { mapType: BackgroundMapType.Aerial } })!);\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    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"MapBoxProvider\", providerData: { mapType: BackgroundMapType.Street } })!);\r\n    mapLayerSources.push(MapLayerSource.fromBackgroundMapProps({ providerName: \"MapBoxProvider\", providerData: { mapType: BackgroundMapType.Aerial } })!);\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.create();\r\n    if (iModel) {\r\n      const projectCenter = iModel.projectExtents.localXYZToWorld(.5, .5, .5)!;\r\n      const cartoCenter = iModel.spatialToCartographicFromEcef(projectCenter);\r\n      const globeRange = MapCartoRectangle.create();\r\n      const nearDelta = Point2d.create(globeRange.xLength() / 100, globeRange.yLength() / 100);\r\n      sourceRange = MapCartoRectangle.create(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 getJson(`${IModelApp.publicPath}assets/MapLayerSources.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/lib/esm/tile/map/MapLayerTileTreeReference.d.ts

@@ -3,16 +3,24 @@
  */
 import { MapLayerSettings } from "@itwin/core-common";
 import { HitDetail } from "../../HitDetail";
+import { IModelConnection } from "../../IModelConnection";
 import { MapLayerImageryProvider, TileTreeReference } from "../internal";
 /** @internal  */
 export declare abstract class MapLayerTileTreeReference extends TileTreeReference {
     protected _layerSettings: MapLayerSettings;
     protected _layerIndex: number;
-    constructor(_layerSettings: MapLayerSettings, _layerIndex: number);
+    iModel: IModelConnection;
+    constructor(_layerSettings: MapLayerSettings, _layerIndex: number, iModel: IModelConnection);
     protected get _transparency(): number | undefined;
-    protected get _imageryProvider(): MapLayerImageryProvider | undefined;
+    get isOpaque(): boolean;
+    get layerName(): string;
+    get imageryProvider(): MapLayerImageryProvider | undefined;
     set layerSettings(layerSettings: MapLayerSettings);
     get layerSettings(): MapLayerSettings;
+    get layerIndex(): number;
+    get transparency(): number | undefined;
     getToolTip(hit: HitDetail): Promise<HTMLElement | string | undefined>;
 }
+/** @internal  */
+export declare function createMapLayerTreeReference(layerSettings: MapLayerSettings, layerIndex: number, iModel: IModelConnection): MapLayerTileTreeReference | undefined;
 //# sourceMappingURL=MapLayerTileTreeReference.d.ts.map

package/lib/esm/tile/map/MapLayerTileTreeReference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MapLayerTileTreeReference.d.ts","sourceRoot":"","sources":["../../../../src/tile/map/MapLayerTileTreeReference.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEzE,iBAAiB;AACjB,8BAAsB,yBAA0B,SAAQ,iBAAiB;IAC3D,SAAS,CAAC,cAAc,EAAE,gBAAgB;IAAE,SAAS,CAAC,WAAW,EAAE,MAAM;gBAA/D,cAAc,EAAE,gBAAgB,EAAY,WAAW,EAAE,MAAM;IAGrF,SAAS,KAAK,aAAa,uBAA8F;IACzH,SAAS,KAAK,gBAAgB,IAAI,uBAAuB,GAAG,SAAS,CAAsB;IAC3F,IAAW,aAAa,CAAC,aAAa,EAAE,gBAAgB,EAA0C;IAClG,IAAW,aAAa,IAAI,gBAAgB,CAAgC;IACtD,UAAU,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,GAAG,MAAM,GAAG,SAAS,CAAC;CAW5F"}
+{"version":3,"file":"MapLayerTileTreeReference.d.ts","sourceRoot":"","sources":["../../../../src/tile/map/MapLayerTileTreeReference.ts"],"names":[],"mappings":"AAIA;;GAEG;AAGH,OAAO,EAAyB,gBAAgB,EAAyB,MAAM,oBAAoB,CAAC;AACpG,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAwC,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAE/G,iBAAiB;AACjB,8BAAsB,yBAA0B,SAAQ,iBAAiB;IAC3D,SAAS,CAAC,cAAc,EAAE,gBAAgB;IAAE,SAAS,CAAC,WAAW,EAAE,MAAM;IAAS,MAAM,EAAE,gBAAgB;gBAAhG,cAAc,EAAE,gBAAgB,EAAY,WAAW,EAAE,MAAM,EAAS,MAAM,EAAE,gBAAgB;IAGtH,SAAS,KAAK,aAAa,uBAA8F;IAEzH,IAAW,QAAQ,YAElB;IACD,IAAW,SAAS,WAAuC;IAC3D,IAAW,eAAe,IAAI,uBAAuB,GAAG,SAAS,CAAsB;IACvF,IAAW,aAAa,CAAC,aAAa,EAAE,gBAAgB,EAA0C;IAClG,IAAW,aAAa,IAAI,gBAAgB,CAAgC;IAC5E,IAAW,UAAU,IAAI,MAAM,CAA6B;IAC5D,IAAW,YAAY,uBAAiC;IAClC,UAAU,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,GAAG,MAAM,GAAG,SAAS,CAAC;CAW5F;AAED,iBAAiB;AACjB,wBAAgB,2BAA2B,CAAC,aAAa,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,yBAAyB,GAAG,SAAS,CAShK"}

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

@@ -5,18 +5,28 @@
 /** @packageDocumentation
  * @module Tiles
  */
-import { TileTreeReference } from "../internal";
+import { assert } from "@itwin/core-bentley";
+import { ImageMapLayerSettings, ModelMapLayerSettings } from "@itwin/core-common";
+import { IModelApp } from "../../IModelApp";
+import { createModelMapLayerTileTreeReference, TileTreeReference } from "../internal";
 /** @internal  */
 export class MapLayerTileTreeReference extends TileTreeReference {
-    constructor(_layerSettings, _layerIndex) {
+    constructor(_layerSettings, _layerIndex, iModel) {
         super();
         this._layerSettings = _layerSettings;
         this._layerIndex = _layerIndex;
+        this.iModel = iModel;
     }
     get _transparency() { return this._layerSettings.transparency ? this._layerSettings.transparency : undefined; }
-    get _imageryProvider() { return undefined; } // We don't use MapTileTreeReference TreeSupplier...
+    get isOpaque() {
+        return this._layerSettings.visible && (!this._layerSettings.allSubLayersInvisible) && !this._layerSettings.transparentBackground && 0 === this._layerSettings.transparency;
+    }
+    get layerName() { return this._layerSettings.name; }
+    get imageryProvider() { return undefined; }
     set layerSettings(layerSettings) { this._layerSettings = layerSettings; }
     get layerSettings() { return this._layerSettings; }
+    get layerIndex() { return this._layerIndex; }
+    get transparency() { return this._transparency; }
     async getToolTip(hit) {
         const tree = this.treeOwner.tileTree;
         if (undefined === tree || hit.iModel !== tree.iModel || tree.modelId !== hit.sourceId)
@@ -28,4 +38,16 @@ export class MapLayerTileTreeReference extends TileTreeReference {
         return div;
     }
 }
+/** @internal  */
+export function createMapLayerTreeReference(layerSettings, layerIndex, iModel) {
+    if (layerSettings instanceof ModelMapLayerSettings) {
+        return createModelMapLayerTileTreeReference(layerSettings, layerIndex, iModel);
+    }
+    else if (layerSettings instanceof ImageMapLayerSettings)
+        return IModelApp.mapLayerFormatRegistry.createImageryMapLayerTree(layerSettings, layerIndex, iModel);
+    else {
+        assert(false);
+        return undefined;
+    }
+}
 //# sourceMappingURL=MapLayerTileTreeReference.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"MapLayerTileTreeReference.js","sourceRoot":"","sources":["../../../../src/tile/map/MapLayerTileTreeReference.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAC/F;;GAEG;AAIH,OAAO,EAA2B,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEzE,iBAAiB;AACjB,MAAM,OAAgB,yBAA0B,SAAQ,iBAAiB;IACvE,YAAsB,cAAgC,EAAY,WAAmB;QACnF,KAAK,EAAE,CAAC;QADY,mBAAc,GAAd,cAAc,CAAkB;QAAY,gBAAW,GAAX,WAAW,CAAQ;IAErF,CAAC;IACD,IAAc,aAAa,KAAK,OAAO,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IACzH,IAAc,gBAAgB,KAA0C,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,oDAAoD;IAChJ,IAAW,aAAa,CAAC,aAA+B,IAAI,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC,CAAC,CAAC;IAClG,IAAW,aAAa,KAAuB,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;IAC5D,KAAK,CAAC,UAAU,CAAC,GAAc;QAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;QACrC,IAAI,SAAS,KAAK,IAAI,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,KAAK,GAAG,CAAC,QAAQ;YACnF,OAAO,SAAS,CAAC;QAEnB,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,OAAO,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC1C,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrC,OAAO,GAAG,CAAC;IACb,CAAC;CACF","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 Tiles\r\n */\r\n\r\nimport { MapLayerSettings } from \"@itwin/core-common\";\r\nimport { HitDetail } from \"../../HitDetail\";\r\nimport { MapLayerImageryProvider, TileTreeReference } from \"../internal\";\r\n\r\n/** @internal  */\r\nexport abstract class MapLayerTileTreeReference extends TileTreeReference {\r\n  constructor(protected _layerSettings: MapLayerSettings, protected _layerIndex: number) {\r\n    super();\r\n  }\r\n  protected get _transparency() { return this._layerSettings.transparency ? this._layerSettings.transparency : undefined; }\r\n  protected get _imageryProvider(): MapLayerImageryProvider | undefined { return undefined; } // We don't use MapTileTreeReference TreeSupplier...\r\n  public set layerSettings(layerSettings: MapLayerSettings) { this._layerSettings = layerSettings; }\r\n  public get layerSettings(): MapLayerSettings { return this._layerSettings; }\r\n  public override async getToolTip(hit: HitDetail): Promise<HTMLElement | string | undefined> {\r\n    const tree = this.treeOwner.tileTree;\r\n    if (undefined === tree || hit.iModel !== tree.iModel || tree.modelId !== hit.sourceId)\r\n      return undefined;\r\n\r\n    const strings = [];\r\n    strings.push(`Map Layer: ${this._layerSettings.name}`);\r\n    const div = document.createElement(\"div\");\r\n    div.innerHTML = strings.join(\"<br>\");\r\n    return div;\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"MapLayerTileTreeReference.js","sourceRoot":"","sources":["../../../../src/tile/map/MapLayerTileTreeReference.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAC/F;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAoB,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAEpG,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,oCAAoC,EAA2B,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAE/G,iBAAiB;AACjB,MAAM,OAAgB,yBAA0B,SAAQ,iBAAiB;IACvE,YAAsB,cAAgC,EAAY,WAAmB,EAAS,MAAwB;QACpH,KAAK,EAAE,CAAC;QADY,mBAAc,GAAd,cAAc,CAAkB;QAAY,gBAAW,GAAX,WAAW,CAAQ;QAAS,WAAM,GAAN,MAAM,CAAkB;IAEtH,CAAC;IACD,IAAc,aAAa,KAAK,OAAO,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAEzH,IAAW,QAAQ;QACjB,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,IAAI,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,qBAAqB,IAAI,CAAC,KAAK,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC;IAC7K,CAAC;IACD,IAAW,SAAS,KAAK,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3D,IAAW,eAAe,KAA0C,OAAO,SAAS,CAAC,CAAC,CAAC;IACvF,IAAW,aAAa,CAAC,aAA+B,IAAI,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC,CAAC,CAAC;IAClG,IAAW,aAAa,KAAuB,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;IAC5E,IAAW,UAAU,KAAa,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC5D,IAAW,YAAY,KAAK,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;IACxC,KAAK,CAAC,UAAU,CAAC,GAAc;QAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;QACrC,IAAI,SAAS,KAAK,IAAI,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,KAAK,GAAG,CAAC,QAAQ;YACnF,OAAO,SAAS,CAAC;QAEnB,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,OAAO,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC1C,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrC,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AAED,iBAAiB;AACjB,MAAM,UAAU,2BAA2B,CAAC,aAA+B,EAAE,UAAkB,EAAE,MAAwB;IACvH,IAAI,aAAa,YAAY,qBAAqB,EAAE;QAClD,OAAO,oCAAoC,CAAC,aAAa,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;KAChF;SAAM,IAAI,aAAa,YAAY,qBAAqB;QACvD,OAAO,SAAS,CAAC,sBAAsB,CAAC,yBAAyB,CAAC,aAAa,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;SAClG;QACH,MAAM,CAAE,KAAK,CAAC,CAAC;QACf,OAAO,SAAS,CAAC;KAClB;AACH,CAAC","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 Tiles\r\n */\r\n\r\nimport { assert } from \"@itwin/core-bentley\";\r\nimport { ImageMapLayerSettings, MapLayerSettings, ModelMapLayerSettings } from \"@itwin/core-common\";\r\nimport { HitDetail } from \"../../HitDetail\";\r\nimport { IModelApp } from \"../../IModelApp\";\r\nimport { IModelConnection } from \"../../IModelConnection\";\r\nimport { createModelMapLayerTileTreeReference, MapLayerImageryProvider, TileTreeReference } from \"../internal\";\r\n\r\n/** @internal  */\r\nexport abstract class MapLayerTileTreeReference extends TileTreeReference {\r\n  constructor(protected _layerSettings: MapLayerSettings, protected _layerIndex: number, public iModel: IModelConnection) {\r\n    super();\r\n  }\r\n  protected get _transparency() { return this._layerSettings.transparency ? this._layerSettings.transparency : undefined; }\r\n\r\n  public get isOpaque() {\r\n    return this._layerSettings.visible && (!this._layerSettings.allSubLayersInvisible) && !this._layerSettings.transparentBackground && 0 === this._layerSettings.transparency;\r\n  }\r\n  public get layerName() { return this._layerSettings.name; }\r\n  public get imageryProvider(): MapLayerImageryProvider | undefined { return undefined; }\r\n  public set layerSettings(layerSettings: MapLayerSettings) { this._layerSettings = layerSettings; }\r\n  public get layerSettings(): MapLayerSettings { return this._layerSettings; }\r\n  public get layerIndex(): number { return this._layerIndex; }\r\n  public get transparency() { return this._transparency; }\r\n  public override async getToolTip(hit: HitDetail): Promise<HTMLElement | string | undefined> {\r\n    const tree = this.treeOwner.tileTree;\r\n    if (undefined === tree || hit.iModel !== tree.iModel || tree.modelId !== hit.sourceId)\r\n      return undefined;\r\n\r\n    const strings = [];\r\n    strings.push(`Map Layer: ${this._layerSettings.name}`);\r\n    const div = document.createElement(\"div\");\r\n    div.innerHTML = strings.join(\"<br>\");\r\n    return div;\r\n  }\r\n}\r\n\r\n/** @internal  */\r\nexport function createMapLayerTreeReference(layerSettings: MapLayerSettings, layerIndex: number, iModel: IModelConnection): MapLayerTileTreeReference | undefined {\r\n  if (layerSettings instanceof ModelMapLayerSettings) {\r\n    return createModelMapLayerTileTreeReference(layerSettings, layerIndex, iModel);\r\n  } else if (layerSettings instanceof ImageMapLayerSettings)\r\n    return IModelApp.mapLayerFormatRegistry.createImageryMapLayerTree(layerSettings, layerIndex, iModel);\r\n  else {\r\n    assert (false);\r\n    return undefined;\r\n  }\r\n}\r\n"]}

package/lib/esm/tile/map/MapTile.d.ts

@@ -1,15 +1,15 @@
 /** @packageDocumentation
  * @module Tiles
  */
-import { ClipVector, EllipsoidPatch, Point3d, Range1d, Range3d, Ray3d, Transform, Vector3d } from "@itwin/core-geometry";
 import { ColorDef, RenderTexture } from "@itwin/core-common";
+import { ClipVector, EllipsoidPatch, Point3d, Range1d, Range3d, Ray3d, Transform, Vector3d } from "@itwin/core-geometry";
 import { GraphicBuilder } from "../../render/GraphicBuilder";
 import { TerrainMeshPrimitive } from "../../render/primitives/mesh/TerrainMeshPrimitive";
 import { RenderGraphic } from "../../render/RenderGraphic";
 import { RenderMemory } from "../../render/RenderMemory";
-import { RenderRealityMeshGeometry, RenderSystem, TerrainTexture } from "../../render/RenderSystem";
+import { RenderSystem, RenderTerrainGeometry, TerrainTexture } from "../../render/RenderSystem";
 import { ViewingSpace } from "../../ViewingSpace";
-import { ImageryMapTile, MapCartoRectangle, MapTileLoader, MapTileTree, QuadId, RealityTile, Tile, TileContent, TileDrawArgs, TileGraphicType, TileParams, TraversalSelectionContext } from "../internal";
+import { ImageryMapTile, MapCartoRectangle, MapTileLoader, MapTileTree, QuadId, RealityTile, RealityTileParams, Tile, TileContent, TileDrawArgs, TileGraphicType, TraversalSelectionContext } from "../internal";
 /** @internal */
 export declare class PlanarTilePatch {
     corners: Point3d[];
@@ -27,11 +27,12 @@ export declare abstract class MapTileProjection {
     abstract get transformFromLocal(): Transform;
     abstract getPoint(u: number, v: number, height: number, result?: Point3d): Point3d;
     get ellipsoidPatch(): EllipsoidPatch | undefined;
+    getGlobalPoint(u: number, v: number, z: number, result?: Point3d): Point3d;
 }
 /** @internal */
 export interface TerrainTileContent extends TileContent {
     terrain?: {
-        geometry?: RenderRealityMeshGeometry;
+        renderGeometry?: RenderTerrainGeometry;
         /** Used on leaves to support up-sampling. */
         mesh?: TerrainMeshPrimitive;
     };
@@ -51,17 +52,17 @@ export declare class MapTile extends RealityTile {
     private _imageryTiles?;
     everLoaded: boolean;
     protected _heightRange: Range1d | undefined;
-    protected _geometry?: RenderRealityMeshGeometry;
+    protected _renderGeometry?: RenderTerrainGeometry;
     protected _mesh?: TerrainMeshPrimitive;
     get isReady(): boolean;
-    get geometry(): RenderRealityMeshGeometry | undefined;
+    get hasGraphics(): boolean;
+    get renderGeometry(): RenderTerrainGeometry | undefined;
     get mesh(): TerrainMeshPrimitive | undefined;
     get loadableTerrainTile(): MapTile;
-    get hasGraphics(): boolean;
     get isPlanar(): boolean;
     get imageryTiles(): ImageryMapTile[] | undefined;
     getRangeCorners(result: Point3d[]): Point3d[];
-    constructor(params: TileParams, mapTree: MapTileTree, quadId: QuadId, _patch: TilePatch, rectangle: MapCartoRectangle, heightRange: Range1d | undefined, _cornerRays: Ray3d[] | undefined);
+    constructor(params: RealityTileParams, mapTree: MapTileTree, quadId: QuadId, _patch: TilePatch, rectangle: MapCartoRectangle, heightRange: Range1d | undefined, _cornerRays: Ray3d[] | undefined);
     getSizeProjectionCorners(): Point3d[] | undefined;
     markUsed(args: TileDrawArgs): void;
     get graphicType(): TileGraphicType;
@@ -80,7 +81,7 @@ export declare class MapTile extends RealityTile {
     isOccluded(viewingSpace: ViewingSpace): boolean;
     protected _loadChildren(resolve: (children: Tile[] | undefined) => void, _reject: (error: Error) => void): void;
     private createGlobeChildren;
-    static computeRangeCorners(corners: Point3d[], normal: Vector3d, chordHeight: number, result: Point3d[], heightRange?: Range1d): Point3d[];
+    static computeRangeCorners(corners: Point3d[], normal: Vector3d, chordHeight: number, result?: Point3d[], heightRange?: Range1d): Point3d[];
     isRegionCulled(args: TileDrawArgs): boolean;
     isContentCulled(args: TileDrawArgs): boolean;
     clearLayers(): void;
@@ -125,7 +126,8 @@ export declare class UpsampledMapTile extends MapTile {
     get isUpsampled(): boolean;
     get isEmpty(): boolean;
     get loadableTile(): RealityTile;
-    get geometry(): RenderRealityMeshGeometry | undefined;
+    private upsampleFromParent;
+    get renderGeometry(): RenderTerrainGeometry | undefined;
     get isLoading(): boolean;
     get isQueued(): boolean;
     get isNotFound(): boolean;

package/lib/esm/tile/map/MapTile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MapTile.d.ts","sourceRoot":"","sources":["../../../../src/tile/map/MapTile.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MapTile.d.ts","sourceRoot":"","sources":["../../../../src/tile/map/MapTile.ts"],"names":[],"mappings":"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"}

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

@@ -6,8 +6,8 @@
  * @module Tiles
  */
 import { assert, dispose } from "@itwin/core-bentley";
-import { AxisOrder, BilinearPatch, ClipPlane, ClipPrimitive, ClipShape, ClipVector, Constant, ConvexClipPlaneSet, EllipsoidPatch, LongitudeLatitudeNumber, Matrix3d, Point3d, PolygonOps, Range1d, Range2d, Range3d, Ray3d, Transform, Vector2d, Vector3d } from "@itwin/core-geometry";
 import { ColorByName, ColorDef, FrustumPlanes, GlobeMode, PackedFeatureTable } from "@itwin/core-common";
+import { AxisOrder, BilinearPatch, ClipPlane, ClipPrimitive, ClipShape, ClipVector, Constant, ConvexClipPlaneSet, EllipsoidPatch, LongitudeLatitudeNumber, Matrix3d, Point3d, PolygonOps, Range1d, Range2d, Range3d, Ray3d, Transform, Vector2d, Vector3d } from "@itwin/core-geometry";
 import { IModelApp } from "../../IModelApp";
 import { TerrainTexture } from "../../render/RenderSystem";
 import { MapCartoRectangle, MapTileTree, QuadId, RealityTile, TileGraphicType, TileLoadStatus, TileTreeLoadStatus, } from "../internal";
@@ -33,6 +33,10 @@ export class PlanarTilePatch {
 /** @internal */
 export class MapTileProjection {
     get ellipsoidPatch() { return undefined; }
+    getGlobalPoint(u, v, z, result) {
+        const point = this.getPoint(u, v, z, result);
+        return this.transformFromLocal.multiplyPoint3d(point, point);
+    }
 }
 /** @internal */
 class EllipsoidProjection extends MapTileProjection {
@@ -91,10 +95,10 @@ export class MapTile extends RealityTile {
         this._heightRange = heightRange ? heightRange.clone() : undefined;
     }
     get isReady() { return super.isReady && this.baseImageryIsReady; }
-    get geometry() { return this._geometry; }
+    get hasGraphics() { return this._renderGeometry !== undefined; }
+    get renderGeometry() { return this._renderGeometry; }
     get mesh() { return this._mesh; }
     get loadableTerrainTile() { return this.loadableTile; }
-    get hasGraphics() { return undefined !== this.geometry; }
     get isPlanar() { return this._patch instanceof PlanarTilePatch; }
     get imageryTiles() { return this._imageryTiles; }
     getRangeCorners(result) { return this._patch instanceof PlanarTilePatch ? this._patch.getRangeCorners(this.heightRange, result) : this.range.corners(result); }
@@ -276,8 +280,11 @@ export class MapTile extends RealityTile {
                     const heightRange = this.mapTree.getChildHeightRange(quadId, rectangle, this);
                     const diagonal = Math.max(corners[0].distance(corners[3]), corners[1].distance(corners[2])) / 2.0;
                     const chordHeight = globeMode === GlobeMode.Ellipsoid ? Math.sqrt(diagonal * diagonal + Constant.earthRadiusWGS84.equator * Constant.earthRadiusWGS84.equator) - Constant.earthRadiusWGS84.equator : 0.0;
-                    const range = Range3d.createArray(MapTile.computeRangeCorners(corners, normal, chordHeight, scratchCorners, heightRange));
-                    children.push(this.mapTree.createPlanarChild({ contentId: quadId.contentId, maximumSize: 512, range, parent: this, isLeaf: childrenAreLeaves }, quadId, corners, normal, rectangle, chordHeight, heightRange));
+                    const rangeCorners = MapTile.computeRangeCorners(corners, normal, chordHeight, undefined, heightRange);
+                    const range = Range3d.createArray(rangeCorners);
+                    const child = this.mapTree.createPlanarChild({ contentId: quadId.contentId, maximumSize: 512, range, parent: this, isLeaf: childrenAreLeaves }, quadId, corners, normal, rectangle, chordHeight, heightRange);
+                    if (child)
+                        children.push(child);
                 }
             }
             resolveChildren(children);
@@ -344,14 +351,15 @@ export class MapTile extends RealityTile {
     produceGraphics() {
         if (undefined !== this._graphic && this.imageryIsReady)
             return this._graphic;
-        const geometry = this.geometry;
+        const geometry = this.renderGeometry;
         assert(undefined !== geometry);
         if (undefined === geometry)
             return undefined;
         const textures = this.getDrapeTextures();
-        const graphic = IModelApp.renderSystem.createRealityMeshGraphic(geometry, PackedFeatureTable.pack(this.mapLoader.featureTable), this.contentId, this.mapTree.baseColor, this.mapTree.baseTransparent, textures);
-        // We no longer need the drape tiles.
-        if (this.imageryIsReady)
+        const { baseColor, baseTransparent, layerClassifiers } = this.mapTree;
+        const graphic = IModelApp.renderSystem.createRealityMeshGraphic({ realityMesh: geometry, projection: this.getProjection(), tileRectangle: this.rectangle, featureTable: PackedFeatureTable.pack(this.mapLoader.featureTable), tileId: this.contentId, baseColor, baseTransparent, textures, layerClassifiers });
+        // If there are no layer classifiers then we can save this graphic for re-use.  If layer classifiers exist they are regenerated based on view and we must collate them with the imagery.
+        if (this.imageryIsReady && 0 === this.mapTree.layerClassifiers.size)
             this._graphic = graphic;
         return graphic;
     }
@@ -359,11 +367,10 @@ export class MapTile extends RealityTile {
         return (this._patch instanceof PlanarTilePatch) ? this._patch.getClipShape() : [this._cornerRays[0].origin, this._cornerRays[1].origin, this._cornerRays[3].origin, this._cornerRays[2].origin];
     }
     _collectStatistics(stats) {
+        var _a, _b;
         super._collectStatistics(stats);
-        if (undefined !== this._geometry)
-            this._geometry.collectStatistics(stats);
-        if (undefined !== this._mesh)
-            this._mesh.collectStatistics(stats);
+        (_a = this._renderGeometry) === null || _a === void 0 ? void 0 : _a.collectStatistics(stats);
+        (_b = this._mesh) === null || _b === void 0 ? void 0 : _b.collectStatistics(stats);
     }
     /** Height range is along with the tile corners to detect if tile intersects view frustum.
      * Range will be single value fo ron-terrain tiles -- if terrain tile is not loaded it will
@@ -391,6 +398,8 @@ export class MapTile extends RealityTile {
             this._heightRange.low = Math.max(this.heightRange.low, minHeight);
             this._heightRange.high = Math.min(this.heightRange.high, maxHeight);
         }
+        if (this.rangeCorners && this._patch instanceof PlanarTilePatch)
+            this._patch.getRangeCorners(this.heightRange, this.rangeCorners);
     }
     getProjection(heightRange) {
         return this._patch instanceof PlanarTilePatch ? new PlanarProjection(this._patch, heightRange) : new EllipsoidProjection(this._patch, heightRange);
@@ -501,10 +510,19 @@ export class MapTile extends RealityTile {
         return new TerrainTexture(imageryTile.texture, featureIndex, scale, translate, drapeRectangle, this.mapTree.getLayerIndex(imageryModelId), this.mapTree.getLayerTransparency(imageryModelId), clipRect);
     }
     setContent(content) {
-        var _a, _b;
-        dispose(this._geometry); // This should never happen but paranoia.
-        this._geometry = (_a = content.terrain) === null || _a === void 0 ? void 0 : _a.geometry;
-        this._mesh = (_b = content.terrain) === null || _b === void 0 ? void 0 : _b.mesh;
+        var _a, _b, _c, _d, _e, _f;
+        this._mesh = (_a = content.terrain) === null || _a === void 0 ? void 0 : _a.mesh;
+        if (this.mapTree.produceGeometry) {
+            const iModelTransform = this.mapTree.iModelTransform;
+            const geometryTransform = (_c = (_b = content.terrain) === null || _b === void 0 ? void 0 : _b.renderGeometry) === null || _c === void 0 ? void 0 : _c.transform;
+            const transform = geometryTransform ? iModelTransform.multiplyTransformTransform(geometryTransform) : iModelTransform;
+            const polyface = (_e = (_d = content.terrain) === null || _d === void 0 ? void 0 : _d.mesh) === null || _e === void 0 ? void 0 : _e.createPolyface(transform);
+            this._geometry = polyface ? { polyfaces: [polyface] } : undefined;
+        }
+        else {
+            dispose(this._renderGeometry);
+            this._renderGeometry = (_f = content.terrain) === null || _f === void 0 ? void 0 : _f.renderGeometry;
+        }
         this.everLoaded = true;
         if (undefined !== content.contentRange)
             this._contentRange = content.contentRange;
@@ -515,7 +533,7 @@ export class MapTile extends RealityTile {
     }
     disposeContents() {
         super.disposeContents();
-        this._geometry = dispose(this._geometry);
+        this._renderGeometry = dispose(this._renderGeometry);
         this.clearImageryTiles();
         // Note - don't dispose of mesh - these should only ever exist on terrain leaf tile and are required by children.  Let garbage collector handle them.
     }
@@ -536,32 +554,35 @@ export class UpsampledMapTile extends MapTile {
             ;
         return parent;
     }
-    get geometry() {
-        if (undefined === this._geometry) {
-            const parent = this.loadableTerrainTile;
-            const parentMesh = parent.mesh;
-            if (undefined === parentMesh) {
-                return undefined;
-            }
-            const thisId = this.quadId, parentId = parent.quadId;
-            const levelDelta = thisId.level - parentId.level;
-            const thisColumn = thisId.column - (parentId.column << levelDelta);
-            const thisRow = thisId.row - (parentId.row << levelDelta);
-            const scale = 1.0 / (1 << levelDelta);
-            const parentParameterRange = Range2d.createXYXY(scale * thisColumn, scale * thisRow, scale * (thisColumn + 1), scale * (thisRow + 1));
-            const upsample = parentMesh.upsample(parentParameterRange);
-            if (undefined === upsample)
-                return undefined;
-            this.adjustHeights(upsample.heightRange.low, upsample.heightRange.high);
-            const projection = parent.getProjection(this.heightRange);
-            this._geometry = IModelApp.renderSystem.createRealityMeshFromTerrain(upsample.mesh, projection.transformFromLocal);
+    upsampleFromParent() {
+        const parent = this.loadableTerrainTile;
+        const parentMesh = parent.mesh;
+        if (undefined === parentMesh) {
+            return undefined;
+        }
+        const thisId = this.quadId, parentId = parent.quadId;
+        const levelDelta = thisId.level - parentId.level;
+        const thisColumn = thisId.column - (parentId.column << levelDelta);
+        const thisRow = thisId.row - (parentId.row << levelDelta);
+        const scale = 1.0 / (1 << levelDelta);
+        const parentParameterRange = Range2d.createXYXY(scale * thisColumn, scale * thisRow, scale * (thisColumn + 1), scale * (thisRow + 1));
+        const upsample = parentMesh.upsample(parentParameterRange);
+        this.adjustHeights(upsample.heightRange.low, upsample.heightRange.high);
+        return upsample;
+    }
+    get renderGeometry() {
+        if (undefined === this._renderGeometry) {
+            const upsample = this.upsampleFromParent();
+            const projection = this.loadableTerrainTile.getProjection(this.heightRange);
+            if (upsample)
+                this._renderGeometry = IModelApp.renderSystem.createRealityMeshFromTerrain(upsample.mesh, projection.transformFromLocal);
         }
-        return this._geometry;
+        return this._renderGeometry;
     }
     get isLoading() { return this.loadableTile.isLoading; }
     get isQueued() { return this.loadableTile.isQueued; }
     get isNotFound() { return this.loadableTile.isNotFound; }
-    get isReady() { return (this._geometry !== undefined || this.loadableTile.loadStatus === TileLoadStatus.Ready) && this.baseImageryIsReady; }
+    get isReady() { return (this._renderGeometry !== undefined || this.loadableTile.loadStatus === TileLoadStatus.Ready) && this.baseImageryIsReady; }
     markUsed(args) {
         args.markUsed(this);
         args.markUsed(this.loadableTile);