添加测试数据

static/data.json

@@ -11,6 +11,41 @@
       "y": 2.18
     },
     {
+      "id": 17,
+      "x": 3.6,
+      "y": -3.73
+    },
+    {
+      "id": 18,
+      "x": 7.83,
+      "y": 4.11
+    },
+    {
+      "id": 21,
+      "x": 0.85,
+      "y": -3.73
+    },
+    {
+      "id": 22,
+      "x": -3.95,
+      "y": -3.73
+    },
+    {
+      "id": 23,
+      "x": -7.56,
+      "y": -3.73
+    },
+    {
+      "id": 24,
+      "x": -3.95,
+      "y": -1.76
+    },
+    {
+      "id": 25,
+      "x": 0.85,
+      "y": -1.74
+    },
+    {
       "id": 26,
       "x": -7.57,
       "y": 3.78
@@ -26,14 +61,19 @@
       "y": 0.06
     },
     {
-      "id": 31,
-      "x": -7.57,
-      "y": 0.06
+      "id": 30,
+      "x": 7.83,
+      "y": -3.73
     },
     {
-      "id": 62,
-      "x": -2.02,
-      "y": 3.78
+      "id": 38,
+      "x": -3.64,
+      "y": -3.78
+    },
+    {
+      "id": 39,
+      "x": -3.67,
+      "y": -1.95
     },
     {
       "id": 65,
@@ -41,14 +81,9 @@
       "y": 3.8
     },
     {
-      "id": 66,
-      "x": -2.02,
-      "y": 3.78
-    },
-    {
-      "id": 68,
-      "x": 0.53,
-      "y": 3.78
+      "id": 83,
+      "x": -1.99,
+      "y": -1.76
     },
     {
       "id": 86,
@@ -61,19 +96,29 @@
       "y": 0.09
     },
     {
+      "id": 96,
+      "x": 5.6,
+      "y": 1.74
+    },
+    {
+      "id": 97,
+      "x": -2.55,
+      "y": -3.78
+    },
+    {
       "id": 112,
       "x": 3.6,
       "y": 0.73
     },
     {
-      "id": 118,
-      "x": 3.59,
-      "y": 0.7
+      "id": 139,
+      "x": 7.83,
+      "y": 0.72
     },
     {
-      "id": 151,
-      "x": -2.02,
-      "y": 2.18
+      "id": 148,
+      "x": 3.6,
+      "y": -1.75
     },
     {
       "id": 152,
@@ -86,17 +131,12 @@
       "y": 2.18
     },
     {
-      "id": 162,
-      "x": -5.48,
-      "y": 0.08
+      "id": 159,
+      "x": -6.79,
+      "y": -3.73
     },
     {
-      "id": 163,
-      "x": -7.57,
-      "y": 0.07
-    },
-    {
-      "id": 164,
+      "id": 162,
       "x": -5.48,
       "y": 0.08
     },
@@ -104,25 +144,104 @@
       "id": 173,
       "x": -5.18,
       "y": 0.09
+    },
+    {
+      "id": 174,
+      "x": 0.53,
+      "y": 4.11
+    },
+    {
+      "id": 180,
+      "x": 3.6,
+      "y": -1.48
+    },
+    {
+      "id": 183,
+      "x": 7.83,
+      "y": -1.48
+    },
+    {
+      "id": 189,
+      "x": 5.69,
+      "y": 0.72
+    },
+    {
+      "id": 192,
+      "x": 5.69,
+      "y": -3.73
+    },
+    {
+      "x": -1.99,
+      "y": -1.2812621359223304,
+      "id": 193
+    },
+    {
+      "x": -3.1926829268292685,
+      "y": -1.76,
+      "id": 194
+    },
+    {
+      "x": 4.105217200451013,
+      "y": 0.7275826928208085,
+      "id": 195
+    },
+    {
+      "x": 0.45787943637277795,
+      "y": -1.74276141241991,
+      "id": 196
+    },
+    {
+      "x": 3.6,
+      "y": 0.38539877300613484,
+      "id": 197
+    },
+    {
+      "x": 5.69,
+      "y": -1.48,
+      "id": 198
     }
   ],
   "wall": [
     {
+      "id": 1,
+      "p1": 192,
+      "p2": 30,
+      "border": true
+    },
+    {
+      "id": 2,
+      "p1": 17,
+      "p2": 21,
+      "border": true
+    },
+    {
+      "id": 3,
+      "p1": 159,
+      "p2": 23,
+      "border": true
+    },
+    {
+      "id": 4,
+      "p1": 174,
+      "p2": 18,
+      "border": true
+    },
+    {
       "id": 5,
       "p1": 152,
       "p2": 26,
       "border": true
     },
     {
-      "id": 9,
-      "p1": 29,
-      "p2": 31,
+      "id": 6,
+      "p1": 22,
+      "p2": 24,
       "border": true
     },
     {
-      "id": 11,
-      "p1": 66,
-      "p2": 62,
+      "id": 8,
+      "p1": 23,
+      "p2": 29,
       "border": true
     },
     {
@@ -133,8 +252,8 @@
     },
     {
       "id": 13,
-      "p1": 164,
-      "p2": 163,
+      "p1": 162,
+      "p2": 29,
       "border": true
     },
     {
@@ -145,20 +264,137 @@
     },
     {
       "id": 15,
-      "p1": 62,
+      "p1": 2,
       "p2": 3,
       "border": true
     },
     {
+      "p1": 87,
+      "p2": 193,
+      "id": 54
+    },
+    {
+      "p1": 83,
+      "p2": 193,
+      "id": 55
+    },
+    {
+      "p1": 24,
+      "p2": 194,
+      "id": 58
+    },
+    {
+      "p1": 83,
+      "p2": 194,
+      "id": 59
+    },
+    {
       "id": 18,
       "p1": 87,
       "p2": 86,
       "border": false
     },
     {
-      "id": 34,
-      "p1": 68,
-      "p2": 65,
+      "p1": 96,
+      "p2": 195,
+      "id": 62
+    },
+    {
+      "p1": 97,
+      "p2": 196,
+      "id": 66
+    },
+    {
+      "p1": 195,
+      "p2": 197,
+      "id": 70
+    },
+    {
+      "p1": 196,
+      "p2": 197,
+      "id": 71
+    },
+    {
+      "id": 20,
+      "p1": 39,
+      "p2": 38,
+      "border": true
+    },
+    {
+      "p1": 96,
+      "p2": 193,
+      "id": 56
+    },
+    {
+      "p1": 39,
+      "p2": 194,
+      "id": 60
+    },
+    {
+      "p1": 193,
+      "p2": 194,
+      "id": 61
+    },
+    {
+      "id": 22,
+      "p1": 97,
+      "p2": 38,
+      "border": true
+    },
+    {
+      "id": 23,
+      "p1": 148,
+      "p2": 17,
+      "border": false
+    },
+    {
+      "id": 24,
+      "p1": 183,
+      "p2": 30,
+      "border": true
+    },
+    {
+      "p1": 189,
+      "p2": 195,
+      "id": 64
+    },
+    {
+      "p1": 112,
+      "p2": 195,
+      "id": 65
+    },
+    {
+      "id": 27,
+      "p1": 18,
+      "p2": 139,
+      "border": true
+    },
+    {
+      "id": 30,
+      "p1": 148,
+      "p2": 25,
+      "border": false
+    },
+    {
+      "id": 31,
+      "p1": 180,
+      "p2": 148,
+      "border": false
+    },
+    {
+      "p1": 83,
+      "p2": 196,
+      "id": 68
+    },
+    {
+      "p1": 25,
+      "p2": 196,
+      "id": 69
+    },
+    {
+      "id": 33,
+      "p1": 21,
+      "p2": 25,
       "border": true
     },
     {
@@ -186,27 +422,15 @@
       "border": true
     },
     {
-      "id": 39,
-      "p1": 62,
-      "p2": 2,
-      "border": true
-    },
-    {
       "id": 40,
       "p1": 173,
       "p2": 162,
       "border": true
     },
     {
-      "id": 42,
-      "p1": 163,
-      "p2": 29,
-      "border": true
-    },
-    {
-      "id": 43,
-      "p1": 164,
-      "p2": 162,
+      "id": 41,
+      "p1": 22,
+      "p2": 159,
       "border": true
     },
     {
@@ -218,24 +442,77 @@
     {
       "id": 45,
       "p1": 65,
-      "p2": 62,
+      "p2": 2,
       "border": true
     },
     {
-      "id": 46,
-      "p1": 151,
-      "p2": 3,
+      "id": 47,
+      "p1": 174,
+      "p2": 65,
+      "border": true
+    },
+    {
+      "p1": 183,
+      "p2": 198,
+      "id": 74
+    },
+    {
+      "p1": 180,
+      "p2": 198,
+      "id": 75
+    },
+    {
+      "id": 49,
+      "p1": 139,
+      "p2": 183,
       "border": true
     },
     {
-      "id": 48,
       "p1": 112,
-      "p2": 118,
+      "p2": 197,
+      "id": 72
+    },
+    {
+      "p1": 180,
+      "p2": 197,
+      "id": 73
+    },
+    {
+      "p1": 192,
+      "p2": 198,
+      "id": 76
+    },
+    {
+      "p1": 189,
+      "p2": 198,
+      "id": 77
+    },
+    {
+      "id": 52,
+      "p1": 17,
+      "p2": 192,
+      "border": true
+    },
+    {
+      "id": 53,
+      "p1": 139,
+      "p2": 189,
       "border": false
     }
   ],
   "window": [
     {
+      "line": 2,
+      "pos": [
+        2.88,
+        -3.73,
+        1.47,
+        -3.73
+      ],
+      "top": null,
+      "bottom": null
+    },
+    {
       "line": 45,
       "pos": [
         -0.12,
@@ -245,16 +522,197 @@
       ],
       "top": null,
       "bottom": null
+    },
+    {
+      "line": 52,
+      "pos": [
+        5.01,
+        -3.73,
+        4.08,
+        -3.73
+      ],
+      "top": null,
+      "bottom": null
+    }
+  ],
+  "door": [
+    {
+      "line": 27,
+      "pos": [
+        7.83,
+        3.12,
+        7.83,
+        2.24
+      ],
+      "top": null,
+      "bottom": -1.7899999999999998,
+      "within": 2,
+      "show": true,
+      "ctl": [
+        6.95,
+        3.12
+      ],
+      "start": true
+    },
+    {
+      "line": 16,
+      "pos": [
+        -1.99,
+        -1.03,
+        -1.99,
+        -0.23
+      ],
+      "top": null,
+      "bottom": null,
+      "within": 3,
+      "show": true,
+      "ctl": [
+        -2.79,
+        -0.22999999999999998
+      ],
+      "start": false
+    },
+    {
+      "line": 30,
+      "pos": [
+        3.33,
+        -1.75,
+        2.53,
+        -1.75
+      ],
+      "top": null,
+      "bottom": null,
+      "within": 0,
+      "show": true,
+      "ctl": [
+        3.331273976236042,
+        -0.9494960249195026
+      ],
+      "start": false
+    },
+    {
+      "line": 36,
+      "pos": [
+        -0.34,
+        2.18,
+        -1.12,
+        2.18
+      ],
+      "top": null,
+      "bottom": null,
+      "within": 0,
+      "show": true,
+      "ctl": [
+        -0.33999999999999997,
+        2.96
+      ],
+      "start": false
+    }
+  ],
+  "column": [
+    {
+      "line": 4,
+      "pos": [
+        4.94,
+        4.11,
+        4.29,
+        4.11,
+        4.94,
+        3.46,
+        4.29,
+        3.46
+      ]
     }
   ],
-  "door": [],
-  "column": [],
   "surplus": [],
-  "slideDoor": [],
-  "groundCase": [],
+  "slideDoor": [
+    {
+      "line": 32,
+      "pos": [
+        0.19,
+        -1.75,
+        -1.59,
+        -1.76
+      ],
+      "top": null,
+      "bottom": null,
+      "within": 0,
+      "show": true
+    },
+    {
+      "line": 26,
+      "pos": [
+        5.01,
+        0.72,
+        4.37,
+        0.72
+      ],
+      "top": null,
+      "bottom": null,
+      "within": 0,
+      "show": true
+    },
+    {
+      "line": 19,
+      "pos": [
+        -2.39,
+        -3.67,
+        -1.34,
+        -2.96
+      ],
+      "top": null,
+      "bottom": null,
+      "within": 0,
+      "show": true
+    }
+  ],
+  "groundCase": [
+    {
+      "line": 20,
+      "pos": [
+        -3.65,
+        -3.63,
+        -3.67,
+        -2.13
+      ],
+      "top": null,
+      "bottom": null
+    },
+    {
+      "line": 8,
+      "pos": [
+        -7.56,
+        -2.79,
+        -7.56,
+        -0.75
+      ],
+      "top": null,
+      "bottom": null
+    }
+  ],
   "tagging": [
     {
       "pos": [
+        4.6696262315895725,
+        -0.44050951340355526
+      ],
+      "title": "客厅",
+      "content": "15m²",
+      "showTitle": true,
+      "showContent": true
+    },
+    {
+      "pos": [
+        3.7642290453270286,
+        2.5555318406795844
+      ],
+      "title": "客厅",
+      "content": "",
+      "showTitle": true,
+      "showContent": true
+    },
+    {
+      "pos": [
         -1.0853396826466815,
         -0.6167567850943294
       ],
@@ -265,17 +723,144 @@
     },
     {
       "pos": [
-        -5.1752475866821355,
-        2.260410972578503
+        -4.830543816484649,
+        2.4040375434941224
       ],
-      "title": "主卧大主卧独飘窗%￥#@",
+      "title": "主卧",
       "content": "20m²",
       "showTitle": true,
       "showContent": true
+    },
+    {
+      "pos": [
+        -3.154130865511239,
+        -2.525383489285503
+      ],
+      "title": "玄关",
+      "content": "3m²",
+      "showTitle": true,
+      "showContent": true
+    },
+    {
+      "pos": [
+        1.8443022576840964,
+        -2.3707029347160518
+      ],
+      "title": "儿童房",
+      "content": "5m²",
+      "showTitle": true,
+      "showContent": true
+    },
+    {
+      "pos": [
+        9.392885059239232,
+        0.044999311641024664
+      ],
+      "title": "整套",
+      "content": "",
+      "showTitle": true,
+      "showContent": true
+    },
+    {
+      "pos": [
+        -5.423283359369536,
+        -1.386850300612184
+      ],
+      "title": "主卧",
+      "content": "15m²",
+      "showTitle": true,
+      "showContent": true
+    },
+    {
+      "pos": [
+        -0.7985077758865916,
+        3.0368480835888922
+      ],
+      "title": "卫生间",
+      "content": "",
+      "showTitle": true,
+      "showContent": true
+    },
+    {
+      "pos": [
+        6.7418324036108315,
+        -0.4226128168630363
+      ],
+      "title": "儿童房",
+      "content": "12m²",
+      "showTitle": true,
+      "showContent": true
+    },
+    {
+      "pos": [
+        4.5634725658047985,
+        -2.330357448520323
+      ],
+      "title": "入房花园",
+      "content": "14m²",
+      "showTitle": true,
+      "showContent": true
+    },
+    {
+      "pos": [
+        6.649612771811144,
+        -2.2955884450868846
+      ],
+      "title": "客餐厅",
+      "content": "12m²",
+      "showTitle": true,
+      "showContent": true
+    }
+  ],
+  "bayCase": [
+    {
+      "line": 12,
+      "pos": [
+        -7.57,
+        0.85,
+        -7.57,
+        2.95
+      ],
+      "top": null,
+      "bottom": null,
+      "within": 0,
+      "ctl": [
+        -7.118226790151344,
+        2.994725547775017,
+        -7.118226790151344,
+        0.8052744522249831
+      ]
+    }
+  ],
+  "furnColumn": [
+    {
+      "pos": [
+        4.1,
+        2.14,
+        4.75,
+        2.14,
+        4.75,
+        2.79,
+        4.1,
+        2.79
+      ],
+      "angle": 0
+    }
+  ],
+  "furnFlue": [
+    {
+      "pos": [
+        1.09,
+        -0.59,
+        1.74,
+        -0.59,
+        1.74,
+        0.06,
+        1.09,
+        0.06
+      ],
+      "angle": 0
     }
   ],
-  "bayCase": [],
-  "furnColumn": [],
-  "furnFlue": [],
   "dire": 90
 }

static/index.html

@@ -107,7 +107,7 @@
     let args = getQueryStringArgs()
     window.test_debugger = true
     $.ajax({
-      // url: 'https://4dkk.4dage.com/data/data' + args.m + '/houst_floor.json?m=36',
+      // url: 'https://4dkk.4dage.com/data/data' + args.m + '/floor.json?m=36',
       url: '/static/data.json',
       method: 'GET',
       success(data) {
@@ -127,7 +127,7 @@
 
         cad.loadData(data);
 
-
+        // cad.
         setTimeout(() => cad.getData(true), 500)
       }
     })