Allocate rooms in zones started

This commit is contained in:
2024-11-14 06:57:47 +03:00
parent 13fa1e6eef
commit 90bfc54952
8 changed files with 1750 additions and 819 deletions

View File

@@ -1,7 +1,7 @@
[layouts]
entries=[ {
"children": [ 3, 4 ],
"children": [ 4, 5 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"floor_index": 0,
"index": 0,
@@ -9,7 +9,7 @@ entries=[ {
"order": 0,
"type": "layout"
}, {
"children": [ 5, 6, 7 ],
"children": [ 6, 7, 8 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"floor_index": 0,
"index": 1,
@@ -17,7 +17,7 @@ entries=[ {
"order": 0,
"type": "layout"
}, {
"children": [ 8, 9, 10, 11, 12 ],
"children": [ 9, 10, 11, 12, 13 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"floor_index": 0,
"index": 2,
@@ -25,136 +25,126 @@ entries=[ {
"order": 0,
"type": "layout"
}, {
"children": [ 13, 14 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"children": [ 14, 15, 16, 17 ],
"commands": [ ],
"floor_index": 0,
"index": 3,
"name": "v4",
"order": 4,
"type": "layout"
}, {
"children": [ 18, 19 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 4,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 1
}, {
"children": [ 15, 16, 17 ],
"children": [ 20, 21, 22 ],
"commands": [ [ 4, [ ] ] ],
"index": 4,
"name": "zone_1",
"order": 1,
"type": "zone",
"zone_type": 0
}, {
"children": [ 18, 19, 20, 21 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 5,
"name": "zone_1",
"order": 1,
"type": "zone",
"zone_type": 0
}, {
"children": [ 23, 24, 25, 26 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 6,
"name": "zone_1",
"order": 0,
"type": "zone",
"zone_type": 1
}, {
"children": [ 22, 23, 24 ],
"children": [ 27, 28, 29 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 6,
"index": 7,
"name": "zone_0",
"order": 1,
"type": "zone",
"zone_type": 0
}, {
"children": [ 25, 26 ],
"children": [ 30, 31 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 7,
"index": 8,
"name": "unit_0",
"order": 3,
"type": "unit"
}, {
"children": [ 27, 28 ],
"children": [ 32, 33 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 8,
"index": 9,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 1
}, {
"children": [ 29, 30 ],
"children": [ 34, 35 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 9,
"index": 10,
"name": "unit_0",
"order": 0,
"type": "unit"
}, {
"children": [ 31, 32 ],
"children": [ 36, 37 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 10,
"index": 11,
"name": "unit_1",
"order": 0,
"type": "unit"
}, {
"children": [ 33, 34 ],
"children": [ 38, 39 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 11,
"index": 12,
"name": "unit_2",
"order": 0,
"type": "unit"
}, {
"children": [ 35, 36 ],
"children": [ 40, 41 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 12,
"index": 13,
"name": "unit_3",
"order": 0,
"type": "unit"
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 13,
"name": "living_room_0",
"order": 1,
"room_area": 144.0,
"room_type": 300,
"type": "room",
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"children": [ 42, 43 ],
"commands": [ ],
"index": 14,
"name": "kitchen_0",
"order": 2,
"room_area": 16.0,
"room_type": 302,
"type": "room",
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 15,
"name": "wc_0",
"order": 0,
"room_area": 16.0,
"room_type": 200,
"type": "room",
"window": false
}, {
"children": [ ],
"commands": [ [ 5, [ ] ], [ 3, [ ] ] ],
"index": 16,
"name": "bathroom_0",
"name": "zone_0",
"order": 1,
"room_area": 16.0,
"room_type": 201,
"type": "room",
"window": false
"type": "zone",
"zone_type": 0
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 17,
"name": "bedroom_0",
"children": [ 44, 45 ],
"commands": [ ],
"index": 15,
"name": "zone_1",
"order": 2,
"room_area": 64.0,
"room_type": 202,
"type": "room",
"window": true
"type": "zone",
"zone_type": 0
}, {
"children": [ 46, 47, 48 ],
"commands": [ ],
"index": 16,
"name": "zone_2",
"order": 3,
"type": "zone",
"zone_type": 0
}, {
"children": [ 49, 50, 51, 52 ],
"commands": [ ],
"index": 17,
"name": "zone_3",
"order": 4,
"type": "zone",
"zone_type": 1
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 18,
"name": "living_room_0",
"order": 0,
"order": 1,
"room_area": 144.0,
"room_type": 300,
"type": "room",
@@ -164,6 +154,56 @@ entries=[ {
"commands": [ [ 5, [ ] ] ],
"index": 19,
"name": "kitchen_0",
"order": 2,
"room_area": 16.0,
"room_type": 302,
"type": "room",
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 20,
"name": "wc_0",
"order": 0,
"room_area": 16.0,
"room_type": 200,
"type": "room",
"window": false
}, {
"children": [ ],
"commands": [ [ 5, [ ] ], [ 3, [ ] ] ],
"index": 21,
"name": "bathroom_0",
"order": 1,
"room_area": 16.0,
"room_type": 201,
"type": "room",
"window": false
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 22,
"name": "bedroom_0",
"order": 2,
"room_area": 64.0,
"room_type": 202,
"type": "room",
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 23,
"name": "living_room_0",
"order": 0,
"room_area": 144.0,
"room_type": 300,
"type": "room",
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 24,
"name": "kitchen_0",
"order": 1,
"room_area": 64.0,
"room_type": 302,
@@ -172,7 +212,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 20,
"index": 25,
"name": "storage_room_0",
"order": 2,
"room_area": 16.0,
@@ -182,7 +222,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ], [ 4, [ ] ] ],
"index": 21,
"index": 26,
"name": "enterance_0",
"order": 3,
"room_area": 16.0,
@@ -192,7 +232,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 22,
"index": 27,
"name": "wc_0",
"order": 0,
"room_area": 16.0,
@@ -202,7 +242,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 23,
"index": 28,
"name": "bathroom_0",
"order": 1,
"room_area": 16.0,
@@ -212,7 +252,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 24,
"index": 29,
"name": "bedroom_0",
"order": 2,
"room_area": 64.0,
@@ -220,17 +260,17 @@ entries=[ {
"type": "room",
"window": true
}, {
"children": [ 37, 38, 39 ],
"children": [ 53, 54, 55 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 25,
"index": 30,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 0
}, {
"children": [ 40, 41 ],
"children": [ 56, 57 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 26,
"index": 31,
"name": "zone_1",
"order": 0,
"type": "zone",
@@ -238,7 +278,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 27,
"index": 32,
"name": "enterance_0",
"order": 0,
"room_area": 64.0,
@@ -246,9 +286,9 @@ entries=[ {
"type": "room",
"window": true
}, {
"children": [ 42 ],
"children": [ 58 ],
"commands": [ [ 5, [ ] ] ],
"index": 28,
"index": 33,
"name": "stair_0",
"order": 0,
"room_area": 16.0,
@@ -256,83 +296,73 @@ entries=[ {
"type": "room",
"window": true
}, {
"children": [ 43, 44, 45 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 29,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 0
}, {
"children": [ 46, 47 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 30,
"name": "zone_1",
"order": 0,
"type": "zone",
"zone_type": 1
}, {
"children": [ 48 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 31,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 0
}, {
"children": [ 49, 50 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 32,
"name": "zone_1",
"order": 0,
"type": "zone",
"zone_type": 1
}, {
"children": [ 51 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 33,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 0
}, {
"children": [ 52 ],
"children": [ 59, 60, 61 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 34,
"name": "zone_1",
"order": 1,
"type": "zone",
"zone_type": 1
}, {
"children": [ 53 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 35,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 0
}, {
"children": [ 54 ],
"children": [ 62, 63 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 35,
"name": "zone_1",
"order": 0,
"type": "zone",
"zone_type": 1
}, {
"children": [ 64 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 36,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 0
}, {
"children": [ 65, 66 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 37,
"name": "zone_1",
"order": 0,
"type": "zone",
"zone_type": 1
}, {
"children": [ 67 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 38,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 0
}, {
"children": [ 68 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 39,
"name": "zone_1",
"order": 1,
"type": "zone",
"zone_type": 1
}, {
"children": [ 69 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 40,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 0
}, {
"children": [ 70 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 41,
"name": "zone_1",
"order": 1,
"type": "zone",
"zone_type": 1
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 37,
"name": "bathroom_0",
"order": 0,
"room_area": 16.0,
"room_type": 201,
"type": "room",
"window": false
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 38,
"commands": [ ],
"index": 42,
"name": "wc_0",
"order": 1,
"room_area": 16.0,
@@ -341,65 +371,27 @@ entries=[ {
"window": false
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 39,
"commands": [ ],
"index": 43,
"name": "bedroom_0",
"order": 2,
"room_area": 36.0,
"room_area": 64.0,
"room_type": 202,
"type": "room",
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 40,
"name": "living_room_0",
"order": 0,
"room_area": 36.0,
"room_type": 300,
"type": "room",
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 41,
"name": "kitchen_0",
"order": 1,
"room_area": 16.0,
"room_type": 302,
"type": "room",
"window": true
}, {
"children": [ 55, 56 ],
"commands": [ ],
"floor_index": 1,
"index": 42,
"name": "floor_0",
"order": 0,
"type": "floor"
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 43,
"index": 44,
"name": "wc_0",
"order": 0,
"order": 1,
"room_area": 16.0,
"room_type": 200,
"type": "room",
"window": false
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 44,
"name": "bathroom_0",
"order": 1,
"room_area": 16.0,
"room_type": 201,
"type": "room",
"window": false
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"commands": [ ],
"index": 45,
"name": "bedroom_0",
"order": 2,
@@ -409,18 +401,38 @@ entries=[ {
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"commands": [ ],
"index": 46,
"name": "kitchen_0",
"order": 0,
"name": "wc_0",
"order": 1,
"room_area": 16.0,
"room_type": 302,
"room_type": 200,
"type": "room",
"window": true
"window": false
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"commands": [ ],
"index": 47,
"name": "bathroom_0",
"order": 2,
"room_area": 16.0,
"room_type": 201,
"type": "room",
"window": false
}, {
"children": [ ],
"commands": [ ],
"index": 48,
"name": "bathroom_1",
"order": 3,
"room_area": 144.0,
"room_type": 201,
"type": "room",
"window": false
}, {
"children": [ ],
"commands": [ ],
"index": 49,
"name": "living_room_0",
"order": 1,
"room_area": 144.0,
@@ -429,52 +441,32 @@ entries=[ {
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 48,
"name": "bathroom_0",
"order": 0,
"room_area": 16.0,
"room_type": 201,
"type": "room",
"window": false
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 49,
"commands": [ ],
"index": 50,
"name": "kitchen_0",
"order": 0,
"order": 2,
"room_area": 64.0,
"room_type": 302,
"type": "room",
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 50,
"name": "living_room_0",
"order": 1,
"room_area": 64.0,
"room_type": 300,
"commands": [ ],
"index": 51,
"name": "dining_room_0",
"order": 3,
"room_area": 144.0,
"room_type": 303,
"type": "room",
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 51,
"name": "wc_0",
"order": 0,
"room_area": 16.0,
"room_type": 200,
"type": "room",
"window": false
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"commands": [ ],
"index": 52,
"name": "living_room_0",
"order": 0,
"room_area": 64.0,
"room_type": 300,
"name": "enterance_0",
"order": 4,
"room_area": 16.0,
"room_type": 304,
"type": "room",
"window": true
}, {
@@ -491,6 +483,144 @@ entries=[ {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 54,
"name": "wc_0",
"order": 1,
"room_area": 16.0,
"room_type": 200,
"type": "room",
"window": false
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 55,
"name": "bedroom_0",
"order": 2,
"room_area": 36.0,
"room_type": 202,
"type": "room",
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 56,
"name": "living_room_0",
"order": 0,
"room_area": 36.0,
"room_type": 300,
"type": "room",
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 57,
"name": "kitchen_0",
"order": 1,
"room_area": 16.0,
"room_type": 302,
"type": "room",
"window": true
}, {
"children": [ 71, 72 ],
"commands": [ ],
"floor_index": 1,
"index": 58,
"name": "floor_0",
"order": 0,
"type": "floor"
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 59,
"name": "wc_0",
"order": 0,
"room_area": 16.0,
"room_type": 200,
"type": "room",
"window": false
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 60,
"name": "bathroom_0",
"order": 1,
"room_area": 16.0,
"room_type": 201,
"type": "room",
"window": false
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 61,
"name": "bedroom_0",
"order": 2,
"room_area": 64.0,
"room_type": 202,
"type": "room",
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 62,
"name": "kitchen_0",
"order": 0,
"room_area": 16.0,
"room_type": 302,
"type": "room",
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 63,
"name": "living_room_0",
"order": 1,
"room_area": 144.0,
"room_type": 300,
"type": "room",
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 64,
"name": "bathroom_0",
"order": 0,
"room_area": 16.0,
"room_type": 201,
"type": "room",
"window": false
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 65,
"name": "kitchen_0",
"order": 0,
"room_area": 64.0,
"room_type": 302,
"type": "room",
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 66,
"name": "living_room_0",
"order": 1,
"room_area": 64.0,
"room_type": 300,
"type": "room",
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 67,
"name": "wc_0",
"order": 0,
"room_area": 16.0,
"room_type": 200,
"type": "room",
"window": false
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 68,
"name": "living_room_0",
"order": 0,
"room_area": 64.0,
@@ -498,24 +628,44 @@ entries=[ {
"type": "room",
"window": true
}, {
"children": [ 57 ],
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 69,
"name": "bathroom_0",
"order": 0,
"room_area": 16.0,
"room_type": 201,
"type": "room",
"window": false
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 70,
"name": "living_room_0",
"order": 0,
"room_area": 64.0,
"room_type": 300,
"type": "room",
"window": true
}, {
"children": [ 73 ],
"commands": [ ],
"index": 55,
"index": 71,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 1
}, {
"children": [ 58, 59 ],
"children": [ 74, 75 ],
"commands": [ ],
"index": 56,
"index": 72,
"name": "unit_0",
"order": 0,
"type": "unit"
}, {
"children": [ ],
"commands": [ ],
"index": 57,
"index": 73,
"name": "storage_room_0",
"order": 0,
"room_area": 64.0,
@@ -523,17 +673,17 @@ entries=[ {
"type": "room",
"window": true
}, {
"children": [ 60 ],
"children": [ 76 ],
"commands": [ ],
"index": 58,
"index": 74,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 0
}, {
"children": [ 61 ],
"children": [ 77 ],
"commands": [ ],
"index": 59,
"index": 75,
"name": "zone_1",
"order": 0,
"type": "zone",
@@ -541,7 +691,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ ],
"index": 60,
"index": 76,
"name": "wc_0",
"order": 0,
"room_area": 16.0,
@@ -551,7 +701,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ ],
"index": 61,
"index": 77,
"name": "living_room_0",
"order": 0,
"room_area": 16.0,