@vitrosoftware/common-ui-ts 1.1.186 → 1.1.188

package/src/controls/BimViewer/js/bim-viewer.js

@@ -1,11 +1,11 @@
-import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.186';
+import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.188';
 
 import {
     Viewer, XKTLoaderPlugin, NavCubePlugin, SectionPlanesPlugin, math, BCFViewpointsPlugin, AnnotationsPlugin,
     ContextMenu, TreeViewPlugin, StoreyViewsPlugin, AngleMeasurementsPlugin, CameraMemento, DistanceMeasurementsPlugin,
     GLTFLoaderPlugin, utils, FastNavPlugin, MetaObject, parsers
 }
-    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.186';
+    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.188';
 
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -540,7 +540,9 @@ class VitroTreeViewPlugin extends TreeViewPlugin
                         propertySetIds,
                         external: metaObjectData.external,
                     });
-					metaObject.childCount = metaObjectData.childCount,
+                    metaObject.childCount = metaObjectData.childCount;
+                    metaObject.modelId = metaModel.id;
+
                     metaModel.metaScene.metaObjects[id] = metaObject;
                 }
                 //metaObject.metaModels.push(metaModel); 
@@ -577,20 +579,21 @@ class VitroTreeViewPlugin extends TreeViewPlugin
         const nodeId = parentElement.id;
         const switchNode = this._nodeNodes[nodeId];
         const childNodes = switchNode.children;
+        const object = this._viewer.metaScene.metaObjects[switchNode.objectId];
 		if(childNodes.length > 0){
 			this.createChildElement(parentElement, childNodes, switchElement)
 		}
-		else{
-			this.loadChildNodes(switchNode.objectId, parentElement, switchElement);
+        else {
+            this.loadChildNodes(object.modelId, switchNode.objectId, parentElement, switchElement);
 		}
     }
 	
-	loadChildNodes(objectId, parentElement, switchElement){
+	loadChildNodes(modelId, objectId, parentElement, switchElement){
 		viewer.scene.canvas.spinner.processes++;
 
         const callback = (metaObjects) =>
         {
-			const metaModel = viewer.metaScene.metaModels[window.model.id];
+            const metaModel = viewer.metaScene.metaModels[modelId];
 			const metaObjectList = this.addObjectsToMetaModel(metaObjects, metaModel);
 			const nodeId =`${this._id}-${objectId}`;
 			const parentNode = this._nodeNodes[nodeId];
@@ -666,6 +669,11 @@ class VitroTreeViewPlugin extends TreeViewPlugin
         this._onCanvasBoundary = viewer.scene.canvas.on("boundary", culledSmallModelList);
         this._onCameraMatrix = viewer.scene.camera.on("matrix", culledSmallModelList);
 
+        this._onSceneTick = viewer.scene.on("reloadSmallScenes", () =>
+        {
+            culledSmallModelList();
+        });
+
         this._onSceneTick = viewer.scene.on("tick", (tickEvent) => {
             if (!fastMode) {
                 return;
@@ -770,8 +778,6 @@ class VitroTreeViewPlugin extends TreeViewPlugin
 
             culledSmallModelList();
         });
-
-
     }
 
     culledModels() {
@@ -786,8 +792,6 @@ class VitroTreeViewPlugin extends TreeViewPlugin
         this.isDeleteModelList = true;
     }
 
-
-
     deleteModels() {
         this.smallModelList.forEach(model => {
             model.destroy();
@@ -804,13 +808,14 @@ class VitroTreeViewPlugin extends TreeViewPlugin
         }
 
         var sceneModel = this.load({
-            id: Date.now() + '_' + this.version + '_' + numPart,
+            id: Date.now() + '_' + this.vitroModel.FileItemId + this.vitroModel.FileVersion + '_' + numPart,
             xkt: data,
             edges: true,
             backfaces: true,
             position: this.position,
         });
 
+        sceneModel.largeModel = this.largeModel;
         this.smallModelList.push(sceneModel);
 
         sceneModel.on('loaded', () => {
@@ -833,7 +838,6 @@ class VitroTreeViewPlugin extends TreeViewPlugin
         });
     }
 
-
     loadData() {
         this.controller = new AbortController();
         if (this.startSmallLoad) {
@@ -856,13 +860,193 @@ class VitroTreeViewPlugin extends TreeViewPlugin
                 sceneOptions.sectionPlanes.push(sectionPlane);
             });
 
-            BIMCommon.GetSmallModel(this.viewer.scene, this.version, sceneOptions, this.controller.signal, this.loadSmallPart.bind(this));
+            BIMCommon.GetSmallModel(this.viewer.scene, BIMCommon.ModelList, sceneOptions, this.controller.signal, this.loadSmallPart.bind(this));
         }
     }
 }
 
 /*! jquery-dialogextend 2.0.3 2014-07-08 */
-(function(){var i;i=jQuery,i.widget("ui.dialogExtend",{version:"2.0.0",modes:{},options:{closable:!0,dblclick:!1,titlebar:!1,icons:{close:"ui-icon-closethick",restore:"ui-icon-newwin"},load:null,beforeRestore:null,restore:null},_create:function(){return this._state="normal",i(this.element[0]).data("ui-dialog")||i.error("jQuery.dialogExtend Error : Only jQuery UI Dialog element is accepted"),this._verifyOptions(),this._initStyles(),this._initButtons(),this._initTitleBar(),this._setState("normal"),this._on("load",function(i){return console.log("test",i)}),this._trigger("load")},_setState:function(t){return i(this.element[0]).removeClass("ui-dialog-"+this._state).addClass("ui-dialog-"+t),this._state=t},_verifyOptions:function(){var t,e,o;!this.options.dblclick||this.options.dblclick in this.modes||(i.error("jQuery.dialogExtend Error : Invalid <dblclick> value '"+this.options.dblclick+"'"),this.options.dblclick=!1),this.options.titlebar&&"none"!==(e=this.options.titlebar)&&"transparent"!==e&&(i.error("jQuery.dialogExtend Error : Invalid <titlebar> value '"+this.options.titlebar+"'"),this.options.titlebar=!1),o=[];for(t in this.modes)this["_verifyOptions_"+t]?o.push(this["_verifyOptions_"+t]()):o.push(void 0);return o},_initStyles:function(){var t,e,o;i(".dialog-extend-css").length||(e="",e+='<style class="dialog-extend-css" type="text/css">',e+=".ui-dialog .ui-dialog-titlebar-buttonpane>a { float: right; }",e+=".ui-dialog .ui-dialog-titlebar-restore { width: 19px; height: 18px; }",e+=".ui-dialog .ui-dialog-titlebar-restore span { display: block; margin: 1px; }",e+=".ui-dialog .ui-dialog-titlebar-restore:hover,",e+=".ui-dialog .ui-dialog-titlebar-restore:focus { padding: 0; }",e+=".ui-dialog .ui-dialog-titlebar ::selection { background-color: transparent; }",e+="</style>",i(e).appendTo("body")),o=[];for(t in this.modes)o.push(this["_initStyles_"+t]());return o},_initButtons:function(){var t,e,o,n,a,l=this;n=i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar"),t=i('<div class="ui-dialog-titlebar-buttonpane"></div>').appendTo(n),t.css({position:"absolute",top:"50%",right:"0.3em","margin-top":"-10px",height:"18px"}),n.find(".ui-dialog-titlebar-close").css({position:"relative","float":"right",top:"auto",right:"auto",margin:0}).find(".ui-icon").removeClass("ui-icon-closethick").addClass(this.options.icons.close).end().appendTo(t).end(),t.append('<a class="ui-dialog-titlebar-restore ui-corner-all ui-state-default" href="#"><span class="ui-icon '+this.options.icons.restore+'" title="restore">restore</span></a>').find(".ui-dialog-titlebar-restore").attr("role","button").mouseover(function(){return i(this).addClass("ui-state-hover")}).mouseout(function(){return i(this).removeClass("ui-state-hover")}).focus(function(){return i(this).addClass("ui-state-focus")}).blur(function(){return i(this).removeClass("ui-state-focus")}).end().find(".ui-dialog-titlebar-close").toggle(this.options.closable).end().find(".ui-dialog-titlebar-restore").hide().click(function(i){return i.preventDefault(),l.restore()}).end(),a=this.modes;for(o in a)e=a[o],this._initModuleButton(o,e);return n.dblclick(function(){return l.options.dblclick?"normal"!==l._state?l.restore():l[l.options.dblclick]():void 0}).select(function(){return!1})},_initModuleButton:function(t,e){var o,n=this;return o=i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar-buttonpane"),o.append('<a class="ui-dialog-titlebar-'+t+' ui-corner-all ui-state-default" href="#" title="'+t+'"><span class="ui-icon '+this.options.icons[t]+'">'+t+"</span></a>").find(".ui-dialog-titlebar-"+t).attr("role","button").mouseover(function(){return i(this).addClass("ui-state-hover")}).mouseout(function(){return i(this).removeClass("ui-state-hover")}).focus(function(){return i(this).addClass("ui-state-focus")}).blur(function(){return i(this).removeClass("ui-state-focus")}).end().find(".ui-dialog-titlebar-"+t).toggle(this.options[e.option]).click(function(i){return i.preventDefault(),n[t]()}).end()},_initTitleBar:function(){var t;switch(this.options.titlebar){case!1:return 0;case"none":return i(this.element[0]).dialog("option","draggable")&&(t=i("<div />").addClass("ui-dialog-draggable-handle").css("cursor","move").height(5),i(this.element[0]).dialog("widget").prepend(t).draggable("option","handle",t)),i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar").find(".ui-dialog-title").html("&nbsp;").end().css({"background-color":"transparent","background-image":"none",border:0,position:"absolute",right:0,top:0,"z-index":9999}).end();case"transparent":return i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar").css({"background-color":"transparent","background-image":"none",border:0});default:return i.error("jQuery.dialogExtend Error : Invalid <titlebar> value '"+this.options.titlebar+"'")}},state:function(){return this._state},restore:function(){return this._trigger("beforeRestore"),this._restore(),this._toggleButtons(),this._trigger("restore")},_restore:function(){return"normal"!==this._state?(this["_restore_"+this._state](),this._setState("normal"),i(this.element[0]).dialog("widget").focus()):void 0},_saveSnapshot:function(){return"normal"===this._state?(this.original_config_resizable=i(this.element[0]).dialog("option","resizable"),this.original_config_draggable=i(this.element[0]).dialog("option","draggable"),this.original_size_height=i(this.element[0]).dialog("widget").outerHeight(),this.original_size_width=i(this.element[0]).dialog("option","width"),this.original_size_maxHeight=i(this.element[0]).dialog("option","maxHeight"),this.original_position_mode=i(this.element[0]).dialog("widget").css("position"),this.original_position_left=i(this.element[0]).dialog("widget").offset().left-i("body").scrollLeft(),this.original_position_top=i(this.element[0]).dialog("widget").offset().top-i("body").scrollTop(),this.original_titlebar_wrap=i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar").css("white-space")):void 0},_loadSnapshot:function(){return{config:{resizable:this.original_config_resizable,draggable:this.original_config_draggable},size:{height:this.original_size_height,width:this.original_size_width,maxHeight:this.original_size_maxHeight},position:{mode:this.original_position_mode,left:this.original_position_left,top:this.original_position_top},titlebar:{wrap:this.original_titlebar_wrap}}},_toggleButtons:function(t){var e,o,n,a,l,s;n=t||this._state,i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar-restore").toggle("normal"!==n).css({right:"1.4em"}).end(),a=this.modes;for(o in a)e=a[o],i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar-"+o).toggle(n!==e.state&&this.options[e.option]);l=this.modes,s=[];for(o in l)e=l[o],e.state===n?s.push(i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar-restore").insertAfter(i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar-"+o)).end()):s.push(void 0);return s}})}).call(this),function(){var i;i=jQuery,i.extend(!0,i.ui.dialogExtend.prototype,{modes:{collapse:{option:"collapsable",state:"collapsed"}},options:{collapsable:!1,icons:{collapse:"ui-icon-triangle-1-s"},beforeCollapse:null,collapse:null},collapse:function(){var t,e;return t=i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar").height()+15,this._trigger("beforeCollapse"),"normal"!==this._state&&this._restore(),this._saveSnapshot(),e=i(this.element[0]).dialog("widget").position(),i(this.element[0]).dialog("option",{resizable:!1,height:t,maxHeight:t,position:[e.left-i(document).scrollLeft(),e.top-i(document).scrollTop()]}).on("dialogclose",this._collapse_restore).hide().dialog("widget").find(".ui-dialog-buttonpane:visible").hide().end().find(".ui-dialog-titlebar").css("white-space","nowrap").end().find(".ui-dialog-content"),this._setState("collapsed"),this._toggleButtons(),this._trigger("collapse")},_restore_collapsed:function(){var t;return t=this._loadSnapshot(),i(this.element[0]).show().dialog("widget").find(".ui-dialog-buttonpane:hidden").show().end().find(".ui-dialog-titlebar").css("white-space",t.titlebar.wrap).end().find(".ui-dialog-content").dialog("option",{resizable:t.config.resizable,height:t.size.height,maxHeight:t.size.maxHeight}).off("dialogclose",this._collapse_restore)},_initStyles_collapse:function(){var t;return i(".dialog-extend-collapse-css").length?void 0:(t="",t+='<style class="dialog-extend-collapse-css" type="text/css">',t+=".ui-dialog .ui-dialog-titlebar-collapse { width: 19px; height: 18px; }",t+=".ui-dialog .ui-dialog-titlebar-collapse span { display: block; margin: 1px; }",t+=".ui-dialog .ui-dialog-titlebar-collapse:hover,",t+=".ui-dialog .ui-dialog-titlebar-collapse:focus { padding: 0; }",t+="</style>",i(t).appendTo("body"))},_collapse_restore:function(){return i(this).dialogExtend("restore")}})}.call(this),function(){var i;i=jQuery,i.extend(!0,i.ui.dialogExtend.prototype,{modes:{maximize:{option:"maximizable",state:"maximized"}},options:{maximizable:!1,icons:{maximize:"ui-icon-extlink"},beforeMaximize:null,maximize:null},maximize:function(){var t,e;return t=i(window).height()-11,e=i(window).width()-11,this._trigger("beforeMaximize"),"normal"!==this._state&&this._restore(),this._saveSnapshot(),i(this.element[0]).dialog("option","draggable")&&i(this.element[0]).dialog("widget").draggable("option","handle",null).find(".ui-dialog-draggable-handle").css("cursor","text").end(),i(this.element[0]).dialog("widget").css("position","fixed").find(".ui-dialog-content").show().dialog("widget").find(".ui-dialog-buttonpane").show().end().find(".ui-dialog-content").dialog("option",{resizable:!1,draggable:!1,height:t,width:e,position:{my:"left top",at:"left top",of:window}}),this._setState("maximized"),this._toggleButtons(),this._trigger("maximize")},_restore_maximized:function(){var t;return t=this._loadSnapshot(),i(this.element[0]).dialog("widget").css("position",t.position.mode).find(".ui-dialog-titlebar").css("white-space",t.titlebar.wrap).end().find(".ui-dialog-content").dialog("option",{resizable:t.config.resizable,draggable:t.config.draggable,height:t.size.height,width:t.size.width,maxHeight:t.size.maxHeight,position:{my:"left top",at:"left+"+t.position.left+" top+"+t.position.top,of:window}}),i(this.element[0]).dialog("option","draggable")?i(this.element[0]).dialog("widget").draggable("option","handle",i(this.element[0]).dialog("widget").find(".ui-dialog-draggable-handle").length?i(this.element[0]).dialog("widget").find(".ui-dialog-draggable-handle"):".ui-dialog-titlebar").find(".ui-dialog-draggable-handle").css("cursor","move"):void 0},_initStyles_maximize:function(){var t;return i(".dialog-extend-maximize-css").length?void 0:(t="",t+='<style class="dialog-extend-maximize-css" type="text/css">',t+=".ui-dialog .ui-dialog-titlebar-maximize { width: 19px; height: 18px; }",t+=".ui-dialog .ui-dialog-titlebar-maximize span { display: block; margin: 1px; }",t+=".ui-dialog .ui-dialog-titlebar-maximize:hover,",t+=".ui-dialog .ui-dialog-titlebar-maximize:focus { padding: 0; }",t+="</style>",i(t).appendTo("body"))}})}.call(this),function(){var i;i=jQuery,i.extend(!0,i.ui.dialogExtend.prototype,{modes:{minimize:{option:"minimizable",state:"minimized"}},options:{minimizable:!1,minimizeLocation:"left",icons:{minimize:"ui-icon-minus"},beforeMinimize:null,minimize:null},minimize:function(){var t,e,o;return this._trigger("beforeMinimize"),"normal"!==this._state&&this._restore(),o=200,i("#dialog-extend-fixed-container").length?e=i("#dialog-extend-fixed-container"):(e=i('<div id="dialog-extend-fixed-container"></div>').appendTo("body"),e.css({position:"fixed",bottom:1,left:1,right:1,"z-index":9999})),this._toggleButtons("minimized"),t=i(this.element[0]).dialog("widget").clone().children().remove().end(),i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar").clone(!0,!0).appendTo(t),t.css({"float":this.options.minimizeLocation,margin:1}),e.append(t),i(this.element[0]).data("dialog-extend-minimize-controls",t),i(this.element[0]).dialog("option","draggable")&&t.removeClass("ui-draggable"),t.css({height:"auto",width:o,position:"static"}),i(this.element[0]).on("dialogbeforeclose",this._minimize_restoreOnClose).dialog("widget").hide(),this._setState("minimized"),this._trigger("minimize")},_restore_minimized:function(){return i(this.element[0]).dialog("widget").show(),i(this.element[0]).off("dialogbeforeclose",this._minimize_restoreOnClose),i(this.element[0]).data("dialog-extend-minimize-controls").remove(),i(this.element[0]).removeData("dialog-extend-minimize-controls")},_initStyles_minimize:function(){var t;return i(".dialog-extend-minimize-css").length?void 0:(t="",t+='<style class="dialog-extend-minimize-css" type="text/css">',t+=".ui-dialog .ui-dialog-titlebar-minimize { width: 19px; height: 18px; }",t+=".ui-dialog .ui-dialog-titlebar-minimize span { display: block; margin: 1px; }",t+=".ui-dialog .ui-dialog-titlebar-minimize:hover,",t+=".ui-dialog .ui-dialog-titlebar-minimize:focus { padding: 0; }",t+="</style>",i(t).appendTo("body"))},_verifyOptions_minimize:function(){var t;return!this.options.minimizeLocation||"left"!==(t=this.options.minimizeLocation)&&"right"!==t?(i.error("jQuery.dialogExtend Error : Invalid <minimizeLocation> value '"+this.options.minimizeLocation+"'"),this.options.minimizeLocation="left"):void 0},_minimize_restoreOnClose:function(){return i(this).dialogExtend("restore")}})}.call(this);window.initBimViewer = function(context) {var angleMeasurementsData = [
+(function(){var i;i=jQuery,i.widget("ui.dialogExtend",{version:"2.0.0",modes:{},options:{closable:!0,dblclick:!1,titlebar:!1,icons:{close:"ui-icon-closethick",restore:"ui-icon-newwin"},load:null,beforeRestore:null,restore:null},_create:function(){return this._state="normal",i(this.element[0]).data("ui-dialog")||i.error("jQuery.dialogExtend Error : Only jQuery UI Dialog element is accepted"),this._verifyOptions(),this._initStyles(),this._initButtons(),this._initTitleBar(),this._setState("normal"),this._on("load",function(i){return console.log("test",i)}),this._trigger("load")},_setState:function(t){return i(this.element[0]).removeClass("ui-dialog-"+this._state).addClass("ui-dialog-"+t),this._state=t},_verifyOptions:function(){var t,e,o;!this.options.dblclick||this.options.dblclick in this.modes||(i.error("jQuery.dialogExtend Error : Invalid <dblclick> value '"+this.options.dblclick+"'"),this.options.dblclick=!1),this.options.titlebar&&"none"!==(e=this.options.titlebar)&&"transparent"!==e&&(i.error("jQuery.dialogExtend Error : Invalid <titlebar> value '"+this.options.titlebar+"'"),this.options.titlebar=!1),o=[];for(t in this.modes)this["_verifyOptions_"+t]?o.push(this["_verifyOptions_"+t]()):o.push(void 0);return o},_initStyles:function(){var t,e,o;i(".dialog-extend-css").length||(e="",e+='<style class="dialog-extend-css" type="text/css">',e+=".ui-dialog .ui-dialog-titlebar-buttonpane>a { float: right; }",e+=".ui-dialog .ui-dialog-titlebar-restore { width: 19px; height: 18px; }",e+=".ui-dialog .ui-dialog-titlebar-restore span { display: block; margin: 1px; }",e+=".ui-dialog .ui-dialog-titlebar-restore:hover,",e+=".ui-dialog .ui-dialog-titlebar-restore:focus { padding: 0; }",e+=".ui-dialog .ui-dialog-titlebar ::selection { background-color: transparent; }",e+="</style>",i(e).appendTo("body")),o=[];for(t in this.modes)o.push(this["_initStyles_"+t]());return o},_initButtons:function(){var t,e,o,n,a,l=this;n=i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar"),t=i('<div class="ui-dialog-titlebar-buttonpane"></div>').appendTo(n),t.css({position:"absolute",top:"50%",right:"0.3em","margin-top":"-10px",height:"18px"}),n.find(".ui-dialog-titlebar-close").css({position:"relative","float":"right",top:"auto",right:"auto",margin:0}).find(".ui-icon").removeClass("ui-icon-closethick").addClass(this.options.icons.close).end().appendTo(t).end(),t.append('<a class="ui-dialog-titlebar-restore ui-corner-all ui-state-default" href="#"><span class="ui-icon '+this.options.icons.restore+'" title="restore">restore</span></a>').find(".ui-dialog-titlebar-restore").attr("role","button").mouseover(function(){return i(this).addClass("ui-state-hover")}).mouseout(function(){return i(this).removeClass("ui-state-hover")}).focus(function(){return i(this).addClass("ui-state-focus")}).blur(function(){return i(this).removeClass("ui-state-focus")}).end().find(".ui-dialog-titlebar-close").toggle(this.options.closable).end().find(".ui-dialog-titlebar-restore").hide().click(function(i){return i.preventDefault(),l.restore()}).end(),a=this.modes;for(o in a)e=a[o],this._initModuleButton(o,e);return n.dblclick(function(){return l.options.dblclick?"normal"!==l._state?l.restore():l[l.options.dblclick]():void 0}).select(function(){return!1})},_initModuleButton:function(t,e){var o,n=this;return o=i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar-buttonpane"),o.append('<a class="ui-dialog-titlebar-'+t+' ui-corner-all ui-state-default" href="#" title="'+t+'"><span class="ui-icon '+this.options.icons[t]+'">'+t+"</span></a>").find(".ui-dialog-titlebar-"+t).attr("role","button").mouseover(function(){return i(this).addClass("ui-state-hover")}).mouseout(function(){return i(this).removeClass("ui-state-hover")}).focus(function(){return i(this).addClass("ui-state-focus")}).blur(function(){return i(this).removeClass("ui-state-focus")}).end().find(".ui-dialog-titlebar-"+t).toggle(this.options[e.option]).click(function(i){return i.preventDefault(),n[t]()}).end()},_initTitleBar:function(){var t;switch(this.options.titlebar){case!1:return 0;case"none":return i(this.element[0]).dialog("option","draggable")&&(t=i("<div />").addClass("ui-dialog-draggable-handle").css("cursor","move").height(5),i(this.element[0]).dialog("widget").prepend(t).draggable("option","handle",t)),i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar").find(".ui-dialog-title").html("&nbsp;").end().css({"background-color":"transparent","background-image":"none",border:0,position:"absolute",right:0,top:0,"z-index":9999}).end();case"transparent":return i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar").css({"background-color":"transparent","background-image":"none",border:0});default:return i.error("jQuery.dialogExtend Error : Invalid <titlebar> value '"+this.options.titlebar+"'")}},state:function(){return this._state},restore:function(){return this._trigger("beforeRestore"),this._restore(),this._toggleButtons(),this._trigger("restore")},_restore:function(){return"normal"!==this._state?(this["_restore_"+this._state](),this._setState("normal"),i(this.element[0]).dialog("widget").focus()):void 0},_saveSnapshot:function(){return"normal"===this._state?(this.original_config_resizable=i(this.element[0]).dialog("option","resizable"),this.original_config_draggable=i(this.element[0]).dialog("option","draggable"),this.original_size_height=i(this.element[0]).dialog("widget").outerHeight(),this.original_size_width=i(this.element[0]).dialog("option","width"),this.original_size_maxHeight=i(this.element[0]).dialog("option","maxHeight"),this.original_position_mode=i(this.element[0]).dialog("widget").css("position"),this.original_position_left=i(this.element[0]).dialog("widget").offset().left-i("body").scrollLeft(),this.original_position_top=i(this.element[0]).dialog("widget").offset().top-i("body").scrollTop(),this.original_titlebar_wrap=i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar").css("white-space")):void 0},_loadSnapshot:function(){return{config:{resizable:this.original_config_resizable,draggable:this.original_config_draggable},size:{height:this.original_size_height,width:this.original_size_width,maxHeight:this.original_size_maxHeight},position:{mode:this.original_position_mode,left:this.original_position_left,top:this.original_position_top},titlebar:{wrap:this.original_titlebar_wrap}}},_toggleButtons:function(t){var e,o,n,a,l,s;n=t||this._state,i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar-restore").toggle("normal"!==n).css({right:"1.4em"}).end(),a=this.modes;for(o in a)e=a[o],i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar-"+o).toggle(n!==e.state&&this.options[e.option]);l=this.modes,s=[];for(o in l)e=l[o],e.state===n?s.push(i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar-restore").insertAfter(i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar-"+o)).end()):s.push(void 0);return s}})}).call(this),function(){var i;i=jQuery,i.extend(!0,i.ui.dialogExtend.prototype,{modes:{collapse:{option:"collapsable",state:"collapsed"}},options:{collapsable:!1,icons:{collapse:"ui-icon-triangle-1-s"},beforeCollapse:null,collapse:null},collapse:function(){var t,e;return t=i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar").height()+15,this._trigger("beforeCollapse"),"normal"!==this._state&&this._restore(),this._saveSnapshot(),e=i(this.element[0]).dialog("widget").position(),i(this.element[0]).dialog("option",{resizable:!1,height:t,maxHeight:t,position:[e.left-i(document).scrollLeft(),e.top-i(document).scrollTop()]}).on("dialogclose",this._collapse_restore).hide().dialog("widget").find(".ui-dialog-buttonpane:visible").hide().end().find(".ui-dialog-titlebar").css("white-space","nowrap").end().find(".ui-dialog-content"),this._setState("collapsed"),this._toggleButtons(),this._trigger("collapse")},_restore_collapsed:function(){var t;return t=this._loadSnapshot(),i(this.element[0]).show().dialog("widget").find(".ui-dialog-buttonpane:hidden").show().end().find(".ui-dialog-titlebar").css("white-space",t.titlebar.wrap).end().find(".ui-dialog-content").dialog("option",{resizable:t.config.resizable,height:t.size.height,maxHeight:t.size.maxHeight}).off("dialogclose",this._collapse_restore)},_initStyles_collapse:function(){var t;return i(".dialog-extend-collapse-css").length?void 0:(t="",t+='<style class="dialog-extend-collapse-css" type="text/css">',t+=".ui-dialog .ui-dialog-titlebar-collapse { width: 19px; height: 18px; }",t+=".ui-dialog .ui-dialog-titlebar-collapse span { display: block; margin: 1px; }",t+=".ui-dialog .ui-dialog-titlebar-collapse:hover,",t+=".ui-dialog .ui-dialog-titlebar-collapse:focus { padding: 0; }",t+="</style>",i(t).appendTo("body"))},_collapse_restore:function(){return i(this).dialogExtend("restore")}})}.call(this),function(){var i;i=jQuery,i.extend(!0,i.ui.dialogExtend.prototype,{modes:{maximize:{option:"maximizable",state:"maximized"}},options:{maximizable:!1,icons:{maximize:"ui-icon-extlink"},beforeMaximize:null,maximize:null},maximize:function(){var t,e;return t=i(window).height()-11,e=i(window).width()-11,this._trigger("beforeMaximize"),"normal"!==this._state&&this._restore(),this._saveSnapshot(),i(this.element[0]).dialog("option","draggable")&&i(this.element[0]).dialog("widget").draggable("option","handle",null).find(".ui-dialog-draggable-handle").css("cursor","text").end(),i(this.element[0]).dialog("widget").css("position","fixed").find(".ui-dialog-content").show().dialog("widget").find(".ui-dialog-buttonpane").show().end().find(".ui-dialog-content").dialog("option",{resizable:!1,draggable:!1,height:t,width:e,position:{my:"left top",at:"left top",of:window}}),this._setState("maximized"),this._toggleButtons(),this._trigger("maximize")},_restore_maximized:function(){var t;return t=this._loadSnapshot(),i(this.element[0]).dialog("widget").css("position",t.position.mode).find(".ui-dialog-titlebar").css("white-space",t.titlebar.wrap).end().find(".ui-dialog-content").dialog("option",{resizable:t.config.resizable,draggable:t.config.draggable,height:t.size.height,width:t.size.width,maxHeight:t.size.maxHeight,position:{my:"left top",at:"left+"+t.position.left+" top+"+t.position.top,of:window}}),i(this.element[0]).dialog("option","draggable")?i(this.element[0]).dialog("widget").draggable("option","handle",i(this.element[0]).dialog("widget").find(".ui-dialog-draggable-handle").length?i(this.element[0]).dialog("widget").find(".ui-dialog-draggable-handle"):".ui-dialog-titlebar").find(".ui-dialog-draggable-handle").css("cursor","move"):void 0},_initStyles_maximize:function(){var t;return i(".dialog-extend-maximize-css").length?void 0:(t="",t+='<style class="dialog-extend-maximize-css" type="text/css">',t+=".ui-dialog .ui-dialog-titlebar-maximize { width: 19px; height: 18px; }",t+=".ui-dialog .ui-dialog-titlebar-maximize span { display: block; margin: 1px; }",t+=".ui-dialog .ui-dialog-titlebar-maximize:hover,",t+=".ui-dialog .ui-dialog-titlebar-maximize:focus { padding: 0; }",t+="</style>",i(t).appendTo("body"))}})}.call(this),function(){var i;i=jQuery,i.extend(!0,i.ui.dialogExtend.prototype,{modes:{minimize:{option:"minimizable",state:"minimized"}},options:{minimizable:!1,minimizeLocation:"left",icons:{minimize:"ui-icon-minus"},beforeMinimize:null,minimize:null},minimize:function(){var t,e,o;return this._trigger("beforeMinimize"),"normal"!==this._state&&this._restore(),o=200,i("#dialog-extend-fixed-container").length?e=i("#dialog-extend-fixed-container"):(e=i('<div id="dialog-extend-fixed-container"></div>').appendTo("body"),e.css({position:"fixed",bottom:1,left:1,right:1,"z-index":9999})),this._toggleButtons("minimized"),t=i(this.element[0]).dialog("widget").clone().children().remove().end(),i(this.element[0]).dialog("widget").find(".ui-dialog-titlebar").clone(!0,!0).appendTo(t),t.css({"float":this.options.minimizeLocation,margin:1}),e.append(t),i(this.element[0]).data("dialog-extend-minimize-controls",t),i(this.element[0]).dialog("option","draggable")&&t.removeClass("ui-draggable"),t.css({height:"auto",width:o,position:"static"}),i(this.element[0]).on("dialogbeforeclose",this._minimize_restoreOnClose).dialog("widget").hide(),this._setState("minimized"),this._trigger("minimize")},_restore_minimized:function(){return i(this.element[0]).dialog("widget").show(),i(this.element[0]).off("dialogbeforeclose",this._minimize_restoreOnClose),i(this.element[0]).data("dialog-extend-minimize-controls").remove(),i(this.element[0]).removeData("dialog-extend-minimize-controls")},_initStyles_minimize:function(){var t;return i(".dialog-extend-minimize-css").length?void 0:(t="",t+='<style class="dialog-extend-minimize-css" type="text/css">',t+=".ui-dialog .ui-dialog-titlebar-minimize { width: 19px; height: 18px; }",t+=".ui-dialog .ui-dialog-titlebar-minimize span { display: block; margin: 1px; }",t+=".ui-dialog .ui-dialog-titlebar-minimize:hover,",t+=".ui-dialog .ui-dialog-titlebar-minimize:focus { padding: 0; }",t+="</style>",i(t).appendTo("body"))},_verifyOptions_minimize:function(){var t;return!this.options.minimizeLocation||"left"!==(t=this.options.minimizeLocation)&&"right"!==t?(i.error("jQuery.dialogExtend Error : Invalid <minimizeLocation> value '"+this.options.minimizeLocation+"'"),this.options.minimizeLocation="left"):void 0},_minimize_restoreOnClose:function(){return i(this).dialogExtend("restore")}})}.call(this);window.initBimViewer = function(context) {function showPropertyInspector(pickResult) {
+    //var metaObject;
+    //var model = getPickResultModel(pickResult);
+    var objectId = pickResult.entity.id;
+
+    collapseSidebarIssueDetail();
+    collapseSidebarNotes();
+    $('#btnToggleSidebarNotes').removeClass('toggled');
+
+    setPropertyBDSets(objectId);
+
+    return false;
+}
+
+function getPickResultModel(pickResult) {
+    var modelId = getPickResultModelId(pickResult);
+    if (modelId) {
+        if (window.model.id == modelId) {
+            return window.model;
+        } else if (window.model2 && window.model2.id == modelId) {
+            return window.model2;
+        } else {
+            return false;
+        }
+    } else {
+        return false;
+    }
+}
+
+function getPickResultModelId(pickResult) {
+    if (pickResult.entity.model && pickResult.entity.model.id) {
+        return pickResult.entity.model.id;
+    } else if (pickResult.entity._owner && pickResult.entity._owner.id) {
+        return pickResult.entity._owner.id;
+    } else {
+        return false;
+    }
+}
+
+function getPropertyValue(property) {
+    if (property.valueBool != null && property.valueBool != undefined) {
+        return property.valueBool;
+    }
+    else if (property.valueInt != null && property.valueInt != undefined) {
+        return property.valueInt;
+    }
+    else if (property.valueText != null && property.valueText != undefined) {
+        return property.valueText;
+    }
+    else if (property.valueReal != null && property.valueReal != undefined) {
+        return property.valueReal;
+    }
+}
+function convertProperty(data) {
+    let groups = [];
+
+    for (let property of data) {
+        let existingGroups = groups.filter(group => group.name == property.groupName);
+        if (existingGroups.length > 0) {
+            existingGroups[0].properties.push({ name: property.name, value: getPropertyValue(property) });
+        }
+        else {
+            let newGroup = {
+                name: property.groupName,
+                properties: [],
+            };
+            newGroup.properties.push({ name: property.name, value: getPropertyValue(property) });
+
+
+            groups.push(newGroup);
+        }
+    }
+
+    return groups;
+}
+
+function setPropertyBDSets(id) {
+    const html = [];
+
+    html.push('<div class="element-attributes">');
+    html.push('</div>');
+
+    viewer.scene.canvas.spinner.processes++;
+
+    BIMModel.GetPropertyList(id,
+        (data) => {
+            const propertySets = convertProperty(data);
+            addPropertySet(propertySets, html);
+            viewer.scene.canvas.spinner.processes--;
+        },
+        (error) => {
+            viewer.scene.canvas.spinner.processes--;
+        }
+    );
+
+    $('#propInspector .prop-inspector-content')[0].innerHTML = html.join("");
+    $('.xeokit-accordion-container').accordion({
+        collapsible: true,
+        heightStyle: "content"
+    });
+    $('#propInspector').show();
+}
+
+function addPropertySet(propertySets, html) {
+    if (!propertySets || propertySets.length == 0) {
+        html.push('<p class="subtitle">No properties sets found.</p>');
+    }
+    else {
+        html.push('<div class="xeokit-accordion">');
+        for (let i = 0, len = propertySets.length; i < len; i++) {
+            const propertySet = propertySets[i];
+            const properties = propertySet.properties || propertySet.p || [];
+            if (properties.length > 0) {
+                html.push('<div class="xeokit-accordion-container">' +
+                    '<h3><span>' + (propertySet.name ? propertySet.name : propertySet.propertySetName) + '</span></h3>' +
+                    '<div class="xeokit-accordion-panel">' +
+                    '<table class="xeokit-table"><tbody>'
+                );
+                for (let i = 0, len = properties.length; i < len; i++) {
+                    const property = properties[i];
+                    html.push('<tr><td class="td1">' + (property.Name || property.name || property.label) + ':</td><td class="td2">' + (property.v || property.Value || property.value) + '</td></tr>');
+                }
+                html.push('</tbody></table>' +
+                    '</div>' +
+                    '</div>');
+            } else {
+                html.push('<p class="subtitle">No properties sets found.</p>');
+            }
+        }
+        html.push('</div>');
+    }
+    $('#propInspector .prop-inspector-content')[0].innerHTML = html.join("");
+    $('.xeokit-accordion-container').accordion({
+        collapsible: true,
+        heightStyle: "content"
+    });
+    $('#propInspector').show();
+}
+
+function setPropertySets(metaObject, dictionaryName = []) {
+    const html = [];
+    var propertySets = metaObject.propertySets || metaObject.ps;
+
+    html.push('<div class="element-attributes">');
+    if (!metaObject) {
+        html.push('<p class="subsubtitle">No object selected</p>');
+    } else {
+        html.push('<table class="xeokit-table">');
+        html.push('<tr><td class="td1">Name:</td><td class="td2">' + metaObject.name + '</td></tr>');
+        if (metaObject.type) {
+            html.push('<tr><td class="td1">Class:</td><td class="td2">' + metaObject.type + '</td></tr>');
+        }
+        html.push('<tr><td class="td1">UUID:</td><td class="td2">' + metaObject.id + '</td></tr>');
+        html.push('</table>');
+
+        addPropertySet(propertySets, html);
+    }
+    $('#propInspector .prop-inspector-content')[0].innerHTML = html.join("");
+    $('.xeokit-accordion-container').accordion({
+        collapsible: true,
+        heightStyle: "content"
+    });
+    $('#propInspector').show();
+}
+
+function bindPropInspectorClose() {
+    $('.prop-inspector-close').on('click', function () {
+        $('#propInspector').hide();
+    })
+}
+
+//------------------------------------------------------------------------------------------------------------------
+// PropertySets resizable
+//------------------------------------------------------------------------------------------------------------------
+function initPropertySetsResizable() {
+    $('#propInspector').resizable({
+        handles: "w",
+        minWidth: 150
+    });
+}
+var angleMeasurementsData = [
 
 ];
 var bcfData = {};
@@ -871,8 +1055,6 @@ var distanceMeasurementsData = [
 ];
 
 var notes = [];
-var srcModel = undefined;
-var srcMetaModelData = undefined;
 var fileVersion = undefined;
 var fileVersionPath = undefined;
 
@@ -894,8 +1076,6 @@ const viewer = new Viewer({
 // Arrange the camera
 //------------------------------------------------------------------------------------------------------------------
 
-const camera = viewer.camera;
-// TODO
 viewer.camera.eye = [-5.02, 2.22, 15.09];
 viewer.camera.look = [4.97, 2.79, 9.89];
 viewer.camera.up = [-0.05, 0.99, 0.02];
@@ -933,7 +1113,7 @@ var treeView = new VitroTreeViewPlugin(viewer, {
 			autoExpandDepth: 1,
 			hierarchy: "containment",
 			autoAddModels: false,
-		});
+});
 
 //------------------------------------------------------------------------------------------------------------------
 // Create two ContextMenus - one for right-click on empty space, the other for right-click on an Entity
@@ -1303,10 +1483,10 @@ function addModelToTreeView() {
 
     const callback = (metaObjects, status, jqXHR) =>
     {
-		const metaModel = viewer.metaScene.metaModels[window.model.id];
+        const metaModel = viewer.metaScene.metaModels[viewer.scene.modelIds[0]];
 
 	    treeView.addObjectsToMetaModel(metaObjects, metaModel);
-        treeView.addModel(window.model.id);
+        treeView.addModel(viewer.scene.modelIds[0]);
 
         $('body').addClass('treeview-expanded');
         $('#treeViewContainerWrap').show();
@@ -1371,40 +1551,38 @@ function onAnnotationsMarkerClickedHandler(annotation) {
 //------------------------------------------------------------------------------------------------------------------
 // Load Model
 //------------------------------------------------------------------------------------------------------------------
-function doLoadModel() {
-    var disableCacheStr = getDisableCacheStr();
-    var modelUrl = srcModel;// + disableCacheStr; //VitroDelete
-    var metaModelDataUrl = srcMetaModelData + disableCacheStr;
-
-
-    window.model = xktLoader.load({
+function doLoadModel(srcModel, isMain) {
+    const model = xktLoader.load({
         id: Date.now(),
-        src: modelUrl,
+        src: srcModel.FilePath,
         edges: true,
         backfaces: true,
     });
 
-	window.model.on('loaded', () => {
-		modelOnLoaded();
-	});
+    srcModel.id = model.id;
 
+    model.vitroModel = srcModel;
+    model.isLarge = true;
+    model.on('loaded', () => {
+        if (isMain) {
+            modelOnLoaded();
+            //------------------------------------------------------------------------------------------------------------------
+            // Load Small Scene
+            //------------------------------------------------------------------------------------------------------------------
+            model.vitroModelLoader = new VitroXKTLoaderPlugin(viewer);
 
+            model.vitroModelLoader.largeModel = model;
+            model.vitroModelLoader.vitroModel = srcModel;
+            model.vitroModelLoader.startSmallLoad = true;
 
-    const fastNavPlugin = new FastNavPlugin(viewer, {
-		hideEdges: true,                   // Don't show edges while we interact (default is true)
-		hideSAO: true,                     // Don't show ambient shadows while we interact (default is true)
-		hideColorTexture: true,            // No color textures while we interact (default is true)
-		hidePBR: true,                     // No physically-based rendering while we interact (default is true)
-		hideTransparentObjects: true,      // Hide transparent objects while we interact (default is false)
-		scaleCanvasResolution: true,       // Scale canvas resolution while we interact (default is false)
-		scaleCanvasResolutionFactor: 0.5,  // Factor by which we scale canvas resolution when we interact (default is 0.6)
-		delayBeforeRestore: true,          // When we stop interacting, delay before restoring normal render (default is true)
-		delayBeforeRestoreSeconds: 1,      // The delay duration, in seconds (default is 0.5)
-		hideTempObj: false,
-		maxTreeDepth: 20,
-	});
 
-	$('#btnToggleSectionPlan').addClass('toggled');
+            $('#btnToggleSectionPlan').addClass('toggled');
+        }
+        else {
+            viewer.scene.fire("reloadSmallScenes");
+        }
+    });
+    return model;
 }
 
 function getDisableCacheStr() {
@@ -1414,18 +1592,11 @@ function getDisableCacheStr() {
 
 function modelOnLoaded() {
 
-	window.model.fileVersion = fileVersion;
-	window.model.filename = srcModel.substring(srcModel.lastIndexOf('/') + 1).replace('.xkt', '');
     //------------------------------------------------------------------------------------------------------------------
     // Create some Annotations
     //------------------------------------------------------------------------------------------------------------------
     loadAnnotations();
 
-    //------------------------------------------------------------------------------------------------------------------
-    // Custom Colorize Entity
-    //------------------------------------------------------------------------------------------------------------------
-    viewer.scene.setObjectsColorized(['2O2Fr$t4X7Zf8NOew3FLPP'], [1.0, 0.0, 0.8]); // entityId, color
-
     //----------------------------------------------------------------------------------------------------------
     // Angle Measurements
     //----------------------------------------------------------------------------------------------------------
@@ -1434,15 +1605,10 @@ function modelOnLoaded() {
     //----------------------------------------------------------------------------------------------------------
     // Storey Views
     //----------------------------------------------------------------------------------------------------------
-    // Внимание! Если до initStoreyViews будет вызван SectionPlane -> картинки планов этажей будут сгенерены в "обрезанном" виде
-    // на них будет только видимая часть оставленная секущими плоскостями SectionPlane
+    // ????????! ???? ?? initStoreyViews ????? ?????? SectionPlane -> ???????? ?????? ?????? ????? ????????? ? "??????????" ????
+    // ?? ??? ????? ?????? ??????? ????? ??????????? ???????? ??????????? SectionPlane
     initStoreyViews();
 
-    //------------------------------------------------------------------------------------------------------------------
-    // Load predefined SectionPlanes
-    //------------------------------------------------------------------------------------------------------------------
-    createSectionPlane();
-
     //----------------------------------------------------------------------------------------------------------
     // Distance Measurements
     //----------------------------------------------------------------------------------------------------------
@@ -1451,11 +1617,6 @@ function modelOnLoaded() {
     ViewFitAll(viewer);
 }
 
-//------------------------------------------------------------------------------------------------------------------
-// Create a couple of cross-section planes
-//------------------------------------------------------------------------------------------------------------------
-function createSectionPlane() {}
-
 //------------------------------------------------------------------------------------------------------------------
 // Clear SectionPlanes
 //------------------------------------------------------------------------------------------------------------------
@@ -1467,22 +1628,13 @@ function clearSectionPanes() {
 // Load Annotations
 //------------------------------------------------------------------------------------------------------------------
 function loadAnnotations() {
-    // TODO -> ajax reqest - get Notes
-    // for Test - notes -> get data from notes.data.php
-
-    BIMAnnotation.GetNote(function (data) {
-
-        if (data && data.length > 0) {
-            var noteList = JSON.parse(data);
-                $.each(noteList, function (key, note) {
-                notes.push(note);
-            });
-            $.each(notes, function (key, val) {
-                val.entity = viewer.scene.objects[val.entity];
-                annotations.createAnnotation(val);
-            });
-        }
-    });
+    context.getIssueList().then(issueList => {
+        issueList.map(issue => {
+            let data = getMarkupData(issue.item);
+            data.occludable = false;
+            annotations.createAnnotation(data);
+        })
+    })
 }
 
 //------------------------------------------------------------------------------------------------------------------
@@ -1525,8 +1677,6 @@ function createSectionPlaneByClick(pickResult) {
     }
 }
 
-
-
 //------------------------------------------------------------------------------------------------------------------
 // Add Note
 //------------------------------------------------------------------------------------------------------------------
@@ -1962,18 +2112,28 @@ function fixNotesTextareaBlur() {
         }
     });
 }
-
 function highlightSidebarNote(noteId) {
-    $('.sidebar-note-wrap').removeClass('active');
-    var notetWrap = $('#noteWrap-' + noteId);
-    notetWrap.addClass('active');
-    autosize(notetWrap.find('textarea'));
-    notetWrap.find('.sidebar-note-expand-btn').removeClass('collapsed');
+    var noteWrap = $('#vitro-issue-tile-' + noteId);
+
+    if (!noteWrap.position()) {
+        setTimeout(() => {
+            highlightSidebarNote(noteId);
+        }, 500);
+
+        return;
+    }
+
+    doHighlightSidebarNote(noteWrap);
+}
+
+function doHighlightSidebarNote(noteWrap) {
     var sidebarContent = $('.sidebar-content');
+    sidebarContent.children().removeClass('vitro-active');
+    noteWrap.addClass('vitro-active');
     var sidebarOffsetTop = parseInt(sidebarContent[0].offsetTop);
     var sidebarScrollTop = parseInt(sidebarContent[0].scrollTop);
     sidebarContent.animate({
-        scrollTop: notetWrap.position().top - sidebarOffsetTop + sidebarScrollTop
+        scrollTop: noteWrap.position().top - sidebarOffsetTop + sidebarScrollTop
     }, 1000);
 }
 
@@ -2494,8 +2654,8 @@ function bindBtnCompareSideBySide() {
         }
         $(this).addClass('toggled');
     });
-}
 
+}
 function bindBtnClearComparison() {
     $(document).on('click', '#btnClearComparison', function() {
         $('#btnCompareOneOverOne').removeClass('toggled');
@@ -2503,6 +2663,7 @@ function bindBtnClearComparison() {
         $('#btnToggleCompare').removeClass('toggled');
 
         doRemoveComparison();
+
     });
 }
 
@@ -2556,7 +2717,6 @@ function compareModels(isSideBySide) {
 }
 
 function doCompareModels(isSideBySide) {
-
     BIMModel.Compare(function (result) {
         var objResult = JSON.parse(result);
         compareModelsResult = objResult;
@@ -2572,6 +2732,9 @@ function doCompareModels(isSideBySide) {
 
         highlightModelsDifference(objResult, isSideBySide);
         createComparisonResultPopup();
+
+        $('#btnAddModel').hide();
+
         viewer.scene.canvas.spinner.processes--;
     },
     function () {
@@ -2712,36 +2875,24 @@ function highlightModelsDifference(result, isSideBySide) {
             color = [1.0, 0.0, 0.8];
         } else {
             color = [0.9, 0.9, 0.9]; // TODO: old Model unique-objects color -> gray
-            setOpacityArObject(arObjId, opacity);
+            setOpacityArObject(window.model, arObjId, opacity);
         }
-        colorizeArObject(arObjId, color); // TODO: old Model unique-objects change color
+        colorizeArObject(window.model, arObjId, color); // TODO: old Model unique-objects change color
     }
 
     // Make old Model not unique-objects unvisible
     if (result['old']['notUnique'].length && !isSideBySide) {
         arObjId = result['old']['notUnique'];
-        setVisibilityArObject(arObjId, false);
+        setVisibilityArObject(window.model, arObjId, false);
     }
 
     if (result['new'].length) {
         arObjId = result['new'];
         color = [1.0, 0.0, 0.8]; // TODO: new Model unique-objects color
-        colorizeArObject(arObjId, color);
+        colorizeArObject(window.model2, arObjId, color);
     }
 }
 
-// Xkt
-/*function highlightModelsDifference(result) {
-    var color = [1.0, 0.0, 0.8];
-    $.each(result, function(modelId, arObj) {
-        if(arObj.length > 0) {
-            $.each(arObj, function(index, obj) {
-                colorizeObject(obj.id, color);
-            });
-        }
-    });
-}*/
-
 function colorizeArObject(arObjId, color) {
     viewer.scene.setObjectsColorized(arObjId, color);
 }
@@ -2898,213 +3049,34 @@ function disableDistanceMeasurements() {
 }
 
 //------------------------------------------------------------------------------------------------------------------
-// PropertySets
+// FastNavPlugin
 //------------------------------------------------------------------------------------------------------------------
-function showPropertyInspector(pickResult) {
-    var metaObject;
-    var model = getPickResultModel(pickResult);
-	var objectId = pickResult.entity.id;
 
-    if (model && model.customMeta) {
+const fastNavPlugin = new FastNavPlugin(viewer, {
+    hideEdges: true,                   // Don't show edges while we interact (default is true)
+    hideSAO: true,                     // Don't show ambient shadows while we interact (default is true)
+    hideColorTexture: true,            // No color textures while we interact (default is true)
+    hidePBR: true,                     // No physically-based rendering while we interact (default is true)
+    hideTransparentObjects: true,      // Hide transparent objects while we interact (default is false)
+    scaleCanvasResolution: true,       // Scale canvas resolution while we interact (default is false)
+    scaleCanvasResolutionFactor: 0.5,  // Factor by which we scale canvas resolution when we interact (default is 0.6)
+    delayBeforeRestore: true,          // When we stop interacting, delay before restoring normal render (default is true)
+    delayBeforeRestoreSeconds: 1,      // The delay duration, in seconds (default is 0.5)
+    hideTempObj: false,
+    maxTreeDepth: 20,
+});
 
+//------------------------------------------------------------------------------------------------------------------
+//
+//------------------------------------------------------------------------------------------------------------------
+
+var notesDescriptionVisibleList = {};
 
-        if (model.customMeta[objectId]) {
-            metaObject = window.model.customMeta[objectId];
-        } else if (pickResult.entity._parentNode && pickResult.entity._parentNode.id && model.customMeta[pickResult.entity._parentNode.id]) {
-            metaObject = window.model.customMeta[pickResult.entity._parentNode.id];
-        }
+BIMAnnotation.GetNote = (callback) => {
+    callback([]);
+}
 
-        if(metaObject) {
-            setPropertySets(metaObject, model.dictionaryName);
-        } else {
-            return false;
-        }
-    } else {
-		setPropertyBDSets(pickResult.entity.id, model.fileVersion);
-
-        return false;
-    }
-}
-
-function getPickResultModel(pickResult) {
-    var modelId = getPickResultModelId(pickResult);
-    if (modelId) {
-        if (window.model.id == modelId) {
-            return window.model;
-        } else if (window.model2 && window.model2.id == modelId) {
-            return window.model2;
-        } else {
-            return false;
-        }
-    } else {
-        return false;
-    }
-}
-
-function getPickResultModelId(pickResult) {
-    if (pickResult.entity.model && pickResult.entity.model.id) {
-        return pickResult.entity.model.id;
-    } else if(pickResult.entity._owner && pickResult.entity._owner.id) {
-        return pickResult.entity._owner.id;
-    } else {
-        return false;
-    }
-}
-
-function getPropertyValue(property) {
-    if (property.value_bool != null && property.value_bool != undefined) {
-        return property.value_bool;
-    }
-    else if (property.value_int != null && property.value_int != undefined) {
-        return property.value_int;
-    }
-    else if (property.value_text != null && property.value_text != undefined) {
-        return property.value_text;
-    }
-    else if (property.value_real != null && property.value_real != undefined) {
-        return property.value_real;
-    }
-}
-
-function convertProperty(data) {
-    let groups = [];
-
-    for (let property of data) {
-        let existingGroups = groups.filter(group => group.name == property.group_name);
-        if (existingGroups.length > 0) {
-            existingGroups[0].properties.push({ name: property.name, value: getPropertyValue(property) });
-        }
-        else {
-            let newGroup = {
-                name: property.group_name,
-                properties: [],
-            };
-            newGroup.properties.push({ name: property.name, value: getPropertyValue(property) });
-
-
-            groups.push(newGroup);
-        }
-    }
-
-    return groups;
-}
-
-function setPropertyBDSets(id, version) {
-    const html = [];
-	
-    html.push('<div class="element-attributes">');
-    html.push('</div>');
-
-    viewer.scene.canvas.spinner.processes++;
-
-		BIMModel.GetPropertyList(id,  
-        (data) => {
-			const propertySets = convertProperty(data);
-			addPropertySet(propertySets, html);
-			viewer.scene.canvas.spinner.processes--;
-        }, 
-        (error) => {
-			viewer.scene.canvas.spinner.processes--;
-        }
-    );
-        
-    $('#propInspector .prop-inspector-content')[0].innerHTML = html.join("");
-    $('.xeokit-accordion-container').accordion({
-        collapsible: true,
-        heightStyle: "content"
-    });
-    $('#propInspector').show();
-}
-
-function addPropertySet(propertySets, html)
-{
-	if(!propertySets || propertySets.length == 0){
-		html.push('<p class="subtitle">No properties sets found.</p>');
-	}
-	else{
-		html.push('<div class="xeokit-accordion">');
-		for (let i = 0, len = propertySets.length; i < len; i++) {
-			const propertySet = propertySets[i];
-			const properties = propertySet.properties || propertySet.p || [];
-			if (properties.length > 0) {
-				html.push('<div class="xeokit-accordion-container">' +
-					'<h3><span>' + (propertySet.name ? propertySet.name : propertySet.propertySetName) + '</span></h3>' +
-					'<div class="xeokit-accordion-panel">' +
-					'<table class="xeokit-table"><tbody>'
-				);
-				for (let i = 0, len = properties.length; i < len; i++) {
-					const property = properties[i];
-					html.push('<tr><td class="td1">' + (property.Name || property.name || property.label) + ':</td><td class="td2">' + (property.v || property.Value || property.value ) + '</td></tr>');
-				}
-				html.push('</tbody></table>' +
-					'</div>' +
-					'</div>');
-			} else {
-				html.push('<p class="subtitle">No properties sets found.</p>');
-			}
-		}
-		html.push('</div>');
-	}
-	$('#propInspector .prop-inspector-content')[0].innerHTML = html.join("");
-	$('.xeokit-accordion-container').accordion({
-		collapsible: true,
-		heightStyle: "content"
-	});
-	$('#propInspector').show();
-}
-function setPropertySets(metaObject, dictionaryName = []) {
-    const html = [];
-    var propertySets = metaObject.propertySets || metaObject.ps;
-
-    html.push('<div class="element-attributes">');
-    if (!metaObject) {
-        html.push('<p class="subsubtitle">No object selected</p>');
-    } else {
-        html.push('<table class="xeokit-table">');
-        html.push('<tr><td class="td1">Name:</td><td class="td2">' + metaObject.name + '</td></tr>');
-        if (metaObject.type) {
-            html.push('<tr><td class="td1">Class:</td><td class="td2">' + metaObject.type + '</td></tr>');
-        }
-        html.push('<tr><td class="td1">UUID:</td><td class="td2">' + metaObject.id + '</td></tr>');
-        html.push('</table>');
-
-		addPropertySet(propertySets, html);
-    }
-    $('#propInspector .prop-inspector-content')[0].innerHTML = html.join("");
-    $('.xeokit-accordion-container').accordion({
-        collapsible: true,
-        heightStyle: "content"
-    });
-    $('#propInspector').show();
-}
-
-function bindPropInspectorClose() {
-    $('.prop-inspector-close').on('click', function() {
-        $('#propInspector').hide();
-    })
-}
-
-//------------------------------------------------------------------------------------------------------------------
-// PropertySets resizable
-//------------------------------------------------------------------------------------------------------------------
-function initPropertySetsResizable() {
-    $('#propInspector').resizable({
-        handles: "w",
-        minWidth: 150
-    });
-}
-
-//------------------------------------------------------------------------------------------------------------------
-//
-//------------------------------------------------------------------------------------------------------------------
-
-var notesDescriptionVisibleList = {};
-
-BIMAnnotation.GetNote = (callback) => {
-    callback([]);
-}
-
-function saveNote(pickResult) {
+function saveNote(pickResult) {
 
 }
 
@@ -3356,73 +3328,9 @@ function collapseSidebarIssueDetail() {
     $('body').removeClass('sidebar-expanded');
 }
 
-function showPropertyInspector(pickResult) {
-    var metaObject;
-    var model = getPickResultModel(pickResult);
-    var objectId = pickResult.entity.id;
-
-    collapseSidebarIssueDetail();
-    collapseSidebarNotes();
-    $('#btnToggleSidebarNotes').removeClass('toggled');
-
-    if (model && model.customMeta) {
-
-
-        if (model.customMeta[objectId]) {
-            metaObject = window.model.customMeta[objectId];
-        } else if (pickResult.entity._parentNode && pickResult.entity._parentNode.id && model.customMeta[pickResult.entity._parentNode.id]) {
-            metaObject = window.model.customMeta[pickResult.entity._parentNode.id];
-        }
-
-        if (metaObject) {
-            setPropertySets(metaObject, model.dictionaryName);
-        } else {
-            return false;
-        }
-    } else {
-        setPropertyBDSets(pickResult.entity.id, model.fileVersion);
-
-        return false;
-    }
-}
-
 //------------------------------------------------------------------------------------------------------------------
 // Load Annotations
 //------------------------------------------------------------------------------------------------------------------
-function loadAnnotations() {
-    context.getIssueList().then(issueList => {
-        issueList.map(issue => {
-            let data = getMarkupData(issue.item);
-            data.occludable = false;
-            annotations.createAnnotation(data);
-        })
-    })
-}
-function highlightSidebarNote(noteId) {
-    var noteWrap = $('#vitro-issue-tile-' + noteId);
-
-    if (!noteWrap.position()) {
-        setTimeout(() => {
-            highlightSidebarNote(noteId);
-        }, 500);
-
-        return;
-    }
-
-    doHighlightSidebarNote(noteWrap);
-}
-
-function doHighlightSidebarNote(noteWrap) {
-    var sidebarContent = $('.sidebar-content');
-    sidebarContent.children().removeClass('vitro-active');
-    noteWrap.addClass('vitro-active');
-    var sidebarOffsetTop = parseInt(sidebarContent[0].offsetTop);
-    var sidebarScrollTop = parseInt(sidebarContent[0].scrollTop);
-    sidebarContent.animate({
-        scrollTop: noteWrap.position().top - sidebarOffsetTop + sidebarScrollTop
-    }, 1000);
-}
-
 function createSidebarNotesItemHeader(noteData) {
 
 }
@@ -3686,35 +3594,6 @@ function getComparisonResulItemsListElm(sceneModel, resultData, cssClass, allIte
     return itemsList;
 }
 
-// Gltf
-function highlightModelsDifference(result, isSideBySide) {
-    var color, arObjId;
-
-    if (result['old']['unique'].length) {
-        arObjId = result['old']['unique'];
-        var opacity = 0.4; // TODO: old Model unique-objects opacity
-        if (isSideBySide) {
-            color = [1.0, 0.0, 0.8];
-        } else {
-            color = [0.9, 0.9, 0.9]; // TODO: old Model unique-objects color -> gray
-            setOpacityArObject(window.model, arObjId, opacity);
-        }
-        colorizeArObject(window.model, arObjId, color); // TODO: old Model unique-objects change color
-    }
-
-    // Make old Model not unique-objects unvisible
-    if (result['old']['notUnique'].length && !isSideBySide) {
-        arObjId = result['old']['notUnique'];
-        setVisibilityArObject(window.model, arObjId, false);
-    }
-
-    if (result['new'].length) {
-        arObjId = result['new'];
-        color = [1.0, 0.0, 0.8]; // TODO: new Model unique-objects color
-        colorizeArObject(window.model2, arObjId, color);
-    }
-}
-
 function withObjects(sceneModel, dbObjs, callback) {
     let changed = false;
     for (let i = 0, len = dbObjs.length; i < len; i++) {
@@ -3817,113 +3696,6 @@ function doRemoveComparison() {
     restoreObjectColorsAfterCompare();
 }
 
-function getPropertyValue(property) {
-    if (property.valueBool != null && property.valueBool != undefined) {
-        return property.valueBool;
-    }
-    else if (property.valueInt != null && property.valueInt != undefined) {
-        return property.valueInt;
-    }
-    else if (property.valueText != null && property.valueText != undefined) {
-        return property.valueText;
-    }
-    else if (property.valueReal != null && property.valueReal != undefined) {
-        return property.valueReal;
-    }
-}
-function convertProperty(data) {
-    let groups = [];
-
-    for (let property of data) {
-        let existingGroups = groups.filter(group => group.name == property.groupName);
-        if (existingGroups.length > 0) {
-            existingGroups[0].properties.push({ name: property.name, value: getPropertyValue(property) });
-        }
-        else {
-            let newGroup = {
-                name: property.groupName,
-                properties: [],
-            };
-            newGroup.properties.push({ name: property.name, value: getPropertyValue(property) });
-
-
-            groups.push(newGroup);
-        }
-    }
-
-    return groups;
-}
-
-function modelOnLoaded() {
-
-	window.model.fileVersion = fileVersion;
-	window.model.filename = srcModel.substring(srcModel.lastIndexOf('/') + 1).replace('.xkt', '');
-    //------------------------------------------------------------------------------------------------------------------
-    // Create some Annotations
-    //------------------------------------------------------------------------------------------------------------------
-    loadAnnotations();
-
-    //------------------------------------------------------------------------------------------------------------------
-    // Custom Colorize Entity
-    //------------------------------------------------------------------------------------------------------------------
-    viewer.scene.setObjectsColorized(['2O2Fr$t4X7Zf8NOew3FLPP'], [1.0, 0.0, 0.8]); // entityId, color
-
-    //----------------------------------------------------------------------------------------------------------
-    // Angle Measurements
-    //----------------------------------------------------------------------------------------------------------
-    const angleMeasurements = createAngleMeasurements(angleMeasurementsData);
-
-    //----------------------------------------------------------------------------------------------------------
-    // Storey Views
-    //----------------------------------------------------------------------------------------------------------
-    // ????????! ???? ?? initStoreyViews ????? ?????? SectionPlane -> ???????? ?????? ?????? ????? ????????? ? "??????????" ????
-    // ?? ??? ????? ?????? ??????? ????? ??????????? ???????? ??????????? SectionPlane
-    initStoreyViews();
-
-    //------------------------------------------------------------------------------------------------------------------
-    // Load predefined SectionPlanes
-    //------------------------------------------------------------------------------------------------------------------
-    createSectionPlane();
-
-    //----------------------------------------------------------------------------------------------------------
-    // Distance Measurements
-    //----------------------------------------------------------------------------------------------------------
-    const distanceMeasurements = createDistanceMeasurements(distanceMeasurementsData);
-
-    ViewFitAll(viewer);
-
-    //------------------------------------------------------------------------------------------------------------------
-    // Load Small Scene
-    //------------------------------------------------------------------------------------------------------------------
-
-    var vitroModelLoader = new VitroXKTLoaderPlugin(viewer);
-
-    vitroModelLoader.version = BIMCommon.FileVersion;
-    vitroModelLoader.startSmallLoad = true;
-}
-
-function convertProperty(data) {
-    let groups = [];
-
-    for (let property of data) {
-        let existingGroups = groups.filter(group => group.name == property.groupName);
-        if (existingGroups.length > 0) {
-            existingGroups[0].properties.push({ name: property.name, value: getPropertyValue(property) });
-        }
-        else {
-            let newGroup = {
-                name: property.groupName,
-                properties: [],
-            };
-            newGroup.properties.push({ name: property.name, value: getPropertyValue(property) });
-
-
-            groups.push(newGroup);
-        }
-    }
-
-    return groups;
-}
 
 function onAnnotationsMarkerClickedHandler(annotation) {
     showNoteDesc(annotation.id);
@@ -4026,7 +3798,57 @@ function initIssueDetailResizable() {
             $('#sectionPlanesOverviewCanvas').css('right', $('#issueDetail').width() + 10);
         }
     });
-}
+}
+
+function addToTreeView(model, sceneModelId) {
+    if (treeView && treeView._rootNodes.length > 0) {
+        const callback = (metaObjects, status, jqXHR) => {
+            const metaModel = viewer.metaScene.metaModels[sceneModelId];
+
+            treeView.addObjectsToMetaModel(metaObjects, metaModel);
+            treeView.addModel(sceneModelId);
+
+            viewer.scene.canvas.spinner.processes--;
+        };
+
+        const error = () => {
+            viewer.scene.canvas.spinner.processes--;
+        };
+
+        BIMModel.GetElementChildList(model.FileItemId, model.FileVersion, "-1", false, null, callback, error);
+    }
+}
+
+function bindBtnAddModel() {
+    $(document).on('click', '#btnAddModel', function () {
+        context.showItemSelectDialog().then(itemIdList => {
+            itemIdList.forEach(itemId =>
+            {
+                BIMCommon.GetFileItem(itemId, undefined, function (modelId) {
+                    context.getItem(modelId).then(item => {
+                        const filePath = context.getFilePath(item.id);
+                        const fileName = context.file.fieldValueMap?.name;
+                        const model = new BIMCommon.VitroModel(itemId, versionStr, filePath, fileName);
+
+                        BIMCommon.ModelList.push(model);
+
+                        const sceneModel = doLoadModel(model, false);
+                        addToTreeView(model, sceneModel.id);
+
+                        $('#btnToggleCompare').hide();
+                    })
+
+                }, function () {
+                    alert("The file is being processed");
+        });
+
+            })
+    });
+    });
+}
+
+
+                        
 //------------------------------------------------------------------------------------------------------------------
 // Do action wherever we click on an object
 //------------------------------------------------------------------------------------------------------------------
@@ -4078,16 +3900,15 @@ BIMCommon.GetFileItem(context.file.id, versionStr, function (modelId) {
         var fileName = context.file.fieldValueMap?.name;
 
         document.title += " - " + fileName;
-        srcModel = filePath;
-        srcMetaModelData = '';
         fileVersion = '';
         fileVersionPath = filePath;
         hideXeokitSpinner();
 
-        BIMCommon.FileVersion = versionStr;
-        BIMCommon.FileItemId = context.file.id;
+        const model = new BIMCommon.VitroModel(context.file.id, versionStr, filePath, fileName);
 
-        doLoadModel();
+        BIMCommon.ModelList.push(model);
+
+        doLoadModel(model, true);
     })
     
 }, function () {
@@ -4132,6 +3953,8 @@ function init() {
     bindBtnCompareSideBySide();
     bindBtnClearComparison();
 
+    bindBtnAddModel();
+
     initCompare();
     bindSelectList();
 }