@itwin/map-layers 3.1.0-dev.8 → 3.1.0

package/lib/esm/ui/widget/FeatureInfoDataProvider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"FeatureInfoDataProvider.d.ts","sourceRoot":"","sources":["../../../../src/ui/widget/FeatureInfoDataProvider.ts"],"names":[],"mappings":"AAKA,OAAO,EAAG,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACzH,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C;;;GAGG;AAEH,oBAAY,uBAAuB;IAAE,aAAa,IAAA;IAAE,WAAW,IAAA;CAAC;AAChE,MAAM,CAAC,OAAO,MAAM,0BAA0B,GAAG,CAAC,KAAK,EAAE,uBAAuB,KAAK,IAAI,CAAC;AAE1F,MAAM,WAAW,wBAAwB;IACvC,WAAW,EAAE,MAAM,CAAC;CACrB;AACD,MAAM,CAAC,OAAO,MAAM,iCAAiC,GAAG,CAAC,IAAI,EAAE,wBAAwB,KAAK,IAAI,CAAC;AAEjG,qBAAa,uBAAwB,YAAW,qBAAqB,EAAE,YAAY;IACjF,OAAO,CAAC,eAAe,CAAa;IAC7B,KAAK,EAAE,cAAc,CAAiC;IACtD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,gBAAgB,EAAE,CAAM;IACpC,OAAO,EAAE;QAAE,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc,EAAE,CAAA;KAAE,CAAM;IAC3D,aAAa,0BAAiC;IAC9C,sBAAsB,sCAA6C;IACnE,aAAa,6CAAoD;gBAC5D,QAAQ,EAAE,WAAW;IAK1B,QAAQ;YAID,aAAa;IAkDpB,cAAc,CAAC,YAAY,EAAE,MAAM;IAGnC,WAAW,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM;IAM/C,iBAAiB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM;IAMrD,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAO7C,WAAW,CAAC,cAAc,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI;IAUvE,cAAc,CAAC,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO;IAe5E,eAAe,CAAC,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,GAAG,OAAO;IAelG,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC;CAG9C"}

package/lib/esm/ui/widget/FeatureInfoDataProvider.js

@@ -0,0 +1,136 @@
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+import { PropertyRecord } from "@itwin/appui-abstract";
+import { PropertyDataChangeEvent } from "@itwin/components-react";
+import { BeEvent } from "@itwin/core-bentley";
+// import { IPropertyDataProvider, PropertyCategory, PropertyData, PropertyDataChangeEvent } from ""
+/**
+ * Implementation of [IPropertyDataProvider] that uses an associative array.
+ * @public
+ */
+export var MapFeatureInfoLoadState;
+(function (MapFeatureInfoLoadState) {
+    MapFeatureInfoLoadState[MapFeatureInfoLoadState["DataLoadStart"] = 0] = "DataLoadStart";
+    MapFeatureInfoLoadState[MapFeatureInfoLoadState["DataLoadEnd"] = 1] = "DataLoadEnd";
+})(MapFeatureInfoLoadState || (MapFeatureInfoLoadState = {}));
+export class FeatureInfoDataProvider {
+    constructor(onMapHit) {
+        this.label = PropertyRecord.fromString("");
+        this.categories = [];
+        this.records = {};
+        this.onDataChanged = new PropertyDataChangeEvent();
+        this.onDataLoadStateChanged = new BeEvent();
+        this.onDataUpdated = new BeEvent();
+        // eslint-disable-next-line @typescript-eslint/unbound-method
+        this._removeListener = onMapHit.addListener(this._handleMapHit, this);
+    }
+    onUnload() {
+        this._removeListener();
+    }
+    async _handleMapHit(mapHit) {
+        var _a, _b;
+        this.records = {};
+        this.categories = [];
+        let recordCount = 0;
+        if (mapHit === null || mapHit === void 0 ? void 0 : mapHit.isMapHit) {
+            this.onDataLoadStateChanged.raiseEvent(MapFeatureInfoLoadState.DataLoadStart);
+            const mapInfo = await mapHit.viewport.getMapFeatureInfo(mapHit);
+            this.onDataLoadStateChanged.raiseEvent(MapFeatureInfoLoadState.DataLoadEnd);
+            if (mapInfo.layerInfo !== undefined) {
+                for (const curLayerInfo of mapInfo.layerInfo) {
+                    const layerCatIdx = this.findCategoryIndexByName(curLayerInfo.layerName);
+                    let nbRecords = 0;
+                    const layerCategory = (layerCatIdx === -1 ?
+                        { name: curLayerInfo.layerName, label: curLayerInfo.layerName, expand: true, childCategories: [] }
+                        : this.categories[layerCatIdx]);
+                    if (curLayerInfo.info && !(curLayerInfo.info instanceof HTMLElement)) {
+                        // This is not an HTMLElement, so iterate over each sub-layer info
+                        for (const subLayerInfo of curLayerInfo.info) {
+                            nbRecords++;
+                            const subCatIdx = (_a = layerCategory.childCategories) === null || _a === void 0 ? void 0 : _a.findIndex((testCategory) => {
+                                return testCategory.name === subLayerInfo.subLayerName;
+                            });
+                            let subLayerCategory;
+                            if (subCatIdx === -1) {
+                                subLayerCategory = { name: subLayerInfo.subLayerName, label: subLayerInfo.subLayerName, expand: true };
+                                this.addSubCategory(subLayerCategory.name);
+                                (_b = layerCategory.childCategories) === null || _b === void 0 ? void 0 : _b.push(subLayerCategory);
+                            }
+                            if (subLayerInfo.records) {
+                                for (const record of subLayerInfo.records) {
+                                    // Always use the string value for now
+                                    this.addProperty(record, subLayerInfo.subLayerName);
+                                }
+                            }
+                        }
+                    }
+                    if (layerCatIdx === -1 && nbRecords > 0)
+                        this.addCategory(layerCategory);
+                    recordCount = recordCount + nbRecords;
+                }
+            }
+        }
+        this.onDataUpdated.raiseEvent({ recordCount });
+        this.onDataChanged.raiseEvent();
+    }
+    addSubCategory(categoryName) {
+        this.records[categoryName] = [];
+    }
+    addCategory(category) {
+        const categoryIdx = this.categories.push(category) - 1;
+        this.records[this.categories[categoryIdx].name] = [];
+        return categoryIdx;
+    }
+    findCategoryIndex(category) {
+        const index = this.categories.findIndex((testCategory) => {
+            return testCategory.name === category.name;
+        });
+        return index;
+    }
+    findCategoryIndexByName(name) {
+        const index = this.categories.findIndex((testCategory) => {
+            return testCategory.name === name;
+        });
+        return index;
+    }
+    addProperty(propertyRecord, categoryName) {
+        const idx = this.records[categoryName].findIndex((prop) => prop.property.name === propertyRecord.property.name);
+        if (idx === -1) {
+            this.records[categoryName].push(propertyRecord);
+        }
+        else {
+            this.records[categoryName][idx].isMerged = true;
+            this.records[categoryName][idx].isReadonly = true;
+        }
+    }
+    removeProperty(propertyRecord, categoryIdx) {
+        const index = this.records[this.categories[categoryIdx].name].findIndex((record) => {
+            return record === propertyRecord;
+        });
+        let result = false;
+        if (index >= 0) {
+            this.records[this.categories[categoryIdx].name].splice(index, 1);
+            this.onDataChanged.raiseEvent();
+            result = true;
+        }
+        return result;
+    }
+    replaceProperty(propertyRecord, categoryIdx, newRecord) {
+        const index = this.records[this.categories[categoryIdx].name].findIndex((record) => {
+            return record === propertyRecord;
+        });
+        let result = false;
+        // istanbul ignore else
+        if (index >= 0) {
+            this.records[this.categories[categoryIdx].name].splice(index, 1, newRecord);
+            result = true;
+        }
+        return result;
+    }
+    async getData() {
+        return this;
+    }
+}
+//# sourceMappingURL=FeatureInfoDataProvider.js.map

package/lib/esm/ui/widget/FeatureInfoDataProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FeatureInfoDataProvider.js","sourceRoot":"","sources":["../../../../src/ui/widget/FeatureInfoDataProvider.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAE/F,OAAO,EAAG,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAyD,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACzH,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,oGAAoG;AAEpG;;;GAGG;AAEH,MAAM,CAAN,IAAY,uBAAoD;AAAhE,WAAY,uBAAuB;IAAE,uFAAa,CAAA;IAAE,mFAAW,CAAA;AAAA,CAAC,EAApD,uBAAuB,KAAvB,uBAAuB,QAA6B;AAQhE,MAAM,OAAO,uBAAuB;IASlC,YAAY,QAAqB;QAP1B,UAAK,GAAmB,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAEtD,eAAU,GAAuB,EAAE,CAAC;QACpC,YAAO,GAAiD,EAAE,CAAC;QAC3D,kBAAa,GAAG,IAAI,uBAAuB,EAAE,CAAC;QAC9C,2BAAsB,GAAG,IAAI,OAAO,EAA8B,CAAC;QACnE,kBAAa,GAAG,IAAI,OAAO,EAAqC,CAAC;QAEtE,6DAA6D;QAC7D,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IACxE,CAAC;IAEM,QAAQ;QACb,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,MAAiB;;QAC3C,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE;YACpB,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC;YAC9E,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAChE,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC;YAC5E,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,EAAG;gBACpC,KAAK,MAAM,YAAY,IAAI,OAAO,CAAC,SAAS,EAAE;oBAC5C,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;oBACzE,IAAI,SAAS,GAAG,CAAC,CAAC;oBAClB,MAAM,aAAa,GAAG,CACpB,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC;wBAClB,EAAC,IAAI,EAAC,YAAY,CAAC,SAAS,EAAE,KAAK,EAAC,YAAY,CAAC,SAAS,EAAE,MAAM,EAAC,IAAI,EAAE,eAAe,EAAC,EAAE,EAAC;wBAC5F,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAE,CAAC;oBAErC,IAAI,YAAY,CAAC,IAAI,IAAI,CAAC,CAAC,YAAY,CAAC,IAAI,YAAY,WAAW,CAAC,EAAE;wBACpE,kEAAkE;wBAClE,KAAK,MAAM,YAAY,IAAI,YAAY,CAAC,IAAI,EAAE;4BAC5C,SAAS,EAAE,CAAC;4BACZ,MAAM,SAAS,GAAG,MAAA,aAAa,CAAC,eAAe,0CAAE,SAAS,CAAC,CAAC,YAA8B,EAAE,EAAE;gCAC5F,OAAO,YAAY,CAAC,IAAI,KAAK,YAAY,CAAC,YAAY,CAAC;4BACzD,CAAC,CAAC,CAAC;4BACH,IAAI,gBAAgB,CAAC;4BACrB,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE;gCACpB,gBAAgB,GAAG,EAAC,IAAI,EAAC,YAAY,CAAC,YAAY,EAAE,KAAK,EAAC,YAAY,CAAC,YAAY,EAAE,MAAM,EAAC,IAAI,EAAC,CAAC;gCAClG,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;gCAC3C,MAAA,aAAa,CAAC,eAAe,0CAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;6BACvD;4BACD,IAAI,YAAY,CAAC,OAAO,EAAE;gCACxB,KAAK,MAAM,MAAM,IAAI,YAAY,CAAC,OAAO,EAAE;oCACzC,sCAAsC;oCACtC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,YAAY,CAAC,CAAC;iCAErD;6BACF;yBACF;qBACF;oBACD,IAAI,WAAW,KAAK,CAAC,CAAC,IAAI,SAAS,GAAC,CAAC;wBACnC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;oBAElC,WAAW,GAAG,WAAW,GAAG,SAAS,CAAC;iBACvC;aACF;SACF;QACD,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,EAAC,WAAW,EAAC,CAAC,CAAC;QAC7C,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;IAClC,CAAC;IAEM,cAAc,CAAC,YAAoB;QACxC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;IAClC,CAAC;IACM,WAAW,CAAC,QAA0B;QAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACvD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACrD,OAAO,WAAW,CAAC;IACrB,CAAC;IAEM,iBAAiB,CAAC,QAA0B;QACjD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,YAA8B,EAAE,EAAE;YACzE,OAAO,YAAY,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAC;QAC7C,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC;IACM,uBAAuB,CAAC,IAAY;QACzC,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,YAA8B,EAAE,EAAE;YACzE,OAAO,YAAY,CAAC,IAAI,KAAK,IAAI,CAAC;QACpC,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,WAAW,CAAC,cAA8B,EAAE,YAAoB;QACrE,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,EAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC/G,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE;YACd,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACjD;aAAM;YACL,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC;YAChD,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC;SACnD;IACH,CAAC;IAEM,cAAc,CAAC,cAA8B,EAAE,WAAmB;QACvE,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,MAAsB,EAAE,EAAE;YACjG,OAAO,MAAM,KAAK,cAAc,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,IAAI,MAAM,GAAG,KAAK,CAAC;QAEnB,IAAI,KAAK,IAAI,CAAC,EAAE;YACd,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACjE,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;YAChC,MAAM,GAAG,IAAI,CAAC;SACf;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,eAAe,CAAC,cAA8B,EAAE,WAAmB,EAAE,SAAyB;QACnG,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,MAAsB,EAAE,EAAE;YACjG,OAAO,MAAM,KAAK,cAAc,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,IAAI,MAAM,GAAG,KAAK,CAAC;QAEnB,uBAAuB;QACvB,IAAI,KAAK,IAAI,CAAC,EAAE;YACd,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;YAC5E,MAAM,GAAG,IAAI,CAAC;SACf;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,OAAO,IAAI,CAAC;IACd,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\r\nimport {  PropertyRecord } from \"@itwin/appui-abstract\";\r\nimport { IPropertyDataProvider, PropertyCategory, PropertyData, PropertyDataChangeEvent } from \"@itwin/components-react\";\r\nimport { BeEvent } from \"@itwin/core-bentley\";\r\nimport { HitDetail } from \"@itwin/core-frontend\";\r\nimport { MapHitEvent } from \"../Interfaces\";\r\n// import { IPropertyDataProvider, PropertyCategory, PropertyData, PropertyDataChangeEvent } from \"\"\r\n\r\n/**\r\n * Implementation of [IPropertyDataProvider] that uses an associative array.\r\n * @public\r\n */\r\n\r\nexport enum MapFeatureInfoLoadState {DataLoadStart, DataLoadEnd}\r\nexport declare type MapFeatureInfoLoadListener = (state: MapFeatureInfoLoadState) => void;\r\n\r\nexport interface MapFeatureInfoDataUpdate {\r\n  recordCount: number;\r\n}\r\nexport declare type MapFeatureInfoDataUpdatedListener = (data: MapFeatureInfoDataUpdate) => void;\r\n\r\nexport class FeatureInfoDataProvider implements IPropertyDataProvider, PropertyData {\r\n  private _removeListener: () => void;\r\n  public label: PropertyRecord = PropertyRecord.fromString(\"\");\r\n  public description?: string;\r\n  public categories: PropertyCategory[] = [];\r\n  public records: { [categoryName: string]: PropertyRecord[] } = {};\r\n  public onDataChanged = new PropertyDataChangeEvent();\r\n  public onDataLoadStateChanged = new BeEvent<MapFeatureInfoLoadListener>();\r\n  public onDataUpdated = new BeEvent<MapFeatureInfoDataUpdatedListener>();\r\n  constructor(onMapHit: MapHitEvent) {\r\n    // eslint-disable-next-line @typescript-eslint/unbound-method\r\n    this._removeListener = onMapHit.addListener(this._handleMapHit, this);\r\n  }\r\n\r\n  public onUnload() {\r\n    this._removeListener();\r\n  }\r\n\r\n  private async _handleMapHit(mapHit: HitDetail)  {\r\n    this.records = {};\r\n    this.categories = [];\r\n    let recordCount = 0;\r\n    if (mapHit?.isMapHit) {\r\n      this.onDataLoadStateChanged.raiseEvent(MapFeatureInfoLoadState.DataLoadStart);\r\n      const mapInfo = await mapHit.viewport.getMapFeatureInfo(mapHit);\r\n      this.onDataLoadStateChanged.raiseEvent(MapFeatureInfoLoadState.DataLoadEnd);\r\n      if (mapInfo.layerInfo !== undefined ) {\r\n        for (const curLayerInfo of mapInfo.layerInfo) {\r\n          const layerCatIdx = this.findCategoryIndexByName(curLayerInfo.layerName);\r\n          let nbRecords = 0;\r\n          const layerCategory = (\r\n            layerCatIdx === -1 ?\r\n              {name:curLayerInfo.layerName, label:curLayerInfo.layerName, expand:true, childCategories:[]}\r\n              : this.categories[layerCatIdx] );\r\n\r\n          if (curLayerInfo.info && !(curLayerInfo.info instanceof HTMLElement)) {\r\n            // This is not an HTMLElement, so iterate over each sub-layer info\r\n            for (const subLayerInfo of curLayerInfo.info) {\r\n              nbRecords++;\r\n              const subCatIdx = layerCategory.childCategories?.findIndex((testCategory: PropertyCategory) => {\r\n                return testCategory.name === subLayerInfo.subLayerName;\r\n              });\r\n              let subLayerCategory;\r\n              if (subCatIdx === -1) {\r\n                subLayerCategory = {name:subLayerInfo.subLayerName, label:subLayerInfo.subLayerName, expand:true};\r\n                this.addSubCategory(subLayerCategory.name);\r\n                layerCategory.childCategories?.push(subLayerCategory);\r\n              }\r\n              if (subLayerInfo.records) {\r\n                for (const record of subLayerInfo.records) {\r\n                  // Always use the string value for now\r\n                  this.addProperty(record, subLayerInfo.subLayerName);\r\n\r\n                }\r\n              }\r\n            }\r\n          }\r\n          if (layerCatIdx === -1 && nbRecords>0)\r\n            this.addCategory(layerCategory);\r\n\r\n          recordCount = recordCount + nbRecords;\r\n        }\r\n      }\r\n    }\r\n    this.onDataUpdated.raiseEvent({recordCount});\r\n    this.onDataChanged.raiseEvent();\r\n  }\r\n\r\n  public addSubCategory(categoryName: string) {\r\n    this.records[categoryName] = [];\r\n  }\r\n  public addCategory(category: PropertyCategory): number {\r\n    const categoryIdx = this.categories.push(category) - 1;\r\n    this.records[this.categories[categoryIdx].name] = [];\r\n    return categoryIdx;\r\n  }\r\n\r\n  public findCategoryIndex(category: PropertyCategory): number {\r\n    const index = this.categories.findIndex((testCategory: PropertyCategory) => {\r\n      return testCategory.name === category.name;\r\n    });\r\n    return index;\r\n  }\r\n  public findCategoryIndexByName(name: string): number {\r\n    const index = this.categories.findIndex((testCategory: PropertyCategory) => {\r\n      return testCategory.name === name;\r\n    });\r\n    return index;\r\n  }\r\n\r\n  public addProperty(propertyRecord: PropertyRecord, categoryName: string): void {\r\n    const idx = this.records[categoryName].findIndex((prop)=> prop.property.name === propertyRecord.property.name);\r\n    if (idx === -1) {\r\n      this.records[categoryName].push(propertyRecord);\r\n    } else {\r\n      this.records[categoryName][idx].isMerged = true;\r\n      this.records[categoryName][idx].isReadonly = true;\r\n    }\r\n  }\r\n\r\n  public removeProperty(propertyRecord: PropertyRecord, categoryIdx: number): boolean {\r\n    const index = this.records[this.categories[categoryIdx].name].findIndex((record: PropertyRecord) => {\r\n      return record === propertyRecord;\r\n    });\r\n\r\n    let result = false;\r\n\r\n    if (index >= 0) {\r\n      this.records[this.categories[categoryIdx].name].splice(index, 1);\r\n      this.onDataChanged.raiseEvent();\r\n      result = true;\r\n    }\r\n    return result;\r\n  }\r\n\r\n  public replaceProperty(propertyRecord: PropertyRecord, categoryIdx: number, newRecord: PropertyRecord): boolean {\r\n    const index = this.records[this.categories[categoryIdx].name].findIndex((record: PropertyRecord) => {\r\n      return record === propertyRecord;\r\n    });\r\n\r\n    let result = false;\r\n\r\n    // istanbul ignore else\r\n    if (index >= 0) {\r\n      this.records[this.categories[categoryIdx].name].splice(index, 1, newRecord);\r\n      result = true;\r\n    }\r\n    return result;\r\n  }\r\n\r\n  public async getData(): Promise<PropertyData> {\r\n    return this;\r\n  }\r\n}\r\n"]}

package/lib/esm/ui/widget/FeatureInfoWidget.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import { MapFeatureInfoOptions } from "../Interfaces";
+interface MapFeatureInfoWidgetProps {
+    featureInfoOpts: MapFeatureInfoOptions;
+}
+export declare function MapFeatureInfoWidget({ featureInfoOpts }: MapFeatureInfoWidgetProps): JSX.Element;
+export {};
+//# sourceMappingURL=FeatureInfoWidget.d.ts.map

package/lib/esm/ui/widget/FeatureInfoWidget.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"FeatureInfoWidget.d.ts","sourceRoot":"","sources":["../../../../src/ui/widget/FeatureInfoWidget.tsx"],"names":[],"mappings":";AAWA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAGtD,UAAU,yBAAyB;IACjC,eAAe,EAAE,qBAAqB,CAAC;CACxC;AAGD,wBAAgB,oBAAoB,CAAC,EAAE,eAAe,EAAE,EAAE,yBAAyB,eAsDlF"}

package/lib/esm/ui/widget/FeatureInfoWidget.js

@@ -0,0 +1,68 @@
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+import * as React from "react";
+import { PropertyGrid } from "@itwin/components-react";
+import { FillCentered, Orientation } from "@itwin/core-react";
+import { FeatureInfoDataProvider, MapFeatureInfoLoadState } from "./FeatureInfoDataProvider";
+import { ProgressRadial } from "@itwin/itwinui-react";
+import { MapLayersUI } from "../../mapLayers";
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export function MapFeatureInfoWidget({ featureInfoOpts }) {
+    var _a;
+    const dataProvider = React.useRef();
+    const [loadingData, setLoadingData] = React.useState(false);
+    const [hasData, setHasData] = React.useState(false);
+    const [noRecordsMessage] = React.useState(MapLayersUI.localization.getLocalizedString("mapLayers:FeatureInfoWidget.NoRecords"));
+    const handleLoadStateChange = (state) => {
+        setLoadingData(state === MapFeatureInfoLoadState.DataLoadStart);
+    };
+    const handleDataUpdated = (state) => {
+        setHasData(state.recordCount !== 0);
+    };
+    React.useEffect(() => {
+        if (featureInfoOpts === null || featureInfoOpts === void 0 ? void 0 : featureInfoOpts.onMapHit) {
+            dataProvider.current = new FeatureInfoDataProvider(featureInfoOpts.onMapHit);
+        }
+        return () => {
+            var _a;
+            (_a = dataProvider === null || dataProvider === void 0 ? void 0 : dataProvider.current) === null || _a === void 0 ? void 0 : _a.onUnload();
+        };
+    }, [featureInfoOpts === null || featureInfoOpts === void 0 ? void 0 : featureInfoOpts.onMapHit]);
+    React.useEffect(() => {
+        var _a;
+        (_a = dataProvider.current) === null || _a === void 0 ? void 0 : _a.onDataUpdated.addListener(handleDataUpdated);
+        return () => {
+            var _a;
+            (_a = dataProvider.current) === null || _a === void 0 ? void 0 : _a.onDataUpdated.removeListener(handleDataUpdated);
+        };
+    }, []);
+    React.useEffect(() => {
+        var _a;
+        if (featureInfoOpts === null || featureInfoOpts === void 0 ? void 0 : featureInfoOpts.showLoadProgressAnimation) {
+            (_a = dataProvider.current) === null || _a === void 0 ? void 0 : _a.onDataLoadStateChanged.addListener(handleLoadStateChange);
+            return () => {
+                var _a;
+                (_a = dataProvider.current) === null || _a === void 0 ? void 0 : _a.onDataLoadStateChanged.removeListener(handleLoadStateChange);
+            };
+        }
+        return;
+    }, [featureInfoOpts === null || featureInfoOpts === void 0 ? void 0 : featureInfoOpts.showLoadProgressAnimation]);
+    if (loadingData) {
+        return (React.createElement(FillCentered, null,
+            React.createElement(ProgressRadial, { indeterminate: true })));
+    }
+    else if (!hasData) {
+        return (React.createElement(FillCentered, null,
+            React.createElement("span", null,
+                React.createElement("i", null, noRecordsMessage))));
+    }
+    else {
+        if (dataProvider.current)
+            return (React.createElement(PropertyGrid, { dataProvider: dataProvider.current, orientation: Orientation.Vertical, isPropertySelectionEnabled: (_a = featureInfoOpts === null || featureInfoOpts === void 0 ? void 0 : featureInfoOpts.propertyGridOptions) === null || _a === void 0 ? void 0 : _a.isPropertySelectionEnabled }));
+        else
+            return (React.createElement(React.Fragment, null));
+    }
+}
+//# sourceMappingURL=FeatureInfoWidget.js.map

package/lib/esm/ui/widget/FeatureInfoWidget.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FeatureInfoWidget.js","sourceRoot":"","sources":["../../../../src/ui/widget/FeatureInfoWidget.tsx"],"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\nimport * as React from \"react\";\r\n\r\nimport { PropertyGrid} from \"@itwin/components-react\";\r\nimport { FillCentered, Orientation } from \"@itwin/core-react\";\r\n\r\nimport { FeatureInfoDataProvider, MapFeatureInfoDataUpdate, MapFeatureInfoLoadState } from \"./FeatureInfoDataProvider\";\r\nimport { ProgressRadial } from \"@itwin/itwinui-react\";\r\nimport { MapFeatureInfoOptions } from \"../Interfaces\";\r\nimport { MapLayersUI } from \"../../mapLayers\";\r\n\r\ninterface MapFeatureInfoWidgetProps {\r\n  featureInfoOpts: MapFeatureInfoOptions;\r\n}\r\n\r\n// eslint-disable-next-line @typescript-eslint/naming-convention\r\nexport function MapFeatureInfoWidget({ featureInfoOpts }: MapFeatureInfoWidgetProps) {\r\n\r\n  const dataProvider = React.useRef<FeatureInfoDataProvider>();\r\n  const [loadingData, setLoadingData] = React.useState<boolean>(false);\r\n  const [hasData, setHasData] = React.useState<boolean>(false);\r\n  const [noRecordsMessage] = React.useState(MapLayersUI.localization.getLocalizedString(\"mapLayers:FeatureInfoWidget.NoRecords\"));\r\n\r\n  const handleLoadStateChange = (state: MapFeatureInfoLoadState) => {\r\n    setLoadingData(state === MapFeatureInfoLoadState.DataLoadStart);\r\n  };\r\n  const handleDataUpdated = (state: MapFeatureInfoDataUpdate) => {\r\n    setHasData(state.recordCount !== 0);\r\n  };\r\n\r\n  React.useEffect(() => {\r\n    if (featureInfoOpts?.onMapHit) {\r\n      dataProvider.current = new FeatureInfoDataProvider(featureInfoOpts.onMapHit);\r\n    }\r\n    return () => {\r\n      dataProvider?.current?.onUnload();\r\n    };\r\n  }, [featureInfoOpts?.onMapHit]);\r\n\r\n  React.useEffect(() => {\r\n\r\n    dataProvider.current?.onDataUpdated.addListener(handleDataUpdated);\r\n    return () => {\r\n      dataProvider.current?.onDataUpdated.removeListener(handleDataUpdated);\r\n    };\r\n\r\n  }, []);\r\n\r\n  React.useEffect(() => {\r\n    if (featureInfoOpts?.showLoadProgressAnimation) {\r\n      dataProvider.current?.onDataLoadStateChanged.addListener(handleLoadStateChange);\r\n      return () => {\r\n        dataProvider.current?.onDataLoadStateChanged.removeListener(handleLoadStateChange);\r\n      };\r\n    }\r\n    return;\r\n\r\n  }, [featureInfoOpts?.showLoadProgressAnimation]);\r\n\r\n  if (loadingData) {\r\n    return (<FillCentered><ProgressRadial indeterminate={true}></ProgressRadial></FillCentered>);\r\n  } else if (!hasData) {\r\n    return (<FillCentered><span><i>{noRecordsMessage}</i></span></FillCentered>);\r\n  } else{\r\n    if (dataProvider.current)\r\n      return (<PropertyGrid dataProvider={dataProvider.current} orientation={Orientation.Vertical}\r\n        isPropertySelectionEnabled={featureInfoOpts?.propertyGridOptions?.isPropertySelectionEnabled} />);\r\n    else\r\n      return (<></>);\r\n  }\r\n}\r\n"]}

package/lib/esm/ui/widget/MapLayerDroppable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MapLayerDroppable.d.ts","sourceRoot":"","sources":["../../../../src/ui/widget/MapLayerDroppable.tsx"],"names":[],"mappings":";AAWA,OAAO,EAAiC,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAQrF,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAGvE,OAAO,wBAAwB,CAAC;AAEhC,gBAAgB;AAChB,UAAU,sBAAsB;IAC9B,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACrC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,oBAAoB,EAAE,MAAM,WAAW,CAAC;IACxC,cAAc,EAAE,cAAc,CAAC;IAC/B,kBAAkB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,qBAAqB,KAAK,IAAI,CAAC;IACtF,6BAA6B,EAAE,CAAC,gBAAgB,EAAE,qBAAqB,KAAK,IAAI,CAAC;IACjF,YAAY,EAAE,MAAM,IAAI,CAAC;CAC1B;AAED,gBAAgB;AAEhB,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,eAqG9D"}
+{"version":3,"file":"MapLayerDroppable.d.ts","sourceRoot":"","sources":["../../../../src/ui/widget/MapLayerDroppable.tsx"],"names":[],"mappings":";AAWA,OAAO,EAAiC,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAOrF,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAGvE,OAAO,wBAAwB,CAAC;AAIhC,gBAAgB;AAChB,UAAU,sBAAsB;IAC9B,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACrC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,oBAAoB,EAAE,MAAM,WAAW,CAAC;IACxC,cAAc,EAAE,cAAc,CAAC;IAC/B,kBAAkB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,qBAAqB,KAAK,IAAI,CAAC;IACtF,6BAA6B,EAAE,CAAC,gBAAgB,EAAE,qBAAqB,KAAK,IAAI,CAAC;IACjF,YAAY,EAAE,MAAM,IAAI,CAAC;CAC1B;AAED,gBAAgB;AAEhB,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,eAsG9D"}

package/lib/esm/ui/widget/MapLayerDroppable.js

@@ -14,37 +14,40 @@ import { ModalDialogManager } from "@itwin/appui-react";
 import { Button } from "@itwin/itwinui-react";
 import { SubLayersPopupButton } from "./SubLayersPopupButton";
 import { AttachLayerButtonType, AttachLayerPopupButton } from "./AttachLayerPopupButton";
-import { MapLayersUiItemsProvider } from "../MapLayersUiItemsProvider";
 import { MapLayerSettingsMenu } from "./MapLayerSettingsMenu";
 import { MapUrlDialog } from "./MapUrlDialog";
 import "./MapLayerManager.scss";
+import { MapLayersUI } from "../../mapLayers";
+import { ImageMapLayerSettings } from "@itwin/core-common";
 /** @internal */
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export function MapLayerDroppable(props) {
     const containsLayer = props.layersList && props.layersList.length > 0;
     const droppableId = props.isOverlay ? "overlayMapLayers" : "backgroundMapLayers";
-    const [toggleVisibility] = React.useState(MapLayersUiItemsProvider.localization.getLocalizedString("mapLayers:Widget.ToggleVisibility"));
-    const [requireAuthTooltip] = React.useState(MapLayersUiItemsProvider.localization.getLocalizedString("mapLayers:Widget.RequireAuthTooltip"));
-    const [noBackgroundMapsSpecifiedLabel] = React.useState(MapLayersUiItemsProvider.localization.getLocalizedString("mapLayers:Widget.NoBackgroundLayers"));
-    const [noUnderlaysSpecifiedLabel] = React.useState(MapLayersUiItemsProvider.localization.getLocalizedString("mapLayers:Widget.NoOverlayLayers"));
-    const [dropLayerLabel] = React.useState(MapLayersUiItemsProvider.localization.getLocalizedString("mapLayers:Widget.DropLayerLabel"));
+    const [toggleVisibility] = React.useState(MapLayersUI.localization.getLocalizedString("mapLayers:Widget.ToggleVisibility"));
+    const [requireAuthTooltip] = React.useState(MapLayersUI.localization.getLocalizedString("mapLayers:Widget.RequireAuthTooltip"));
+    const [noBackgroundMapsSpecifiedLabel] = React.useState(MapLayersUI.localization.getLocalizedString("mapLayers:Widget.NoBackgroundLayers"));
+    const [noUnderlaysSpecifiedLabel] = React.useState(MapLayersUI.localization.getLocalizedString("mapLayers:Widget.NoOverlayLayers"));
+    const [dropLayerLabel] = React.useState(MapLayersUI.localization.getLocalizedString("mapLayers:Widget.DropLayerLabel"));
     const renderItem = (dragProvided, _, rubric) => {
         var _a;
         assert(props.layersList !== undefined);
         const activeLayer = props.layersList[rubric.source.index];
-        return (React.createElement("div", Object.assign({ className: "map-manager-source-item", "data-id": rubric.source.index, key: activeLayer.name }, dragProvided.draggableProps, { ref: dragProvided.innerRef }),
+        return (React.createElement("div", { className: "map-manager-source-item", "data-id": rubric.source.index, key: activeLayer.name, ...dragProvided.draggableProps, ref: dragProvided.innerRef },
             React.createElement("button", { className: "map-manager-item-visibility", title: toggleVisibility, onClick: () => { props.onItemVisibilityToggleClicked(activeLayer); } },
                 React.createElement(Icon, { iconSpec: activeLayer.visible ? "icon-visibility" : "icon-visibility-hide-2" })),
-            React.createElement("span", Object.assign({ className: "map-manager-item-label" }, dragProvided.dragHandleProps), activeLayer.name),
+            React.createElement("span", { className: "map-manager-item-label", ...dragProvided.dragHandleProps }, activeLayer.name),
             React.createElement("div", { className: "map-manager-item-sub-layer-container" }, activeLayer.subLayers && activeLayer.subLayers.length > 1 &&
                 React.createElement(SubLayersPopupButton, { mapLayerSettings: activeLayer, activeViewport: props.activeViewport })),
             ((_a = activeLayer.provider) === null || _a === void 0 ? void 0 : _a.status) === MapLayerImageryProviderStatus.RequireAuth &&
                 React.createElement(Button, { className: "map-manager-item-requireAuth", onClick: () => {
                         var _a;
-                        const indexInDisplayStyle = (_a = props.activeViewport) === null || _a === void 0 ? void 0 : _a.displayStyle.findMapLayerIndexByNameAndUrl(activeLayer.name, activeLayer.url, activeLayer.isOverlay);
+                        const indexInDisplayStyle = (_a = props.activeViewport) === null || _a === void 0 ? void 0 : _a.displayStyle.findMapLayerIndexByNameAndSource(activeLayer.name, activeLayer.source, activeLayer.isOverlay);
                         if (indexInDisplayStyle !== undefined && indexInDisplayStyle >= 0) {
                             const layerSettings = props.activeViewport.displayStyle.mapLayerAtIndex(indexInDisplayStyle, activeLayer.isOverlay);
-                            ModalDialogManager.openDialog(React.createElement(MapUrlDialog, { activeViewport: props.activeViewport, isOverlay: props.isOverlay, layerRequiringCredentials: layerSettings === null || layerSettings === void 0 ? void 0 : layerSettings.toJSON(), onOkResult: props.onItemEdited, mapTypesOptions: props.mapTypesOptions }));
+                            if (layerSettings instanceof ImageMapLayerSettings) {
+                                ModalDialogManager.openDialog(React.createElement(MapUrlDialog, { activeViewport: props.activeViewport, isOverlay: props.isOverlay, layerRequiringCredentials: layerSettings === null || layerSettings === void 0 ? void 0 : layerSettings.toJSON(), onOkResult: props.onItemEdited, mapTypesOptions: props.mapTypesOptions }));
+                            }
                         }
                     }, title: requireAuthTooltip },
                     React.createElement(Icon, { iconSpec: "icon-status-warning" })),
@@ -71,7 +74,7 @@ export function MapLayerDroppable(props) {
         return node;
     }
     function renderDraggable(dropProvided, dropSnapshot) {
-        return (React.createElement("div", Object.assign({ className: `map-manager-attachments${dropSnapshot.isDraggingOver && containsLayer ? " is-dragging-map-over" : ""}`, ref: dropProvided.innerRef }, dropProvided.droppableProps),
+        return (React.createElement("div", { className: `map-manager-attachments${dropSnapshot.isDraggingOver && containsLayer ? " is-dragging-map-over" : ""}`, ref: dropProvided.innerRef, ...dropProvided.droppableProps },
             renderDraggableContent(dropSnapshot),
             React.createElement("div", { style: containsLayer ? undefined : { display: "none" } }, dropProvided.placeholder)));
     }

package/lib/esm/ui/widget/MapLayerDroppable.js.map

@@ -1 +1 @@
-{"version":3,"file":"MapLayerDroppable.js","sourceRoot":"","sources":["../../../../src/ui/widget/MapLayerDroppable.tsx"],"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// cSpell:ignore droppable Sublayer Basemap\r\n\r\n// the following quiet warning caused by react-beautiful-dnd package\r\n/* eslint-disable @typescript-eslint/unbound-method */\r\n\r\nimport * as React from \"react\";\r\nimport { Draggable, DraggableChildrenFn, Droppable, DroppableProvided, DroppableStateSnapshot } from \"react-beautiful-dnd\";\r\nimport { MapLayerImageryProviderStatus, ScreenViewport } from \"@itwin/core-frontend\";\r\nimport { Icon } from \"@itwin/core-react\";\r\nimport { assert } from \"@itwin/core-bentley\";\r\nimport { ModalDialogManager } from \"@itwin/appui-react\";\r\nimport { Button } from \"@itwin/itwinui-react\";\r\nimport { SubLayersPopupButton } from \"./SubLayersPopupButton\";\r\nimport { AttachLayerButtonType, AttachLayerPopupButton } from \"./AttachLayerPopupButton\";\r\nimport { MapLayersUiItemsProvider } from \"../MapLayersUiItemsProvider\";\r\nimport { MapTypesOptions, StyleMapLayerSettings } from \"../Interfaces\";\r\nimport { MapLayerSettingsMenu } from \"./MapLayerSettingsMenu\";\r\nimport { MapUrlDialog } from \"./MapUrlDialog\";\r\nimport \"./MapLayerManager.scss\";\r\n\r\n/** @internal */\r\ninterface MapLayerDroppableProps {\r\n  isOverlay: boolean;\r\n  layersList?: StyleMapLayerSettings[];\r\n  mapTypesOptions?: MapTypesOptions;\r\n  getContainerForClone: () => HTMLElement;\r\n  activeViewport: ScreenViewport;\r\n  onMenuItemSelected: (action: string, mapLayerSettings: StyleMapLayerSettings) => void;\r\n  onItemVisibilityToggleClicked: (mapLayerSettings: StyleMapLayerSettings) => void;\r\n  onItemEdited: () => void;\r\n}\r\n\r\n/** @internal */\r\n// eslint-disable-next-line @typescript-eslint/naming-convention\r\nexport function MapLayerDroppable(props: MapLayerDroppableProps) {\r\n  const containsLayer = props.layersList && props.layersList.length > 0;\r\n  const droppableId = props.isOverlay ? \"overlayMapLayers\" : \"backgroundMapLayers\";\r\n  const [toggleVisibility] = React.useState(MapLayersUiItemsProvider.localization.getLocalizedString(\"mapLayers:Widget.ToggleVisibility\"));\r\n  const [requireAuthTooltip] = React.useState(MapLayersUiItemsProvider.localization.getLocalizedString(\"mapLayers:Widget.RequireAuthTooltip\"));\r\n  const [noBackgroundMapsSpecifiedLabel] = React.useState(MapLayersUiItemsProvider.localization.getLocalizedString(\"mapLayers:Widget.NoBackgroundLayers\"));\r\n  const [noUnderlaysSpecifiedLabel] = React.useState(MapLayersUiItemsProvider.localization.getLocalizedString(\"mapLayers:Widget.NoOverlayLayers\"));\r\n  const [dropLayerLabel] = React.useState(MapLayersUiItemsProvider.localization.getLocalizedString(\"mapLayers:Widget.DropLayerLabel\"));\r\n\r\n  const renderItem: DraggableChildrenFn = (dragProvided, _, rubric) => {\r\n    assert(props.layersList !== undefined);\r\n    const activeLayer = props.layersList[rubric.source.index];\r\n\r\n    return (\r\n      <div className=\"map-manager-source-item\" data-id={rubric.source.index} key={activeLayer.name}\r\n        {...dragProvided.draggableProps}\r\n        ref={dragProvided.innerRef} >\r\n        <button className=\"map-manager-item-visibility\" title={toggleVisibility} onClick={() => { props.onItemVisibilityToggleClicked(activeLayer); }}>\r\n          <Icon iconSpec={activeLayer.visible ? \"icon-visibility\" : \"icon-visibility-hide-2\"} /></button>\r\n        <span className=\"map-manager-item-label\" {...dragProvided.dragHandleProps}>{activeLayer.name}</span>\r\n        <div className=\"map-manager-item-sub-layer-container\">\r\n          {activeLayer.subLayers && activeLayer.subLayers.length > 1 &&\r\n            <SubLayersPopupButton mapLayerSettings={activeLayer} activeViewport={props.activeViewport} />\r\n          }\r\n        </div>\r\n        {activeLayer.provider?.status === MapLayerImageryProviderStatus.RequireAuth &&\r\n          <Button\r\n            className=\"map-manager-item-requireAuth\"\r\n            onClick={() => {\r\n              const indexInDisplayStyle = props.activeViewport?.displayStyle.findMapLayerIndexByNameAndUrl(activeLayer.name, activeLayer.url, activeLayer.isOverlay);\r\n              if (indexInDisplayStyle !== undefined && indexInDisplayStyle >= 0) {\r\n                const layerSettings = props.activeViewport.displayStyle.mapLayerAtIndex(indexInDisplayStyle, activeLayer.isOverlay);\r\n\r\n                ModalDialogManager.openDialog(<MapUrlDialog activeViewport={props.activeViewport}\r\n                  isOverlay={props.isOverlay}\r\n                  layerRequiringCredentials={layerSettings?.toJSON()}\r\n                  onOkResult={props.onItemEdited}\r\n                  mapTypesOptions={props.mapTypesOptions}></MapUrlDialog>);\r\n              }\r\n\r\n            }}\r\n            title={requireAuthTooltip}\r\n          >\r\n            <Icon iconSpec=\"icon-status-warning\" />\r\n          </Button>\r\n        }\r\n        <MapLayerSettingsMenu activeViewport={props.activeViewport} mapLayerSettings={activeLayer} onMenuItemSelection={props.onMenuItemSelected} />\r\n      </div>\r\n    );\r\n  };\r\n\r\n  function renderDraggableContent(snapshot: DroppableStateSnapshot): React.ReactNode {\r\n    let node: React.ReactNode;\r\n    if (containsLayer) {\r\n      // Render a <Draggable>\r\n      node = (props.layersList?.map((mapLayerSettings, i) =>\r\n        <Draggable key={mapLayerSettings.name} draggableId={mapLayerSettings.name} index={i}>\r\n          {renderItem}\r\n        </Draggable>));\r\n    } else {\r\n      // Render a label that provide a 'Drop here' hint\r\n      const label = props.isOverlay ? noUnderlaysSpecifiedLabel : noBackgroundMapsSpecifiedLabel;\r\n      node =\r\n        <div title={label} className=\"map-manager-no-layers-container\">\r\n          {snapshot.isDraggingOver ?\r\n            <span className=\"map-manager-no-layers-label\">{dropLayerLabel}</span>\r\n            :\r\n            <>\r\n              <span className=\"map-manager-no-layers-label\">{label}</span>\r\n              <AttachLayerPopupButton buttonType={AttachLayerButtonType.Blue} isOverlay={props.isOverlay} />\r\n            </>\r\n          }\r\n        </div>;\r\n    }\r\n    return node;\r\n  }\r\n\r\n  function renderDraggable(dropProvided: DroppableProvided, dropSnapshot: DroppableStateSnapshot): React.ReactElement<HTMLElement> {\r\n    return (\r\n      <div className={`map-manager-attachments${dropSnapshot.isDraggingOver && containsLayer ? \" is-dragging-map-over\" : \"\"}`} ref={dropProvided.innerRef} {...dropProvided.droppableProps} >\r\n\r\n        {renderDraggableContent(dropSnapshot)}\r\n\r\n        {\r\n          /* We don't want a placeholder when displaying the 'Drop here' message\r\n              Unfortunately, if don't add it, 'react-beautiful-dnd' show an error message in the console.\r\n              So I simply make it hidden. See https://github.com/atlassian/react-beautiful-dnd/issues/518 */\r\n        }\r\n        <div style={containsLayer ? undefined : { display: \"none\" }}>{dropProvided.placeholder}</div>\r\n      </div>);\r\n  }\r\n\r\n  return (\r\n    <Droppable\r\n      droppableId={droppableId}\r\n      renderClone={renderItem}\r\n      getContainerForClone={props.getContainerForClone as any}\r\n    >\r\n      {renderDraggable}\r\n    </Droppable>\r\n  );\r\n}\r\n"]}
+{"version":3,"file":"MapLayerDroppable.js","sourceRoot":"","sources":["../../../../src/ui/widget/MapLayerDroppable.tsx"],"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// cSpell:ignore droppable Sublayer Basemap\r\n\r\n// the following quiet warning caused by react-beautiful-dnd package\r\n/* eslint-disable @typescript-eslint/unbound-method */\r\n\r\nimport * as React from \"react\";\r\nimport { Draggable, DraggableChildrenFn, Droppable, DroppableProvided, DroppableStateSnapshot } from \"react-beautiful-dnd\";\r\nimport { MapLayerImageryProviderStatus, ScreenViewport } from \"@itwin/core-frontend\";\r\nimport { Icon } from \"@itwin/core-react\";\r\nimport { assert } from \"@itwin/core-bentley\";\r\nimport { ModalDialogManager } from \"@itwin/appui-react\";\r\nimport { Button } from \"@itwin/itwinui-react\";\r\nimport { SubLayersPopupButton } from \"./SubLayersPopupButton\";\r\nimport { AttachLayerButtonType, AttachLayerPopupButton } from \"./AttachLayerPopupButton\";\r\nimport { MapTypesOptions, StyleMapLayerSettings } from \"../Interfaces\";\r\nimport { MapLayerSettingsMenu } from \"./MapLayerSettingsMenu\";\r\nimport { MapUrlDialog } from \"./MapUrlDialog\";\r\nimport \"./MapLayerManager.scss\";\r\nimport { MapLayersUI } from \"../../mapLayers\";\r\nimport { ImageMapLayerSettings } from \"@itwin/core-common\";\r\n\r\n/** @internal */\r\ninterface MapLayerDroppableProps {\r\n  isOverlay: boolean;\r\n  layersList?: StyleMapLayerSettings[];\r\n  mapTypesOptions?: MapTypesOptions;\r\n  getContainerForClone: () => HTMLElement;\r\n  activeViewport: ScreenViewport;\r\n  onMenuItemSelected: (action: string, mapLayerSettings: StyleMapLayerSettings) => void;\r\n  onItemVisibilityToggleClicked: (mapLayerSettings: StyleMapLayerSettings) => void;\r\n  onItemEdited: () => void;\r\n}\r\n\r\n/** @internal */\r\n// eslint-disable-next-line @typescript-eslint/naming-convention\r\nexport function MapLayerDroppable(props: MapLayerDroppableProps) {\r\n  const containsLayer = props.layersList && props.layersList.length > 0;\r\n  const droppableId = props.isOverlay ? \"overlayMapLayers\" : \"backgroundMapLayers\";\r\n  const [toggleVisibility] = React.useState(MapLayersUI.localization.getLocalizedString(\"mapLayers:Widget.ToggleVisibility\"));\r\n  const [requireAuthTooltip] = React.useState(MapLayersUI.localization.getLocalizedString(\"mapLayers:Widget.RequireAuthTooltip\"));\r\n  const [noBackgroundMapsSpecifiedLabel] = React.useState(MapLayersUI.localization.getLocalizedString(\"mapLayers:Widget.NoBackgroundLayers\"));\r\n  const [noUnderlaysSpecifiedLabel] = React.useState(MapLayersUI.localization.getLocalizedString(\"mapLayers:Widget.NoOverlayLayers\"));\r\n  const [dropLayerLabel] = React.useState(MapLayersUI.localization.getLocalizedString(\"mapLayers:Widget.DropLayerLabel\"));\r\n\r\n  const renderItem: DraggableChildrenFn = (dragProvided, _, rubric) => {\r\n    assert(props.layersList !== undefined);\r\n    const activeLayer = props.layersList[rubric.source.index];\r\n\r\n    return (\r\n      <div className=\"map-manager-source-item\" data-id={rubric.source.index} key={activeLayer.name}\r\n        {...dragProvided.draggableProps}\r\n        ref={dragProvided.innerRef} >\r\n        <button className=\"map-manager-item-visibility\" title={toggleVisibility} onClick={() => { props.onItemVisibilityToggleClicked(activeLayer); }}>\r\n          <Icon iconSpec={activeLayer.visible ? \"icon-visibility\" : \"icon-visibility-hide-2\"} /></button>\r\n        <span className=\"map-manager-item-label\" {...dragProvided.dragHandleProps}>{activeLayer.name}</span>\r\n        <div className=\"map-manager-item-sub-layer-container\">\r\n          {activeLayer.subLayers && activeLayer.subLayers.length > 1 &&\r\n            <SubLayersPopupButton mapLayerSettings={activeLayer} activeViewport={props.activeViewport} />\r\n          }\r\n        </div>\r\n        {activeLayer.provider?.status === MapLayerImageryProviderStatus.RequireAuth &&\r\n          <Button\r\n            className=\"map-manager-item-requireAuth\"\r\n            onClick={() => {\r\n              const indexInDisplayStyle = props.activeViewport?.displayStyle.findMapLayerIndexByNameAndSource(activeLayer.name, activeLayer.source, activeLayer.isOverlay);\r\n              if (indexInDisplayStyle !== undefined && indexInDisplayStyle >= 0) {\r\n                const layerSettings = props.activeViewport.displayStyle.mapLayerAtIndex(indexInDisplayStyle, activeLayer.isOverlay);\r\n                if (layerSettings instanceof ImageMapLayerSettings) {\r\n                  ModalDialogManager.openDialog(<MapUrlDialog activeViewport={props.activeViewport}\r\n                    isOverlay={props.isOverlay}\r\n                    layerRequiringCredentials={layerSettings?.toJSON()}\r\n                    onOkResult={props.onItemEdited}\r\n                    mapTypesOptions={props.mapTypesOptions}></MapUrlDialog>);\r\n                }\r\n              }\r\n\r\n            }}\r\n            title={requireAuthTooltip}\r\n          >\r\n            <Icon iconSpec=\"icon-status-warning\" />\r\n          </Button>\r\n        }\r\n        <MapLayerSettingsMenu activeViewport={props.activeViewport} mapLayerSettings={activeLayer} onMenuItemSelection={props.onMenuItemSelected} />\r\n      </div>\r\n    );\r\n  };\r\n\r\n  function renderDraggableContent(snapshot: DroppableStateSnapshot): React.ReactNode {\r\n    let node: React.ReactNode;\r\n    if (containsLayer) {\r\n      // Render a <Draggable>\r\n      node = (props.layersList?.map((mapLayerSettings, i) =>\r\n        <Draggable key={mapLayerSettings.name} draggableId={mapLayerSettings.name} index={i}>\r\n          {renderItem}\r\n        </Draggable>));\r\n    } else {\r\n      // Render a label that provide a 'Drop here' hint\r\n      const label = props.isOverlay ? noUnderlaysSpecifiedLabel : noBackgroundMapsSpecifiedLabel;\r\n      node =\r\n        <div title={label} className=\"map-manager-no-layers-container\">\r\n          {snapshot.isDraggingOver ?\r\n            <span className=\"map-manager-no-layers-label\">{dropLayerLabel}</span>\r\n            :\r\n            <>\r\n              <span className=\"map-manager-no-layers-label\">{label}</span>\r\n              <AttachLayerPopupButton buttonType={AttachLayerButtonType.Blue} isOverlay={props.isOverlay} />\r\n            </>\r\n          }\r\n        </div>;\r\n    }\r\n    return node;\r\n  }\r\n\r\n  function renderDraggable(dropProvided: DroppableProvided, dropSnapshot: DroppableStateSnapshot): React.ReactElement<HTMLElement> {\r\n    return (\r\n      <div className={`map-manager-attachments${dropSnapshot.isDraggingOver && containsLayer ? \" is-dragging-map-over\" : \"\"}`} ref={dropProvided.innerRef} {...dropProvided.droppableProps} >\r\n\r\n        {renderDraggableContent(dropSnapshot)}\r\n\r\n        {\r\n          /* We don't want a placeholder when displaying the 'Drop here' message\r\n              Unfortunately, if don't add it, 'react-beautiful-dnd' show an error message in the console.\r\n              So I simply make it hidden. See https://github.com/atlassian/react-beautiful-dnd/issues/518 */\r\n        }\r\n        <div style={containsLayer ? undefined : { display: \"none\" }}>{dropProvided.placeholder}</div>\r\n      </div>);\r\n  }\r\n\r\n  return (\r\n    <Droppable\r\n      droppableId={droppableId}\r\n      renderClone={renderItem}\r\n      getContainerForClone={props.getContainerForClone as any}\r\n    >\r\n      {renderDraggable}\r\n    </Droppable>\r\n  );\r\n}\r\n"]}

package/lib/esm/ui/widget/MapLayerManager.d.ts

@@ -1,7 +1,7 @@
-import "./MapLayerManager.scss";
-import * as React from "react";
 import { MapLayerSource, ScreenViewport } from "@itwin/core-frontend";
+import * as React from "react";
 import { MapLayerOptions, MapTypesOptions, StyleMapLayerSettings } from "../Interfaces";
+import "./MapLayerManager.scss";
 /** @internal */
 export interface SourceMapContextProps {
     readonly sources: MapLayerSource[];

package/lib/esm/ui/widget/MapLayerManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MapLayerManager.d.ts","sourceRoot":"","sources":["../../../../src/ui/widget/MapLayerManager.tsx"],"names":[],"mappings":"AASA,OAAO,wBAAwB,CAAC;AAChC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EACmD,cAAc,EACtE,cAAc,EACf,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAOxF,gBAAgB;AAChB,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC;IACnC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,CAAC;IACjC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,IAAI,CAAC;IACtC,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC;IACzC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACpD,QAAQ,CAAC,aAAa,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACjD,QAAQ,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;CAC5C;AAED,gBAAgB;AAChB,eAAO,MAAM,gBAAgB,sCAK3B,CAAC;AAEH,gBAAgB;AAChB,wBAAgB,mBAAmB,IAAI,qBAAqB,CAE3D;AAmCD,UAAU,oBAAoB;IAC5B,oBAAoB,EAAE,MAAM,WAAW,CAAC;IACxC,cAAc,EAAE,cAAc,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAGD,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,eAyX1D"}
+{"version":3,"file":"MapLayerManager.d.ts","sourceRoot":"","sources":["../../../../src/ui/widget/MapLayerManager.tsx"],"names":[],"mappings":"AAWA,OAAO,EACmD,cAAc,EACtE,cAAc,EACf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAIxF,OAAO,wBAAwB,CAAC;AAIhC,gBAAgB;AAChB,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC;IACnC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,CAAC;IACjC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,IAAI,CAAC;IACtC,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC;IACzC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACpD,QAAQ,CAAC,aAAa,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACjD,QAAQ,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;CAC5C;AAED,gBAAgB;AAChB,eAAO,MAAM,gBAAgB,sCAK3B,CAAC;AAEH,gBAAgB;AAChB,wBAAgB,mBAAmB,IAAI,qBAAqB,CAE3D;AAoCD,UAAU,oBAAoB;IAC5B,oBAAoB,EAAE,MAAM,WAAW,CAAC;IACxC,cAAc,EAAE,cAAc,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAGD,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,eA0X1D"}

package/lib/esm/ui/widget/MapLayerManager.js

@@ -5,18 +5,19 @@
 // cSpell:ignore droppable Sublayer Basemap
 // the following quiet warning caused by react-beautiful-dnd package
 /* eslint-disable @typescript-eslint/unbound-method */
-import "./MapLayerManager.scss";
-import * as React from "react";
-import { DragDropContext } from "react-beautiful-dnd";
 import { assert, BentleyError } from "@itwin/core-bentley";
+import { ImageMapLayerSettings } from "@itwin/core-common";
 import { ImageryMapTileTree, IModelApp, MapLayerSources, NotifyMessageDetails, OutputMessagePriority, } from "@itwin/core-frontend";
 import { ToggleSwitch } from "@itwin/itwinui-react";
+import * as React from "react";
+import { DragDropContext } from "react-beautiful-dnd";
 import { MapLayerPreferences, MapLayerSourceChangeType } from "../../MapLayerPreferences";
-import { MapLayersUiItemsProvider } from "../MapLayersUiItemsProvider";
 import { AttachLayerPopupButton } from "./AttachLayerPopupButton";
 import { BasemapPanel } from "./BasemapPanel";
 import { MapLayerDroppable } from "./MapLayerDroppable";
+import "./MapLayerManager.scss";
 import { MapLayerSettingsPopupButton } from "./MapLayerSettingsPopupButton";
+import { MapLayersUI } from "../../mapLayers";
 /** @internal */
 export const SourceMapContext = React.createContext({
     sources: [],
@@ -41,13 +42,14 @@ function getMapLayerSettingsFromViewport(viewport, getBackgroundMap, populateSub
         const layerSettings = displayStyleLayers[layerIdx];
         const isOverlay = !getBackgroundMap;
         const layerProvider = viewport.getMapLayerImageryProvider(layerIdx, isOverlay);
+        const popSubLayers = populateSubLayers && (layerSettings instanceof ImageMapLayerSettings);
         layers.push({
             visible: layerSettings.visible,
             name: layerSettings.name,
-            url: layerSettings.url,
+            source: layerSettings.source,
             transparency: layerSettings.transparency,
             transparentBackground: layerSettings.transparentBackground,
-            subLayers: populateSubLayers ? getSubLayerProps(layerSettings.subLayers) : undefined,
+            subLayers: popSubLayers ? getSubLayerProps(layerSettings.subLayers) : undefined,
             showSubLayers: false,
             isOverlay,
             provider: layerProvider,
@@ -62,8 +64,8 @@ export function MapLayerManager(props) {
     const [mapSources, setMapSources] = React.useState();
     const [loadingSources, setLoadingSources] = React.useState(false);
     const [baseSources, setBaseSources] = React.useState();
-    const [overlaysLabel] = React.useState(MapLayersUiItemsProvider.localization.getLocalizedString("mapLayers:Widget.OverlayLayers"));
-    const [underlaysLabel] = React.useState(MapLayersUiItemsProvider.localization.getLocalizedString("mapLayers:Widget.BackgroundLayers"));
+    const [overlaysLabel] = React.useState(MapLayersUI.localization.getLocalizedString("mapLayers:Widget.OverlayLayers"));
+    const [underlaysLabel] = React.useState(MapLayersUI.localization.getLocalizedString("mapLayers:Widget.BackgroundLayers"));
     const { activeViewport, mapLayerOptions } = props;
     const hideExternalMapLayersSection = (mapLayerOptions === null || mapLayerOptions === void 0 ? void 0 : mapLayerOptions.hideExternalMapLayers) ? mapLayerOptions.hideExternalMapLayers : false;
     const fetchPublicMapLayerSources = (mapLayerOptions === null || mapLayerOptions === void 0 ? void 0 : mapLayerOptions.fetchPublicMapLayerSources) ? mapLayerOptions.fetchPublicMapLayerSources : false;
@@ -135,15 +137,15 @@ export function MapLayerManager(props) {
             const bases = [];
             const sourceLayers = await MapLayerSources.create(undefined, (fetchPublicMapLayerSources && !hideExternalMapLayersSection));
             const iModel = IModelApp.viewManager.selectedView ? IModelApp.viewManager.selectedView.iModel : undefined;
-            if (iModel && iModel.iTwinId && iModel.iModelId) {
-                try {
-                    const preferenceSources = await MapLayerPreferences.getSources(iModel.iTwinId, iModel.iModelId);
-                    for (const source of preferenceSources)
-                        await MapLayerSources.addSourceToMapLayerSources(source);
-                }
-                catch (err) {
-                    IModelApp.notifications.outputMessage(new NotifyMessageDetails(OutputMessagePriority.Error, IModelApp.localization.getLocalizedString("mapLayers:CustomAttach.ErrorLoadingLayers"), BentleyError.getErrorMessage(err)));
-                }
+            try {
+                const preferenceSources = ((iModel === null || iModel === void 0 ? void 0 : iModel.iTwinId) === undefined
+                    ? []
+                    : await MapLayerPreferences.getSources(iModel === null || iModel === void 0 ? void 0 : iModel.iTwinId, iModel === null || iModel === void 0 ? void 0 : iModel.iModelId));
+                for (const source of preferenceSources)
+                    await MapLayerSources.addSourceToMapLayerSources(source);
+            }
+            catch (err) {
+                IModelApp.notifications.outputMessage(new NotifyMessageDetails(OutputMessagePriority.Error, IModelApp.localization.getLocalizedString("mapLayers:CustomAttach.ErrorLoadingLayers"), BentleyError.getErrorMessage(err)));
             }
             if (!isMounted.current) {
                 return;
@@ -220,7 +222,7 @@ export function MapLayerManager(props) {
     const handleOnMenuItemSelection = React.useCallback((action, mapLayerSettings) => {
         if (!activeViewport || !activeViewport.displayStyle)
             return;
-        const indexInDisplayStyle = activeViewport.displayStyle.findMapLayerIndexByNameAndUrl(mapLayerSettings.name, mapLayerSettings.url, mapLayerSettings.isOverlay);
+        const indexInDisplayStyle = activeViewport.displayStyle.findMapLayerIndexByNameAndSource(mapLayerSettings.name, mapLayerSettings.source, mapLayerSettings.isOverlay);
         if (indexInDisplayStyle < 0)
             return;
         switch (action) {
@@ -230,7 +232,7 @@ export function MapLayerManager(props) {
             case "zoom-to-layer":
                 activeViewport.displayStyle.viewMapLayerRange(indexInDisplayStyle, mapLayerSettings.isOverlay, activeViewport).then((status) => {
                     if (!status) {
-                        const msg = MapLayersUiItemsProvider.localization.getLocalizedString("mapLayers:Messages.NoRangeDefined");
+                        const msg = MapLayersUI.localization.getLocalizedString("mapLayers:Messages.NoRangeDefined");
                         IModelApp.notifications.outputMessage(new NotifyMessageDetails(OutputMessagePriority.Error, `${msg} [${mapLayerSettings.name}]`));
                     }
                 }).catch((_error) => { });
@@ -244,7 +246,7 @@ export function MapLayerManager(props) {
         if (activeViewport) {
             const isVisible = !mapLayerSettings.visible;
             const displayStyle = activeViewport.displayStyle;
-            const indexInDisplayStyle = displayStyle.findMapLayerIndexByNameAndUrl(mapLayerSettings.name, mapLayerSettings.url, mapLayerSettings.isOverlay);
+            const indexInDisplayStyle = displayStyle.findMapLayerIndexByNameAndSource(mapLayerSettings.name, mapLayerSettings.source, mapLayerSettings.isOverlay);
             if (-1 !== indexInDisplayStyle) {
                 // update the display style
                 displayStyle.changeMapLayerProps({ visible: isVisible }, indexInDisplayStyle, mapLayerSettings.isOverlay);
@@ -286,9 +288,9 @@ export function MapLayerManager(props) {
             else if (destination.droppableId === "backgroundMapLayers" && backgroundMapLayers)
                 toMapLayer = backgroundMapLayers[destination.index];
             if (toMapLayer)
-                toIndexInDisplayStyle = displayStyle.findMapLayerIndexByNameAndUrl(toMapLayer.name, toMapLayer.url, toMapLayer.isOverlay);
+                toIndexInDisplayStyle = displayStyle.findMapLayerIndexByNameAndSource(toMapLayer.name, toMapLayer.source, toMapLayer.isOverlay);
         }
-        const fromIndexInDisplayStyle = displayStyle.findMapLayerIndexByNameAndUrl(fromMapLayer.name, fromMapLayer.url, fromMapLayer.isOverlay);
+        const fromIndexInDisplayStyle = displayStyle.findMapLayerIndexByNameAndSource(fromMapLayer.name, fromMapLayer.source, fromMapLayer.isOverlay);
         if (fromIndexInDisplayStyle < 0)
             return;
         if (destination.droppableId !== source.droppableId) {
@@ -326,7 +328,7 @@ export function MapLayerManager(props) {
         if (activeViewport)
             loadMapLayerSettingsFromViewport(activeViewport);
     }, [activeViewport, loadMapLayerSettingsFromViewport]);
-    const [baseMapPanelLabel] = React.useState(MapLayersUiItemsProvider.localization.getLocalizedString("mapLayers:Basemap.BaseMapPanelTitle"));
+    const [baseMapPanelLabel] = React.useState(MapLayersUI.localization.getLocalizedString("mapLayers:Basemap.BaseMapPanelTitle"));
     return (React.createElement(SourceMapContext.Provider, { value: {
             activeViewport,
             loadingSources,