diff --git a/Frontend/forgetTest2.html b/Frontend/forgetTest2.html
index 7555315..f164442 100644
--- a/Frontend/forgetTest2.html
+++ b/Frontend/forgetTest2.html
@@ -186,8 +186,22 @@
             //launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlX2ZvcmdlX3Rlc3QvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDXzEyMjEubndk');
 
             //測試熱圖
-            launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlX2ZvcmdlX3Rlc3QvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDXzEyMjFfMjIzMC5ud2Q');
+            //launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlX2ZvcmdlX3Rlc3QvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDXzEyMjFfMjIzMC5ud2Q');
 
+            //三菱 最新urn 資料庫
+            //launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlX2ZvcmdlX3Rlc3QvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDXzEyMjFfMjIzMC5ud2Q');
+
+            //測試單獨 7樓熱圖 DEMO
+            launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlX2ZvcmdlX3Rlc3QvJUUzJTgwJTkwQVJDJUUzJTgwJTkxN0ZfREVNT18yMDIyXzEyXzI2Lm53Yw');
+
+            //測試 方案2 7樓熱圖 
+            //launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6LW1vZGVsX3Rlc3QxMTIxLyVFMyU4MCU5MEFSQyVFMyU4MCU5MTdGXzIwMjJfMTJfMjYubndj');
+
+            //測試 方案3 熱圖
+            //launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlX2ZvcmdlX3Rlc3QvJUU2JTk2JUI5JUU2JUExJTg4M18yMDIyXzEyXzI2Lm53ZA');
+
+            //測試 方案4
+            //launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlX2ZvcmdlX3Rlc3QvJUU2JTk2JUI5JUU2JUExJTg4NF8yMDIyXzEyXzI2Lm53ZA');
 
             //launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlX2ZvcmdlX3Rlc3QvJUUzJTgwJTkwQVJDJUUzJTgwJTkxXzIwMjJfMTJfMTMubndk');//new ARC
             //launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlX2ZvcmdlX3Rlc3QvJUUzJTgwJTkwTUVQJUUzJTgwJTkxXzIwMjJfMTJfMTMubndj');//new MEP
diff --git a/Frontend/js/forge/modeltest.js b/Frontend/js/forge/modeltest.js
index f9a8b49..2b85eda 100644
--- a/Frontend/js/forge/modeltest.js
+++ b/Frontend/js/forge/modeltest.js
@@ -20,9 +20,9 @@ function launchViewer(urn) {
         var documentId = 'urn:' + urn;
 
         //加入熱點
-        viewer.addEventListener(av.GEOMETRY_LOADED_EVENT, addHotPoint, {
-            once: true,
-        });
+        //viewer.addEventListener(av.GEOMETRY_LOADED_EVENT, addHotPoint, {
+        //    once: true,
+        //});
 
         Autodesk.Viewing.Document.load(documentId, onDocumentLoadSuccess, onDocumentLoadFailure);
         
@@ -266,8 +266,9 @@ function onDocumentLoadSuccess(doc) {
                 if (item.displayName == "【tag_id】") { // Tag_name tag_id 【tag_id】
                     if (item.displayValue != "") {
                         //if ((item.displayValue).indexOf('TPE_B1_EE_E4') > -1) {
-                            //console.log("Tag_name dbid: " + e.dbId);
-                            //console.log("value: " + item.displayValue);
+                            console.log("--------------------------------------------------");
+                            console.log("Tag_name dbid: " + e.dbId);
+                            console.log("value: " + item.displayValue);
                         //}
                         //var v = getFragmentWorldMatrixByNodeId(e.dbId, viewer);
                         //console.log("v: " + v);
@@ -290,7 +291,8 @@ function onDocumentLoadSuccess(doc) {
                         }, true);
                         var position = bounds.center();
                         //if ((item.displayValue).indexOf('TPE_B1_EE_E4') > -1) {
-                            //console.log("position: (" + (position.x).toFixed(2) + ", " + (position.y).toFixed(2) + ", " + (position.z).toFixed(2) + ")");
+                        console.log("position: (" + (position.x).toFixed(2) + ", " + (position.y).toFixed(2) + ", " + (position.z).toFixed(2) + ")");
+                        console.log("--------------------------------------------------");
                         //}
                     }
                     //getFragmentWorldMatrixByNodeId(e.dbId, viewer);
@@ -1068,7 +1070,7 @@ async function loadHeatmaps(model) {
     //    },
     //    true
     //);
-    roofDbIds.push(5113);
+    roofDbIds.push(834);//5113 834 838 8106 8177
 
     const {
         SurfaceShadingData,