@itwin/core-frontend 3.1.0-dev.25 → 3.1.0-dev.29

package/lib/cjs/tile/map/MapTiledGraphicsProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MapTiledGraphicsProvider.d.ts","sourceRoot":"","sources":["../../../../src/tile/map/MapTiledGraphicsProvider.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAsB,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEtH,gBAAgB;AAChB,qBAAa,wBAAyB,YAAW,qBAAqB;IACpE,SAAgB,aAAa,EAAE,oBAAoB,CAAC;IACpD,SAAgB,UAAU,EAAE,oBAAoB,CAAC;IACjD,SAAgB,kBAAkB,EAAE,oBAAoB,CAAC;IACzD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAsB;IAEvD,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,iBAAiB,KAAK,IAAI,GAAG,IAAI;gBAM/E,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,iBAAiB;IAyBxD,OAAO,CAAC,OAAO,EAAE,SAAS;IAsB1B,sBAAsB,IAAI,IAAI;IAIrC,gBAAgB;IACT,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,uBAAuB,GAAG,SAAS;IAKzG,gBAAgB;IACT,eAAe,CAAC,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,GAAG,gBAAgB,GAAG,SAAS;CAOrG"}
+{"version":3,"file":"MapTiledGraphicsProvider.d.ts","sourceRoot":"","sources":["../../../../src/tile/map/MapTiledGraphicsProvider.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAA4C,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAChG,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEtH,gBAAgB;AAChB,qBAAa,wBAAyB,YAAW,qBAAqB;IACpE,SAAgB,aAAa,EAAE,oBAAoB,CAAC;IACpD,SAAgB,UAAU,EAAE,oBAAoB,CAAC;IACjD,SAAgB,kBAAkB,EAAE,oBAAoB,CAAC;IACzD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAsB;IAEvD,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,iBAAiB,KAAK,IAAI,GAAG,IAAI;gBAM/E,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,iBAAiB;IAyBxD,OAAO,CAAC,OAAO,EAAE,SAAS;IAsB1B,sBAAsB,IAAI,IAAI;IAIrC,gBAAgB;IACT,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,uBAAuB,GAAG,SAAS;IAKzG,gBAAgB;IACT,eAAe,CAAC,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,GAAG,gBAAgB,GAAG,SAAS;CAOrG"}

package/lib/cjs/tile/map/MapTiledGraphicsProvider.js

@@ -53,7 +53,7 @@ class MapTiledGraphicsProvider {
         const mapImagery = newView.displayStyle.settings.mapImagery;
         if (!newView.displayStyle.backgroundMapSettings.equals(this.backgroundMap.settings)
             || !layersMatch(mapImagery.backgroundLayers, this.backgroundMap.layerSettings)
-            || (mapImagery.backgroundBase instanceof core_common_1.MapLayerSettings && !layersMatch([mapImagery.backgroundBase], this.backgroundDrapeMap.layerSettings))) {
+            || (mapImagery.backgroundBase instanceof core_common_1.BaseMapLayerSettings && !layersMatch([mapImagery.backgroundBase], this.backgroundDrapeMap.layerSettings))) {
             this.backgroundMap.clearLayers();
             this.backgroundDrapeMap.clearLayers();
         }

package/lib/cjs/tile/map/MapTiledGraphicsProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"MapTiledGraphicsProvider.js","sourceRoot":"","sources":["../../../../src/tile/map/MapTiledGraphicsProvider.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 Tiles\r\n */\r\n\r\nimport { Id64String } from \"@itwin/core-bentley\";\r\nimport { MapImagerySettings, MapLayerSettings } from \"@itwin/core-common\";\r\nimport { DisplayStyleState } from \"../../DisplayStyleState\";\r\nimport { ViewState } from \"../../ViewState\";\r\nimport { Viewport } from \"../../Viewport\";\r\nimport { MapLayerImageryProvider, MapTileTreeReference, TiledGraphicsProvider, TileTreeReference } from \"../internal\";\r\n\r\n/** @internal */\r\nexport class MapTiledGraphicsProvider implements TiledGraphicsProvider {\r\n  public readonly backgroundMap: MapTileTreeReference;\r\n  public readonly overlayMap: MapTileTreeReference;\r\n  public readonly backgroundDrapeMap: MapTileTreeReference;\r\n  private readonly _detachFromDisplayStyle: VoidFunction[] = [];\r\n\r\n  public forEachTileTreeRef(viewport: Viewport, func: (ref: TileTreeReference) => void): void {\r\n    if (viewport.viewFlags.backgroundMap) {\r\n      func(this.backgroundMap);\r\n      func(this.overlayMap);\r\n    }\r\n  }\r\n  constructor(viewportId: number, displayStyle: DisplayStyleState) {\r\n    const mapSettings = displayStyle.backgroundMapSettings;\r\n    const mapImagery = displayStyle.settings.mapImagery;\r\n    this.backgroundMap = new MapTileTreeReference(mapSettings, mapImagery.backgroundBase, mapImagery.backgroundLayers, displayStyle.iModel, viewportId, false, false, () => displayStyle.overrideTerrainDisplay());\r\n    this.overlayMap = new MapTileTreeReference(mapSettings, undefined, mapImagery.overlayLayers, displayStyle.iModel, viewportId, true, false);\r\n    this.backgroundDrapeMap = new MapTileTreeReference(mapSettings, mapImagery.backgroundBase, mapImagery.backgroundLayers, displayStyle.iModel, viewportId, false, true);\r\n\r\n    const removals = this._detachFromDisplayStyle;\r\n    removals.push(displayStyle.settings.onBackgroundMapChanged.addListener((settings) => {\r\n      this.backgroundMap.settings = settings;\r\n      this.overlayMap.settings = settings;\r\n      this.backgroundDrapeMap.settings = settings;\r\n    }));\r\n\r\n    removals.push(displayStyle.settings.onMapImageryChanged.addListener((imagery: Readonly<MapImagerySettings>) => {\r\n      this.backgroundMap.setBaseLayerSettings(imagery.backgroundBase);\r\n      this.backgroundMap.setLayerSettings(imagery.backgroundLayers);\r\n      this.backgroundDrapeMap.setBaseLayerSettings(mapImagery.backgroundBase);\r\n      this.backgroundDrapeMap.setLayerSettings(mapImagery.backgroundLayers);\r\n      this.overlayMap.setLayerSettings(imagery.overlayLayers);\r\n    }));\r\n  }\r\n\r\n  // This is used in inital view setup and when views are synchronized.  If view is being synchronized\r\n  // we need to clear the layers which purges tile graphics if the settings or layers are changed.\r\n  public setView(newView: ViewState) {\r\n    const layersMatch = ((layers1: MapLayerSettings[], layers2: MapLayerSettings[]): boolean => {\r\n      if (layers1.length !== layers2.length)\r\n        return false;\r\n\r\n      for (let i = 0; i < layers1.length; i++)\r\n        if (!layers1[i].displayMatches(layers2[i]))\r\n          return false;\r\n\r\n      return true;\r\n    });\r\n    const mapImagery = newView.displayStyle.settings.mapImagery;\r\n    if (!newView.displayStyle.backgroundMapSettings.equals(this.backgroundMap.settings)\r\n      || !layersMatch(mapImagery.backgroundLayers, this.backgroundMap.layerSettings)\r\n      || (mapImagery.backgroundBase instanceof MapLayerSettings && !layersMatch([mapImagery.backgroundBase], this.backgroundDrapeMap.layerSettings))) {\r\n      this.backgroundMap.clearLayers();\r\n      this.backgroundDrapeMap.clearLayers();\r\n    }\r\n    if (!layersMatch(mapImagery.overlayLayers, this.overlayMap.layerSettings))\r\n      this.overlayMap.clearLayers();\r\n  }\r\n\r\n  public detachFromDisplayStyle(): void {\r\n    this._detachFromDisplayStyle.forEach((f) => f());\r\n    this._detachFromDisplayStyle.length = 0;\r\n  }\r\n  /** @internal */\r\n  public getMapLayerImageryProvider(index: number, isOverlay: boolean): MapLayerImageryProvider | undefined {\r\n    const imageryTreeRef = isOverlay ? this.overlayMap.getLayerImageryTreeRef(index) : this.backgroundMap.getLayerImageryTreeRef(index);\r\n    return imageryTreeRef?.imageryProvider;\r\n  }\r\n\r\n  /** @internal */\r\n  public mapLayerFromIds(mapTreeId: Id64String, layerTreeId: Id64String): MapLayerSettings | undefined {\r\n    let mapLayer;\r\n    if (undefined === (mapLayer = this.backgroundMap.layerFromTreeModelIds(mapTreeId, layerTreeId)))\r\n      mapLayer = this.overlayMap.layerFromTreeModelIds(mapTreeId, layerTreeId);\r\n\r\n    return mapLayer;\r\n  }\r\n}\r\n\r\n"]}
+{"version":3,"file":"MapTiledGraphicsProvider.js","sourceRoot":"","sources":["../../../../src/tile/map/MapTiledGraphicsProvider.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 Tiles\r\n */\r\n\r\nimport { Id64String } from \"@itwin/core-bentley\";\r\nimport { BaseMapLayerSettings, MapImagerySettings, MapLayerSettings } from \"@itwin/core-common\";\r\nimport { DisplayStyleState } from \"../../DisplayStyleState\";\r\nimport { ViewState } from \"../../ViewState\";\r\nimport { Viewport } from \"../../Viewport\";\r\nimport { MapLayerImageryProvider, MapTileTreeReference, TiledGraphicsProvider, TileTreeReference } from \"../internal\";\r\n\r\n/** @internal */\r\nexport class MapTiledGraphicsProvider implements TiledGraphicsProvider {\r\n  public readonly backgroundMap: MapTileTreeReference;\r\n  public readonly overlayMap: MapTileTreeReference;\r\n  public readonly backgroundDrapeMap: MapTileTreeReference;\r\n  private readonly _detachFromDisplayStyle: VoidFunction[] = [];\r\n\r\n  public forEachTileTreeRef(viewport: Viewport, func: (ref: TileTreeReference) => void): void {\r\n    if (viewport.viewFlags.backgroundMap) {\r\n      func(this.backgroundMap);\r\n      func(this.overlayMap);\r\n    }\r\n  }\r\n  constructor(viewportId: number, displayStyle: DisplayStyleState) {\r\n    const mapSettings = displayStyle.backgroundMapSettings;\r\n    const mapImagery = displayStyle.settings.mapImagery;\r\n    this.backgroundMap = new MapTileTreeReference(mapSettings, mapImagery.backgroundBase, mapImagery.backgroundLayers, displayStyle.iModel, viewportId, false, false, () => displayStyle.overrideTerrainDisplay());\r\n    this.overlayMap = new MapTileTreeReference(mapSettings, undefined, mapImagery.overlayLayers, displayStyle.iModel, viewportId, true, false);\r\n    this.backgroundDrapeMap = new MapTileTreeReference(mapSettings, mapImagery.backgroundBase, mapImagery.backgroundLayers, displayStyle.iModel, viewportId, false, true);\r\n\r\n    const removals = this._detachFromDisplayStyle;\r\n    removals.push(displayStyle.settings.onBackgroundMapChanged.addListener((settings) => {\r\n      this.backgroundMap.settings = settings;\r\n      this.overlayMap.settings = settings;\r\n      this.backgroundDrapeMap.settings = settings;\r\n    }));\r\n\r\n    removals.push(displayStyle.settings.onMapImageryChanged.addListener((imagery: Readonly<MapImagerySettings>) => {\r\n      this.backgroundMap.setBaseLayerSettings(imagery.backgroundBase);\r\n      this.backgroundMap.setLayerSettings(imagery.backgroundLayers);\r\n      this.backgroundDrapeMap.setBaseLayerSettings(mapImagery.backgroundBase);\r\n      this.backgroundDrapeMap.setLayerSettings(mapImagery.backgroundLayers);\r\n      this.overlayMap.setLayerSettings(imagery.overlayLayers);\r\n    }));\r\n  }\r\n\r\n  // This is used in inital view setup and when views are synchronized.  If view is being synchronized\r\n  // we need to clear the layers which purges tile graphics if the settings or layers are changed.\r\n  public setView(newView: ViewState) {\r\n    const layersMatch = ((layers1: MapLayerSettings[], layers2: MapLayerSettings[]): boolean => {\r\n      if (layers1.length !== layers2.length)\r\n        return false;\r\n\r\n      for (let i = 0; i < layers1.length; i++)\r\n        if (!layers1[i].displayMatches(layers2[i]))\r\n          return false;\r\n\r\n      return true;\r\n    });\r\n    const mapImagery = newView.displayStyle.settings.mapImagery;\r\n    if (!newView.displayStyle.backgroundMapSettings.equals(this.backgroundMap.settings)\r\n      || !layersMatch(mapImagery.backgroundLayers, this.backgroundMap.layerSettings)\r\n      || (mapImagery.backgroundBase instanceof BaseMapLayerSettings && !layersMatch([mapImagery.backgroundBase], this.backgroundDrapeMap.layerSettings))) {\r\n      this.backgroundMap.clearLayers();\r\n      this.backgroundDrapeMap.clearLayers();\r\n    }\r\n    if (!layersMatch(mapImagery.overlayLayers, this.overlayMap.layerSettings))\r\n      this.overlayMap.clearLayers();\r\n  }\r\n\r\n  public detachFromDisplayStyle(): void {\r\n    this._detachFromDisplayStyle.forEach((f) => f());\r\n    this._detachFromDisplayStyle.length = 0;\r\n  }\r\n  /** @internal */\r\n  public getMapLayerImageryProvider(index: number, isOverlay: boolean): MapLayerImageryProvider | undefined {\r\n    const imageryTreeRef = isOverlay ? this.overlayMap.getLayerImageryTreeRef(index) : this.backgroundMap.getLayerImageryTreeRef(index);\r\n    return imageryTreeRef?.imageryProvider;\r\n  }\r\n\r\n  /** @internal */\r\n  public mapLayerFromIds(mapTreeId: Id64String, layerTreeId: Id64String): MapLayerSettings | undefined {\r\n    let mapLayer;\r\n    if (undefined === (mapLayer = this.backgroundMap.layerFromTreeModelIds(mapTreeId, layerTreeId)))\r\n      mapLayer = this.overlayMap.layerFromTreeModelIds(mapTreeId, layerTreeId);\r\n\r\n    return mapLayer;\r\n  }\r\n}\r\n\r\n"]}

package/lib/cjs/tools/ViewTool.js

@@ -65,7 +65,7 @@ class ViewTool extends Tool_1.InteractiveTool {
     async run(..._args) {
         const toolAdmin = IModelApp_1.IModelApp.toolAdmin;
         if (undefined !== this.viewport && this.viewport === toolAdmin.markupView) {
-            IModelApp_1.IModelApp.notifications.outputPromptByKey("Viewing.NotDuringMarkup");
+            IModelApp_1.IModelApp.notifications.outputPromptByKey("iModelJs:Viewing.NotDuringMarkup");
             return false;
         }
         if (!await toolAdmin.onInstallTool(this))