@kensnzk/koyu 0.26.0 → 0.28.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/plan/README.md +18 -0
- package/assets/plan/catalog.muro +87 -0
- package/assets/plan/library.muro +26 -0
- package/assets/plan/svg/bathtub.svg +9 -0
- package/assets/plan/svg/bed-double.svg +9 -0
- package/assets/plan/svg/bed-single.svg +8 -0
- package/assets/plan/svg/cabinet.svg +9 -0
- package/assets/plan/svg/chair.svg +8 -0
- package/assets/plan/svg/desk.svg +9 -0
- package/assets/plan/svg/hedge-2m.svg +7 -0
- package/assets/plan/svg/kitchen-sink.svg +10 -0
- package/assets/plan/svg/locker.svg +9 -0
- package/assets/plan/svg/office-chair.svg +25 -0
- package/assets/plan/svg/potted-plant.svg +14 -0
- package/assets/plan/svg/refrigerator.svg +10 -0
- package/assets/plan/svg/shelf.svg +9 -0
- package/assets/plan/svg/shrub-1m.svg +7 -0
- package/assets/plan/svg/sofa-2.svg +9 -0
- package/assets/plan/svg/sofa-3.svg +9 -0
- package/assets/plan/svg/table-rect.svg +7 -0
- package/assets/plan/svg/table-round.svg +7 -0
- package/assets/plan/svg/tree-3m.svg +8 -0
- package/assets/plan/svg/urinal.svg +9 -0
- package/assets/plan/svg/washing-machine-pan.svg +13 -0
- package/assets/plan/svg/washing-machine.svg +10 -0
- package/assets/plan/svg/washstand-500.svg +12 -0
- package/assets/plan/svg/washstand.svg +12 -0
- package/assets/plan/svg/wc-cabinet.svg +14 -0
- package/assets/plan/svg/wc.svg +9 -0
- package/dist/cli.js +2 -2
- package/dist/cli.js.map +1 -1
- package/dist/core/components.d.ts +31 -0
- package/dist/core/components.d.ts.map +1 -0
- package/dist/core/components.js +167 -0
- package/dist/core/components.js.map +1 -0
- package/dist/core/derive.d.ts +9 -1
- package/dist/core/derive.d.ts.map +1 -1
- package/dist/core/derive.js +33 -3
- package/dist/core/derive.js.map +1 -1
- package/dist/core/diagnose.d.ts +6 -0
- package/dist/core/diagnose.d.ts.map +1 -1
- package/dist/core/diagnose.js +137 -4
- package/dist/core/diagnose.js.map +1 -1
- package/dist/core/model.d.ts +5 -5
- package/dist/core/model.d.ts.map +1 -1
- package/dist/core/model.js +6 -1
- package/dist/core/model.js.map +1 -1
- package/dist/core/parse.d.ts.map +1 -1
- package/dist/core/parse.js +5 -4
- package/dist/core/parse.js.map +1 -1
- package/dist/core/section.d.ts +27 -2
- package/dist/core/section.d.ts.map +1 -1
- package/dist/core/section.js +63 -11
- package/dist/core/section.js.map +1 -1
- package/dist/core/vocabulary.d.ts +20 -4
- package/dist/core/vocabulary.d.ts.map +1 -1
- package/dist/core/vocabulary.js +107 -9
- package/dist/core/vocabulary.js.map +1 -1
- package/dist/draw/component-files.d.ts +8 -0
- package/dist/draw/component-files.d.ts.map +1 -0
- package/dist/draw/component-files.js +35 -0
- package/dist/draw/component-files.js.map +1 -0
- package/dist/draw/component-svg.d.ts +14 -0
- package/dist/draw/component-svg.d.ts.map +1 -0
- package/dist/draw/component-svg.js +67 -0
- package/dist/draw/component-svg.js.map +1 -0
- package/dist/draw/conventions/architectural.d.ts +32 -0
- package/dist/draw/conventions/architectural.d.ts.map +1 -0
- package/dist/draw/conventions/architectural.js +29 -0
- package/dist/draw/conventions/architectural.js.map +1 -0
- package/dist/draw/index.d.ts +2 -2
- package/dist/draw/index.d.ts.map +1 -1
- package/dist/draw/index.js +2 -2
- package/dist/draw/index.js.map +1 -1
- package/dist/draw/marks.d.ts +37 -12
- package/dist/draw/marks.d.ts.map +1 -1
- package/dist/draw/marks.js +508 -38
- package/dist/draw/marks.js.map +1 -1
- package/dist/draw/plan.d.ts +3 -1
- package/dist/draw/plan.d.ts.map +1 -1
- package/dist/draw/plan.js +247 -85
- package/dist/draw/plan.js.map +1 -1
- package/dist/draw/section.d.ts +20 -2
- package/dist/draw/section.d.ts.map +1 -1
- package/dist/draw/section.js +43 -10
- package/dist/draw/section.js.map +1 -1
- package/dist/form.d.ts +2 -2
- package/dist/form.d.ts.map +1 -1
- package/dist/form.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/mcp.js +21 -3
- package/dist/mcp.js.map +1 -1
- package/dist/parse-file.d.ts +1 -0
- package/dist/parse-file.d.ts.map +1 -1
- package/dist/parse-file.js +1 -0
- package/dist/parse-file.js.map +1 -1
- package/dist/validate/builtin/index.d.ts +4 -2
- package/dist/validate/builtin/index.d.ts.map +1 -1
- package/dist/validate/builtin/index.js +9 -2
- package/dist/validate/builtin/index.js.map +1 -1
- package/dist/validate/builtin/opening-operations.d.ts +63 -0
- package/dist/validate/builtin/opening-operations.d.ts.map +1 -0
- package/dist/validate/builtin/opening-operations.js +406 -0
- package/dist/validate/builtin/opening-operations.js.map +1 -0
- package/editors/vscode/syntaxes/koyu.tmLanguage.json +3 -3
- package/examples/basement/main.muro +3 -3
- package/examples/complex/L1.muro +1 -1
- package/examples/complex/assets.muro +2 -2
- package/examples/complex/main.muro +1 -1
- package/examples/house/L1.muro +3 -3
- package/examples/house/L2.muro +2 -2
- package/examples/house/assets.muro +8 -8
- package/examples/house/main.muro +1 -1
- package/examples/house/site.muro +2 -2
- package/examples/house.muro +6 -6
- package/examples/mansion.muro +1 -1
- package/examples/office.muro +1 -1
- package/examples/steps/06-finished.muro +1 -1
- package/examples/tower/assets.muro +1 -1
- package/examples/tower/main.muro +1 -1
- package/examples/twin/assets.muro +2 -2
- package/examples/twin/main.muro +1 -1
- package/examples/two-rooms.canonical.json +1 -1
- package/examples/two-rooms.muro +1 -1
- package/package.json +7 -4
- package/src/cli.ts +2 -2
- package/src/core/components.ts +224 -0
- package/src/core/derive.ts +47 -4
- package/src/core/diagnose.ts +182 -4
- package/src/core/model.ts +10 -5
- package/src/core/parse.ts +5 -4
- package/src/core/section.ts +107 -8
- package/src/core/vocabulary.ts +115 -9
- package/src/draw/component-files.ts +36 -0
- package/src/draw/component-svg.ts +79 -0
- package/src/draw/conventions/architectural.ts +60 -0
- package/src/draw/index.ts +9 -2
- package/src/draw/marks.ts +564 -44
- package/src/draw/plan.ts +253 -88
- package/src/draw/section.ts +78 -14
- package/src/form.ts +4 -0
- package/src/index.ts +1 -1
- package/src/mcp.ts +21 -3
- package/src/parse-file.ts +1 -0
- package/src/validate/builtin/index.ts +14 -2
- package/src/validate/builtin/opening-operations.ts +519 -0
|
@@ -0,0 +1,406 @@
|
|
|
1
|
+
import { codePointCompare } from "../../analysis/json.js";
|
|
2
|
+
import { derive } from "../../core/derive.js";
|
|
3
|
+
import { canonicalBoundaryOrder, canonicalOpeningOrder, canonicalSpaceOrder, regionOf, } from "../../core/model.js";
|
|
4
|
+
import { pointIn } from "../../core/poly.js";
|
|
5
|
+
import { EPS, PARALLEL_EPS, PROBE } from "../../core/tolerance.js";
|
|
6
|
+
import { freezeBuiltin } from "./freeze.js";
|
|
7
|
+
export const SLIDING_STORAGE_LEAVES_SPACE_RULE_ID = freezeBuiltin({
|
|
8
|
+
id: "koyu.schematic.opening.storage-leaves-space",
|
|
9
|
+
revision: "1",
|
|
10
|
+
});
|
|
11
|
+
export const SLIDING_STORAGE_OVERLAPS_OPENING_RULE_ID = freezeBuiltin({
|
|
12
|
+
id: "koyu.schematic.opening.storage-overlaps-opening",
|
|
13
|
+
revision: "1",
|
|
14
|
+
});
|
|
15
|
+
export const OPENING_OPERATIONS_ANALYSIS_ID = freezeBuiltin({
|
|
16
|
+
id: "koyu.analysis.opening-operations",
|
|
17
|
+
revision: "1",
|
|
18
|
+
});
|
|
19
|
+
export const OPENING_OPERATIONS_ANALYSIS = freezeBuiltin({
|
|
20
|
+
...OPENING_OPERATIONS_ANALYSIS_ID,
|
|
21
|
+
title: "Opening operation geometry observations",
|
|
22
|
+
model: "consistent",
|
|
23
|
+
dependencies: [],
|
|
24
|
+
context: [],
|
|
25
|
+
run: ({ model }) => {
|
|
26
|
+
const coreModel = model;
|
|
27
|
+
const form = derive(coreModel);
|
|
28
|
+
const spaces = canonicalSpaceOrder(coreModel);
|
|
29
|
+
const openings = [];
|
|
30
|
+
const evidence = [];
|
|
31
|
+
for (const opening of form.openings) {
|
|
32
|
+
const style = slidingStyle(opening.style);
|
|
33
|
+
if (!style)
|
|
34
|
+
continue;
|
|
35
|
+
const observation = storageObservation(opening, style, spaces, form.openings);
|
|
36
|
+
openings.push(observation);
|
|
37
|
+
evidence.push(storageEvidence(observation, opening, coreModel));
|
|
38
|
+
}
|
|
39
|
+
openings.sort((a, b) => codePointCompare(a.ref, b.ref));
|
|
40
|
+
evidence.sort((a, b) => codePointCompare(a.id, b.id));
|
|
41
|
+
return { state: "complete", value: { openings }, evidence };
|
|
42
|
+
},
|
|
43
|
+
});
|
|
44
|
+
export const SLIDING_STORAGE_LEAVES_SPACE_RULE = freezeBuiltin({
|
|
45
|
+
...SLIDING_STORAGE_LEAVES_SPACE_RULE_ID,
|
|
46
|
+
title: "Sliding leaf storage stays in its intended space",
|
|
47
|
+
level: "violation",
|
|
48
|
+
model: "consistent",
|
|
49
|
+
analyses: [{ analysis: OPENING_OPERATIONS_ANALYSIS_ID, accept: "complete" }],
|
|
50
|
+
context: [],
|
|
51
|
+
authority: [],
|
|
52
|
+
evaluate: ({ get }) => evaluateSlidingStorage(get(OPENING_OPERATIONS_ANALYSIS_ID)),
|
|
53
|
+
});
|
|
54
|
+
export const SLIDING_STORAGE_OVERLAPS_OPENING_RULE = freezeBuiltin({
|
|
55
|
+
...SLIDING_STORAGE_OVERLAPS_OPENING_RULE_ID,
|
|
56
|
+
title: "Sliding leaf storage does not cover another opening",
|
|
57
|
+
level: "violation",
|
|
58
|
+
model: "consistent",
|
|
59
|
+
analyses: [{ analysis: OPENING_OPERATIONS_ANALYSIS_ID, accept: "complete" }],
|
|
60
|
+
context: [],
|
|
61
|
+
authority: [],
|
|
62
|
+
evaluate: ({ get }) => evaluateStorageOpeningOverlap(get(OPENING_OPERATIONS_ANALYSIS_ID)),
|
|
63
|
+
});
|
|
64
|
+
function evaluateSlidingStorage(artifact) {
|
|
65
|
+
if (artifact.state !== "complete") {
|
|
66
|
+
return {
|
|
67
|
+
applicability: "indeterminate",
|
|
68
|
+
reason: "Opening operation geometry observations are incomplete",
|
|
69
|
+
missing: artifact.missing,
|
|
70
|
+
evidence: artifact.state === "partial" ? artifact.evidence : [],
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
if (artifact.value.openings.length === 0) {
|
|
74
|
+
return { applicability: "not-applicable", reason: "No placeable sliding opening is present", evidence: [] };
|
|
75
|
+
}
|
|
76
|
+
const evidenceById = new Map(artifact.evidence.map((item) => [item.id, item]));
|
|
77
|
+
const outcomes = artifact.value.openings.map((opening) => {
|
|
78
|
+
const evidence = evidenceById.get(storageEvidenceId(opening.ref));
|
|
79
|
+
if (!evidence)
|
|
80
|
+
throw new Error(`missing opening-operation evidence for ${opening.ref}`);
|
|
81
|
+
const subjects = storageSubjects(opening);
|
|
82
|
+
if (opening.state === "indeterminate") {
|
|
83
|
+
return {
|
|
84
|
+
id: opening.ref,
|
|
85
|
+
status: "indeterminate",
|
|
86
|
+
subjects,
|
|
87
|
+
message: `${opening.ref} has no resolved room side for its sliding-leaf storage`,
|
|
88
|
+
evidence: [evidence],
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
if (opening.storage.length === 0) {
|
|
92
|
+
return {
|
|
93
|
+
id: opening.ref,
|
|
94
|
+
status: "pass",
|
|
95
|
+
subjects,
|
|
96
|
+
message: `${opening.ref} needs no sliding-leaf storage beyond its aperture`,
|
|
97
|
+
evidence: [evidence],
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
const outside = opening.storage.reduce((sum, leaf) => sum + leaf.outsideTargetMm, 0);
|
|
101
|
+
const failed = outside > EPS;
|
|
102
|
+
return {
|
|
103
|
+
id: opening.ref,
|
|
104
|
+
status: failed ? "fail" : "pass",
|
|
105
|
+
subjects,
|
|
106
|
+
message: failed
|
|
107
|
+
? `${opening.ref} has ${roundMm(outside)} mm of sliding-leaf storage outside ${opening.intoSpace}`
|
|
108
|
+
: `${opening.ref} keeps its sliding-leaf storage inside ${opening.intoSpace}`,
|
|
109
|
+
evidence: [evidence],
|
|
110
|
+
};
|
|
111
|
+
});
|
|
112
|
+
return { applicability: "applicable", outcomes: outcomes };
|
|
113
|
+
}
|
|
114
|
+
function evaluateStorageOpeningOverlap(artifact) {
|
|
115
|
+
if (artifact.state !== "complete") {
|
|
116
|
+
return {
|
|
117
|
+
applicability: "indeterminate",
|
|
118
|
+
reason: "Opening operation geometry observations are incomplete",
|
|
119
|
+
missing: artifact.missing,
|
|
120
|
+
evidence: artifact.state === "partial" ? artifact.evidence : [],
|
|
121
|
+
};
|
|
122
|
+
}
|
|
123
|
+
if (artifact.value.openings.length === 0) {
|
|
124
|
+
return { applicability: "not-applicable", reason: "No placeable sliding opening is present", evidence: [] };
|
|
125
|
+
}
|
|
126
|
+
const evidenceById = new Map(artifact.evidence.map((item) => [item.id, item]));
|
|
127
|
+
const outcomes = artifact.value.openings.map((opening) => {
|
|
128
|
+
const evidence = evidenceById.get(storageEvidenceId(opening.ref));
|
|
129
|
+
if (!evidence)
|
|
130
|
+
throw new Error(`missing opening-operation evidence for ${opening.ref}`);
|
|
131
|
+
const subjects = storageSubjects(opening);
|
|
132
|
+
if (opening.state === "indeterminate") {
|
|
133
|
+
return {
|
|
134
|
+
id: opening.ref,
|
|
135
|
+
status: "indeterminate",
|
|
136
|
+
subjects,
|
|
137
|
+
message: `${opening.ref} has unresolved sliding-leaf storage geometry`,
|
|
138
|
+
evidence: [evidence],
|
|
139
|
+
};
|
|
140
|
+
}
|
|
141
|
+
const overlaps = opening.storage.flatMap((leaf) => leaf.overlappedOpenings);
|
|
142
|
+
const first = overlaps[0];
|
|
143
|
+
return {
|
|
144
|
+
id: opening.ref,
|
|
145
|
+
status: first ? "fail" : "pass",
|
|
146
|
+
subjects,
|
|
147
|
+
message: first
|
|
148
|
+
? `${opening.ref} stores a sliding leaf across ${first.ref} for ${roundMm(first.lengthMm)} mm`
|
|
149
|
+
: `${opening.ref} stores no sliding leaf across another opening`,
|
|
150
|
+
evidence: [evidence],
|
|
151
|
+
};
|
|
152
|
+
});
|
|
153
|
+
return { applicability: "applicable", outcomes: outcomes };
|
|
154
|
+
}
|
|
155
|
+
function slidingStyle(style) {
|
|
156
|
+
switch (style) {
|
|
157
|
+
case "sliding":
|
|
158
|
+
case "sliding-double":
|
|
159
|
+
case "sliding-bypass":
|
|
160
|
+
case "auto":
|
|
161
|
+
case "auto-single":
|
|
162
|
+
case "auto-double":
|
|
163
|
+
case "gate-sliding":
|
|
164
|
+
return style;
|
|
165
|
+
default:
|
|
166
|
+
return undefined;
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
function slideKind(style) {
|
|
170
|
+
if (style === "sliding-bypass"
|
|
171
|
+
|| style === "auto"
|
|
172
|
+
|| style === "auto-single"
|
|
173
|
+
|| style === "auto-double")
|
|
174
|
+
return "bypass";
|
|
175
|
+
if (style === "sliding-double")
|
|
176
|
+
return "double";
|
|
177
|
+
return "single";
|
|
178
|
+
}
|
|
179
|
+
function storageObservation(opening, style, spaces, allOpenings) {
|
|
180
|
+
const aperture = segment(opening.swing?.hinge ?? apertureStart(opening), opening.swing?.jamb ?? apertureEnd(opening));
|
|
181
|
+
const base = {
|
|
182
|
+
ref: opening.ref,
|
|
183
|
+
boundaryRef: opening.ref.slice(0, opening.ref.lastIndexOf("/")),
|
|
184
|
+
level: opening.level ?? "",
|
|
185
|
+
kind: opening.kind,
|
|
186
|
+
style,
|
|
187
|
+
z0: opening.z0,
|
|
188
|
+
z1: opening.z1,
|
|
189
|
+
aperture,
|
|
190
|
+
};
|
|
191
|
+
const kind = slideKind(style);
|
|
192
|
+
if (kind === "bypass") {
|
|
193
|
+
return {
|
|
194
|
+
...base,
|
|
195
|
+
intoSpace: opening.swing?.into ?? null,
|
|
196
|
+
state: "complete",
|
|
197
|
+
reason: null,
|
|
198
|
+
storage: [],
|
|
199
|
+
};
|
|
200
|
+
}
|
|
201
|
+
if (!opening.swing || !opening.level) {
|
|
202
|
+
return {
|
|
203
|
+
...base,
|
|
204
|
+
intoSpace: opening.swing?.into ?? null,
|
|
205
|
+
state: "indeterminate",
|
|
206
|
+
reason: "opening-side-unresolved",
|
|
207
|
+
storage: [],
|
|
208
|
+
};
|
|
209
|
+
}
|
|
210
|
+
const target = spaces.find((space) => space.path === opening.swing.into);
|
|
211
|
+
if (!target) {
|
|
212
|
+
return {
|
|
213
|
+
...base,
|
|
214
|
+
intoSpace: opening.swing.into,
|
|
215
|
+
state: "indeterminate",
|
|
216
|
+
reason: "opening-side-unresolved",
|
|
217
|
+
storage: [],
|
|
218
|
+
};
|
|
219
|
+
}
|
|
220
|
+
const along = unit(opening.swing.hinge, opening.swing.jamb);
|
|
221
|
+
const inward = unit(opening.swing.hinge, opening.swing.leaf);
|
|
222
|
+
const faceOffset = opening.t / 2 + PROBE;
|
|
223
|
+
const parkedAxis = kind === "double"
|
|
224
|
+
? [
|
|
225
|
+
{ widthMm: opening.w / 2, from: move(opening.swing.hinge, along, -opening.w / 2), to: opening.swing.hinge },
|
|
226
|
+
{ widthMm: opening.w / 2, from: opening.swing.jamb, to: move(opening.swing.jamb, along, opening.w / 2) },
|
|
227
|
+
]
|
|
228
|
+
: [{ widthMm: opening.w, from: move(opening.swing.hinge, along, -opening.w), to: opening.swing.hinge }];
|
|
229
|
+
const levelSpaces = spaces.filter((space) => space.level === opening.level);
|
|
230
|
+
const storage = parkedAxis.map((leaf, index) => {
|
|
231
|
+
const axis = segment(leaf.from, leaf.to);
|
|
232
|
+
const line = segment(move(leaf.from, inward, faceOffset), move(leaf.to, inward, faceOffset));
|
|
233
|
+
const targetLength = coveredLength(line, regionOf(target));
|
|
234
|
+
const crossedSpaces = levelSpaces
|
|
235
|
+
.filter((space) => space.path !== target.path)
|
|
236
|
+
.map((space) => ({
|
|
237
|
+
ref: space.path,
|
|
238
|
+
lengthMm: roundMm(coveredLength(line, regionOf(space))),
|
|
239
|
+
}))
|
|
240
|
+
.filter((space) => space.lengthMm > EPS);
|
|
241
|
+
return {
|
|
242
|
+
leaf: index,
|
|
243
|
+
widthMm: leaf.widthMm,
|
|
244
|
+
parked: line,
|
|
245
|
+
wallAxis: axis,
|
|
246
|
+
outsideTargetMm: roundMm(Math.max(0, leaf.widthMm - targetLength)),
|
|
247
|
+
crossedSpaces,
|
|
248
|
+
overlappedOpenings: allOpenings
|
|
249
|
+
.filter((candidate) => candidate.ref !== opening.ref && verticalOverlap(opening, candidate) > EPS)
|
|
250
|
+
.map((candidate) => ({
|
|
251
|
+
ref: candidate.ref,
|
|
252
|
+
lengthMm: roundMm(collinearOverlap(axis, apertureSegment(candidate))),
|
|
253
|
+
}))
|
|
254
|
+
.filter((candidate) => candidate.lengthMm > EPS)
|
|
255
|
+
.sort((a, b) => codePointCompare(a.ref, b.ref)),
|
|
256
|
+
};
|
|
257
|
+
});
|
|
258
|
+
return {
|
|
259
|
+
...base,
|
|
260
|
+
intoSpace: target.path,
|
|
261
|
+
state: "complete",
|
|
262
|
+
reason: null,
|
|
263
|
+
storage,
|
|
264
|
+
};
|
|
265
|
+
}
|
|
266
|
+
function apertureSegment(opening) {
|
|
267
|
+
return segment(opening.swing?.hinge ?? apertureStart(opening), opening.swing?.jamb ?? apertureEnd(opening));
|
|
268
|
+
}
|
|
269
|
+
function verticalOverlap(a, b) {
|
|
270
|
+
return Math.max(0, Math.min(a.z1, b.z1) - Math.max(a.z0, b.z0));
|
|
271
|
+
}
|
|
272
|
+
function collinearOverlap(a, b) {
|
|
273
|
+
const from = { x: a.x1, y: a.y1 };
|
|
274
|
+
const to = { x: a.x2, y: a.y2 };
|
|
275
|
+
const direction = unit(from, to);
|
|
276
|
+
const length = Math.hypot(to.x - from.x, to.y - from.y);
|
|
277
|
+
if (length <= EPS)
|
|
278
|
+
return 0;
|
|
279
|
+
const normal = { x: -direction.y, y: direction.x };
|
|
280
|
+
const b1 = { x: b.x1, y: b.y1 };
|
|
281
|
+
const b2 = { x: b.x2, y: b.y2 };
|
|
282
|
+
const distance1 = Math.abs((b1.x - from.x) * normal.x + (b1.y - from.y) * normal.y);
|
|
283
|
+
const distance2 = Math.abs((b2.x - from.x) * normal.x + (b2.y - from.y) * normal.y);
|
|
284
|
+
if (distance1 > EPS || distance2 > EPS)
|
|
285
|
+
return 0;
|
|
286
|
+
const project = (point) => (point.x - from.x) * direction.x + (point.y - from.y) * direction.y;
|
|
287
|
+
const bStart = Math.min(project(b1), project(b2));
|
|
288
|
+
const bEnd = Math.max(project(b1), project(b2));
|
|
289
|
+
return Math.max(0, Math.min(length, bEnd) - Math.max(0, bStart));
|
|
290
|
+
}
|
|
291
|
+
function coveredLength(line, pieces) {
|
|
292
|
+
const from = { x: line.x1, y: line.y1 };
|
|
293
|
+
const to = { x: line.x2, y: line.y2 };
|
|
294
|
+
const length = Math.hypot(to.x - from.x, to.y - from.y);
|
|
295
|
+
if (length <= EPS)
|
|
296
|
+
return 0;
|
|
297
|
+
const cuts = [0, 1];
|
|
298
|
+
for (const piece of pieces) {
|
|
299
|
+
for (let i = 0; i < piece.length; i++) {
|
|
300
|
+
addIntersectionParameters(cuts, from, to, piece[i], piece[(i + 1) % piece.length]);
|
|
301
|
+
}
|
|
302
|
+
}
|
|
303
|
+
cuts.sort((a, b) => a - b);
|
|
304
|
+
const unique = cuts.filter((value, index) => index === 0 || Math.abs(value - cuts[index - 1]) * length > EPS);
|
|
305
|
+
let inside = 0;
|
|
306
|
+
for (let i = 0; i + 1 < unique.length; i++) {
|
|
307
|
+
const a = unique[i];
|
|
308
|
+
const b = unique[i + 1];
|
|
309
|
+
if ((b - a) * length <= EPS)
|
|
310
|
+
continue;
|
|
311
|
+
const at = (a + b) / 2;
|
|
312
|
+
const point = { x: from.x + (to.x - from.x) * at, y: from.y + (to.y - from.y) * at };
|
|
313
|
+
if (pieces.some((piece) => pointIn(point, piece)))
|
|
314
|
+
inside += (b - a) * length;
|
|
315
|
+
}
|
|
316
|
+
return inside;
|
|
317
|
+
}
|
|
318
|
+
function addIntersectionParameters(cuts, p, q, a, b) {
|
|
319
|
+
const rx = q.x - p.x;
|
|
320
|
+
const ry = q.y - p.y;
|
|
321
|
+
const sx = b.x - a.x;
|
|
322
|
+
const sy = b.y - a.y;
|
|
323
|
+
const cross = rx * sy - ry * sx;
|
|
324
|
+
const apx = a.x - p.x;
|
|
325
|
+
const apy = a.y - p.y;
|
|
326
|
+
if (Math.abs(cross) <= PARALLEL_EPS) {
|
|
327
|
+
if (Math.abs(apx * ry - apy * rx) > PARALLEL_EPS)
|
|
328
|
+
return;
|
|
329
|
+
const length2 = rx * rx + ry * ry;
|
|
330
|
+
if (length2 === 0)
|
|
331
|
+
return;
|
|
332
|
+
for (const edgePoint of [a, b]) {
|
|
333
|
+
const at = ((edgePoint.x - p.x) * rx + (edgePoint.y - p.y) * ry) / length2;
|
|
334
|
+
if (at > 0 && at < 1)
|
|
335
|
+
cuts.push(at);
|
|
336
|
+
}
|
|
337
|
+
return;
|
|
338
|
+
}
|
|
339
|
+
const t = (apx * sy - apy * sx) / cross;
|
|
340
|
+
const u = (apx * ry - apy * rx) / cross;
|
|
341
|
+
if (t >= 0 && t <= 1 && u >= 0 && u <= 1)
|
|
342
|
+
cuts.push(Math.max(0, Math.min(1, t)));
|
|
343
|
+
}
|
|
344
|
+
function apertureStart(opening) {
|
|
345
|
+
const along = unit({ x: opening.segment.x1, y: opening.segment.y1 }, { x: opening.segment.x2, y: opening.segment.y2 });
|
|
346
|
+
return move({ x: opening.cx, y: opening.cy }, along, -opening.w / 2);
|
|
347
|
+
}
|
|
348
|
+
function apertureEnd(opening) {
|
|
349
|
+
const along = unit({ x: opening.segment.x1, y: opening.segment.y1 }, { x: opening.segment.x2, y: opening.segment.y2 });
|
|
350
|
+
return move({ x: opening.cx, y: opening.cy }, along, opening.w / 2);
|
|
351
|
+
}
|
|
352
|
+
function unit(from, to) {
|
|
353
|
+
const length = Math.hypot(to.x - from.x, to.y - from.y) || 1;
|
|
354
|
+
return { x: (to.x - from.x) / length, y: (to.y - from.y) / length };
|
|
355
|
+
}
|
|
356
|
+
function move(point, direction, distance) {
|
|
357
|
+
return { x: point.x + direction.x * distance, y: point.y + direction.y * distance };
|
|
358
|
+
}
|
|
359
|
+
function segment(from, to) {
|
|
360
|
+
return { x1: from.x, y1: from.y, x2: to.x, y2: to.y };
|
|
361
|
+
}
|
|
362
|
+
function roundMm(value) {
|
|
363
|
+
return Math.round(value * 1000) / 1000;
|
|
364
|
+
}
|
|
365
|
+
function storageEvidence(observation, formOpening, model) {
|
|
366
|
+
const boundary = canonicalBoundaryOrder(model)[formOpening.boundary];
|
|
367
|
+
const opening = canonicalOpeningOrder(boundary)[formOpening.index];
|
|
368
|
+
return {
|
|
369
|
+
id: storageEvidenceId(observation.ref),
|
|
370
|
+
kind: "fact",
|
|
371
|
+
name: "openingOperationGeometry",
|
|
372
|
+
value: observation,
|
|
373
|
+
subjects: storageSubjects(observation),
|
|
374
|
+
sources: [modelSource(openingSubject(observation.ref), opening.line, boundary.file)],
|
|
375
|
+
producedBy: OPENING_OPERATIONS_ANALYSIS_ID,
|
|
376
|
+
};
|
|
377
|
+
}
|
|
378
|
+
function storageSubjects(observation) {
|
|
379
|
+
const refs = [openingSubject(observation.ref)];
|
|
380
|
+
if (observation.intoSpace)
|
|
381
|
+
refs.push(spaceSubject(observation.intoSpace));
|
|
382
|
+
const crossed = new Set(observation.storage.flatMap((leaf) => leaf.crossedSpaces.map((space) => space.ref)));
|
|
383
|
+
for (const ref of [...crossed].sort(codePointCompare))
|
|
384
|
+
refs.push(spaceSubject(ref));
|
|
385
|
+
const openings = new Set(observation.storage.flatMap((leaf) => leaf.overlappedOpenings.map((item) => item.ref)));
|
|
386
|
+
for (const ref of [...openings].sort(codePointCompare))
|
|
387
|
+
refs.push(openingSubject(ref));
|
|
388
|
+
return refs;
|
|
389
|
+
}
|
|
390
|
+
function modelSource(subject, line, file) {
|
|
391
|
+
return {
|
|
392
|
+
kind: "model",
|
|
393
|
+
subject,
|
|
394
|
+
location: { ...(file !== undefined ? { file } : {}), line },
|
|
395
|
+
};
|
|
396
|
+
}
|
|
397
|
+
function openingSubject(ref) {
|
|
398
|
+
return { kind: "opening", ref };
|
|
399
|
+
}
|
|
400
|
+
function spaceSubject(ref) {
|
|
401
|
+
return { kind: "space", ref };
|
|
402
|
+
}
|
|
403
|
+
function storageEvidenceId(ref) {
|
|
404
|
+
return `opening-operation:${ref}`;
|
|
405
|
+
}
|
|
406
|
+
//# sourceMappingURL=opening-operations.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opening-operations.js","sourceRoot":"","sources":["../../../src/validate/builtin/opening-operations.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAoB,MAAM,sBAAsB,CAAC;AAChE,OAAO,EACL,sBAAsB,EACtB,qBAAqB,EACrB,mBAAmB,EACnB,QAAQ,GAIT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAEnE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,CAAC,MAAM,oCAAoC,GAAG,aAAa,CAAC;IAChE,EAAE,EAAE,6CAA6C;IACjD,QAAQ,EAAE,GAAG;CACL,CAAC,CAAC;AAEZ,MAAM,CAAC,MAAM,wCAAwC,GAAG,aAAa,CAAC;IACpE,EAAE,EAAE,iDAAiD;IACrD,QAAQ,EAAE,GAAG;CACL,CAAC,CAAC;AA+DZ,MAAM,CAAC,MAAM,8BAA8B,GAAgD,aAAa,CAAC;IACvG,EAAE,EAAE,kCAAkC;IACtC,QAAQ,EAAE,GAAG;CACd,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAuD,aAAa,CAAqD;IAC/J,GAAG,8BAA8B;IACjC,KAAK,EAAE,yCAAyC;IAChD,KAAK,EAAE,YAAY;IACnB,YAAY,EAAE,EAAE;IAChB,OAAO,EAAE,EAAE;IACX,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,EAAoD,EAAE;QACnE,MAAM,SAAS,GAAG,KAAyB,CAAC;QAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAgC,EAAE,CAAC;QACjD,MAAM,QAAQ,GAAe,EAAE,CAAC;QAEhC,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpC,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC1C,IAAI,CAAC,KAAK;gBAAE,SAAS;YACrB,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC9E,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC3B,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;QAClE,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACxD,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACtD,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC;IAC9D,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,iCAAiC,GAAS,aAAa,CAAO;IACzE,GAAG,oCAAoC;IACvC,KAAK,EAAE,kDAAkD;IACzD,KAAK,EAAE,WAAW;IAClB,KAAK,EAAE,YAAY;IACnB,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,8BAA8B,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IAC5E,OAAO,EAAE,EAAE;IACX,SAAS,EAAE,EAAE;IACb,QAAQ,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,sBAAsB,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;CACnF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,qCAAqC,GAAS,aAAa,CAAO;IAC7E,GAAG,wCAAwC;IAC3C,KAAK,EAAE,qDAAqD;IAC5D,KAAK,EAAE,WAAW;IAClB,KAAK,EAAE,YAAY;IACnB,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,8BAA8B,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IAC5E,OAAO,EAAE,EAAE;IACX,SAAS,EAAE,EAAE;IACb,QAAQ,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,6BAA6B,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;CAC1F,CAAC,CAAC;AAEH,SAAS,sBAAsB,CAC7B,QAA0D;IAE1D,IAAI,QAAQ,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;QAClC,OAAO;YACL,aAAa,EAAE,eAAe;YAC9B,MAAM,EAAE,wDAAwD;YAChE,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,QAAQ,EAAE,QAAQ,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;SAChE,CAAC;IACJ,CAAC;IACD,IAAI,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,EAAE,yCAAyC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAC9G,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/E,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAe,EAAE;QACpE,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,0CAA0C,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACxF,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,OAAO,CAAC,KAAK,KAAK,eAAe,EAAE,CAAC;YACtC,OAAO;gBACL,EAAE,EAAE,OAAO,CAAC,GAAG;gBACf,MAAM,EAAE,eAAe;gBACvB,QAAQ;gBACR,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,yDAAyD;gBAChF,QAAQ,EAAE,CAAC,QAAQ,CAAC;aACrB,CAAC;QACJ,CAAC;QACD,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO;gBACL,EAAE,EAAE,OAAO,CAAC,GAAG;gBACf,MAAM,EAAE,MAAM;gBACd,QAAQ;gBACR,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,oDAAoD;gBAC3E,QAAQ,EAAE,CAAC,QAAQ,CAAC;aACrB,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;QACrF,MAAM,MAAM,GAAG,OAAO,GAAG,GAAG,CAAC;QAC7B,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,GAAG;YACf,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;YAChC,QAAQ;YACR,OAAO,EAAE,MAAM;gBACb,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,QAAQ,OAAO,CAAC,OAAO,CAAC,uCAAuC,OAAO,CAAC,SAAS,EAAE;gBAClG,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,0CAA0C,OAAO,CAAC,SAAS,EAAE;YAC/E,QAAQ,EAAE,CAAC,QAAQ,CAAC;SACrB,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,QAA2C,EAAE,CAAC;AAChG,CAAC;AAED,SAAS,6BAA6B,CACpC,QAA0D;IAE1D,IAAI,QAAQ,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;QAClC,OAAO;YACL,aAAa,EAAE,eAAe;YAC9B,MAAM,EAAE,wDAAwD;YAChE,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,QAAQ,EAAE,QAAQ,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;SAChE,CAAC;IACJ,CAAC;IACD,IAAI,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,EAAE,yCAAyC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAC9G,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/E,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAe,EAAE;QACpE,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,0CAA0C,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACxF,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,OAAO,CAAC,KAAK,KAAK,eAAe,EAAE,CAAC;YACtC,OAAO;gBACL,EAAE,EAAE,OAAO,CAAC,GAAG;gBACf,MAAM,EAAE,eAAe;gBACvB,QAAQ;gBACR,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,+CAA+C;gBACtE,QAAQ,EAAE,CAAC,QAAQ,CAAC;aACrB,CAAC;QACJ,CAAC;QACD,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC5E,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC1B,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,GAAG;YACf,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;YAC/B,QAAQ;YACR,OAAO,EAAE,KAAK;gBACZ,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,iCAAiC,KAAK,CAAC,GAAG,QAAQ,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK;gBAC9F,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,gDAAgD;YAClE,QAAQ,EAAE,CAAC,QAAQ,CAAC;SACrB,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,QAA2C,EAAE,CAAC;AAChG,CAAC;AAKD,SAAS,YAAY,CAAC,KAAyB;IAC7C,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,SAAS,CAAC;QACf,KAAK,gBAAgB,CAAC;QACtB,KAAK,gBAAgB,CAAC;QACtB,KAAK,MAAM,CAAC;QACZ,KAAK,aAAa,CAAC;QACnB,KAAK,aAAa,CAAC;QACnB,KAAK,cAAc;YACjB,OAAO,KAAK,CAAC;QACf;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,KAAmB;IACpC,IACE,KAAK,KAAK,gBAAgB;WACvB,KAAK,KAAK,MAAM;WAChB,KAAK,KAAK,aAAa;WACvB,KAAK,KAAK,aAAa;QAC1B,OAAO,QAAQ,CAAC;IAClB,IAAI,KAAK,KAAK,gBAAgB;QAAE,OAAO,QAAQ,CAAC;IAChD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,kBAAkB,CACzB,OAAoB,EACpB,KAAmB,EACnB,MAAwB,EACxB,WAAmC;IAEnC,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,KAAK,EAAE,IAAI,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;IACtH,MAAM,IAAI,GAAG;QACX,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC/D,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,EAAE;QAC1B,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,KAAK;QACL,EAAE,EAAE,OAAO,CAAC,EAAE;QACd,EAAE,EAAE,OAAO,CAAC,EAAE;QACd,QAAQ;KACA,CAAC;IACX,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IAC9B,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,OAAO;YACL,GAAG,IAAI;YACP,SAAS,EAAE,OAAO,CAAC,KAAK,EAAE,IAAI,IAAI,IAAI;YACtC,KAAK,EAAE,UAAU;YACjB,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE,EAAE;SACZ,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrC,OAAO;YACL,GAAG,IAAI;YACP,SAAS,EAAE,OAAO,CAAC,KAAK,EAAE,IAAI,IAAI,IAAI;YACtC,KAAK,EAAE,eAAe;YACtB,MAAM,EAAE,yBAAyB;YACjC,OAAO,EAAE,EAAE;SACZ,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,KAAM,CAAC,IAAI,CAAC,CAAC;IAC1E,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;YACL,GAAG,IAAI;YACP,SAAS,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI;YAC7B,KAAK,EAAE,eAAe;YACtB,MAAM,EAAE,yBAAyB;YACjC,OAAO,EAAE,EAAE;SACZ,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5D,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACzC,MAAM,UAAU,GAAG,IAAI,KAAK,QAAQ;QAClC,CAAC,CAAC;YACE,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE;YAC3G,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE;SACzG;QACH,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;IAC1G,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC;IAC5E,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAiC,EAAE;QAC5E,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACzC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;QAC7F,MAAM,YAAY,GAAG,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3D,MAAM,aAAa,GAAG,WAAW;aAC9B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC;aAC7C,GAAG,CAAC,CAAC,KAAK,EAA2B,EAAE,CAAC,CAAC;YACxC,GAAG,EAAE,KAAK,CAAC,IAAI;YACf,QAAQ,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;SACxD,CAAC,CAAC;aACF,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC;QAC3C,OAAO;YACL,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,IAAI;YACd,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;YAClE,aAAa;YACb,kBAAkB,EAAE,WAAW;iBAC5B,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,KAAK,OAAO,CAAC,GAAG,IAAI,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG,GAAG,CAAC;iBACjG,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;gBACnB,GAAG,EAAE,SAAS,CAAC,GAAG;gBAClB,QAAQ,EAAE,OAAO,CAAC,gBAAgB,CAAC,IAAI,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC;aACtE,CAAC,CAAC;iBACF,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,GAAG,GAAG,CAAC;iBAC/C,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;SAClD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,IAAI;QACP,SAAS,EAAE,MAAM,CAAC,IAAI;QACtB,KAAK,EAAE,UAAU;QACjB,MAAM,EAAE,IAAI;QACZ,OAAO;KACR,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,OAAoB;IAC3C,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,KAAK,EAAE,IAAI,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;AAC9G,CAAC;AAED,SAAS,eAAe,CAAC,CAAc,EAAE,CAAc;IACrD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAClE,CAAC;AAED,SAAS,gBAAgB,CAAC,CAAmB,EAAE,CAAmB;IAChE,MAAM,IAAI,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;IAClC,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;IAChC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACjC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACxD,IAAI,MAAM,IAAI,GAAG;QAAE,OAAO,CAAC,CAAC;IAC5B,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC;IACnD,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;IAChC,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;IAChC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACpF,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACpF,IAAI,SAAS,GAAG,GAAG,IAAI,SAAS,GAAG,GAAG;QAAE,OAAO,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,CAAC,KAAS,EAAU,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;IAC3G,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;IAClD,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;IAChD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AACnE,CAAC;AAED,SAAS,aAAa,CAAC,IAAsB,EAAE,MAAuB;IACpE,MAAM,IAAI,GAAG,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;IACxC,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;IACtC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACxD,IAAI,MAAM,IAAI,GAAG;QAAE,OAAO,CAAC,CAAC;IAC5B,MAAM,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACpB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACtC,yBAAyB,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC,CAAE,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,MAAM,CAAE,CAAC,CAAC;QACvF,CAAC;IACH,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG,CAAC,CAAE,CAAC,GAAG,MAAM,GAAG,GAAG,CAAC,CAAC;IAC/G,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC;QACrB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC;QACzB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,IAAI,GAAG;YAAE,SAAS;QACtC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACvB,MAAM,KAAK,GAAG,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC;QACrF,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC;IAChF,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,yBAAyB,CAAC,IAAc,EAAE,CAAK,EAAE,CAAK,EAAE,CAAK,EAAE,CAAK;IAC3E,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,KAAK,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IAChC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACtB,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACtB,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,YAAY,EAAE,CAAC;QACpC,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,GAAG,YAAY;YAAE,OAAO;QACzD,MAAM,OAAO,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;QAClC,IAAI,OAAO,KAAK,CAAC;YAAE,OAAO;QAC1B,KAAK,MAAM,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YAC/B,MAAM,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC;YAC3E,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC;gBAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACtC,CAAC;QACD,OAAO;IACT,CAAC;IACD,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,GAAG,KAAK,CAAC;IACxC,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,GAAG,KAAK,CAAC;IACxC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AACnF,CAAC;AAED,SAAS,aAAa,CAAC,OAAoB;IACzC,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IACvH,OAAO,IAAI,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;AACvE,CAAC;AAED,SAAS,WAAW,CAAC,OAAoB;IACvC,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IACvH,OAAO,IAAI,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,IAAI,CAAC,IAAQ,EAAE,EAAM;IAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC7D,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,CAAC;AACtE,CAAC;AAED,SAAS,IAAI,CAAC,KAAS,EAAE,SAAa,EAAE,QAAgB;IACtD,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,QAAQ,EAAE,CAAC;AACtF,CAAC;AAED,SAAS,OAAO,CAAC,IAAQ,EAAE,EAAM;IAC/B,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC;AACxD,CAAC;AAED,SAAS,OAAO,CAAC,KAAa;IAC5B,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;AACzC,CAAC;AAED,SAAS,eAAe,CACtB,WAAsC,EACtC,WAAwB,EACxB,KAAY;IAEZ,MAAM,QAAQ,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAE,CAAC;IACtE,MAAM,OAAO,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,KAAK,CAAE,CAAC;IACpE,OAAO;QACL,EAAE,EAAE,iBAAiB,CAAC,WAAW,CAAC,GAAG,CAAC;QACtC,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,0BAA0B;QAChC,KAAK,EAAE,WAAW;QAClB,QAAQ,EAAE,eAAe,CAAC,WAAW,CAAC;QACtC,OAAO,EAAE,CAAC,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpF,UAAU,EAAE,8BAA8B;KAC3C,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,WAAsC;IAC7D,MAAM,IAAI,GAAiB,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7D,IAAI,WAAW,CAAC,SAAS;QAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC7G,KAAK,MAAM,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC;QAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;IACpF,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACjH,KAAK,MAAM,GAAG,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC;QAAE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;IACvF,OAAO,IAAqC,CAAC;AAC/C,CAAC;AAED,SAAS,WAAW,CAAC,OAAmB,EAAE,IAAY,EAAE,IAAa;IACnE,OAAO;QACL,IAAI,EAAE,OAAO;QACb,OAAO;QACP,QAAQ,EAAE,EAAE,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE;KAC5D,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,GAAW;IACjC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,YAAY,CAAC,GAAW;IAC/B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;AAChC,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAW;IACpC,OAAO,qBAAqB,GAAG,EAAE,CAAC;AACpC,CAAC"}
|
|
@@ -79,8 +79,8 @@
|
|
|
79
79
|
}
|
|
80
80
|
},
|
|
81
81
|
"line-asset": {
|
|
82
|
-
"comment": "asset
|
|
83
|
-
"match": "^(asset)[ \\t]+(?![^\\s#\"]*:)([^\\s#]+)[ \\t]+(door|window)\\b",
|
|
82
|
+
"comment": "asset <name> door|window|component ...",
|
|
83
|
+
"match": "^(asset)[ \\t]+(?![^\\s#\"]*:)([^\\s#]+)[ \\t]+(door|window|component)\\b",
|
|
84
84
|
"captures": {
|
|
85
85
|
"1": { "name": "keyword.control.directive.muro" },
|
|
86
86
|
"2": { "name": "entity.name.function.asset.muro" },
|
|
@@ -178,7 +178,7 @@
|
|
|
178
178
|
},
|
|
179
179
|
"attr-ledger": {
|
|
180
180
|
"comment": "The ledger keys that are not carrier-tier — the attributes the tools act on. ATTR_LEDGER in src/core/vocabulary.ts is the contract; free k:v gets a different colour",
|
|
181
|
-
"match": "\\b(underground|escalator|elevation|daylight|northing|vertical|ceiling|landing|outside|easting|hinge|level|riser|slope|stair|style|swing|tread|pitch|entry|lane|lift|form|road|slab|site|area|turn|type|edge|name|ramp|void|epsg|uid|air|use|at|h|w|t|d|x|y)(:)",
|
|
181
|
+
"match": "\\b(underground|escalator|elevation|daylight|northing|vertical|ceiling|landing|outside|offset-x|offset-y|align-x|align-y|plan-svg|easting|panels|asset|rotate|hinge|level|riser|slope|stair|style|swing|tread|pitch|entry|lane|lift|form|road|slab|site|area|turn|type|edge|name|ramp|void|epsg|uid|air|use|at|h|w|t|d|x|y)(:)",
|
|
182
182
|
"captures": {
|
|
183
183
|
"1": { "name": "entity.other.attribute-name.muro" },
|
|
184
184
|
"2": { "name": "punctuation.separator.key-value.muro" }
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
# * 地下は level の underground:1 という宣言。zの負値からは推定しない (ADR-0022)。
|
|
12
12
|
# * 土に接する壁は spec 語彙 (spec:RC土圧壁)。境界の型は増やさない — 物の名は spec である。
|
|
13
13
|
|
|
14
|
-
muro 1.
|
|
14
|
+
muro 1.5
|
|
15
15
|
name 地下駐車場 — 縦動線の最小例
|
|
16
16
|
unit mm
|
|
17
17
|
|
|
@@ -19,7 +19,7 @@ grid X 0 8000 16000 25000 34000
|
|
|
19
19
|
grid Y 0 7000 16000
|
|
20
20
|
|
|
21
21
|
asset FD1 door w:900 h:2000 style:hinged fire:特定防火設備 name:防火戸
|
|
22
|
-
asset VG1 door w:6000 h:3000 style:
|
|
22
|
+
asset VG1 door w:6000 h:3000 style:rolling-shutter name:Vehicle-shutter
|
|
23
23
|
|
|
24
24
|
level B2 -7400 h:2600 slab:800 underground:1
|
|
25
25
|
level B1 -3700 h:2600 slab:800 underground:1
|
|
@@ -69,7 +69,7 @@ boundary /L1/ramp /L1/st t:250 spec:RC
|
|
|
69
69
|
boundary /L1/ramp /L1/ev t:250 spec:RC
|
|
70
70
|
boundary /L1/st /L1/ev t:250 spec:RC
|
|
71
71
|
boundary /L1/ramp /road edge:E t:200 spec:RC
|
|
72
|
-
door VG1 name
|
|
72
|
+
door VG1 name:Vehicle-entrance # This is the only vehicle opening serving both parking levels.
|
|
73
73
|
boundary /L1/ramp /out edge:S t:200 spec:RC
|
|
74
74
|
boundary /L1/ramp /out edge:N t:200 spec:RC
|
|
75
75
|
boundary /L1/ramp /out edge:W t:200 spec:RC
|
package/examples/complex/L1.muro
CHANGED
|
@@ -124,7 +124,7 @@ boundary /L1/s05 /site/east edge:E t:300 spec:カーテンウォール
|
|
|
124
124
|
door AD1 name:東側入口
|
|
125
125
|
boundary /L1/n05 /site/east edge:E t:300 spec:カーテンウォール
|
|
126
126
|
boundary /L1/mall /site/east edge:E t:300 spec:カーテンウォール
|
|
127
|
-
door AD1 name
|
|
127
|
+
door AD1 w:1800 name:East-mall-entrance
|
|
128
128
|
boundary /L1/bohE /site/east edge:E t:300 spec:RC
|
|
129
129
|
door GD1 name:荷捌き入口
|
|
130
130
|
boundary /L1/bohW /out edge:N t:300 spec:RC
|
|
@@ -8,9 +8,9 @@ asset FD2 door w:1800 h:2400 style:hinged fire:特定防火設備 name:両開
|
|
|
8
8
|
asset SD1 door w:900 h:2100 style:sliding name:片引き戸
|
|
9
9
|
asset HD1 door w:900 h:2100 style:hinged fire:防火設備 name:客室扉
|
|
10
10
|
asset MD1 door w:1800 h:2400 style:hinged name:機械室扉
|
|
11
|
-
asset GD1 door w:3600 h:3000 style:
|
|
11
|
+
asset GD1 door w:3600 h:3000 style:rolling-shutter name:Loading-shutter
|
|
12
12
|
|
|
13
|
-
asset VG1 door w:6000 h:3000 style:
|
|
13
|
+
asset VG1 door w:6000 h:3000 style:rolling-shutter name:Vehicle-shutter
|
|
14
14
|
asset CW1 window w:7200 h:3600 sill:900 name:基壇カーテンウォール
|
|
15
15
|
asset CW2 window w:7200 h:2100 sill:800 name:事務所カーテンウォール
|
|
16
16
|
asset W1 window w:2600 h:2000 sill:400 name:客室窓
|
package/examples/house/L1.muro
CHANGED
|
@@ -4,13 +4,13 @@ space /home/ldk ldk X1..X2 Y1..Y3 + X2..X3 Y1..Y2 level:L1 name:LDK floor:オ
|
|
|
4
4
|
space /home/hall1 hall X2..X3 Y2..Y3 level:L1 name:玄関・階段
|
|
5
5
|
|
|
6
6
|
boundary /home/ldk /home/hall1 t:120 spec:LGS
|
|
7
|
-
door SD1 edge:E hinge:S swing:b #
|
|
7
|
+
door SD1 edge:E hinge:S swing:b # The asset operation selects the sliding plan symbol.
|
|
8
8
|
boundary /home/ldk /site/garden t:150 spec:EW
|
|
9
|
-
window W1 at:X2 name
|
|
9
|
+
window W1 at:X2 name:Full-height-window
|
|
10
10
|
boundary /home/ldk /site/west t:150 spec:EW
|
|
11
11
|
window W2
|
|
12
12
|
boundary /home/ldk /site/east t:150 spec:EW
|
|
13
13
|
boundary /home/ldk /site/north t:150 spec:EW
|
|
14
14
|
boundary /home/hall1 /site/east t:150 spec:EW
|
|
15
|
-
door D1 at:Y2+1820 name
|
|
15
|
+
door D1 at:Y2+1820 name:Entrance
|
|
16
16
|
boundary /home/hall1 /site/north t:150 spec:EW
|
package/examples/house/L2.muro
CHANGED
|
@@ -10,10 +10,10 @@ boundary /home/bed1 /out/w edge:W t:150 spec:EW
|
|
|
10
10
|
boundary /home/bed1 /out/n edge:N t:150 spec:EW
|
|
11
11
|
boundary /home/bed1 /home/void t:120 spec:LGS
|
|
12
12
|
boundary /home/bed1 /home/hall2 t:120 spec:LGS
|
|
13
|
-
door SD1 name
|
|
13
|
+
door SD1 name:Bedroom-sliding-door
|
|
14
14
|
boundary /home/void /home/hall2 t:120 spec:手すり air:1 h:1100
|
|
15
15
|
boundary /home/void /out/road edge:S t:150 spec:EW
|
|
16
|
-
window W3 name
|
|
16
|
+
window W3 name:Void-clerestory
|
|
17
17
|
boundary /home/void /out/e edge:E t:150 spec:EW
|
|
18
18
|
boundary /home/hall2 /out/e edge:E t:150 spec:EW
|
|
19
19
|
boundary /home/hall2 /out/n edge:N t:150 spec:EW
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
#
|
|
2
|
-
#
|
|
1
|
+
# Opening assets, analogous to Revit families or USD references (ADR-0010).
|
|
2
|
+
# An opening refers to one with `door SD1 ...`; instance attributes override asset attributes.
|
|
3
3
|
|
|
4
|
-
asset D1 door w:900 h:2100 style:hinged name
|
|
5
|
-
asset SD1 door w:800 h:2000 style:sliding name
|
|
6
|
-
asset GT1 door w:900 h:1200 style:hinged name
|
|
7
|
-
asset W1 window w:2600 h:2200 sill:0 name
|
|
8
|
-
asset W2 window w:1650 h:1100 sill:900 name
|
|
9
|
-
asset W3 window w:2600 h:1100 sill:1100 name
|
|
4
|
+
asset D1 door w:900 h:2100 style:hinged name:Entrance-door
|
|
5
|
+
asset SD1 door w:800 h:2000 style:sliding name:Single-sliding-door
|
|
6
|
+
asset GT1 door w:900 h:1200 style:gate-hinged name:Gate
|
|
7
|
+
asset W1 window w:2600 h:2200 sill:0 name:Full-height-window
|
|
8
|
+
asset W2 window w:1650 h:1100 sill:900 name:Waist-height-window
|
|
9
|
+
asset W3 window w:2600 h:1100 sill:1100 name:Clerestory
|
package/examples/house/main.muro
CHANGED
package/examples/house/site.muro
CHANGED
|
@@ -19,9 +19,9 @@ boundary /site/garden /site/east type:open
|
|
|
19
19
|
boundary /site/west /site/north type:open
|
|
20
20
|
boundary /site/east /site/north type:open
|
|
21
21
|
|
|
22
|
-
# ----
|
|
22
|
+
# ---- Site boundary: the gate uses an asset reference at an explicit position. ----
|
|
23
23
|
boundary /site/garden /out/road edge:S t:120 spec:ブロック塀+フェンス air:1 h:1200
|
|
24
|
-
door GT1 at:X2 name
|
|
24
|
+
door GT1 at:X2 name:Gate # The grid-based position is explicit; overshooting is an error.
|
|
25
25
|
boundary /site/garden /out/w edge:W t:120 spec:ブロック塀 air:1 h:1200
|
|
26
26
|
boundary /site/garden /out/e edge:E t:120 spec:ブロック塀 air:1 h:1200
|
|
27
27
|
boundary /site/west /out/w edge:W t:120 spec:ブロック塀 air:1 h:1200
|
package/examples/house.muro
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
# 敷地 = zone site:1 (宣言面積と導出面積を site コマンドが突き合わせる)。
|
|
8
8
|
# L1の平面図はそのまま配置図兼用になる。
|
|
9
9
|
|
|
10
|
-
muro 1.
|
|
10
|
+
muro 1.5
|
|
11
11
|
name 小さな戸建住宅
|
|
12
12
|
unit mm
|
|
13
13
|
|
|
@@ -43,13 +43,13 @@ space /home/hall2 hall X2..X3 Y2..Y3 level:L2 name:2階ホール
|
|
|
43
43
|
boundary /home/ldk /home/hall1 t:120 spec:LGS
|
|
44
44
|
door w:800 edge:E hinge:S swing:b
|
|
45
45
|
boundary /home/ldk /site/garden t:150 spec:EW
|
|
46
|
-
window w:2600 h:2200 sill:0 name
|
|
46
|
+
window w:2600 h:2200 sill:0 name:Full-height-window
|
|
47
47
|
boundary /home/ldk /site/west t:150 spec:EW
|
|
48
48
|
window w:1650 h:1100 sill:900
|
|
49
49
|
boundary /home/ldk /site/east t:150 spec:EW
|
|
50
50
|
boundary /home/ldk /site/north t:150 spec:EW
|
|
51
51
|
boundary /home/hall1 /site/east t:150 spec:EW
|
|
52
|
-
door w:900 name
|
|
52
|
+
door w:900 name:Entrance
|
|
53
53
|
boundary /home/hall1 /site/north t:150 spec:EW
|
|
54
54
|
|
|
55
55
|
# ---- 庭同士は連続 ----
|
|
@@ -58,9 +58,9 @@ boundary /site/garden /site/east type:open
|
|
|
58
58
|
boundary /site/west /site/north type:open
|
|
59
59
|
boundary /site/east /site/north type:open
|
|
60
60
|
|
|
61
|
-
# ----
|
|
61
|
+
# ---- Site boundary: the wall is boundary specification; air:1 leaves it open to outside air. ----
|
|
62
62
|
boundary /site/garden /out/road edge:S t:120 spec:ブロック塀+フェンス air:1 h:1200
|
|
63
|
-
door w:900 name
|
|
63
|
+
door w:900 style:gate-hinged name:Gate
|
|
64
64
|
boundary /site/garden /out/w edge:W t:120 spec:ブロック塀 air:1 h:1200
|
|
65
65
|
boundary /site/garden /out/e edge:E t:120 spec:ブロック塀 air:1 h:1200
|
|
66
66
|
boundary /site/west /out/w edge:W t:120 spec:ブロック塀 air:1 h:1200
|
|
@@ -79,7 +79,7 @@ boundary /home/bed1 /home/hall2 t:120 spec:LGS
|
|
|
79
79
|
door w:800
|
|
80
80
|
boundary /home/void /home/hall2 t:120 spec:手すり air:1 h:1100
|
|
81
81
|
boundary /home/void /out/road edge:S t:150 spec:EW
|
|
82
|
-
window w:2600 h:1100 sill:1100 name
|
|
82
|
+
window w:2600 h:1100 sill:1100 name:Void-clerestory
|
|
83
83
|
boundary /home/void /out/e edge:E t:150 spec:EW
|
|
84
84
|
boundary /home/hall2 /out/e edge:E t:150 spec:EW
|
|
85
85
|
boundary /home/hall2 /out/n edge:N t:150 spec:EW
|