Procházet zdrojové kódy

Merge branch 'master' of http://192.168.0.115:3000/4dkankan/laser_v1

bill před 4 roky
rodič
revize
8a6d5c2d63
38 změnil soubory, kde provedl 505 přidání a 216 odebrání
  1. 6 16
      02d94ca661791fcac14ba92f8dcecbee.vertical_distance.svg
  2. 6 16
      1540b1aeaab2bc7a19ec443260a1fa0e.free_distance.svg
  3. 11 21
      5bba7dd7bc6240ea288672b61c3031d1.vertical_area_rectangle.svg
  4. 14 23
      6c9b0975d6ba095cfccbb03860ff45a9.vertical_area_polygon.svg
  5. 6 16
      843bab5c0f25be1c96cc7437f5a78dfd.horizontal_distance.svg
  6. 10 25
      87ccfb7e7cdbeb899c99456a4da61326.free_area.svg
  7. 6 3
      IndoorViewerAPI.js
  8. 14 23
      ac0e0b5511699ec66145c4153f5c0023.horizontal_area_polygon.svg
  9. 14 1
      api/tiled_maps
  10. 384 38
      css/style.css
  11. 12 20
      de3fd9d7dd7f30358753a7bf817833ae.horizontal_area_rectangle.svg
  12. binární
      img/icon/icon_EditMode.png
  13. binární
      img/icon/icon_EditMode_1.png
  14. binární
      img/icon/icon_data@2_1.png
  15. binární
      img/icon/icon_data@2x.png
  16. binární
      img/icon/icon_del.png
  17. binární
      img/icon/icon_element@2x.png
  18. binární
      img/icon/icon_element@2x_1.png
  19. binární
      img/icon/icon_eye@2x.png
  20. binární
      img/icon/icon_eye@2x_1.png
  21. binární
      img/icon/icon_hide.png
  22. binární
      img/icon/icon_load_n.png
  23. binární
      img/icon/icon_load_s.png
  24. binární
      img/icon/icon_location@2x.png
  25. binární
      img/icon/icon_location@2x_1.png
  26. binární
      img/icon/icon_location_n.png
  27. binární
      img/icon/icon_location_s.png
  28. binární
      img/icon/icon_measure@2x.png
  29. binární
      img/icon/icon_measure@2x_1.png
  30. binární
      img/icon/icon_save.png
  31. binární
      img/icon/share.png
  32. 2 1
      index.html
  33. 8 1
      js/index.js
  34. 2 2
      js/popindoorAPI2.7.1.js
  35. 1 1
      locat/addDataSet.html
  36. 1 1
      main.async.937f8f38454add70d57b.js
  37. 7 7
      translations/json/zh.json
  38. 1 1
      translations/zh.json

+ 6 - 16
02d94ca661791fcac14ba92f8dcecbee.vertical_distance.svg

@@ -1,21 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>切片</title>
-    <g id="激光相机" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="04--1测量-默认" transform="translate(-1538.000000, -503.000000)">
-            <g id="编组-5" transform="translate(1440.000000, 0.000000)">
-                <g id="编组-23" transform="translate(20.000000, 454.000000)">
-                    <g id="编组-12" transform="translate(70.000000, 41.000000)">
-                        <g id="icon_v_d" transform="translate(8.000000, 8.000000)">
-                            <g id="编组-7" transform="translate(9.000000, 3.000000)">
-                                <circle id="椭圆形" fill="#FFFFFF" cx="3" cy="15" r="3"></circle>
-                                <circle id="椭圆形备份" fill="#FFFFFF" cx="3" cy="3" r="3"></circle>
-                                <line x1="3" y1="3" x2="3" y2="15" id="路径" stroke="#FFFFFF" stroke-width="2"></line>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
+    <title>5bba7dd7bc6240ea288672b61c3031d1.vertical_area_rectangle</title>
+    <g id="5bba7dd7bc6240ea288672b61c3031d1.vertical_area_rectangle" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-7" transform="translate(9.000000, 3.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <path d="M3,12 C4.65685425,12 6,13.3431458 6,15 C6,16.6568542 4.65685425,18 3,18 C1.34314575,18 0,16.6568542 0,15 C0,13.3431458 1.34314575,12 3,12 Z M3,14 C2.44771525,14 2,14.4477153 2,15 C2,15.5522847 2.44771525,16 3,16 C3.55228475,16 4,15.5522847 4,15 C4,14.4477153 3.55228475,14 3,14 Z" id="椭圆形"></path>
+            <path d="M3,0 C4.65685425,0 6,1.34314575 6,3 C6,4.65685425 4.65685425,6 3,6 C1.34314575,6 0,4.65685425 0,3 C0,1.34314575 1.34314575,0 3,0 Z M3,2 C2.44771525,2 2,2.44771525 2,3 C2,3.55228475 2.44771525,4 3,4 C3.55228475,4 4,3.55228475 4,3 C4,2.44771525 3.55228475,2 3,2 Z" id="椭圆形备份"></path>
         </g>
+        <polygon id="路径-26" fill="#FFFFFF" fill-rule="nonzero" points="12.5 8 12.5 16 11.5 16 11.5 8"></polygon>
     </g>
 </svg>

+ 6 - 16
1540b1aeaab2bc7a19ec443260a1fa0e.free_distance.svg

@@ -1,21 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>切片</title>
-    <g id="激光相机" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="04--1测量-默认" transform="translate(-1538.000000, -159.000000)">
-            <g id="编组-5" transform="translate(1440.000000, 0.000000)">
-                <g id="编组-21" transform="translate(20.000000, 110.000000)">
-                    <g id="编组-20" transform="translate(70.000000, 41.000000)">
-                        <g id="icon_f_l" transform="translate(8.000000, 8.000000)">
-                            <g id="编组-11" transform="translate(3.000000, 5.000000)">
-                                <circle id="椭圆形" fill="#FFFFFF" cx="15" cy="3" r="3"></circle>
-                                <circle id="椭圆形备份" fill="#FFFFFF" cx="3" cy="11" r="3"></circle>
-                                <line x1="2" y1="12" x2="16" y2="1.5" id="路径" stroke="#FFFFFF" stroke-width="2"></line>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
+    <title>1540b1aeaab2bc7a19ec443260a1fa0e.free_distance</title>
+    <g id="1540b1aeaab2bc7a19ec443260a1fa0e.free_distance" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-11" transform="translate(7.000000, 8.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <polygon id="路径-2" points="7.64644661 0.646446609 8.35355339 1.35355339 2.35355339 7.35355339 1.64644661 6.64644661"></polygon>
         </g>
+        <path d="M7,14 C8.65685425,14 10,15.3431458 10,17 C10,18.6568542 8.65685425,20 7,20 C5.34314575,20 4,18.6568542 4,17 C4,15.3431458 5.34314575,14 7,14 Z M7,16 C6.44771525,16 6,16.4477153 6,17 C6,17.5522847 6.44771525,18 7,18 C7.55228475,18 8,17.5522847 8,17 C8,16.4477153 7.55228475,16 7,16 Z" id="椭圆形备份-4" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M17,4 C18.6568542,4 20,5.34314575 20,7 C20,8.65685425 18.6568542,10 17,10 C15.3431458,10 14,8.65685425 14,7 C14,5.34314575 15.3431458,4 17,4 Z M17,6 C16.4477153,6 16,6.44771525 16,7 C16,7.55228475 16.4477153,8 17,8 C17.5522847,8 18,7.55228475 18,7 C18,6.44771525 17.5522847,6 17,6 Z" id="椭圆形备份-5" fill="#FFFFFF" fill-rule="nonzero"></path>
     </g>
 </svg>

+ 11 - 21
5bba7dd7bc6240ea288672b61c3031d1.vertical_area_rectangle.svg

@@ -1,26 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>切片</title>
-    <g id="激光相机" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="04--1测量-默认" transform="translate(-1798.000000, -503.000000)" fill="#FFFFFF">
-            <g id="编组-5" transform="translate(1440.000000, 0.000000)">
-                <g id="编组-23" transform="translate(20.000000, 454.000000)">
-                    <g id="编组-14" transform="translate(330.000000, 41.000000)">
-                        <g id="icon_v_r" transform="translate(8.000000, 8.000000)">
-                            <g id="编组-6" transform="translate(4.000000, 2.000000)">
-                                <circle id="椭圆形" cx="2" cy="14" r="2"></circle>
-                                <circle id="椭圆形备份-3" cx="13" cy="3" r="3"></circle>
-                                <circle id="椭圆形备份-4" cx="13" cy="17" r="3"></circle>
-                                <circle id="椭圆形备份" cx="2" cy="5" r="2"></circle>
-                                <g id="路径备份-2" transform="translate(1.187000, 5.000000)">
-                                    <path d="M12.441,8 L12.626,9 L-0.001,9 L0.184,8 L12.441,8 Z M12.069,6 L12.255,7 L0.37,7 L0.556,6 L12.069,6 Z M11.698,4 L11.883,5 L0.742,5 L0.927,4 L11.698,4 Z M11.326,2 L11.512,3 L1.113,3 L1.299,2 L11.326,2 Z M10.9558571,0 L11.141,1 L1.484,1 L1.67014286,0 L10.9558571,0 Z" id="形状结合"></path>
-                                </g>
-                                <path d="M14,18.8675815 L14,1.24722598 L1,4.20177144 L1,14.7312179 L14,18.8675815 Z M12,3.753 L12,16.132 L3,13.269 L3,5.798 L12,3.753 Z" id="路径" fill-rule="nonzero"></path>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
+    <title>02d94ca661791fcac14ba92f8dcecbee.vertical_distance</title>
+    <g id="02d94ca661791fcac14ba92f8dcecbee.vertical_distance" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-6" transform="translate(3.000000, 2.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <path d="M14,0 C15.6568542,0 17,1.34314575 17,3 C17,4.65685425 15.6568542,6 14,6 C12.3431458,6 11,4.65685425 11,3 C11,1.34314575 12.3431458,0 14,0 Z M14,2 C13.4477153,2 13,2.44771525 13,3 C13,3.55228475 13.4477153,4 14,4 C14.5522847,4 15,3.55228475 15,3 C15,2.44771525 14.5522847,2 14,2 Z" id="椭圆形备份-3"></path>
+            <path d="M2.5,2 C3.88071187,2 5,3.11928813 5,4.5 C5,5.88071187 3.88071187,7 2.5,7 C1.11928813,7 0,5.88071187 0,4.5 C0,3.11928813 1.11928813,2 2.5,2 Z M2.5,4 C2.22385763,4 2,4.22385763 2,4.5 C2,4.77614237 2.22385763,5 2.5,5 C2.77614237,5 3,4.77614237 3,4.5 C3,4.22385763 2.77614237,4 2.5,4 Z" id="椭圆形备份-5"></path>
+            <path d="M2.5,12 C3.88071187,12 5,13.1192881 5,14.5 C5,15.8807119 3.88071187,17 2.5,17 C1.11928813,17 0,15.8807119 0,14.5 C0,13.1192881 1.11928813,12 2.5,12 Z M2.5,14 C2.22385763,14 2,14.2238576 2,14.5 C2,14.7761424 2.22385763,15 2.5,15 C2.77614237,15 3,14.7761424 3,14.5 C3,14.2238576 2.77614237,14 2.5,14 Z" id="椭圆形备份-6"></path>
+            <path d="M14,14 C15.6568542,14 17,15.3431458 17,17 C17,18.6568542 15.6568542,20 14,20 C12.3431458,20 11,18.6568542 11,17 C11,15.3431458 12.3431458,14 14,14 Z M14,16 C13.4477153,16 13,16.4477153 13,17 C13,17.5522847 13.4477153,18 14,18 C14.5522847,18 15,17.5522847 15,17 C15,16.4477153 14.5522847,16 14,16 Z" id="椭圆形备份-4"></path>
         </g>
+        <polygon id="路径-22" fill="#FFFFFF" fill-rule="nonzero" points="17.5 7 17.5 17 16.5 17 16.5 7"></polygon>
+        <polygon id="路径-23" fill="#FFFFFF" fill-rule="nonzero" points="7.12126781 16.5149287 15.1212678 18.5149287 14.8787322 19.4850713 6.87873219 17.4850713"></polygon>
+        <polygon id="路径-24" fill="#FFFFFF" fill-rule="nonzero" points="14.9078557 4.50856391 15.0921443 5.49143609 7.09214427 6.99143609 6.90785573 6.00856391"></polygon>
+        <polygon id="路径-25" fill="#FFFFFF" fill-rule="nonzero" points="6 7.5 6 15.5 5 15.5 5 7.5"></polygon>
     </g>
 </svg>

+ 14 - 23
6c9b0975d6ba095cfccbb03860ff45a9.vertical_area_polygon.svg

@@ -1,29 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>切片</title>
-    <g id="激光相机" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="04--1测量-默认" transform="translate(-1668.000000, -503.000000)">
-            <g id="编组-5" transform="translate(1440.000000, 0.000000)">
-                <g id="编组-23" transform="translate(20.000000, 454.000000)">
-                    <g id="编组-15" transform="translate(199.000000, 41.000000)">
-                        <g id="编组备份-4" transform="translate(1.000000, 0.000000)">
-                            <g id="icon_v_m" transform="translate(8.000000, 8.000000)">
-                                <g id="编组-4" transform="translate(5.000000, 2.000000)">
-                                    <circle id="椭圆形" fill="#FFFFFF" cx="2" cy="13" r="2"></circle>
-                                    <circle id="椭圆形备份-2" fill="#FFFFFF" cx="7" cy="2" r="2"></circle>
-                                    <circle id="椭圆形备份-3" fill="#FFFFFF" cx="12" cy="6" r="3"></circle>
-                                    <circle id="椭圆形备份-4" fill="#FFFFFF" cx="12" cy="17" r="3"></circle>
-                                    <circle id="椭圆形备份" fill="#FFFFFF" cx="2" cy="4" r="2"></circle>
-                                    <g id="路径备份-2" transform="translate(2.000000, 5.000000)" fill="#FFFFFF">
-                                        <path d="M10,8 L10,9 L2.5,9 L0,8 L10,8 Z M10,6 L10,7 L0,7 L0,6 L10,6 Z M10,4 L10,5 L0,5 L0,4 L10,4 Z M10,2 L10,3 L0,3 L0,2 L10,2 Z M9.286,0 L10,0.5 L10,1 L0,1 L0,0 L9.286,0 Z" id="形状结合"></path>
-                                    </g>
-                                    <polygon id="路径" stroke="#FFFFFF" stroke-width="2" points="2 4 2 13 12 17 12 5.5 7 2"></polygon>
-                                </g>
-                            </g>
-                        </g>
-                    </g>
-                </g>
+    <title>6c9b0975d6ba095cfccbb03860ff45a9.vertical_area_polygon</title>
+    <g id="6c9b0975d6ba095cfccbb03860ff45a9.vertical_area_polygon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-2" transform="translate(3.000000, 1.500000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="编组-8">
+                <path d="M9,0 C10.6568542,0 12,1.34314575 12,3 C12,4.65685425 10.6568542,6 9,6 C7.34314575,6 6,4.65685425 6,3 C6,1.34314575 7.34314575,0 9,0 Z M9,2 C8.44771525,2 8,2.44771525 8,3 C8,3.55228475 8.44771525,4 9,4 C9.55228475,4 10,3.55228475 10,3 C10,2.44771525 9.55228475,2 9,2 Z" id="椭圆形备份-2"></path>
+                <path d="M3,11.5 C4.65685425,11.5 6,12.8431458 6,14.5 C6,16.1568542 4.65685425,17.5 3,17.5 C1.34314575,17.5 0,16.1568542 0,14.5 C0,12.8431458 1.34314575,11.5 3,11.5 Z M3,13.5 C2.44771525,13.5 2,13.9477153 2,14.5 C2,15.0522847 2.44771525,15.5 3,15.5 C3.55228475,15.5 4,15.0522847 4,14.5 C4,13.9477153 3.55228475,13.5 3,13.5 Z" id="椭圆形备份-3"></path>
+                <path d="M15,14.5 C16.6568542,14.5 18,15.8431458 18,17.5 C18,19.1568542 16.6568542,20.5 15,20.5 C13.3431458,20.5 12,19.1568542 12,17.5 C12,15.8431458 13.3431458,14.5 15,14.5 Z M15,16.5 C14.4477153,16.5 14,16.9477153 14,17.5 C14,18.0522847 14.4477153,18.5 15,18.5 C15.5522847,18.5 16,18.0522847 16,17.5 C16,16.9477153 15.5522847,16.5 15,16.5 Z" id="椭圆形备份-4"></path>
+                <path d="M15,5.5 C16.6568542,5.5 18,6.84314575 18,8.5 C18,10.1568542 16.6568542,11.5 15,11.5 C13.3431458,11.5 12,10.1568542 12,8.5 C12,6.84314575 13.3431458,5.5 15,5.5 Z M15,7.5 C14.4477153,7.5 14,7.94771525 14,8.5 C14,9.05228475 14.4477153,9.5 15,9.5 C15.5522847,9.5 16,9.05228475 16,8.5 C16,7.94771525 15.5522847,7.5 15,7.5 Z" id="椭圆形备份-5"></path>
+                <path d="M3,4 C4.65685425,4 6,5.34314575 6,7 C6,8.65685425 4.65685425,10 3,10 C1.34314575,10 0,8.65685425 0,7 C0,5.34314575 1.34314575,4 3,4 Z M3,6 C2.44771525,6 2,6.44771525 2,7 C2,7.55228475 2.44771525,8 3,8 C3.55228475,8 4,7.55228475 4,7 C4,6.44771525 3.55228475,6 3,6 Z" id="椭圆形备份-6"></path>
             </g>
         </g>
+        <polygon id="路径-19" fill="#FFFFFF" fill-rule="nonzero" points="7.61451967 16.5132914 16.1145197 18.5132914 15.8854803 19.4867086 7.38548033 17.4867086"></polygon>
+        <polygon id="路径-20" fill="#FFFFFF" fill-rule="nonzero" points="18.5 12 18.5 16.5 17.5 16.5 17.5 12"></polygon>
+        <polygon id="路径-20备份" fill="#FFFFFF" fill-rule="nonzero" points="6.5 10.5 6.5 15 5.5 15 5.5 10.5"></polygon>
+        <polygon id="路径-20备份-2" fill="#FFFFFF" fill-rule="nonzero" points="9.18765248 5.1095656 9.81234752 5.8904344 7.31234752 7.8904344 6.68765248 7.1095656"></polygon>
+        <polygon id="路径-20备份-3" fill="#FFFFFF" fill-rule="nonzero" transform="translate(14.500000, 7.000000) scale(-1, 1) translate(-14.500000, -7.000000) " points="15.7226499 5.58397485 16.2773501 6.41602515 13.2773501 8.41602515 12.7226499 7.58397485"></polygon>
     </g>
 </svg>

+ 6 - 16
843bab5c0f25be1c96cc7437f5a78dfd.horizontal_distance.svg

@@ -1,21 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>切片</title>
-    <g id="激光相机" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="04--1测量-默认" transform="translate(-1538.000000, -331.000000)">
-            <g id="编组-5" transform="translate(1440.000000, 0.000000)">
-                <g id="编组-22" transform="translate(20.000000, 282.000000)">
-                    <g id="编组-16" transform="translate(70.000000, 41.000000)">
-                        <g id="icon_h_d" transform="translate(8.000000, 8.000000)">
-                            <g id="编组-10" transform="translate(2.000000, 9.000000)">
-                                <circle id="椭圆形" fill="#FFFFFF" cx="17" cy="3" r="3"></circle>
-                                <circle id="椭圆形备份" fill="#FFFFFF" cx="3" cy="3" r="3"></circle>
-                                <line x1="3" y1="3" x2="17" y2="3" id="路径" stroke="#FFFFFF" stroke-width="2"></line>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
+    <title>843bab5c0f25be1c96cc7437f5a78dfd.horizontal_distance</title>
+    <g id="843bab5c0f25be1c96cc7437f5a78dfd.horizontal_distance" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-10" transform="translate(2.000000, 9.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <path d="M17,0 C18.6568542,0 20,1.34314575 20,3 C20,4.65685425 18.6568542,6 17,6 C15.3431458,6 14,4.65685425 14,3 C14,1.34314575 15.3431458,0 17,0 Z M17,2 C16.4477153,2 16,2.44771525 16,3 C16,3.55228475 16.4477153,4 17,4 C17.5522847,4 18,3.55228475 18,3 C18,2.44771525 17.5522847,2 17,2 Z" id="椭圆形"></path>
+            <path d="M3,0 C4.65685425,0 6,1.34314575 6,3 C6,4.65685425 4.65685425,6 3,6 C1.34314575,6 0,4.65685425 0,3 C0,1.34314575 1.34314575,0 3,0 Z M3,2 C2.44771525,2 2,2.44771525 2,3 C2,3.55228475 2.44771525,4 3,4 C3.55228475,4 4,3.55228475 4,3 C4,2.44771525 3.55228475,2 3,2 Z" id="椭圆形备份"></path>
         </g>
+        <polygon id="路径-18" fill="#FFFFFF" fill-rule="nonzero" points="16.5 11 16.5 12 7.5 12 7.5 11"></polygon>
     </g>
 </svg>

+ 10 - 25
87ccfb7e7cdbeb899c99456a4da61326.free_area.svg

@@ -1,29 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>切片</title>
-    <g id="激光相机" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="04--1测量-默认" transform="translate(-1668.000000, -503.000000)">
-            <g id="编组-5" transform="translate(1440.000000, 0.000000)">
-                <g id="编组-23" transform="translate(20.000000, 454.000000)">
-                    <g id="编组-15" transform="translate(199.000000, 41.000000)">
-                        <g id="编组备份-4" transform="translate(1.000000, 0.000000)">
-                            <g id="icon_v_m" transform="translate(8.000000, 8.000000)">
-                                <g id="编组-4" transform="translate(5.000000, 2.000000)">
-                                    <circle id="椭圆形" fill="#FFFFFF" cx="2" cy="13" r="2"></circle>
-                                    <circle id="椭圆形备份-2" fill="#FFFFFF" cx="7" cy="2" r="2"></circle>
-                                    <circle id="椭圆形备份-3" fill="#FFFFFF" cx="12" cy="6" r="3"></circle>
-                                    <circle id="椭圆形备份-4" fill="#FFFFFF" cx="12" cy="17" r="3"></circle>
-                                    <circle id="椭圆形备份" fill="#FFFFFF" cx="2" cy="4" r="2"></circle>
-                                    <g id="路径备份-2" transform="translate(2.000000, 5.000000)" fill="#FFFFFF">
-                                        <path d="M10,8 L10,9 L2.5,9 L0,8 L10,8 Z M10,6 L10,7 L0,7 L0,6 L10,6 Z M10,4 L10,5 L0,5 L0,4 L10,4 Z M10,2 L10,3 L0,3 L0,2 L10,2 Z M9.286,0 L10,0.5 L10,1 L0,1 L0,0 L9.286,0 Z" id="形状结合"></path>
-                                    </g>
-                                    <polygon id="路径" stroke="#FFFFFF" stroke-width="2" points="2 4 2 13 12 17 12 5.5 7 2"></polygon>
-                                </g>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
+    <title>87ccfb7e7cdbeb899c99456a4da61326.free_area</title>
+    <g id="87ccfb7e7cdbeb899c99456a4da61326.free_area" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M19,8 C20.6568542,8 22,9.34314575 22,11 C22,12.6568542 20.6568542,14 19,14 C17.3431458,14 16,12.6568542 16,11 C16,9.34314575 17.3431458,8 19,8 Z M19,10 C18.4477153,10 18,10.4477153 18,11 C18,11.5522847 18.4477153,12 19,12 C19.5522847,12 20,11.5522847 20,11 C20,10.4477153 19.5522847,10 19,10 Z" id="椭圆形" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M12,1 C13.6568542,1 15,2.34314575 15,4 C15,5.65685425 13.6568542,7 12,7 C10.3431458,7 9,5.65685425 9,4 C9,2.34314575 10.3431458,1 12,1 Z M12,3 C11.4477153,3 11,3.44771525 11,4 C11,4.55228475 11.4477153,5 12,5 C12.5522847,5 13,4.55228475 13,4 C13,3.44771525 12.5522847,3 12,3 Z" id="椭圆形备份-2" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M9,16 C10.6568542,16 12,17.3431458 12,19 C12,20.6568542 10.6568542,22 9,22 C7.34314575,22 6,20.6568542 6,19 C6,17.3431458 7.34314575,16 9,16 Z M9,18 C8.44771525,18 8,18.4477153 8,19 C8,19.5522847 8.44771525,20 9,20 C9.55228475,20 10,19.5522847 10,19 C10,18.4477153 9.55228475,18 9,18 Z" id="椭圆形备份-3" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M4,8 C5.65685425,8 7,9.34314575 7,11 C7,12.6568542 5.65685425,14 4,14 C2.34314575,14 1,12.6568542 1,11 C1,9.34314575 2.34314575,8 4,8 Z M4,10 C3.44771525,10 3,10.4477153 3,11 C3,11.5522847 3.44771525,12 4,12 C4.55228475,12 5,11.5522847 5,11 C5,10.4477153 4.55228475,10 4,10 Z" id="椭圆形备份" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <polygon id="路径" fill="#FFFFFF" fill-rule="nonzero" points="10.1876525 5.1095656 10.8123475 5.8904344 5.81234752 9.8904344 5.18765248 9.1095656"></polygon>
+        <polygon id="路径-6" fill="#FFFFFF" fill-rule="nonzero" points="4.92874646 12.2427521 7.92874646 17.2427521 7.07125354 17.7572479 4.07125354 12.7572479"></polygon>
+        <polygon id="路径-16" fill="#FFFFFF" fill-rule="nonzero" points="17.2093809 12.0931333 17.7906191 12.9068667 10.7906191 17.9068667 10.2093809 17.0931333"></polygon>
+        <polygon id="路径-17" fill="#FFFFFF" fill-rule="nonzero" points="13.8535534 5.14644661 17.8535534 9.14644661 17.1464466 9.85355339 13.1464466 5.85355339"></polygon>
     </g>
 </svg>

+ 6 - 3
IndoorViewerAPI.js

@@ -53003,7 +53003,9 @@ and limitations under the License.
             void 0 === i && (i = !0),
             e[this.JWTTokenService.getJwtUrlParamKey()] = this.JWTTokenService.getJwt();
             var r = this.$httpParamSerializer(e)
-              , o = u.getBaseUrl() + (i ? this.apiEndpoint + t : t);
+              //, o = u.getBaseUrl() + (i ? this.apiEndpoint + t : t);
+              , o = (i ? this.apiEndpoint + t : t);
+            n = o.substring(o.lastIndexOf('/')+1);
             c.clickHiddenURL(o + "?" + r, n)
         }
         ,
@@ -75884,7 +75886,8 @@ and limitations under the License.
         }
         ,
         t.prototype.getJwtHeaderValue = function() {
-            return this.TOKEN_VALUE_PREFIX_HEADER + " " + this.getJwt()
+            //return this.TOKEN_VALUE_PREFIX_HEADER + " " + this.getJwt()
+			return this.getJwt()
         }
         ,
         t.prototype.setJwtHeaderOnXHR = function(t) {
@@ -152975,7 +152978,7 @@ and limitations under the License.
 								else if(a.indexOf('/poi/icon')>-1){
 									a = '../../indoor/'+sceneNum+a.substring(a.indexOf('/poi/'));
 								}
-                                else if(a.indexOf('/api/newmeasurements')>-1||a.indexOf('/api/datasets')>-1||a.indexOf('/api/site_model/within_polygon')>-1||a.indexOf('/api/pois')>-1||a.indexOf('/api/poi_types')>-1||a.indexOf('/api/poi_type_groups')>-1||a.indexOf('/api/auth/token')>-1){
+                                else if(a.indexOf('/api/jobs')>-1||a.indexOf('/api/site_model/validate')>-1||a.indexOf('/api/pointcloud/crop')>-1||a.indexOf('/api/newmeasurements')>-1||a.indexOf('/api/datasets')>-1||a.indexOf('/api/site_model/within_polygon')>-1||a.indexOf('/api/pois')>-1||a.indexOf('/api/poi_types')>-1||a.indexOf('/api/poi_type_groups')>-1||a.indexOf('/api/auth/token')>-1){
                                     a = '../../indoor/'+sceneNum+a.substring(a.indexOf('/api/'));
                                 }
                                 y.open(o, a, !0),

+ 14 - 23
ac0e0b5511699ec66145c4153f5c0023.horizontal_area_polygon.svg

@@ -1,29 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>切片</title>
-    <g id="激光相机" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="04--1测量-默认" transform="translate(-1668.000000, -331.000000)" fill="#FFFFFF">
-            <g id="编组-5" transform="translate(1440.000000, 0.000000)">
-                <g id="编组-22" transform="translate(20.000000, 282.000000)">
-                    <g id="编组-17" transform="translate(199.000000, 41.000000)">
-                        <g id="编组备份-3" transform="translate(1.000000, 0.000000)">
-                            <g id="icon_h_m" transform="translate(8.000000, 8.000000)">
-                                <g id="编组-8" transform="translate(2.000000, 4.000000)">
-                                    <circle id="椭圆形" cx="16" cy="5" r="2"></circle>
-                                    <circle id="椭圆形备份-2" cx="10" cy="2" r="2"></circle>
-                                    <circle id="椭圆形备份-3" cx="3" cy="13" r="3"></circle>
-                                    <circle id="椭圆形备份-4" cx="17" cy="13" r="3"></circle>
-                                    <circle id="椭圆形备份" cx="4" cy="5" r="2"></circle>
-                                    <g id="路径备份-2" transform="translate(3.000000, 3.000000)" fill-rule="nonzero">
-                                        <path d="M13.941,10 L14,10.5 L0,10 L13.941,10 Z M13.706,8 L13.824,9 L0.125,9 L0.25,8 L13.706,8 Z M13.471,6 L13.588,7 L0.375,7 L0.5,6 L13.471,6 Z M13.235,4 L13.353,5 L0.625,5 L0.75,4 L13.235,4 Z M13,2 L13.118,3 L0.875,3 L1,2 L13,2 Z M9,0 L11,1 L3,1 L5,0 L9,0 Z" id="形状"></path>
-                                    </g>
-                                    <path d="M16.9300734,4.34700272 L10,0.881966011 L3.06992658,4.34700272 L1.87545631,14.5 L18.1245437,14.5 L16.9300734,4.34700272 Z M10,3.118 L15.069,5.653 L15.875,12.5 L4.124,12.5 L4.93,5.653 L10,3.118 Z" id="路径" fill-rule="nonzero"></path>
-                                </g>
-                            </g>
-                        </g>
-                    </g>
-                </g>
+    <title>ac0e0b5511699ec66145c4153f5c0023.horizontal_area_polygon</title>
+    <g id="ac0e0b5511699ec66145c4153f5c0023.horizontal_area_polygon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-2" transform="translate(2.000000, 1.500000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="编组-8">
+                <path d="M10,0 C11.6568542,0 13,1.34314575 13,3 C13,4.65685425 11.6568542,6 10,6 C8.34314575,6 7,4.65685425 7,3 C7,1.34314575 8.34314575,0 10,0 Z M10,2 C9.44771525,2 9,2.44771525 9,3 C9,3.55228475 9.44771525,4 10,4 C10.5522847,4 11,3.55228475 11,3 C11,2.44771525 10.5522847,2 10,2 Z" id="椭圆形备份-2"></path>
+                <path d="M3,13.5 C4.65685425,13.5 6,14.8431458 6,16.5 C6,18.1568542 4.65685425,19.5 3,19.5 C1.34314575,19.5 0,18.1568542 0,16.5 C0,14.8431458 1.34314575,13.5 3,13.5 Z M3,15.5 C2.44771525,15.5 2,15.9477153 2,16.5 C2,17.0522847 2.44771525,17.5 3,17.5 C3.55228475,17.5 4,17.0522847 4,16.5 C4,15.9477153 3.55228475,15.5 3,15.5 Z" id="椭圆形备份-3"></path>
+                <path d="M17,13.5 C18.6568542,13.5 20,14.8431458 20,16.5 C20,18.1568542 18.6568542,19.5 17,19.5 C15.3431458,19.5 14,18.1568542 14,16.5 C14,14.8431458 15.3431458,13.5 17,13.5 Z M17,15.5 C16.4477153,15.5 16,15.9477153 16,16.5 C16,17.0522847 16.4477153,17.5 17,17.5 C17.5522847,17.5 18,17.0522847 18,16.5 C18,15.9477153 17.5522847,15.5 17,15.5 Z" id="椭圆形备份-4"></path>
+                <path d="M15.5,5 C17.1568542,5 18.5,6.34314575 18.5,8 C18.5,9.65685425 17.1568542,11 15.5,11 C13.8431458,11 12.5,9.65685425 12.5,8 C12.5,6.34314575 13.8431458,5 15.5,5 Z M15.5,7 C14.9477153,7 14.5,7.44771525 14.5,8 C14.5,8.55228475 14.9477153,9 15.5,9 C16.0522847,9 16.5,8.55228475 16.5,8 C16.5,7.44771525 16.0522847,7 15.5,7 Z" id="椭圆形备份-5"></path>
+                <path d="M4.5,5 C6.15685425,5 7.5,6.34314575 7.5,8 C7.5,9.65685425 6.15685425,11 4.5,11 C2.84314575,11 1.5,9.65685425 1.5,8 C1.5,6.34314575 2.84314575,5 4.5,5 Z M4.5,7 C3.94771525,7 3.5,7.44771525 3.5,8 C3.5,8.55228475 3.94771525,9 4.5,9 C5.05228475,9 5.5,8.55228475 5.5,8 C5.5,7.44771525 5.05228475,7 4.5,7 Z" id="椭圆形备份-6"></path>
             </g>
         </g>
+        <polygon id="路径-19" fill="#FFFFFF" fill-rule="nonzero" points="17.5 18 17.5 19 6.5 19 6.5 18"></polygon>
+        <polygon id="路径-20" fill="#FFFFFF" fill-rule="nonzero" points="18.4880935 10.8915348 19.4880935 15.3915348 18.5119065 15.6084652 17.5119065 11.1084652"></polygon>
+        <polygon id="路径-20备份" fill="#FFFFFF" fill-rule="nonzero" points="5.51190647 10.8915348 6.48809353 11.1084652 5.48809353 15.6084652 4.51190647 15.3915348"></polygon>
+        <polygon id="路径-20备份-2" fill="#FFFFFF" fill-rule="nonzero" points="10.2093809 5.09313326 10.7906191 5.90686674 7.2906191 8.40686674 6.7093809 7.59313326"></polygon>
+        <polygon id="路径-20备份-3" fill="#FFFFFF" fill-rule="nonzero" transform="translate(15.250000, 6.750000) scale(-1, 1) translate(-15.250000, -6.750000) " points="16.7093809 5.09313326 17.2906191 5.90686674 13.7906191 8.40686674 13.2093809 7.59313326"></polygon>
     </g>
 </svg>

+ 14 - 1
api/tiled_maps

@@ -1 +1,14 @@
-[]
+[{
+	"bundle_id": 3,
+	"file_path": "data/building_1/mapTest2",
+	"file_name": "$DEPTH/$X/$Y.png",
+	"floor_id": 11,
+	"id": 5,
+	"map_size_m": 37.10058256252635,
+	"max_depth": 3,
+	"quadtree": "fccf7fffcff3bf7f",
+	"location": [113.5892056859005,22.367124170442096,0.5987030136375425],
+	"orientation": [1,0,0,0],
+	"tile_size_px": 256,
+	"type": "TILED_PYRAMID"
+}]

+ 384 - 38
css/style.css

@@ -11,7 +11,7 @@ body a:hover {
 }
 
 .ng-isolate-scope .vertical-menu {
-    background-color: rgba(0, 0, 0, 0.8) !important;
+    background-color: #141414 !important;
 }
 
 
@@ -55,12 +55,11 @@ sidebar-menu-items-collection {
     background-color: transparent !important;
 }
 
-sidebar-preview-menu>.vertical-menu sidebar-menu-items-collection>.panel-autoscroll {
-    background-color: transparent !important;
-}
+
+/* 首页导航栏 */
 
 sidebar-preview-menu>.vertical-menu sidebar-menu-items-collection>.panel-autoscroll {
-    display: none !important;
+    /* display: none !important; */
 }
 
 sidebar-preview-menu>.vertical-menu sidebar-menu-items-collection sidebar-menu-item>li icon>i {
@@ -107,11 +106,19 @@ sidebar-menu .link {
     color: #fff;
 }
 
+left-panel .threeD-overlay {
+    margin: 10px 0 0 60px !important;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 100;
+    max-width: 300px !important;
+}
+
 .threeD-overlay #left-panel-pois {
-    /* width: 360px; */
     background: rgba(0, 0, 0, 0.8) !important;
-    /* margin-left: 78px;
-    height: 42px; */
+    border: 1px solid rgba(255, 255, 255, .2);
+    border-radius: 32px !important;
 }
 
 .search-box #searchInput.padding-left-menu-icon {
@@ -119,6 +126,15 @@ sidebar-menu .link {
     /* padding-left: 20px !important; */
 }
 
+.search-box #searchInput {
+    color: #fff !important;
+    font-size: 1em !important;
+}
+
+.search-box #searchInput::-webkit-input-placeholde {
+    color: #fff !important;
+}
+
 navbar-menu .navbar-default .navbar-custom>li.navbar-menu-item-sidebar>a {
     /* padding: 0 !important; */
 }
@@ -174,6 +190,7 @@ site-model-details .vcenter.padding-horizontal .long-title {
 
 navbar-menu .navbar-default .navbar-custom>li.navbar-menu-item-sidebar>a icon {
     background: transparent !important;
+    display: none !important;
 }
 
 navbar-menu .navbar-default .navbar-custom>li.navbar-menu-item-sidebar.shadow {
@@ -210,63 +227,67 @@ sidebar-menu>.vertical-menu>.vertical-menu-heading>.root-heading>span {
     display: none !important;
 }
 
+sidebar-preview-menu>.vertical-menu sidebar-menu-items-collection sidebar-menu-item>li {
+    margin-bottom: 20px;
+}
+
 sidebar-menu-item>li icon>i.material-icons[icon-ligature="dashboard"] {
-    background: url(../img/icon/icon_data@2x.png)no-repeat;
+    background: url(../img/icon/icon_data@2x.png?4)no-repeat;
     background-size: 100% 100%;
-    width: 20px;
-    height: 20px;
+    width: 60px;
+    height: 60px;
     color: transparent;
 }
 
 .vertical-menu sidebar-menu-item.active>li icon>i.material-icons[icon-ligature="dashboard"] {
-    background: url(../img/icon/icon_data@2_1.png)no-repeat;
+    background: url(../img/icon/icon_data@2_1.png?4)no-repeat;
     background-size: 100% 100%;
 }
 
 sidebar-menu-item>li icon>i.material-icons[icon-ligature="remove_red_eye"] {
-    background: url(../img/icon/icon_eye@2x.png)no-repeat;
+    background: url(../img/icon/icon_eye@2x.png?4)no-repeat;
     background-size: 100% 100%;
-    width: 20px;
-    height: 20px;
+    width: 60px;
+    height: 60px;
     color: transparent;
 }
 
 .vertical-menu sidebar-menu-item.active>li icon>i.material-icons[icon-ligature="remove_red_eye"] {
-    background: url(../img/icon/icon_eye@2x_1.png)no-repeat;
+    background: url(../img/icon/icon_eye@2x_1.png?4)no-repeat;
     background-size: 100% 100%;
 }
 
 sidebar-menu-item>li icon>i.material-icons[icon-ligature="location_on"] {
-    background: url(../img/icon/icon_element@2x.png)no-repeat;
+    background: url(../img/icon/icon_element@2x.png?4)no-repeat;
     background-size: 100% 100%;
-    width: 20px;
-    height: 20px;
+    width: 60px;
+    height: 60px;
     color: transparent;
 }
 
-.vertical-menu sidebar-menu-item.active>li icon>i.material-icons[icon-ligature="mode_edit"] {
-    background: url(../img/icon/icon_EditMode_1.png)no-repeat;
+.vertical-menu sidebar-menu-item.active>li icon>i.material-icons[icon-ligature="location_on"] {
+    background: url(../img/icon/icon_element@2x_1.png?4)no-repeat;
     background-size: 100% 100%;
 }
 
 sidebar-menu-item>li icon>i.material-icons[icon-ligature="mode_edit"] {
-    background: url(../img/icon/icon_EditMode.png)no-repeat;
+    background: url(../img/icon/icon_EditMode_1.png?4)no-repeat;
     background-size: 100% 100%;
-    width: 20px;
-    height: 20px;
+    width: 60px;
+    height: 60px;
     color: transparent;
 }
 
-.vertical-menu sidebar-menu-item.active>li icon>i.material-icons[icon-ligature="location_on"] {
-    background: url(../img/icon/icon_element@2x_1.png)no-repeat;
+.vertical-menu sidebar-menu-item.active>li icon>i.material-icons[icon-ligature="mode_edit"] {
+    background: url(../img/icon/icon_EditMode.png?4)no-repeat;
     background-size: 100% 100%;
 }
 
 sidebar-menu-item>li icon>i.material-icons[icon-ligature="straighten"] {
-    background: url(../img/icon/icon_measure@2x.png)no-repeat;
+    background: url(../img/icon/icon_measure@2x.png?4)no-repeat;
     background-size: 100% 100%;
-    width: 20px;
-    height: 20px;
+    width: 60px;
+    height: 60px;
     color: transparent;
 }
 
@@ -275,22 +296,39 @@ sidebar-menu-item>li icon>i.material-icons[icon-ligature="straighten"] {
     background-size: 100% 100%;
 }
 
-sidebar-menu-item>li icon>i.fa-thumb-tack[iv-tooltip="坐标查询"] {
-    background: url(../img/icon/icon_location@2x.png)no-repeat;
+sidebar-menu-item>li icon>i.fa-thumb-tack[iv-tooltip="坐标"] {
+    background: url(../img/icon/icon_location@2x.png?4)no-repeat;
     background-size: 100% 100%;
-    width: 20px;
-    height: 20px;
+    width: 60px;
+    height: 60px;
+    color: transparent;
+}
+
+.vertical-menu sidebar-menu-item.active>li icon>i.fa-thumb-tack[iv-tooltip="坐标"] {
+    background: url(../img/icon/icon_location@2x_1.png?4)no-repeat;
+    background-size: 100% 100%;
+}
+
+sidebar-menu-item>li icon>i.fa-thumb-tack[iv-tooltip="平面图"] {
+    background: url(../img/icon/icon_load_n.png?4)no-repeat;
+    background-size: 100% 100%;
+    width: 60px;
+    height: 60px;
     color: transparent;
 }
 
-.vertical-menu sidebar-menu-item.active>li icon>i.fa-thumb-tack[iv-tooltip="坐标查询"] {
-    background: url(../img/icon/icon_location@2x_1.png)no-repeat;
+.vertical-menu sidebar-menu-item.active>li icon>i.fa-thumb-tack[iv-tooltip="平面图"] {
+    background: url(../img/icon/icon_load_s.png?4)no-repeat;
     background-size: 100% 100%;
 }
 
 
 /* 数据集 */
 
+.ng-isolate-scope sidebar-menu-item>li.sidebar-menu-item-mode-alignment {
+    display: none !important;
+}
+
 .multiple-dataset-selector>h4 {
     height: 64px;
     margin: 0 auto 30px;
@@ -470,7 +508,7 @@ poi-type-group-list .panel-default>.panel-heading {
 }
 
 sidebar-menu-item>li icon {
-    padding: 10px !important;
+    /* padding: 10px !important; */
 }
 
 
@@ -693,6 +731,7 @@ left-panel .poi-extensions-box>*>* {
 
 .search-box #searchInput.padding-left-menu-icon {
     border-color: transparent !important;
+    padding-left: 10px !important;
 }
 
 .list-group-item {
@@ -775,6 +814,23 @@ point-cloud-viewport .view-switcher__holder .btn-default svg {
     color: #fff;
 }
 
+measurement-tool {
+    /* width: auto !important; */
+    /* flex: none !important; */
+    /* margin-right: 20px; */
+}
+
+measurement-tool>span {
+    display: flex!important;
+    align-items: center!important;
+    justify-content: center!important;
+}
+
+measurement-tool>span>img {
+    margin-right: 10px!important;
+    border-radius: 50% !important;
+}
+
 
 /* 路线弹窗 */
 
@@ -833,6 +889,14 @@ sidebar-menu-items-collection>.panel-autoscroll>.sidebar-menu-templateselect opt
     color: #fff !important;
 } */
 
+.sidebar-menu-item-mode-normal {
+    display: none!important;
+}
+
+h4[title="编辑模式"]+sidebar-menu-items-collection .panel-autoscroll sidebar-menu-item:nth-of-type(1) {
+    display: none !important;
+}
+
 .ng-isolate-scope sidebar-menu-item>li.sidebar-menu-item-mode-vector-map {
     display: none;
 }
@@ -867,6 +931,10 @@ site-model-editor .btn-primary:hover {
 
 /* 空间模型 */
 
+.ng-isolate-scope sidebar-menu-item>li.sidebar-menu-item-mode-site-model {
+    display: none;
+}
+
 form[class="ng-pristine ng-valid"] .panel.panel-default {
     border-color: rgba(255, 255, 255, .2);
 }
@@ -1011,6 +1079,7 @@ vector-map-toolbar[class="ng-isolate-scope"] .btn-toolbar .btn-default:hover {
 
 download-button .collapse-style {
     background-color: transparent !important;
+    bottom: 80% !important;
 }
 
 .input-group-addon {
@@ -1050,6 +1119,24 @@ download-button .input-group .btn-primary {
     border-color: #15BEC8;
 }
 
+#vertical-toolbox-menu .vertical-menu-content download-point-cloud .collapse-style .input-group input[placeholder="pointcloud"] {
+    display: none !important;
+}
+
+#vertical-toolbox-menu .vertical-menu-content download-point-cloud .collapse-style .input-group .input-group-addon {
+    display: none !important;
+}
+
+#vertical-toolbox-menu .vertical-menu-content download-point-cloud .collapse-style .input-group .input-group-btn button {
+    width: 100%!important;
+    float: right;
+    border-radius: 4px;
+}
+
+#vertical-toolbox-menu .vertical-menu-content download-point-cloud reference-dataset-selection {
+    display: none;
+}
+
 .route-box .btn-close:active,
 .route-box .btn-close:hover {
     background: transparent !important;
@@ -1131,6 +1218,30 @@ input[readonly="readonly"] {
     display: none !important;
 }
 
+#viewConfiguration hr {
+    /* display: none !important; */
+}
+
+#viewConfiguration .checkbox:nth-of-type(-n+4) {
+    /* display: none !important; */
+}
+
+automatic-alignment {
+    /* display: none !important; */
+}
+
+dataset-tree {
+    display: none !important;
+}
+
+generate-and-save-bundle-xml {
+    /* display: none !important; */
+}
+
+dataset-alignment-panel form[role="form"] .form-group.text-right.mt-10 {
+    display: none !important;
+}
+
 
 /* 变换 */
 
@@ -1256,6 +1367,10 @@ measurement-list-toolbar .fa-check-square-o {
 
 /* 搜索 */
 
+#results-list.show {
+    left: 60px!important;
+}
+
 #results-list .results-heading {
     background-color: transparent !important;
 }
@@ -1396,8 +1511,239 @@ translation-editor[selected-language="selectedLanguage"] .form-group:first-of-ty
 }
 
 
-/* 加载地图 */
+/* 平面图 */
 
-sidebar-menu-item li h4[title="加载地图"]+sidebar-menu-items-collection.active {
+sidebar-menu-item li h4[title="平面图"]+sidebar-menu-items-collection.active {
     position: fixed;
+    width: calc(100% - 60px);
+    height: calc(100% - 60px);
+    right: 0;
+    left: 60px !important;
+    top: 62px !important;
+}
+
+
+/* 导航栏 */
+
+body {
+    background-color: #141414 !important;
+}
+
+sidebar-preview-menu>.vertical-menu>.vertical-menu-content>sidebar-menu-items-collection>.panel-autoscroll>ul>sidebar-menu-item:nth-of-type(2) {
+    display: none;
+    /* 隐藏数据集 */
+}
+
+.vertical-menu .vertical-menu-heading {
+    background: #141414 !important;
+}
+
+.vertical-menu .vertical-menu-heading h3 {
+    /* background-color: rgba(0, 0, 0, 0.5) !important; */
+    margin: 0 0 0 0 !important;
+}
+
+sidebar-menu-items-collection.active {
+    left: 0 !important;
+    z-index: 100;
+}
+
+sidebar-menu>.vertical-menu>.vertical-menu-heading .back-button {
+    display: none !important;
+}
+
+.vertical-menu-content>sidebar-menu-items-collection>.panel-autoscroll>ul>sidebar-menu-item>li>h4 {
+    opacity: 0 !important;
+}
+
+.custom-tooltip {
+    /* margin: 0 auto; */
+}
+
+sidebar-menu-item>li {
+    padding-left: 0 !important;
+}
+
+sidebar-menu .vertical-menu-content>sidebar-menu-items-collection>.panel-autoscroll>ul>sidebar-menu-item>li>.custom-tooltip {
+    opacity: 0;
+}
+
+sidebar-preview-menu>.vertical-menu sidebar-menu-items-collection>.panel-autoscroll {
+    background-color: transparent!important;
+}
+
+sidebar-preview-menu>.vertical-menu sidebar-menu-items-collection sidebar-menu-item>li {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-left: 0px !important;
+}
+
+sidebar-menu>.vertical-menu {
+    left: 60px!important;
+    max-height: 60%;
+    top: 62px !important;
+}
+
+sidebar-preview-menu>.vertical-menu {
+    height: 100% !important;
+}
+
+sidebar-menu>.vertical-menu.hide {
+    left: -461px!important;
+}
+
+sidebar-menu .copyright-area>.logo img {
+    opacity: 0 !important;
+}
+
+
+/* .desktop>sidebar-preview-menu>.vertical-menu>.vertical-menu-content>sidebar-menu-items-collection>.panel-autoscroll {
+    height: calc(100%) !important;
+} */
+
+navbar-menu .navbar-default {
+    height: 62px!important;
+    background-color: #141414 !important;
+    margin: 0 !important;
+    padding: 0!important;
+    border-radius: 0;
+}
+
+#insetPanel .swap-views-button {
+    position: fixed;
+    top: 7px;
+    right: 110px;
+    z-index: 999;
+    width: 0;
+}
+
+#insetPanel {
+    width: 0 !important;
+    height: 0 !important;
+    min-width: 0 !important;
+    min-height: 0 !important;
+    z-index: 1000 !important;
+}
+
+#insetPanel canvas {
+    display: none !important;
+}
+
+
+/* 登录头像 */
+
+navbar-menu .navbar-default .navbar-custom>li.navbar-menu-item-user {
+    margin: 10px !important;
+    /* display: none; */
+}
+
+.glyphicon-resize-full:before {
+    content: "" !important;
+    width: 16px;
+    height: 16px;
+    display: block;
+    background: url(../img/icon/icon_location_n.png)no-repeat;
+    background-size: 100% 100%;
+}
+
+.glyphicon-resize-full.active:before {
+    content: "" !important;
+    width: 16px;
+    height: 16px;
+    display: block;
+    background: url(../img/icon/icon_location_s.png)no-repeat;
+    background-size: 100% 100%;
+}
+
+toolbox-menu>.vertical-menu {
+    /* height: calc(100% - 62px) !important;
+    top: 62px !important; */
+}
+
+point-cloud-viewport .view-switcher__holder {
+    top: 70px !important;
+}
+
+.uncollapse-btn {
+    justify-content: flex-end;
+}
+
+.uncollapse-btn .uncollapse-button-text {
+    display: none !important;
+}
+
+.vertical-viewport-separator .btn-resizer {
+    display: none !important;
+}
+
+.vertical-viewport-separator.resizeable {
+    background: #141414 !important;
+}
+
+measurement-details .measurement-details .measurement-details-row img[alt="distance_icon"] {
+    display: none;
+}
+
+.measurement-note-placeholder {
+    font-style: normal !important;
+}
+
+measurements {
+    padding: 0 !important;
+}
+
+measurement-tool-selection[ng-reflect-is-collapsed-view="false"] {
+    background: #000;
+    padding: 25px 20px 0;
+    margin-bottom: 0 !important;
+}
+
+measurement-tool-selection[ng-reflect-is-collapsed-view="true"] {
+    background: #000;
+    margin-bottom: 0 !important;
+}
+
+measurement-list {
+    margin: 0 !important;
+}
+
+floor-changer .btn-group-vertical {
+    display: none !important;
+}
+
+.measurement-list-items {
+    background: #000;
+}
+
+button[title="隐藏所选"] .material-icons {
+    background: url(../img/icon/icon_hide.png?4)no-repeat;
+    background-size: 100% 100%;
+    width: 20px;
+    height: 20px;
+    color: transparent !important;
+}
+
+button[title="分享所选"] .material-icons {
+    background: url(../img/icon/share.png?4)no-repeat;
+    background-size: 100% 100%;
+    width: 20px;
+    height: 20px;
+    color: transparent !important;
+}
+
+button[title="删除所选"] .material-icons {
+    background: url(../img/icon/icon_del.png?4)no-repeat;
+    background-size: 100% 100%;
+    width: 20px;
+    height: 20px;
+    color: transparent !important;
+}
+
+button[title="保存所选"] .material-icons {
+    background: url(../img/icon/icon_save.png?4)no-repeat;
+    background-size: 100% 100%;
+    width: 20px;
+    height: 20px;
+    color: transparent !important;
 }

+ 12 - 20
de3fd9d7dd7f30358753a7bf817833ae.horizontal_area_rectangle.svg

@@ -1,25 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>切片</title>
-    <g id="激光相机" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="04--1测量-默认" transform="translate(-1798.000000, -331.000000)" fill="#FFFFFF">
-            <g id="编组-5" transform="translate(1440.000000, 0.000000)">
-                <g id="编组-22" transform="translate(20.000000, 282.000000)">
-                    <g id="编组-18" transform="translate(330.000000, 41.000000)">
-                        <g id="icon_h_r" transform="translate(8.000000, 8.000000)">
-                            <g id="编组-9" transform="translate(2.000000, 5.000000)">
-                                <circle id="椭圆形" cx="15" cy="2" r="2"></circle>
-                                <circle id="椭圆形备份-3" cx="3" cy="12" r="3"></circle>
-                                <circle id="椭圆形备份-4" cx="17" cy="12" r="3"></circle>
-                                <circle id="椭圆形备份" cx="5" cy="2" r="2"></circle>
-                                <g id="路径备份-2" transform="translate(3.000000, 3.000000)">
-                                    <path d="M13.684,8 L14,9.5 L0,9.5 L0.316,8 L13.684,8 Z M13.263,6 L13.474,7 L0.526,7 L0.737,6 L13.263,6 Z M12.842,4 L13.053,5 L0.947,5 L1.158,4 L12.842,4 Z M12.421,2 L12.632,3 L1.368,3 L1.579,2 L12.421,2 Z M12,0 L12.211,1 L1.789,1 L2,0 L12,0 Z" id="形状"></path>
-                                </g>
-                                <path d="M15.8275028,1 L4.17249722,1 L1.79154484,13.5 L18.2084552,13.5 L15.8275028,1 Z M14.172,3 L15.791,11.5 L4.208,11.5 L5.827,3 L14.172,3 Z" id="路径" fill-rule="nonzero"></path>
-                            </g>
-                        </g>
-                    </g>
-                </g>
+    <title>de3fd9d7dd7f30358753a7bf817833ae.horizontal_area_rectangle</title>
+    <g id="de3fd9d7dd7f30358753a7bf817833ae.horizontal_area_rectangle" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-3" transform="translate(2.000000, 4.500000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="编组-9">
+                <path d="M3,10.5 C4.65685425,10.5 6,11.8431458 6,13.5 C6,15.1568542 4.65685425,16.5 3,16.5 C1.34314575,16.5 0,15.1568542 0,13.5 C0,11.8431458 1.34314575,10.5 3,10.5 Z M3,12.5 C2.44771525,12.5 2,12.9477153 2,13.5 C2,14.0522847 2.44771525,14.5 3,14.5 C3.55228475,14.5 4,14.0522847 4,13.5 C4,12.9477153 3.55228475,12.5 3,12.5 Z" id="椭圆形备份-3"></path>
+                <polygon id="路径-20" points="16.493197 4.91780051 17.493197 10.9178005 16.506803 11.0821995 15.506803 5.08219949"></polygon>
+                <polygon id="路径-20备份" points="4.01492875 4.87873219 4.98507125 5.12126781 3.48507125 11.1212678 2.51492875 10.8787322"></polygon>
+                <polygon id="路径-19" points="15.5 13.5 15.5 14.5 4.5 14.5 4.5 13.5"></polygon>
+                <path d="M17,10.5 C18.6568542,10.5 20,11.8431458 20,13.5 C20,15.1568542 18.6568542,16.5 17,16.5 C15.3431458,16.5 14,15.1568542 14,13.5 C14,11.8431458 15.3431458,10.5 17,10.5 Z M17,12.5 C16.4477153,12.5 16,12.9477153 16,13.5 C16,14.0522847 16.4477153,14.5 17,14.5 C17.5522847,14.5 18,14.0522847 18,13.5 C18,12.9477153 17.5522847,12.5 17,12.5 Z" id="椭圆形备份-4"></path>
+                <path d="M15.5,0 C17.1568542,0 18.5,1.34314575 18.5,3 C18.5,4.65685425 17.1568542,6 15.5,6 C13.8431458,6 12.5,4.65685425 12.5,3 C12.5,1.34314575 13.8431458,0 15.5,0 Z M15.5,2 C14.9477153,2 14.5,2.44771525 14.5,3 C14.5,3.55228475 14.9477153,4 15.5,4 C16.0522847,4 16.5,3.55228475 16.5,3 C16.5,2.44771525 16.0522847,2 15.5,2 Z" id="椭圆形备份-5"></path>
+                <path d="M4.5,0 C6.15685425,0 7.5,1.34314575 7.5,3 C7.5,4.65685425 6.15685425,6 4.5,6 C2.84314575,6 1.5,4.65685425 1.5,3 C1.5,1.34314575 2.84314575,0 4.5,0 Z M4.5,2 C3.94771525,2 3.5,2.44771525 3.5,3 C3.5,3.55228475 3.94771525,4 4.5,4 C5.05228475,4 5.5,3.55228475 5.5,3 C5.5,2.44771525 5.05228475,2 4.5,2 Z" id="椭圆形备份-6"></path>
+                <polygon id="路径" points="13.5 2.5 13.5 3.5 6.5 3.5 6.5 2.5"></polygon>
             </g>
         </g>
     </g>

binární
img/icon/icon_EditMode.png


binární
img/icon/icon_EditMode_1.png


binární
img/icon/icon_data@2_1.png


binární
img/icon/icon_data@2x.png


binární
img/icon/icon_del.png


binární
img/icon/icon_element@2x.png


binární
img/icon/icon_element@2x_1.png


binární
img/icon/icon_eye@2x.png


binární
img/icon/icon_eye@2x_1.png


binární
img/icon/icon_hide.png


binární
img/icon/icon_load_n.png


binární
img/icon/icon_load_s.png


binární
img/icon/icon_location@2x.png


binární
img/icon/icon_location@2x_1.png


binární
img/icon/icon_location_n.png


binární
img/icon/icon_location_s.png


binární
img/icon/icon_measure@2x.png


binární
img/icon/icon_measure@2x_1.png


binární
img/icon/icon_save.png


binární
img/icon/share.png


+ 2 - 1
index.html

@@ -22,7 +22,8 @@
 <script type="text/javascript">
     const ossPrefix = 'https://laser.4dkankan.com/data/';
     const ossPrefixDep = 'https://laser.4dkankan.com/public/';
-    const sceneNum = '@replace';
+    // const sceneNum = '@replace';
+    const sceneNum = 't-iksBApb';
 </script>
 <script src="IndoorViewerAPI.js"></script>
 <script type="text/javascript" src="js/OBJExporter.js"></script>

+ 8 - 1
js/index.js

@@ -1 +1,8 @@
-// 
+window.onload = function() {
+    $('.glyphicon-resize-full').bind('click', function(params) {
+        $(this).toggleClass('active')
+    })
+
+
+
+}

+ 2 - 2
js/popindoorAPI2.7.1.js

@@ -520,7 +520,7 @@ var LookupGeoLocation= function (main_view,main_scene,map_view)
     var menuItems = IV.getMenuItems();
     var selected_proj4=null;
     var newItem = {
-        title: "坐标查询",
+        title: "坐标",
         icon: {
             className: "fa fa-thumb-tack"
         },
@@ -885,7 +885,7 @@ var addMinMap= function (main_view,main_scene,map_view)
     var menuItems = IV.getMenuItems();
 
     var newItem = {
-        title: "加载地图",
+        title: "平面图",
         icon: {
             className: "fa fa-thumb-tack"
         },

+ 1 - 1
locat/addDataSet.html

@@ -282,7 +282,7 @@
                     this.pointLayerArray = [];
                     this.gaodeMapLayer = new ol.layer.Tile({
                         source: new ol.source.XYZ({
-                            url: 'http://wprd03.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}' //高德地图切片访问路径
+                            url: 'http://wprd03.is.autonavi.com/appmaptile?style=7&x={x}&y={y}&z={z}' //高德地图切片访问路径
                         })
                     });
 

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1 - 1
main.async.937f8f38454add70d57b.js


+ 7 - 7
translations/json/zh.json

@@ -21,7 +21,7 @@
     "Upload Data": "上传数据",
     "Upload recorded data": "上传所记录的数据",
     "or drop files here": "或将文件拖到这里",
-    "Connect the SSD from a 4DKanKan device and drag-and-drop your datasets_rec folder or the dataset folder here to start": "从4DKanKan设备连接SSD,将您的datasets_rec文件夹或数据集文件夹拖放到这里,以便开始",
+    "Connect the SSD from a 4Dkankan device and drag-and-drop your datasets_rec folder or the dataset folder here to start": "从4Dkankan设备连接SSD,将您的datasets_rec文件夹或数据集文件夹拖放到这里,以便开始",
     "Download Processed Data": "下载所处理的数据",
     "Please select the file of {datasetName} you want to download": "请选择您想下载的{datasetName}文件",
     "Colored point cloud {fileExtension}": "彩色点云{fileExtension}",
@@ -55,29 +55,29 @@
     "Share Selected": "分享所选",
     "Delete Selected": "删除所选",
     "Save Selected": "保存所选",
-    "Free": "自由",
-    "Distance": "距离",
+    "Free": "自由方向",
+    "Distance": "直线距离",
     "Free Distance": "自由距离",
     "Polygon": "多边形",
     "Free Area": "自由面积",
-    "Horizontal": "水平",
+    "Horizontal": "水平方向",
     "Horizontal Distance": "水平距离",
     "Horizontal Area": "水平面积",
     "Rectangle": "矩形",
     "Horizontal Rectangle": "水平矩形",
-    "Vertical": "垂直",
+    "Vertical": "垂直方向",
     "Vertical Distance": "垂直距离",
     "Vertical Area": "垂直面积",
     "Vertical Rectangle": "垂直矩形",
     "The depth maps are used in panorama mode by the cursor to visualize the distance of an object to the current position. The improved depth maps allow you to capture and measure details in the panoramas more accurately.": "深度图通过光标用于全景模式,以使对象与当前位置的距离可视化。经过改进的深度图可使您更精确地捕捉和测量全景图像中的细节。",
     "The update may take a while, but during this time you will be still able use the measurement mode.": "更新可能需要一段时间,但在此期间,您仍能使用测量模式。",
     "Do you want to start the update?": "您要开始更新吗?",
-    "Please contact your 4DKanKan administrator to update your data. The update will allow you to capture and measure details in the panoramas more accurately.": "请联系您的4DKanKan管理员以更新您的数据。更新将使您能够更准确地捕捉和测量全景图像的细节。",
+    "Please contact your 4Dkankan administrator to update your data. The update will allow you to capture and measure details in the panoramas more accurately.": "请联系您的4Dkankan管理员以更新您的数据。更新将使您能够更准确地捕捉和测量全景图像的细节。",
     "Magnifier": "放大镜",
     "Open ID group mapping": "打开ID组映射",
     "Create these groups in your OIDC system of record ensuring you create a mapper to a claim array matching your selector in BOTH your identity and access tokens.": "在您的OIDC记录系统中创建这些组,确保您创建一个声明数组的映射器,而该声明数组是与标识和访问令牌中的选择器匹配的。",
     "Your administrator may then assign membership within the OIDC system of record. Users will have the rights and privileges assigned to members of that group when they log in.": "然后,您的管理员可以在OIDC记录系统中分配成员资格。用户在登录时将拥有分配给该组成员的权利和特权。",
-    "4DKanKan Groups": "4DKanKan组",
+    "4Dkankan Groups": "4Dkankan组",
     "Export CSV": "导出CSV",
     "Export JSON": "导出JSON",
     "Today": "今天",

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1 - 1
translations/zh.json