@kensnzk/koyu 0.15.0 → 0.16.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/README.ja.md +2 -2
- package/README.md +3 -3
- package/dist/cli.js +156 -81
- package/dist/cli.js.map +1 -1
- package/dist/core/derive.d.ts +259 -0
- package/dist/core/derive.d.ts.map +1 -0
- package/dist/core/derive.js +570 -0
- package/dist/core/derive.js.map +1 -0
- package/dist/{check.d.ts → core/diagnose.d.ts} +11 -12
- package/dist/core/diagnose.d.ts.map +1 -0
- package/dist/{check.js → core/diagnose.js} +232 -221
- package/dist/core/diagnose.js.map +1 -0
- package/dist/core/diff.d.ts.map +1 -0
- package/dist/{diff.js → core/diff.js} +84 -41
- package/dist/core/diff.js.map +1 -0
- package/dist/{fabric.d.ts → core/fabric.d.ts} +4 -0
- package/dist/core/fabric.d.ts.map +1 -0
- package/dist/{fabric.js → core/fabric.js} +4 -3
- package/dist/core/fabric.js.map +1 -0
- package/dist/{graph.d.ts → core/graph.d.ts} +1 -3
- package/dist/core/graph.d.ts.map +1 -0
- package/dist/{graph.js → core/graph.js} +43 -51
- package/dist/core/graph.js.map +1 -0
- package/dist/core/light.d.ts +24 -0
- package/dist/core/light.d.ts.map +1 -0
- package/dist/{light.js → core/light.js} +15 -10
- package/dist/core/light.js.map +1 -0
- package/dist/{model.d.ts → core/model.d.ts} +124 -13
- package/dist/core/model.d.ts.map +1 -0
- package/dist/{model.js → core/model.js} +186 -49
- package/dist/core/model.js.map +1 -0
- package/dist/core/parse.d.ts.map +1 -0
- package/dist/{parse.js → core/parse.js} +528 -116
- package/dist/core/parse.js.map +1 -0
- package/dist/{poly.d.ts → core/poly.d.ts} +3 -2
- package/dist/core/poly.d.ts.map +1 -0
- package/dist/{poly.js → core/poly.js} +8 -9
- package/dist/core/poly.js.map +1 -0
- package/dist/core/site.d.ts.map +1 -0
- package/dist/core/site.js.map +1 -0
- package/dist/core/tolerance.d.ts +26 -0
- package/dist/core/tolerance.d.ts.map +1 -0
- package/dist/core/tolerance.js +48 -0
- package/dist/core/tolerance.js.map +1 -0
- package/dist/{vertical.d.ts → core/vertical.d.ts} +41 -12
- package/dist/core/vertical.d.ts.map +1 -0
- package/dist/{vertical.js → core/vertical.js} +45 -104
- package/dist/core/vertical.js.map +1 -0
- package/dist/core/vocabulary.d.ts +40 -0
- package/dist/core/vocabulary.d.ts.map +1 -0
- package/dist/core/vocabulary.js +164 -0
- package/dist/core/vocabulary.js.map +1 -0
- package/dist/{axo.d.ts → draw/axo.d.ts} +1 -1
- package/dist/draw/axo.d.ts.map +1 -0
- package/dist/{axo.js → draw/axo.js} +53 -81
- package/dist/draw/axo.js.map +1 -0
- package/dist/draw/index.d.ts +3 -0
- package/dist/draw/index.d.ts.map +1 -0
- package/dist/draw/index.js +11 -0
- package/dist/draw/index.js.map +1 -0
- package/dist/draw/plan.d.ts +10 -0
- package/dist/draw/plan.d.ts.map +1 -0
- package/dist/draw/plan.js +284 -0
- package/dist/draw/plan.js.map +1 -0
- package/dist/index.d.ts +15 -11
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +49 -12
- package/dist/index.js.map +1 -1
- package/dist/mcp.js +71 -40
- package/dist/mcp.js.map +1 -1
- package/dist/parse-file.d.ts +1 -1
- package/dist/parse-file.d.ts.map +1 -1
- package/dist/parse-file.js +1 -1
- package/dist/parse-file.js.map +1 -1
- package/dist/validate/access.d.ts +6 -0
- package/dist/validate/access.d.ts.map +1 -0
- package/dist/validate/access.js +238 -0
- package/dist/validate/access.js.map +1 -0
- package/dist/validate/envelope.d.ts +4 -0
- package/dist/validate/envelope.d.ts.map +1 -0
- package/dist/validate/envelope.js +55 -0
- package/dist/validate/envelope.js.map +1 -0
- package/dist/validate/index.d.ts +60 -0
- package/dist/validate/index.d.ts.map +1 -0
- package/dist/validate/index.js +77 -0
- package/dist/validate/index.js.map +1 -0
- package/dist/validate/light.d.ts +6 -0
- package/dist/validate/light.d.ts.map +1 -0
- package/dist/validate/light.js +28 -0
- package/dist/validate/light.js.map +1 -0
- package/dist/validate/runs.d.ts +16 -0
- package/dist/validate/runs.d.ts.map +1 -0
- package/dist/validate/runs.js +60 -0
- package/dist/validate/runs.js.map +1 -0
- package/dist/validate/site.d.ts +6 -0
- package/dist/validate/site.d.ts.map +1 -0
- package/dist/validate/site.js +63 -0
- package/dist/validate/site.js.map +1 -0
- package/editors/vscode/.vscodeignore +2 -0
- package/editors/vscode/README.md +28 -0
- package/editors/vscode/extension.js +150 -0
- package/editors/vscode/language-configuration.json +19 -0
- package/editors/vscode/package.json +57 -0
- package/editors/vscode/syntaxes/koyu.tmLanguage.json +226 -0
- package/examples/basement/main.muro +1 -1
- package/examples/complex/main.muro +1 -1
- package/examples/house/main.muro +2 -2
- package/examples/house.muro +2 -2
- package/examples/mansion.muro +2 -2
- package/examples/office.muro +2 -2
- package/examples/steps/01-one-room.muro +1 -1
- package/examples/steps/02-two-rooms.muro +1 -1
- package/examples/steps/03-door.muro +1 -1
- package/examples/steps/04-exterior.muro +1 -1
- package/examples/steps/05-two-storeys.muro +1 -1
- package/examples/steps/06-finished.muro +2 -2
- package/examples/tower/main.muro +1 -1
- package/examples/twin/main.muro +2 -2
- package/examples/two-rooms.canonical.json +4 -2
- package/examples/two-rooms.muro +2 -2
- package/package.json +16 -1
- package/spec/README.md +28 -0
- package/spec/canonical-json.md +98 -0
- package/spec/composition.md +121 -0
- package/spec/derivation.md +393 -0
- package/spec/en/README.md +30 -0
- package/spec/en/canonical-json.md +101 -0
- package/spec/en/composition.md +121 -0
- package/spec/en/derivation.md +393 -0
- package/spec/en/language.md +164 -0
- package/spec/en/notation-v0.md +145 -0
- package/spec/en/scope.md +229 -0
- package/spec/en/semantics.md +132 -0
- package/spec/en/tools.md +108 -0
- package/spec/en/validation.md +79 -0
- package/spec/en/vocabulary.md +103 -0
- package/spec/language.md +163 -0
- package/spec/notation-v0.md +184 -0
- package/spec/scope.md +229 -0
- package/spec/semantics.md +130 -0
- package/spec/tools.md +106 -0
- package/spec/validation.md +79 -0
- package/spec/vocabulary.md +114 -0
- package/src/cli.ts +165 -80
- package/src/core/derive.ts +852 -0
- package/src/{check.ts → core/diagnose.ts} +260 -229
- package/src/{diff.ts → core/diff.ts} +84 -40
- package/src/{fabric.ts → core/fabric.ts} +4 -3
- package/src/{graph.ts → core/graph.ts} +47 -60
- package/src/core/light.ts +69 -0
- package/src/{model.ts → core/model.ts} +228 -51
- package/src/{parse.ts → core/parse.ts} +584 -116
- package/src/{poly.ts → core/poly.ts} +8 -9
- package/src/core/tolerance.ts +55 -0
- package/src/{vertical.ts → core/vertical.ts} +65 -115
- package/src/core/vocabulary.ts +197 -0
- package/src/{axo.ts → draw/axo.ts} +51 -94
- package/src/draw/index.ts +11 -0
- package/src/draw/plan.ts +344 -0
- package/src/index.ts +181 -35
- package/src/mcp.ts +76 -40
- package/src/parse-file.ts +2 -2
- package/src/validate/access.ts +279 -0
- package/src/validate/envelope.ts +59 -0
- package/src/validate/index.ts +107 -0
- package/src/validate/light.ts +43 -0
- package/src/validate/runs.ts +87 -0
- package/src/validate/site.ts +84 -0
- package/dist/axo.d.ts.map +0 -1
- package/dist/axo.js.map +0 -1
- package/dist/check.d.ts.map +0 -1
- package/dist/check.js.map +0 -1
- package/dist/diff.d.ts.map +0 -1
- package/dist/diff.js.map +0 -1
- package/dist/fabric.d.ts.map +0 -1
- package/dist/fabric.js.map +0 -1
- package/dist/graph.d.ts.map +0 -1
- package/dist/graph.js.map +0 -1
- package/dist/light.d.ts +0 -15
- package/dist/light.d.ts.map +0 -1
- package/dist/light.js.map +0 -1
- package/dist/model.d.ts.map +0 -1
- package/dist/model.js.map +0 -1
- package/dist/parse.d.ts.map +0 -1
- package/dist/parse.js.map +0 -1
- package/dist/plan.d.ts +0 -10
- package/dist/plan.d.ts.map +0 -1
- package/dist/plan.js +0 -354
- package/dist/plan.js.map +0 -1
- package/dist/poly.d.ts.map +0 -1
- package/dist/poly.js.map +0 -1
- package/dist/site.d.ts.map +0 -1
- package/dist/site.js.map +0 -1
- package/dist/vertical.d.ts.map +0 -1
- package/dist/vertical.js.map +0 -1
- package/src/light.ts +0 -63
- package/src/plan.ts +0 -472
- /package/dist/{diff.d.ts → core/diff.d.ts} +0 -0
- /package/dist/{parse.d.ts → core/parse.d.ts} +0 -0
- /package/dist/{site.d.ts → core/site.d.ts} +0 -0
- /package/dist/{site.js → core/site.js} +0 -0
- /package/src/{site.ts → core/site.ts} +0 -0
|
@@ -0,0 +1,238 @@
|
|
|
1
|
+
// 検証 — 到達可能性と、位置を書かない要素どうしの衝突
|
|
2
|
+
//
|
|
3
|
+
// **この章は、旗艦例が実際に踏んだ失敗の集まりである。**掟2 (「check が緑でも建物が
|
|
4
|
+
// 使えるとは限らない」) は文として書かれていたが、旗艦例は check 緑のまま
|
|
5
|
+
// 「床の無い吹抜けにしか扉が開かない区画が20」「他人の店舗を貫通する避難路」
|
|
6
|
+
// 「車の出入口の無い2層の駐車場」「バックヤードの奥で孤立したエスカレーター」を
|
|
7
|
+
// 抱えていた。予言された失敗を、予言した当人が踏んだのである。
|
|
8
|
+
//
|
|
9
|
+
// 直したことと再発しないことは別なので、その四つと「外部へ到達できない室」
|
|
10
|
+
// 「柱が塞ぐ扉」を判定として置く。**判定は MCP から呼べなければ、機械にとって
|
|
11
|
+
// 存在しないに等しい** (spec/validation.md) — スクリプトの中に閉じている限り、
|
|
12
|
+
// 同じ誤りは別の建物で何度でも起きる。
|
|
13
|
+
//
|
|
14
|
+
// core が持つのは経路そのもの (`doorsBetween` / `passable` / `placeOpening`) で、
|
|
15
|
+
// **どの到達不能が問題かを言うのはここである** (spec/scope.md §4)。
|
|
16
|
+
import { passable, placeOpening } from "../core/graph.js";
|
|
17
|
+
import { columnsFor, effectiveUse, levelsSorted, } from "../core/model.js";
|
|
18
|
+
import { finding } from "./index.js";
|
|
19
|
+
/** 車が通れる開口の最小幅 mm。人の扉 (900) では車は出られない */
|
|
20
|
+
export const CAR_WIDTH_MIN = 2400;
|
|
21
|
+
/** 空間としては連続するが人も車も通り抜けられない型 — どの到達性の問いでも常に避ける */
|
|
22
|
+
const IMPASSABLE = new Set(["shaft", "void"]);
|
|
23
|
+
/**
|
|
24
|
+
* from (複数可) から toSet のどれかへ、avoid が真になる空間を**通らずに**辿り着けるか。
|
|
25
|
+
* 到達先そのものは avoid を問わない (外部は exterior だが、着いた時点で目的は果たされている)。
|
|
26
|
+
*/
|
|
27
|
+
function reachableAvoiding(model, from, toSet, avoid = () => false, canPass = passable) {
|
|
28
|
+
const seen = new Set();
|
|
29
|
+
const queue = [];
|
|
30
|
+
for (const f of from) {
|
|
31
|
+
if (toSet.has(f))
|
|
32
|
+
return true;
|
|
33
|
+
if (model.spaces.has(f) && !seen.has(f)) {
|
|
34
|
+
seen.add(f);
|
|
35
|
+
queue.push(f);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
while (queue.length) {
|
|
39
|
+
const u = queue.shift();
|
|
40
|
+
for (const b of model.boundaries) {
|
|
41
|
+
if (!canPass(b))
|
|
42
|
+
continue;
|
|
43
|
+
const v = b.a === u ? b.b : b.b === u ? b.a : undefined;
|
|
44
|
+
if (!v || seen.has(v))
|
|
45
|
+
continue;
|
|
46
|
+
if (toSet.has(v))
|
|
47
|
+
return true;
|
|
48
|
+
const s = model.spaces.get(v);
|
|
49
|
+
if (!s || IMPASSABLE.has(s.type) || avoid(s))
|
|
50
|
+
continue;
|
|
51
|
+
seen.add(v);
|
|
52
|
+
queue.push(v);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
return false;
|
|
56
|
+
}
|
|
57
|
+
/** 外部の空間パスの集合。空なら到達性は問えない (外部が書かれていない模型に穴は無い) */
|
|
58
|
+
function exteriorSet(model) {
|
|
59
|
+
return new Set([...model.spaces.values()].filter((s) => s.type === "exterior").map((s) => s.path));
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* 通れる境界だけを辿って外部から届く空間の集合。
|
|
63
|
+
*
|
|
64
|
+
* ここは `doorsBetween` と同じグラフを一度だけ広げたものである — 通行は向きを持たないので
|
|
65
|
+
* 「どれかの外部から s へ行けるか」は「s とどれかの外部が同じ連結成分にあるか」に等しい。
|
|
66
|
+
* 空間ごとに最短経路を引き直すと室数×外部数の探索になり、延床14万㎡の例で分単位になる。
|
|
67
|
+
*/
|
|
68
|
+
function reachableFromExterior(model) {
|
|
69
|
+
const seen = new Set(exteriorSet(model));
|
|
70
|
+
const queue = [...seen];
|
|
71
|
+
while (queue.length) {
|
|
72
|
+
const u = queue.shift();
|
|
73
|
+
for (const b of model.boundaries) {
|
|
74
|
+
if (!passable(b))
|
|
75
|
+
continue;
|
|
76
|
+
const v = b.a === u ? b.b : b.b === u ? b.a : undefined;
|
|
77
|
+
if (!v || seen.has(v))
|
|
78
|
+
continue;
|
|
79
|
+
seen.add(v);
|
|
80
|
+
queue.push(v);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
return seen;
|
|
84
|
+
}
|
|
85
|
+
/** 車が通れる境界 — open・幅 2400mm 以上の扉・斜路の縦連結だけ */
|
|
86
|
+
function carPassable(model) {
|
|
87
|
+
return (b) => {
|
|
88
|
+
if (b.kind === "open")
|
|
89
|
+
return true;
|
|
90
|
+
if (b.kind === "shaft" || b.kind === "void")
|
|
91
|
+
return false;
|
|
92
|
+
if (b.kind === "stair") {
|
|
93
|
+
// 階段の縦連結は、斜路の宣言が無ければ車にとってただの段差である
|
|
94
|
+
const ra = model.spaces.get(b.a)?.attrs["ramp"];
|
|
95
|
+
const rb = model.spaces.get(b.b)?.attrs["ramp"];
|
|
96
|
+
return ra != null || rb != null;
|
|
97
|
+
}
|
|
98
|
+
return b.openings.some((o) => o.kind === "door" && o.w >= CAR_WIDTH_MIN);
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
const at = (s) => ({ line: s.line, file: s.file, path: [s.path] });
|
|
102
|
+
export function accessFindings(model) {
|
|
103
|
+
const out = [];
|
|
104
|
+
const outs = exteriorSet(model);
|
|
105
|
+
// ---- 外部へ到達できない室 ----
|
|
106
|
+
// **扉の有無ではなく到達性を問う。**扉を持っていても、その先が行き止まりなら出られない。
|
|
107
|
+
// violation — 「出られない室」を建築として読める解釈は無い。シャフト (人が通れない) と
|
|
108
|
+
// 吹抜け (床が無い) と外部そのものだけが対象外である。
|
|
109
|
+
if (outs.size > 0) {
|
|
110
|
+
const reached = reachableFromExterior(model);
|
|
111
|
+
for (const s of model.spaces.values()) {
|
|
112
|
+
if (s.rects.length === 0 || s.type === "exterior" || IMPASSABLE.has(s.type))
|
|
113
|
+
continue;
|
|
114
|
+
if (reached.has(s.path))
|
|
115
|
+
continue;
|
|
116
|
+
out.push(finding("access.unreachable", `Cannot reach the exterior: ${s.path} (no passable boundary leads out — write a door)`, at(s)));
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
// ---- 吹抜けにしか扉が開かない区画 ----
|
|
120
|
+
// 通れる境界を持つのに行き先が全部 type:void なら、扉は床の無い穴に向かって開いている。
|
|
121
|
+
// violation — 出入りしたつもりでどこへも行けない。旗艦例はこれを20区画抱えたまま緑だった。
|
|
122
|
+
for (const s of model.spaces.values()) {
|
|
123
|
+
if (s.rects.length === 0 || s.type === "exterior" || IMPASSABLE.has(s.type))
|
|
124
|
+
continue;
|
|
125
|
+
let doors = 0;
|
|
126
|
+
let allVoid = true;
|
|
127
|
+
for (const b of model.boundaries) {
|
|
128
|
+
if (!passable(b))
|
|
129
|
+
continue;
|
|
130
|
+
const other = b.a === s.path ? b.b : b.b === s.path ? b.a : undefined;
|
|
131
|
+
if (!other)
|
|
132
|
+
continue;
|
|
133
|
+
doors++;
|
|
134
|
+
if (model.spaces.get(other)?.type !== "void")
|
|
135
|
+
allVoid = false;
|
|
136
|
+
}
|
|
137
|
+
if (doors > 0 && allVoid) {
|
|
138
|
+
out.push(finding("access.voidonly", `Doors open only onto a void: ${s.path} (they open where there is no floor, so nobody can pass)`, at(s)));
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
// ---- 賃貸区画を貫く避難路 ----
|
|
142
|
+
// 階段室ごとに「use:rentable を避けても外部へ出られるか」を問う。賃貸経由でしか出られない
|
|
143
|
+
// 階段は、テナントが施錠した瞬間に死ぬ。
|
|
144
|
+
// caution — 通ってよいかは契約と管轄の側の事実であって、原本には書かれていない
|
|
145
|
+
// (専用通路として通す設計も現にある)。疑う値打ちはあるが、断じる根拠はここに無い。
|
|
146
|
+
if (outs.size > 0) {
|
|
147
|
+
for (const s of model.spaces.values()) {
|
|
148
|
+
if (s.type !== "stair" || s.rects.length === 0)
|
|
149
|
+
continue;
|
|
150
|
+
if (reachableAvoiding(model, [s.path], outs, (t) => effectiveUse(model, t) === "rentable"))
|
|
151
|
+
continue;
|
|
152
|
+
out.push(finding("access.throughtenant", `Escape from ${s.path} passes through rentable space (if the tenant locks up, there is no way out)`, at(s)));
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
// ---- 車が出られない駐車場 ----
|
|
156
|
+
// 人は900mmの扉と階段で出られてしまうので access.unreachable では見えない。
|
|
157
|
+
// violation — 車が出られない駐車場は駐車場ではない。
|
|
158
|
+
if (outs.size > 0) {
|
|
159
|
+
const canPass = carPassable(model);
|
|
160
|
+
for (const s of model.spaces.values()) {
|
|
161
|
+
if (s.rects.length === 0 || s.type === "exterior" || IMPASSABLE.has(s.type))
|
|
162
|
+
continue;
|
|
163
|
+
if (effectiveUse(model, s) !== "parking")
|
|
164
|
+
continue;
|
|
165
|
+
if (reachableAvoiding(model, [s.path], outs, () => false, canPass))
|
|
166
|
+
continue;
|
|
167
|
+
out.push(finding("access.parking", `No vehicle route to the exterior: ${s.path} (needs an opening at least ${CAR_WIDTH_MIN}mm wide, a type:open boundary, or a ramp)`, at(s)));
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
// ---- 客が乗れない縦動線 ----
|
|
171
|
+
// 縦動線の宣言 (stair:/escalator: — ADR-0021) を持つ共用の空間は客動線の一部なので、
|
|
172
|
+
// 共用廊下からバックヤードを通らずに届かなければ孤立している。共用廊下が一つも無い建物には
|
|
173
|
+
// 客動線の区別が無いので問わない (住宅の階段を孤立と誤検出しないため)。
|
|
174
|
+
//
|
|
175
|
+
// 当の空間へは**水平に**入れなければならない。自分の縦連結を経由すると「上の階から当の
|
|
176
|
+
// エスカレーターで降りてくれば乗り場に着く」という循環が成り立ってしまう。
|
|
177
|
+
//
|
|
178
|
+
// caution — 「共用の縦動線はすべて客用」は粗い推定である。従業員用の共用階段を客用と
|
|
179
|
+
// 読み違えることがあるので、断じずに疑う。
|
|
180
|
+
const corridors = [...model.spaces.values()]
|
|
181
|
+
.filter((s) => s.type === "corridor" && s.rects.length > 0 && effectiveUse(model, s) === "common")
|
|
182
|
+
.map((s) => s.path);
|
|
183
|
+
if (corridors.length > 0) {
|
|
184
|
+
for (const s of model.spaces.values()) {
|
|
185
|
+
if (s.rects.length === 0 || s.type === "shaft")
|
|
186
|
+
continue;
|
|
187
|
+
if (s.attrs["stair"] == null && s.attrs["escalator"] == null)
|
|
188
|
+
continue;
|
|
189
|
+
if (effectiveUse(model, s) !== "common")
|
|
190
|
+
continue;
|
|
191
|
+
const horizontalEntry = (b) => passable(b) && !(b.kind === "stair" && (b.a === s.path || b.b === s.path));
|
|
192
|
+
if (reachableAvoiding(model, corridors, new Set([s.path]), (t) => t.type === "backyard", horizontalEntry)) {
|
|
193
|
+
continue;
|
|
194
|
+
}
|
|
195
|
+
out.push(finding("access.backofhouse", `${s.path} cannot be reached from a common corridor without passing through back-of-house (visitors cannot use this vertical circulation)`, at(s)));
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
// ---- 柱が塞ぐ扉 ----
|
|
199
|
+
// **位置を書かない要素が二つあると、衝突は導出でしか分からない。**柱は通り芯の交点から
|
|
200
|
+
// (ADR-0023)、扉は境界線分の上から (at: の比率か通り参照から) 導かれるので、どちらも
|
|
201
|
+
// 原本には座標が無い。だから目で見るまで気づかない。通り芯の交点は境界線分の端でもあるので、
|
|
202
|
+
// 扉を隅に寄せると必ずぶつかる。
|
|
203
|
+
// violation — 物と物が同じ場所を占めている。読み方によって許される衝突ではない。
|
|
204
|
+
const byLevel = new Map();
|
|
205
|
+
for (const l of levelsSorted(model))
|
|
206
|
+
byLevel.set(l.name, columnsFor(model, l.name));
|
|
207
|
+
for (const b of model.boundaries) {
|
|
208
|
+
const lv = model.spaces.get(b.a)?.level ?? model.spaces.get(b.b)?.level;
|
|
209
|
+
if (!lv)
|
|
210
|
+
continue;
|
|
211
|
+
for (const o of b.openings) {
|
|
212
|
+
if (o.kind !== "door")
|
|
213
|
+
continue;
|
|
214
|
+
const p = placeOpening(model, b, o);
|
|
215
|
+
if ("error" in p)
|
|
216
|
+
continue; // 置けない開口は core が既に言っている
|
|
217
|
+
const seg = p.segment;
|
|
218
|
+
const half = o.w / 2;
|
|
219
|
+
for (const c of byLevel.get(lv) ?? []) {
|
|
220
|
+
const cx1 = c.x - c.w / 2;
|
|
221
|
+
const cx2 = c.x + c.w / 2;
|
|
222
|
+
const cy1 = c.y - c.d / 2;
|
|
223
|
+
const cy2 = c.y + c.d / 2;
|
|
224
|
+
// 扉は線分に沿って幅を持ち、線分に直交する向きには厚みを持たない
|
|
225
|
+
const along = seg.horizontal
|
|
226
|
+
? Math.max(p.cx - half, cx1) < Math.min(p.cx + half, cx2)
|
|
227
|
+
: Math.max(p.cy - half, cy1) < Math.min(p.cy + half, cy2);
|
|
228
|
+
const across = seg.horizontal ? cy1 < seg.y1 && seg.y1 < cy2 : cx1 < seg.x1 && seg.x1 < cx2;
|
|
229
|
+
if (along && across) {
|
|
230
|
+
out.push(finding("column.blocksdoor", `A column blocks a door: the door (${o.w}mm wide) on ${b.a} | ${b.b} overlaps the column at ${c.grid}`, { line: b.line, file: b.file, path: [b.a, b.b] }));
|
|
231
|
+
break;
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
return out;
|
|
237
|
+
}
|
|
238
|
+
//# sourceMappingURL=access.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"access.js","sourceRoot":"","sources":["../../src/validate/access.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"envelope.d.ts","sourceRoot":"","sources":["../../src/validate/envelope.ts"],"names":[],"mappings":"AAWA,OAAO,EAAiB,KAAK,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAW,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAInD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,EAAE,CA0CxD"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
// 検証 — 外皮の連続 (ADR-0025)
|
|
2
|
+
//
|
|
3
|
+
// 方針が「保証しないもの」に**外皮の連続**を名指しで挙げている (spec/scope.md §3)。
|
|
4
|
+
// core に残るのは `envelopeGaps` — 何にも面していない外周の**線分を返す導出**であって、
|
|
5
|
+
// それが穴かどうかの判断はしない。判断はここが引き受ける。
|
|
6
|
+
//
|
|
7
|
+
// 判定は粗い。**外部への境界を一本でも書いたレベルだけ**を見る — 外皮をまだ模型に
|
|
8
|
+
// していない階を「穴が開いている」とは言わない。「書き始めたなら閉じきる」という
|
|
9
|
+
// 整合の要求であって、完全性の要求ではない。粗さが許されるのは、ここが凍らないからである。
|
|
10
|
+
import { envelopeGaps, segmentLength } from "../core/graph.js";
|
|
11
|
+
import { isSemiOutdoor } from "../core/model.js";
|
|
12
|
+
import { finding } from "./index.js";
|
|
13
|
+
const VERTICAL = new Set(["stair", "shaft", "void"]);
|
|
14
|
+
export function envelopeFindings(model) {
|
|
15
|
+
const out = [];
|
|
16
|
+
const siteZones = [...model.zones.values()].filter((z) => z.attrs["site"] === 1).map((z) => z.path);
|
|
17
|
+
// 外皮を書き始めているレベル = 領域を持たない空間 (外部) との境界が宣言されているレベル
|
|
18
|
+
const envelopedLevels = new Set();
|
|
19
|
+
for (const b of model.boundaries) {
|
|
20
|
+
if (b.derived || VERTICAL.has(b.kind))
|
|
21
|
+
continue;
|
|
22
|
+
const sa = model.spaces.get(b.a);
|
|
23
|
+
const sb = model.spaces.get(b.b);
|
|
24
|
+
if (!sa || !sb)
|
|
25
|
+
continue;
|
|
26
|
+
const outer = sa.rects.length === 0 ? sb : sb.rects.length === 0 ? sa : undefined;
|
|
27
|
+
if (outer?.level)
|
|
28
|
+
envelopedLevels.add(outer.level);
|
|
29
|
+
}
|
|
30
|
+
for (const s of model.spaces.values()) {
|
|
31
|
+
if (s.rects.length === 0)
|
|
32
|
+
continue;
|
|
33
|
+
if (!s.level || !envelopedLevels.has(s.level))
|
|
34
|
+
continue;
|
|
35
|
+
// 外部・半屋外・外構のタイルは囲われていないのが正常
|
|
36
|
+
if (s.type === "exterior" || isSemiOutdoor(model, s))
|
|
37
|
+
continue;
|
|
38
|
+
if (siteZones.some((z) => s.path.startsWith(z + "/")))
|
|
39
|
+
continue;
|
|
40
|
+
const gaps = envelopeGaps(model, s);
|
|
41
|
+
if (gaps.length === 0)
|
|
42
|
+
continue;
|
|
43
|
+
// **どの辺かを言う。**合計長だけでは、edge を書き分けている図面で直す辺が特定できない
|
|
44
|
+
const byDir = new Map();
|
|
45
|
+
for (const g of gaps) {
|
|
46
|
+
const d = g.edgeOfA ?? (g.horizontal ? "N/S" : "E/W");
|
|
47
|
+
byDir.set(d, (byDir.get(d) ?? 0) + segmentLength(g));
|
|
48
|
+
}
|
|
49
|
+
const total = gaps.reduce((a, g) => a + segmentLength(g), 0);
|
|
50
|
+
const where = [...byDir].map(([d, mm]) => `${d} ${Math.round(mm)}mm`).join(" / ");
|
|
51
|
+
out.push(finding("envelope.gap", `Perimeter not faced by any envelope: ${s.path} — ${where} (${Math.round(total)}mm over ${gaps.length} run(s)). Write a boundary to the exterior`, { line: s.line, file: s.file, path: [s.path] }));
|
|
52
|
+
}
|
|
53
|
+
return out;
|
|
54
|
+
}
|
|
55
|
+
//# sourceMappingURL=envelope.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"envelope.js","sourceRoot":"","sources":["../../src/validate/envelope.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import type { Model } from "../core/model.js";
|
|
2
|
+
/**
|
|
3
|
+
* 判定の台帳。**綴りが core の診断コードと違う**のは事故を防ぐためである —
|
|
4
|
+
* `ENV01` と `envelope.gap` を取り違える読み手はいない。
|
|
5
|
+
*
|
|
6
|
+
* 章 (`envelope` / `daylight` / `stair` / `run` / `access` / `column` / `site`) は管轄ではなく
|
|
7
|
+
* 主題である。管轄が二つ目を持ったとき (日本の法規と別の国の法規) に章の下へ足す。
|
|
8
|
+
*/
|
|
9
|
+
export declare const VALIDATION_RULES: {
|
|
10
|
+
readonly "envelope.gap": "caution";
|
|
11
|
+
readonly "daylight.ratio": "violation";
|
|
12
|
+
readonly "daylight.unknown": "caution";
|
|
13
|
+
readonly "stair.proportion": "caution";
|
|
14
|
+
readonly "run.slope": "caution";
|
|
15
|
+
readonly "run.disconnected": "caution";
|
|
16
|
+
readonly "access.unreachable": "violation";
|
|
17
|
+
readonly "access.voidonly": "violation";
|
|
18
|
+
readonly "access.throughtenant": "caution";
|
|
19
|
+
readonly "access.parking": "violation";
|
|
20
|
+
readonly "access.backofhouse": "caution";
|
|
21
|
+
readonly "column.blocksdoor": "violation";
|
|
22
|
+
readonly "site.escape": "violation";
|
|
23
|
+
readonly "site.area": "caution";
|
|
24
|
+
readonly "site.frontage": "violation";
|
|
25
|
+
};
|
|
26
|
+
/** 判定の規則名。台帳が唯一の出所 — 登録していない規則は型が通らない (core の DiagnosticCode と同じ構え) */
|
|
27
|
+
export type ValidationRule = keyof typeof VALIDATION_RULES;
|
|
28
|
+
/**
|
|
29
|
+
* 判定の一件。**core の Diagnostic とは別の型である** — 混ぜられないことがこの型の仕事。
|
|
30
|
+
*
|
|
31
|
+
* `level` は「守られなかった」(violation) と「疑わしい」(caution) を分ける。
|
|
32
|
+
* core の severity と違って、これは**建築の側の重さ**であって構成の壊れ方ではない。
|
|
33
|
+
*/
|
|
34
|
+
export interface Finding {
|
|
35
|
+
rule: ValidationRule;
|
|
36
|
+
level: "violation" | "caution";
|
|
37
|
+
/** 日本語の本文 (位置接頭辞なし — core の Diagnostic と同じ流儀) */
|
|
38
|
+
message: string;
|
|
39
|
+
/** 出所の行 */
|
|
40
|
+
line?: number;
|
|
41
|
+
/** 出所レイヤー (合成時) */
|
|
42
|
+
file?: string;
|
|
43
|
+
/** 対象の空間/ゾーンのパス */
|
|
44
|
+
path?: string[];
|
|
45
|
+
}
|
|
46
|
+
/** Finding を組み立てる — level は規則の不変属性であって、場合によって変わらない */
|
|
47
|
+
export declare function finding(rule: ValidationRule, message: string, at?: {
|
|
48
|
+
line?: number;
|
|
49
|
+
file?: string;
|
|
50
|
+
path?: string[];
|
|
51
|
+
}): Finding;
|
|
52
|
+
/**
|
|
53
|
+
* 全ての判定を回す。並びは章の順で、章の中は走査の順である
|
|
54
|
+
* (core の checkDiagnostics と同じ規律 — ADR-0028)。
|
|
55
|
+
*
|
|
56
|
+
* **合否は返さない。**返るのは「守られなかったこと」の列であって、
|
|
57
|
+
* 建物が使えるかどうかの結論ではない。
|
|
58
|
+
*/
|
|
59
|
+
export declare function validate(model: Model): Finding[];
|
|
60
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/validate/index.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAO9C;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;CAgB+B,CAAC;AAE7D,uEAAuE;AACvE,MAAM,MAAM,cAAc,GAAG,MAAM,OAAO,gBAAgB,CAAC;AAE3D;;;;;GAKG;AACH,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,WAAW,GAAG,SAAS,CAAC;IAC/B,iDAAiD;IACjD,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,mBAAmB;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,mBAAmB;IACnB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,sDAAsD;AACtD,wBAAgB,OAAO,CACrB,IAAI,EAAE,cAAc,EACpB,OAAO,EAAE,MAAM,EACf,EAAE,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;CAAO,GACzD,OAAO,CAST;AAED;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,EAAE,CAQhD"}
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
// koyu — 検証の面 (建築的な判定)
|
|
2
|
+
//
|
|
3
|
+
// **ここは core ではない。**core が言うのは「書かれたものがデータとして矛盾していない」
|
|
4
|
+
// までであって、建築として妥当かは何も言わない (spec/scope.md §3)。採光・面積率・
|
|
5
|
+
// 外皮の連続・階段の寸法・到達可能性 — 建築の側の判断はすべてこの面に属す。
|
|
6
|
+
//
|
|
7
|
+
// この面は**凍らない**。規則が粗くても、管轄が一つしかなくても、精度が足りなくても、
|
|
8
|
+
// 増やしてよいし捨ててよい。値段が安いのは、凍らないからである。
|
|
9
|
+
//
|
|
10
|
+
// 汚くてよい条件は一つだけある — **判定の結果が、原本の保証と混同されないこと。**
|
|
11
|
+
// そのために、core の Diagnostic とは**型ごと分けてある**:
|
|
12
|
+
//
|
|
13
|
+
// core Diagnostic { code: "HGT01", severity: "error" | "warning" }
|
|
14
|
+
// 検証 Finding { rule: "daylight.ratio", level: "violation" | "caution" }
|
|
15
|
+
//
|
|
16
|
+
// フィールド名が違うので、二つの配列は取り違えようがない。連結しようとすれば型が落ちる。
|
|
17
|
+
// 「core の緑」と「判定の緑」を同じ言葉で語れないようにすることが、この分離の目的である。
|
|
18
|
+
//
|
|
19
|
+
// 依存は一方向 — 検証は core を読むが、core は検証を知らない
|
|
20
|
+
// (test/domains.test.ts が import を機械的に検査する)。
|
|
21
|
+
import { accessFindings } from "./access.js";
|
|
22
|
+
import { daylightFindings } from "./light.js";
|
|
23
|
+
import { envelopeFindings } from "./envelope.js";
|
|
24
|
+
import { runFindings } from "./runs.js";
|
|
25
|
+
import { siteFindings } from "./site.js";
|
|
26
|
+
/**
|
|
27
|
+
* 判定の台帳。**綴りが core の診断コードと違う**のは事故を防ぐためである —
|
|
28
|
+
* `ENV01` と `envelope.gap` を取り違える読み手はいない。
|
|
29
|
+
*
|
|
30
|
+
* 章 (`envelope` / `daylight` / `stair` / `run` / `access` / `column` / `site`) は管轄ではなく
|
|
31
|
+
* 主題である。管轄が二つ目を持ったとき (日本の法規と別の国の法規) に章の下へ足す。
|
|
32
|
+
*/
|
|
33
|
+
export const VALIDATION_RULES = {
|
|
34
|
+
"envelope.gap": "caution", // 外皮に穴 — 何にも面していない外周 (ADR-0025)
|
|
35
|
+
"daylight.ratio": "violation", // 有効窓面積 < 床面積/7 (ADR-0020)
|
|
36
|
+
"daylight.unknown": "caution", // h を持たない窓があり、窓面積を数え切れていない
|
|
37
|
+
"stair.proportion": "caution", // 導出された段が窮屈 (踏面 <240 / 2R+T が 550〜700 の外)
|
|
38
|
+
"run.slope": "caution", // 導出された勾配が宣言より急・常用域の外
|
|
39
|
+
"run.disconnected": "caution", // 縦動線の形はあるが上下を繋ぐ垂直境界が無い
|
|
40
|
+
"access.unreachable": "violation", // 領域を持つ室から外部へ辿り着けない
|
|
41
|
+
"access.voidonly": "violation", // 扉が吹抜け (床の無い所) にしか開いていない
|
|
42
|
+
"access.throughtenant": "caution", // 階段室からの避難が賃貸区画を通る
|
|
43
|
+
"access.parking": "violation", // 駐車場から車が出られない
|
|
44
|
+
"access.backofhouse": "caution", // 共用廊下からバックヤードを通らずに縦動線へ届かない
|
|
45
|
+
"column.blocksdoor": "violation", // 導出された柱が導出された扉と重なる (ADR-0023)
|
|
46
|
+
"site.escape": "violation", // 建物が敷地形状からはみ出す
|
|
47
|
+
"site.area": "caution", // 敷地面積の宣言と導出の食い違い
|
|
48
|
+
"site.frontage": "violation", // 接道長が 2m 未満 (法43条の粗い写し)
|
|
49
|
+
};
|
|
50
|
+
/** Finding を組み立てる — level は規則の不変属性であって、場合によって変わらない */
|
|
51
|
+
export function finding(rule, message, at = {}) {
|
|
52
|
+
return {
|
|
53
|
+
rule,
|
|
54
|
+
level: VALIDATION_RULES[rule],
|
|
55
|
+
message,
|
|
56
|
+
...(at.line !== undefined ? { line: at.line } : {}),
|
|
57
|
+
...(at.line !== undefined && at.file !== undefined ? { file: at.file } : {}),
|
|
58
|
+
...(at.path ? { path: at.path } : {}),
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* 全ての判定を回す。並びは章の順で、章の中は走査の順である
|
|
63
|
+
* (core の checkDiagnostics と同じ規律 — ADR-0028)。
|
|
64
|
+
*
|
|
65
|
+
* **合否は返さない。**返るのは「守られなかったこと」の列であって、
|
|
66
|
+
* 建物が使えるかどうかの結論ではない。
|
|
67
|
+
*/
|
|
68
|
+
export function validate(model) {
|
|
69
|
+
return [
|
|
70
|
+
...envelopeFindings(model),
|
|
71
|
+
...daylightFindings(model),
|
|
72
|
+
...runFindings(model),
|
|
73
|
+
...accessFindings(model),
|
|
74
|
+
...siteFindings(model),
|
|
75
|
+
];
|
|
76
|
+
}
|
|
77
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validate/index.ts"],"names":[],"mappings":"AAAA,uBAAuB;AACvB,EAAE;AACF,qDAAqD;AACrD,oDAAoD;AACpD,yCAAyC;AACzC,EAAE;AACF,8CAA8C;AAC9C,kCAAkC;AAClC,EAAE;AACF,8CAA8C;AAC9C,0CAA0C;AAC1C,EAAE;AACF,gFAAgF;AAChF,iFAAiF;AACjF,EAAE;AACF,8CAA8C;AAC9C,iDAAiD;AACjD,EAAE;AACF,uCAAuC;AACvC,6CAA6C;AAG7C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,cAAc,EAAE,SAAS,EAAE,gCAAgC;IAC3D,gBAAgB,EAAE,WAAW,EAAE,2BAA2B;IAC1D,kBAAkB,EAAE,SAAS,EAAE,2BAA2B;IAC1D,kBAAkB,EAAE,SAAS,EAAE,0CAA0C;IACzE,WAAW,EAAE,SAAS,EAAE,sBAAsB;IAC9C,kBAAkB,EAAE,SAAS,EAAE,wBAAwB;IACvD,oBAAoB,EAAE,WAAW,EAAE,oBAAoB;IACvD,iBAAiB,EAAE,WAAW,EAAE,0BAA0B;IAC1D,sBAAsB,EAAE,SAAS,EAAE,mBAAmB;IACtD,gBAAgB,EAAE,WAAW,EAAE,eAAe;IAC9C,oBAAoB,EAAE,SAAS,EAAE,4BAA4B;IAC7D,mBAAmB,EAAE,WAAW,EAAE,+BAA+B;IACjE,aAAa,EAAE,WAAW,EAAE,gBAAgB;IAC5C,WAAW,EAAE,SAAS,EAAE,kBAAkB;IAC1C,eAAe,EAAE,WAAW,EAAE,yBAAyB;CACG,CAAC;AAwB7D,sDAAsD;AACtD,MAAM,UAAU,OAAO,CACrB,IAAoB,EACpB,OAAe,EACf,KAAwD,EAAE;IAE1D,OAAO;QACL,IAAI;QACJ,KAAK,EAAE,gBAAgB,CAAC,IAAI,CAAC;QAC7B,OAAO;QACP,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnD,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,SAAS,IAAI,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5E,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACtC,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,QAAQ,CAAC,KAAY;IACnC,OAAO;QACL,GAAG,gBAAgB,CAAC,KAAK,CAAC;QAC1B,GAAG,gBAAgB,CAAC,KAAK,CAAC;QAC1B,GAAG,WAAW,CAAC,KAAK,CAAC;QACrB,GAAG,cAAc,CAAC,KAAK,CAAC;QACxB,GAAG,YAAY,CAAC,KAAK,CAAC;KACvB,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { Model } from "../core/model.js";
|
|
2
|
+
import { type Finding } from "./index.js";
|
|
3
|
+
/** 必要面積の分母。**建築の側の数であって、core の不変量ではない** */
|
|
4
|
+
export declare const DAYLIGHT_DIVISOR = 7;
|
|
5
|
+
export declare function daylightFindings(model: Model): Finding[];
|
|
6
|
+
//# sourceMappingURL=light.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"light.d.ts","sourceRoot":"","sources":["../../src/validate/light.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAW,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAEnD,2CAA2C;AAC3C,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAElC,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,EAAE,CAyBxD"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
// 検証 — 採光 (法28条1項の粗い写し)
|
|
2
|
+
//
|
|
3
|
+
// **合否はここが言う。**core が返すのは `daylightInputs` — 床面積と、係数を掛けた
|
|
4
|
+
// 有効窓面積という**数**だけである (spec/scope.md §4「問いは合否を言わない」)。
|
|
5
|
+
// 1/7 という閾値は建築の側の規則であって、原本の構成が満たすべき不変量ではない。
|
|
6
|
+
//
|
|
7
|
+
// 判定は甘い。採光補正係数を掛けない粗い判定であり、基本計画の解像度に合わせた
|
|
8
|
+
// 早期警報である。用途別割合 (令19条3項) も適用建築物 (法28条1項) も見ない —
|
|
9
|
+
// 1/7 を掛ける先は `daylight:1` を書く位置として書き手が決める (ADR-0020)。
|
|
10
|
+
import { daylightInputs } from "../core/light.js";
|
|
11
|
+
import { finding } from "./index.js";
|
|
12
|
+
/** 必要面積の分母。**建築の側の数であって、core の不変量ではない** */
|
|
13
|
+
export const DAYLIGHT_DIVISOR = 7;
|
|
14
|
+
export function daylightFindings(model) {
|
|
15
|
+
const out = [];
|
|
16
|
+
for (const d of daylightInputs(model)) {
|
|
17
|
+
const at = { line: d.space.line, file: d.space.file, path: [d.space.path] };
|
|
18
|
+
const need = d.floor / DAYLIGHT_DIVISOR;
|
|
19
|
+
if (d.window + 1e-9 < need) {
|
|
20
|
+
out.push(finding("daylight.ratio", `Insufficient daylight: ${d.space.path} — effective window ${d.window.toFixed(2)} m2 < required ${need.toFixed(2)} m2 (1/${DAYLIGHT_DIVISOR} of the ${d.floor.toFixed(2)} m2 floor)`, at));
|
|
21
|
+
}
|
|
22
|
+
if (d.missingH) {
|
|
23
|
+
out.push(finding("daylight.unknown", `Window area is not fully counted: ${d.space.path} has a window without h: (write h: on it)`, at));
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
return out;
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=light.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"light.js","sourceRoot":"","sources":["../../src/validate/light.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,EAAE;AACF,yDAAyD;AACzD,qDAAqD;AACrD,4CAA4C;AAC5C,EAAE;AACF,yCAAyC;AACzC,gDAAgD;AAChD,sDAAsD;AAGtD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAgB,MAAM,YAAY,CAAC;AAEnD,2CAA2C;AAC3C,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAElC,MAAM,UAAU,gBAAgB,CAAC,KAAY;IAC3C,MAAM,GAAG,GAAc,EAAE,CAAC;IAC1B,KAAK,MAAM,CAAC,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;QACtC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5E,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,GAAG,gBAAgB,CAAC;QACxC,IAAI,CAAC,CAAC,MAAM,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC;YAC3B,GAAG,CAAC,IAAI,CACN,OAAO,CACL,gBAAgB,EAChB,0BAA0B,CAAC,CAAC,KAAK,CAAC,IAAI,uBAAuB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,gBAAgB,WAAW,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,EACpL,EAAE,CACH,CACF,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;YACf,GAAG,CAAC,IAAI,CACN,OAAO,CACL,kBAAkB,EAClB,qCAAqC,CAAC,CAAC,KAAK,CAAC,IAAI,2CAA2C,EAC5F,EAAE,CACH,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { Model } from "../core/model.js";
|
|
2
|
+
import { type Finding } from "./index.js";
|
|
3
|
+
/** 踏面の下限 mm — 令23条の一般的な下限に倣う粗い値 */
|
|
4
|
+
export declare const TREAD_MIN = 240;
|
|
5
|
+
/** 2×蹴上 + 踏面 の目安 mm (歩幅則) */
|
|
6
|
+
export declare const STEP_RULE: {
|
|
7
|
+
lo: number;
|
|
8
|
+
hi: number;
|
|
9
|
+
};
|
|
10
|
+
/** エスカレーターの常用勾配 (約1/1.7 = 30度) の許容幅 */
|
|
11
|
+
export declare const ESCALATOR_SLOPE: {
|
|
12
|
+
lo: number;
|
|
13
|
+
hi: number;
|
|
14
|
+
};
|
|
15
|
+
export declare function runFindings(model: Model): Finding[];
|
|
16
|
+
//# sourceMappingURL=runs.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runs.d.ts","sourceRoot":"","sources":["../../src/validate/runs.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAW,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAEnD,mCAAmC;AACnC,eAAO,MAAM,SAAS,MAAM,CAAC;AAC7B,6BAA6B;AAC7B,eAAO,MAAM,SAAS;;;CAAuB,CAAC;AAC9C,uCAAuC;AACvC,eAAO,MAAM,eAAe;;;CAA+B,CAAC;AAE5D,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,EAAE,CAiEnD"}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
// 検証 — 縦動線の建築的な妥当性 (ADR-0021)
|
|
2
|
+
//
|
|
3
|
+
// core が保証するのは「宣言から**形が一意に決まる**」までである (RUN01〜RUN05)。
|
|
4
|
+
// 決まった形が**登りやすいか**は建築の側の判断で、ここが引き受ける。
|
|
5
|
+
//
|
|
6
|
+
// 段数も踏面も勾配も原本には書かれない — 領域と階高から導出される。
|
|
7
|
+
// だから検査の対象は「書かれた値」ではなく「導出された値」である。
|
|
8
|
+
// 閾値 (踏面240mm・2R+T の 550〜700・エスカレーターの常用域) は日本の慣行の粗い写しで、
|
|
9
|
+
// 管轄が二つ目を持ったときに章の下へ足す。凍らないので、その時に足せばよい。
|
|
10
|
+
import { slopeText, verticalRuns } from "../core/vertical.js";
|
|
11
|
+
import { finding } from "./index.js";
|
|
12
|
+
/** 踏面の下限 mm — 令23条の一般的な下限に倣う粗い値 */
|
|
13
|
+
export const TREAD_MIN = 240;
|
|
14
|
+
/** 2×蹴上 + 踏面 の目安 mm (歩幅則) */
|
|
15
|
+
export const STEP_RULE = { lo: 550, hi: 700 };
|
|
16
|
+
/** エスカレーターの常用勾配 (約1/1.7 = 30度) の許容幅 */
|
|
17
|
+
export const ESCALATOR_SLOPE = { lo: 1 / 2.3, hi: 1 / 1.4 };
|
|
18
|
+
export function runFindings(model) {
|
|
19
|
+
const out = [];
|
|
20
|
+
// 上下を繋ぐ垂直境界を持つ空間 — 形があってもここに無ければグラフでは通れない
|
|
21
|
+
const stairLinked = new Set();
|
|
22
|
+
for (const b of model.boundaries) {
|
|
23
|
+
if (b.kind === "stair" || b.kind === "shaft") {
|
|
24
|
+
stairLinked.add(b.a);
|
|
25
|
+
stairLinked.add(b.b);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
for (const run of verticalRuns(model)) {
|
|
29
|
+
const s = model.spaces.get(run.path);
|
|
30
|
+
if (!s)
|
|
31
|
+
continue;
|
|
32
|
+
const at = { line: s.line, file: s.file, path: [s.path] };
|
|
33
|
+
if (run.device === "lift")
|
|
34
|
+
continue;
|
|
35
|
+
if (!stairLinked.has(run.path)) {
|
|
36
|
+
out.push(finding("run.disconnected", `${run.path} has a vertical-circulation form but no vertical boundary connecting the levels (write stack or boundary type:stair — the form exists, but the graph cannot pass)`, at));
|
|
37
|
+
}
|
|
38
|
+
if (run.device === "stair") {
|
|
39
|
+
const t = Math.round(run.tread);
|
|
40
|
+
const r = Math.round(run.riser);
|
|
41
|
+
const rule = 2 * r + t;
|
|
42
|
+
if (t < TREAD_MIN || rule < STEP_RULE.lo || rule > STEP_RULE.hi) {
|
|
43
|
+
out.push(finding("stair.proportion", `Derived step dimensions are cramped: ${run.risers} risers of ${r}mm, tread ${t}mm (2*riser+tread = ${Math.round(rule)}mm; expected ${STEP_RULE.lo}-${STEP_RULE.hi}mm)`, at));
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
else if (run.device === "ramp") {
|
|
47
|
+
const declared = s.attrs["slope"];
|
|
48
|
+
if (typeof declared === "number" && declared > 0 && run.slope > 1 / declared + 1e-9) {
|
|
49
|
+
out.push(finding("run.slope", `Derived slope ${slopeText(run.slope)} is steeper than the declared 1/${declared} (lengthen the run or lower the storey height)`, at));
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
else if (run.device === "escalator") {
|
|
53
|
+
if (run.slope < ESCALATOR_SLOPE.lo || run.slope > ESCALATOR_SLOPE.hi) {
|
|
54
|
+
out.push(finding("run.slope", `Derived slope ${slopeText(run.slope)} is outside the usual escalator range (about 1/1.7 = 30 degrees)`, at));
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
return out;
|
|
59
|
+
}
|
|
60
|
+
//# sourceMappingURL=runs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runs.js","sourceRoot":"","sources":["../../src/validate/runs.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { type Model } from "../core/model.js";
|
|
2
|
+
import { type Finding } from "./index.js";
|
|
3
|
+
/** 接道長の下限 mm — 法43条 (接道義務) の粗い写し */
|
|
4
|
+
export declare const FRONTAGE_MIN = 2000;
|
|
5
|
+
export declare function siteFindings(model: Model): Finding[];
|
|
6
|
+
//# sourceMappingURL=site.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"site.d.ts","sourceRoot":"","sources":["../../src/validate/site.ts"],"names":[],"mappings":"AAYA,OAAO,EAAgD,KAAK,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE5F,OAAO,EAAW,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAMnD,oCAAoC;AACpC,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,EAAE,CA4DpD"}
|