bill 1 anno fa
parent
commit
e5b0a05540
100 ha cambiato i file con 492 aggiunte e 0 eliminazioni
  1. 10 0
      public/assets/a-connect-dis.1dc85b42.svg
  2. 1 0
      public/assets/a-connect-dis.7119640b.js
  3. 10 0
      public/assets/a-connect.0e9d3b6b.svg
  4. 1 0
      public/assets/a-connect.927c87c2.js
  5. 1 0
      public/assets/criminal.713e2a36.css
  6. 11 0
      public/assets/data_revise_n.00a7e90e.svg
  7. 1 0
      public/assets/data_revise_n.df36300c.js
  8. 10 0
      public/assets/dianwei.8f3437cd.svg
  9. 1 0
      public/assets/dianwei.b603c40b.js
  10. 1 0
      public/assets/fire.83fd1418.css
  11. 1 0
      public/assets/fuse-edit.11811992.js
  12. 1 0
      public/assets/fuse-edit.89b888ba.css
  13. 1 0
      public/assets/fuse-switch.169963a6.css
  14. 1 0
      public/assets/fuse-switch.a3b5234a.js
  15. BIN
      public/assets/iconfont.67d53b4c.ttf
  16. BIN
      public/assets/iconfont.99f6b31e.woff2
  17. BIN
      public/assets/iconfont.ca893839.woff
  18. 1 0
      public/assets/index.09887199.css
  19. 1 0
      public/assets/index.0a09da59.css
  20. 1 0
      public/assets/index.12d4a354.js
  21. 1 0
      public/assets/index.1564bf2a.js
  22. 1 0
      public/assets/index.1fdf11b6.css
  23. 1 0
      public/assets/index.229d38d4.css
  24. 1 0
      public/assets/index.28791e3e.css
  25. 1 0
      public/assets/index.2a7137c8.js
  26. 1 0
      public/assets/index.2bbfccb7.css
  27. 1 0
      public/assets/index.331e21ee.css
  28. 1 0
      public/assets/index.419e1efc.js
  29. 1 0
      public/assets/index.41f76741.js
  30. 1 0
      public/assets/index.492404a6.js
  31. 1 0
      public/assets/index.4dd7c73b.js
  32. 1 0
      public/assets/index.5909368e.js
  33. 1 0
      public/assets/index.61647325.css
  34. 1 0
      public/assets/index.6adb5b64.css
  35. 1 0
      public/assets/index.6b20dc77.js
  36. 1 0
      public/assets/index.70d26901.js
  37. 1 0
      public/assets/index.73768371.js
  38. 1 0
      public/assets/index.7669c7f1.js
  39. 1 0
      public/assets/index.86b95ef5.css
  40. 1 0
      public/assets/index.8d5d318a.js
  41. 1 0
      public/assets/index.94b6d56a.js
  42. BIN
      public/assets/index.a5e59c31.png
  43. 1 0
      public/assets/index.a69b51f6.js
  44. 1 0
      public/assets/index.a70c5d1e.css
  45. 1 0
      public/assets/index.baab9c5c.css
  46. 1 0
      public/assets/index.bd2f214e.css
  47. 1 0
      public/assets/index.be6bb0e7.js
  48. 1 0
      public/assets/index.c7d9232e.css
  49. 1 0
      public/assets/index.ccf1373d.css
  50. 1 0
      public/assets/index.da0fc879.css
  51. 1 0
      public/assets/index.db4c7078.css
  52. 1 0
      public/assets/index.df78d740.css
  53. 1 0
      public/assets/index.e1ad8159.js
  54. 1 0
      public/assets/index.f06f7f62.css
  55. 1 0
      public/assets/index.f31d612e.js
  56. 1 0
      public/assets/index.fe5e3b98.js
  57. 1 0
      public/assets/index.vue_vue_type_script_setup_true_lang.9d8e32c7.js
  58. 1 0
      public/assets/index.vue_vue_type_style_index_0_lang.bbe5fad8.js
  59. 3 0
      public/assets/init.47ec3ecd.js
  60. 1 0
      public/assets/left-pano.dbbe321d.js
  61. 9 0
      public/assets/m-r.1b57e43f.svg
  62. 1 0
      public/assets/m-r.f0cd856b.js
  63. 1 0
      public/assets/meta.b086afcf.js
  64. 5 0
      public/assets/offline.9991804f.css
  65. 269 0
      public/assets/offline.ee04b43a.js
  66. BIN
      public/assets/pic.d5781b0c.jpg
  67. 12 0
      public/assets/point-s.569e1ee3.svg
  68. 1 0
      public/assets/point-s.62bf903a.js
  69. 1 0
      public/assets/right-fill-pano.c9a0dc6c.js
  70. 1 0
      public/assets/right-fill-pano.e3246e64.css
  71. 1 0
      public/assets/scene-edit.06471586.js
  72. 1 0
      public/assets/scene-edit.ff953527.css
  73. 4 0
      public/assets/scene-select.5723a731.js
  74. 1 0
      public/assets/scene-select.f1d2a1ae.css
  75. 1 0
      public/assets/show.53d041a5.css
  76. 1 0
      public/assets/show.751b0ae6.css
  77. 1 0
      public/assets/show.dcfda603.js
  78. 1 0
      public/assets/show.e3a28da7.js
  79. 1 0
      public/assets/sign.36e145c3.js
  80. 1 0
      public/assets/sign.4c4637b6.css
  81. 1 0
      public/assets/sign.553a4fb8.js
  82. 1 0
      public/assets/sign.96476f41.css
  83. 1 0
      public/assets/sign.a45cc032.css
  84. 1 0
      public/assets/sign.abf43530.js
  85. 24 0
      public/assets/sign.c12201b3.js
  86. 1 0
      public/assets/sign.c73a9fbf.css
  87. 1 0
      public/assets/sign.e7399cfc.css
  88. 1 0
      public/assets/sign.fcb9b444.js
  89. 1 0
      public/assets/slide-menu.3787e06f.js
  90. 1 0
      public/assets/slide-menu.9104c3b3.css
  91. 1 0
      public/assets/state_gps.09feec42.js
  92. 11 0
      public/assets/state_gps.730ab352.svg
  93. 14 0
      public/assets/vuedraggable.umd.35671d28.js
  94. 10 0
      public/assets/weitiao.0586cc6e.svg
  95. 1 0
      public/assets/weitiao.4b10909e.js
  96. 11 0
      public/assets/zoom_n.b5a52281.svg
  97. 1 0
      public/assets/zoom_n.c1311408.js
  98. 2 0
      public/oss/fusion/default/tag_icon_default.svg
  99. BIN
      public/oss/fusion/xj/file/8db0690d13544af0a546c2faf21641f7.png
  100. 0 0
      public/oss/scene_view_data/SG-xj-rSA59CCivvq/images/3dtiles/floor_0/LOD-0/Mesh-XL-YL_floor_0.glb

File diff suppressed because it is too large
+ 10 - 0
public/assets/a-connect-dis.1dc85b42.svg


+ 1 - 0
public/assets/a-connect-dis.7119640b.js

@@ -0,0 +1 @@
+const e=""+new URL("a-connect-dis.1dc85b42.svg",import.meta.url).href;export{e as default};

File diff suppressed because it is too large
+ 10 - 0
public/assets/a-connect.0e9d3b6b.svg


+ 1 - 0
public/assets/a-connect.927c87c2.js

@@ -0,0 +1 @@
+const e=""+new URL("a-connect.0e9d3b6b.svg",import.meta.url).href;export{e as default};

File diff suppressed because it is too large
+ 1 - 0
public/assets/criminal.713e2a36.css


File diff suppressed because it is too large
+ 11 - 0
public/assets/data_revise_n.00a7e90e.svg


+ 1 - 0
public/assets/data_revise_n.df36300c.js

@@ -0,0 +1 @@
+const e=""+new URL("data_revise_n.00a7e90e.svg",import.meta.url).href;export{e as default};

+ 10 - 0
public/assets/dianwei.8f3437cd.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>dianwei</title>
+    <g id="控件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="dianwei" fill="#FFFFFF">
+            <path d="M8,0 C12.418278,0 16,3.581722 16,8 C16,12.418278 12.418278,16 8,16 C3.581722,16 0,12.418278 0,8 C0,3.581722 3.581722,0 8,0 Z M8,1 C4.13400675,1 1,4.13400675 1,8 C1,11.8659932 4.13400675,15 8,15 C11.8659932,15 15,11.8659932 15,8 C15,4.13400675 11.8659932,1 8,1 Z" id="椭圆形" fill-rule="nonzero"></path>
+            <path d="M8,2 C11.3137085,2 14,4.6862915 14,8 C14,11.3137085 11.3137085,14 8,14 C4.6862915,14 2,11.3137085 2,8 C2,4.6862915 4.6862915,2 8,2 Z M8,4 C5.790861,4 4,5.790861 4,8 C4,10.209139 5.790861,12 8,12 C10.209139,12 12,10.209139 12,8 C12,5.790861 10.209139,4 8,4 Z" id="形状结合" fill-opacity="0.5"></path>
+        </g>
+    </g>
+</svg>

+ 1 - 0
public/assets/dianwei.b603c40b.js

@@ -0,0 +1 @@
+const e=""+new URL("dianwei.8f3437cd.svg",import.meta.url).href;export{e as default};

File diff suppressed because it is too large
+ 1 - 0
public/assets/fire.83fd1418.css


File diff suppressed because it is too large
+ 1 - 0
public/assets/fuse-edit.11811992.js


+ 1 - 0
public/assets/fuse-edit.89b888ba.css

@@ -0,0 +1 @@
+.add-fuse-model[data-v-513ed4f1]{position:absolute;left:50%;transform:translate(-50%);width:160px;z-index:3;bottom:10px}.add-fuse-model .icon[data-v-513ed4f1]{margin-right:4px}

File diff suppressed because it is too large
+ 1 - 0
public/assets/fuse-switch.169963a6.css


File diff suppressed because it is too large
+ 1 - 0
public/assets/fuse-switch.a3b5234a.js


BIN
public/assets/iconfont.67d53b4c.ttf


BIN
public/assets/iconfont.99f6b31e.woff2


BIN
public/assets/iconfont.ca893839.woff


+ 1 - 0
public/assets/index.09887199.css

@@ -0,0 +1 @@
+.error[data-v-8d115d26]{width:100vw;height:100vh;background:#F7F7F7;display:flex;align-items:center;flex-direction:column}.error img[data-v-8d115d26]{margin-top:120px}.error p[data-v-8d115d26]{margin-top:30px;color:#999;text-align:center;font-size:16px}

+ 1 - 0
public/assets/index.0a09da59.css

@@ -0,0 +1 @@
+.actions[data-v-1dca32ff]{display:flex;gap:10px}.actions span[data-v-1dca32ff]{flex:1;height:34px;background:rgba(255,255,255,.1);border-radius:4px;opacity:1;display:flex;align-items:center;justify-content:center;color:#fff9;font-size:14px;cursor:pointer;transition:all .3s ease}.actions span .icon[data-v-1dca32ff]{margin-right:4px}.actions span[data-v-1dca32ff]:hover,.actions span.active[data-v-1dca32ff]{background:rgba(0,200,175,.16);color:#00c8af}

File diff suppressed because it is too large
+ 1 - 0
public/assets/index.12d4a354.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.1564bf2a.js


+ 1 - 0
public/assets/index.1fdf11b6.css

@@ -0,0 +1 @@
+.info h2[data-v-a182ce18]{padding:20px;font-weight:700;display:flex;justify-content:space-between;border-bottom:1px solid rgba(255,255,255,.16);align-items:center;margin-bottom:0}.info p[data-v-a182ce18]{padding:0 30px;margin:20px 0;color:#fff;font-size:14px;display:flex;word-break:break-all}.info p span[data-v-a182ce18]{flex:none;display:inline-block;width:70px;height:100%;margin-right:20px;color:#ffffffb3}

File diff suppressed because it is too large
+ 1 - 0
public/assets/index.229d38d4.css


+ 1 - 0
public/assets/index.28791e3e.css

@@ -0,0 +1 @@
+.measure-list[data-v-0e1922b3]{padding-bottom:30px}

File diff suppressed because it is too large
+ 1 - 0
public/assets/index.2a7137c8.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.2bbfccb7.css


+ 1 - 0
public/assets/index.331e21ee.css

@@ -0,0 +1 @@
+.merge-layout .ui-input .text.suffix input{padding-left:5px;padding-right:15px}.merge-layout .ui-input .text.suffix .retouch{right:5px}.set-prop{cursor:pointer}

File diff suppressed because it is too large
+ 1 - 0
public/assets/index.419e1efc.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.41f76741.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.492404a6.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.4dd7c73b.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.5909368e.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.61647325.css


+ 1 - 0
public/assets/index.6adb5b64.css

@@ -0,0 +1 @@
+.scene-list>.content>li{padding:0!important}.scene{padding:0 20px}.scene p{height:1.5em;overflow:hidden;text-overflow:ellipsis;word-break:keep-all;line-height:1.5em}.scene-model-list.list{margin-bottom:-20px;margin-top:-20px}.scene-model-list.list .header{padding:30px 20px 20px}.scene-model-list.list .header h3{font-size:20px;font-weight:700;color:#fff}.scene-model-list.list.active .header{background-color:#00c8af29}.scene-model-list.list .content li:last-child .atom-content{border:none}

File diff suppressed because it is too large
+ 1 - 0
public/assets/index.6b20dc77.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.70d26901.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.73768371.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.7669c7f1.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.86b95ef5.css


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.8d5d318a.js


+ 1 - 0
public/assets/index.94b6d56a.js

@@ -0,0 +1 @@
+import{_ as s,o as t,e as _,bP as c,bQ as d,J as o}from"./offline.ee04b43a.js";const n=""+new URL("index.a5e59c31.png",import.meta.url).href;const a={},r=e=>(c("data-v-8d115d26"),e=e(),d(),e),p={class:"error"},i=r(()=>o("div",null,[o("img",{src:n}),o("p",null,"\u8D44\u6E90\u4E0D\u5B58\u5728\u6216\u5DF2\u5220\u9664")],-1)),l=[i];function u(e,m){return t(),_("div",p,l)}const h=s(a,[["render",u],["__scopeId","data-v-8d115d26"]]);export{h as default};

BIN
public/assets/index.a5e59c31.png


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.a69b51f6.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.a70c5d1e.css


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.baab9c5c.css


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.bd2f214e.css


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.be6bb0e7.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.c7d9232e.css


+ 1 - 0
public/assets/index.ccf1373d.css

@@ -0,0 +1 @@
+:root{--editor-menu-width: 80px;--editor-head-height: 0px}.hideLeft{--editor-menu-left: calc(-1 * var(--editor-menu-width));--left-pano-left: calc(var(--editor-menu-left) + var(--editor-menu-width) - var(--left-pano-width)) !important}

+ 1 - 0
public/assets/index.da0fc879.css

@@ -0,0 +1 @@
+.leng-input[data-v-2aca6420]{margin:0 20px 0 10px}

File diff suppressed because it is too large
+ 1 - 0
public/assets/index.db4c7078.css


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.df78d740.css


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.e1ad8159.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.f06f7f62.css


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.f31d612e.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.fe5e3b98.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.vue_vue_type_script_setup_true_lang.9d8e32c7.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/index.vue_vue_type_style_index_0_lang.bbe5fad8.js


File diff suppressed because it is too large
+ 3 - 0
public/assets/init.47ec3ecd.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/left-pano.dbbe321d.js


+ 9 - 0
public/assets/m-r.1b57e43f.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>m-r</title>
+    <g id="控件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="m-r" fill="#FFFFFF">
+            <path d="M5.5,0 C7.15685425,0 8.5,1.34314575 8.5,3 L11,3 C12.6568542,3 14,4.34314575 14,6 L14,10 C14,13.2383969 11.4344251,15.8775718 8.22493826,15.9958615 L8,16 L8,16 C4.6862915,16 2,13.3137085 2,10 L2,6 C2,4.34314575 3.34314575,3 5,3 L7.5,3 L7.5,3 C7.5,1.8954305 6.6045695,1 5.5,1 C5.22385763,1 5,0.776142375 5,0.5 C5,0.223857625 5.22385763,0 5.5,0 Z M11,4 L8,4 L8,8 L13,8 L13,6 C13,4.9456382 12.1841222,4.08183488 11.1492623,4.00548574 L11,4 Z" id="形状结合"></path>
+        </g>
+    </g>
+</svg>

+ 1 - 0
public/assets/m-r.f0cd856b.js

@@ -0,0 +1 @@
+const e=""+new URL("m-r.1b57e43f.svg",import.meta.url).href;export{e as default};

File diff suppressed because it is too large
+ 1 - 0
public/assets/meta.b086afcf.js


File diff suppressed because it is too large
+ 5 - 0
public/assets/offline.9991804f.css


File diff suppressed because it is too large
+ 269 - 0
public/assets/offline.ee04b43a.js


BIN
public/assets/pic.d5781b0c.jpg


+ 12 - 0
public/assets/point-s.569e1ee3.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>point-s</title>
+    <g id="控件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/16/icon_point-s" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="point-s">
+                <path d="M8,1 C4.13400675,1 1,4.13400675 1,8 C1,11.8659932 4.13400675,15 8,15 C11.8659932,15 15,11.8659932 15,8 C15,4.13400675 11.8659932,1 8,1 Z" id="路径" fill-opacity="0.500464379"></path>
+                <path d="M8,3 C10.7614237,3 13,5.23857625 13,8 C13,10.7614237 10.7614237,13 8,13 C5.23857625,13 3,10.7614237 3,8 C3,5.23857625 5.23857625,3 8,3 Z" id="路径"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 1 - 0
public/assets/point-s.62bf903a.js

@@ -0,0 +1 @@
+const e=""+new URL("point-s.569e1ee3.svg",import.meta.url).href;export{e as default};

File diff suppressed because it is too large
+ 1 - 0
public/assets/right-fill-pano.c9a0dc6c.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/right-fill-pano.e3246e64.css


File diff suppressed because it is too large
+ 1 - 0
public/assets/scene-edit.06471586.js


+ 1 - 0
public/assets/scene-edit.ff953527.css

@@ -0,0 +1 @@
+:root{--editor-menu-width: 0px}

File diff suppressed because it is too large
+ 4 - 0
public/assets/scene-select.5723a731.js


+ 1 - 0
public/assets/scene-select.f1d2a1ae.css

@@ -0,0 +1 @@
+.model-header[data-v-5331684a]{display:flex;justify-content:space-between;padding-bottom:24px;align-items:center}.table-layout[data-v-5331684a]{max-height:500px;overflow-y:auto}.model-header .header-desc{margin-bottom:0}.ant-modal-root .ant-table-tbody>tr>td{word-break:break-all}

+ 1 - 0
public/assets/show.53d041a5.css

@@ -0,0 +1 @@
+.pano-group[data-v-33ea66ee]{padding:0 20px}

+ 1 - 0
public/assets/show.751b0ae6.css

@@ -0,0 +1 @@
+.pano-group[data-v-1be426cd]{padding:0 20px 40px}

File diff suppressed because it is too large
+ 1 - 0
public/assets/show.dcfda603.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/show.e3a28da7.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/sign.36e145c3.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/sign.4c4637b6.css


File diff suppressed because it is too large
+ 1 - 0
public/assets/sign.553a4fb8.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/sign.96476f41.css


File diff suppressed because it is too large
+ 1 - 0
public/assets/sign.a45cc032.css


File diff suppressed because it is too large
+ 1 - 0
public/assets/sign.abf43530.js


File diff suppressed because it is too large
+ 24 - 0
public/assets/sign.c12201b3.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/sign.c73a9fbf.css


File diff suppressed because it is too large
+ 1 - 0
public/assets/sign.e7399cfc.css


File diff suppressed because it is too large
+ 1 - 0
public/assets/sign.fcb9b444.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/slide-menu.3787e06f.js


File diff suppressed because it is too large
+ 1 - 0
public/assets/slide-menu.9104c3b3.css


+ 1 - 0
public/assets/state_gps.09feec42.js

@@ -0,0 +1 @@
+const t=""+new URL("state_gps.730ab352.svg",import.meta.url).href;export{t as default};

File diff suppressed because it is too large
+ 11 - 0
public/assets/state_gps.730ab352.svg


File diff suppressed because it is too large
+ 14 - 0
public/assets/vuedraggable.umd.35671d28.js


File diff suppressed because it is too large
+ 10 - 0
public/assets/weitiao.0586cc6e.svg


+ 1 - 0
public/assets/weitiao.4b10909e.js

@@ -0,0 +1 @@
+const e=""+new URL("weitiao.0586cc6e.svg",import.meta.url).href;export{e as default};

File diff suppressed because it is too large
+ 11 - 0
public/assets/zoom_n.b5a52281.svg


+ 1 - 0
public/assets/zoom_n.c1311408.js

@@ -0,0 +1 @@
+const o=""+new URL("zoom_n.b5a52281.svg",import.meta.url).href;export{o as default};

File diff suppressed because it is too large
+ 2 - 0
public/oss/fusion/default/tag_icon_default.svg


BIN
public/oss/fusion/xj/file/8db0690d13544af0a546c2faf21641f7.png


+ 0 - 0
public/oss/scene_view_data/SG-xj-rSA59CCivvq/images/3dtiles/floor_0/LOD-0/Mesh-XL-YL_floor_0.glb


Some files were not shown because too many files changed in this diff