@kensnzk/koyu 0.14.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 +4 -2
- package/README.md +5 -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} +193 -50
- 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/L1.muro +136 -119
- package/examples/twin/L5.muro +85 -123
- package/examples/twin/assets.muro +10 -8
- package/examples/twin/basement.muro +43 -34
- package/examples/twin/core.muro +148 -65
- package/examples/twin/hotel.muro +66 -107
- package/examples/twin/main.muro +73 -67
- package/examples/twin/office.muro +87 -88
- package/examples/twin/podium.muro +309 -97
- package/examples/twin/residence.muro +61 -116
- package/examples/twin/site.muro +16 -13
- 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} +236 -52
- 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
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
canonicalOpeningEntry,
|
|
12
12
|
canonicalSegEntry,
|
|
13
13
|
canonicalSpaceEntry,
|
|
14
|
+
openingIdentity,
|
|
14
15
|
polygonAreaM2,
|
|
15
16
|
type Attrs,
|
|
16
17
|
type AttrValue,
|
|
@@ -185,7 +186,7 @@ function fmtGrids(s: Space): string {
|
|
|
185
186
|
return s.grids.map((g) => `${g.xa}..${g.xb} ${g.ya}..${g.yb}`).join(" + ");
|
|
186
187
|
}
|
|
187
188
|
|
|
188
|
-
const fmtArea = (v: number | undefined): string | undefined => (v === undefined ? undefined : `${v.toFixed(2)}
|
|
189
|
+
const fmtArea = (v: number | undefined): string | undefined => (v === undefined ? undefined : `${v.toFixed(2)} m2`);
|
|
189
190
|
|
|
190
191
|
function spaceFields(sa: Space, sb: Space): FieldChange[] {
|
|
191
192
|
const fields: FieldChange[] = [];
|
|
@@ -194,12 +195,12 @@ function spaceFields(sa: Space, sb: Space): FieldChange[] {
|
|
|
194
195
|
const ea = canonicalSpaceEntry(sa);
|
|
195
196
|
const eb = canonicalSpaceEntry(sb);
|
|
196
197
|
if (JSON.stringify(ea["at"] ?? null) !== JSON.stringify(eb["at"] ?? null)) {
|
|
197
|
-
fields.push(fieldChange("
|
|
198
|
+
fields.push(fieldChange("region", fmtGrids(sa), fmtGrids(sb)));
|
|
198
199
|
}
|
|
199
200
|
// 面積は導出値の差分として別掲する — 領域が同じでもグリッド座標の移動で変わる (原因はgrid差分が先頭で言う)
|
|
200
201
|
const arA = areaM2(sa);
|
|
201
202
|
const arB = areaM2(sb);
|
|
202
|
-
if (arA !== arB) fields.push(fieldChange("
|
|
203
|
+
if (arA !== arB) fields.push(fieldChange("area", fmtArea(arA), fmtArea(arB)));
|
|
203
204
|
fields.push(...attrFields(sa.attrs, sb.attrs));
|
|
204
205
|
// 数えない分節 (area) — 正準順の直列で多重集合として比べる
|
|
205
206
|
fields.push(
|
|
@@ -263,10 +264,25 @@ function comparable(b: Boundary, tok: (p: string) => string): string {
|
|
|
263
264
|
return JSON.stringify(e);
|
|
264
265
|
}
|
|
265
266
|
|
|
266
|
-
/**
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
267
|
+
/**
|
|
268
|
+
* 開口の対のキー。**名があれば名が優先である** (ADR-0039) —
|
|
269
|
+
* 開口の同一性は「含む対象 + その中で一意な名」から導かれるので (spec/scope.md §5)、
|
|
270
|
+
* 名の付いた扉を動かせば「同じ扉の at が変わった」であって「消えて生えた」ではない。
|
|
271
|
+
* 名が無ければ位置で対応づける他にない: (kind, edge??"", atRef??at)。
|
|
272
|
+
* 名のある開口と無い開口は別のキー空間に落ちるので、名を後から書き足した編集は追加/削除に見える —
|
|
273
|
+
* 名を書く行為そのものが同一性の宣言なので、それでよい
|
|
274
|
+
*/
|
|
275
|
+
const openingKey = (model: Model) => (o: Opening): string => {
|
|
276
|
+
const name = openingIdentity(model, o);
|
|
277
|
+
// 名は、位置のキー (door… / window…) と混ざらないトークン空間に置く
|
|
278
|
+
if (name !== undefined) return `\u0000name:${name}`;
|
|
279
|
+
return `${o.kind}#${o.edge ?? ""}#${String(o.atRef ?? o.at)}`;
|
|
280
|
+
};
|
|
281
|
+
const openingLabel = (model: Model) => (o: Opening): string => {
|
|
282
|
+
const name = openingIdentity(model, o);
|
|
283
|
+
if (name !== undefined) return `${o.kind} ${name}`;
|
|
284
|
+
return `${o.kind}${o.edge ? ` edge:${o.edge}` : ""} at:${String(o.atRef ?? o.at)}`;
|
|
285
|
+
};
|
|
270
286
|
|
|
271
287
|
function describeOpening(o: Opening): string {
|
|
272
288
|
const parts = [
|
|
@@ -280,9 +296,17 @@ function describeOpening(o: Opening): string {
|
|
|
280
296
|
return parts.join(" ");
|
|
281
297
|
}
|
|
282
298
|
|
|
283
|
-
/** seg
|
|
284
|
-
const segKey = (g: Seg): string =>
|
|
285
|
-
const
|
|
299
|
+
/** segの対のキー — 開口と同じ規律。名があれば名、無ければ (edge??"", atRef??at, w) */
|
|
300
|
+
const segKey = (g: Seg): string => {
|
|
301
|
+
const name = g.attrs["name"];
|
|
302
|
+
if (name !== undefined && name !== "") return `\u0000name:${String(name)}`;
|
|
303
|
+
return `${g.edge ?? ""}#${String(g.atRef ?? g.at)}#${g.w}`;
|
|
304
|
+
};
|
|
305
|
+
const segLabel = (g: Seg): string => {
|
|
306
|
+
const name = g.attrs["name"];
|
|
307
|
+
if (name !== undefined && name !== "") return `seg ${String(name)}`;
|
|
308
|
+
return `seg${g.edge ? ` edge:${g.edge}` : ""} at:${String(g.atRef ?? g.at)} w:${g.w}`;
|
|
309
|
+
};
|
|
286
310
|
|
|
287
311
|
interface Keyed<T> {
|
|
288
312
|
x: T;
|
|
@@ -334,12 +358,17 @@ function pairUp<T>(as: Keyed<T>[], bs: Keyed<T>[]) {
|
|
|
334
358
|
const keyed = <T>(xs: T[], key: (x: T) => string, serial: (x: T) => string): Keyed<T>[] =>
|
|
335
359
|
xs.map((x) => ({ x, key: key(x), serial: serial(x) }));
|
|
336
360
|
|
|
337
|
-
function openingFields(oa: Opening, ob: Opening): FieldChange[] {
|
|
338
|
-
const label = openingLabel(ob);
|
|
361
|
+
function openingFields(mb: Model, oa: Opening, ob: Opening): FieldChange[] {
|
|
362
|
+
const label = openingLabel(mb)(ob);
|
|
339
363
|
const out: FieldChange[] = [];
|
|
340
364
|
const sub = (f: string, va: AttrValue | undefined, vb: AttrValue | undefined) => {
|
|
341
365
|
if (va !== vb) out.push(fieldChange(`${label} ${f}`, str(va), str(vb)));
|
|
342
366
|
};
|
|
367
|
+
// 名で対応づいた対は、種別も辺も位置もキーに入っていない — フィールドの変化として言う。
|
|
368
|
+
// 位置で対応づいた対ではこの三つは定義上一致するので、何も出ない (ADR-0039)
|
|
369
|
+
sub("kind", oa.kind, ob.kind);
|
|
370
|
+
sub("edge", oa.edge, ob.edge);
|
|
371
|
+
sub("at", String(oa.atRef ?? oa.at), String(ob.atRef ?? ob.at));
|
|
343
372
|
sub("ref", oa.ref, ob.ref);
|
|
344
373
|
sub("w", oa.w, ob.w);
|
|
345
374
|
sub("h", oa.h, ob.h);
|
|
@@ -356,13 +385,20 @@ function lineLabel(d: DrawnLine | undefined): string | undefined {
|
|
|
356
385
|
return forward ? `${d.aRef}..${d.bRef}` : `${d.bRef}..${d.aRef}`;
|
|
357
386
|
}
|
|
358
387
|
|
|
359
|
-
function boundaryFields(
|
|
388
|
+
function boundaryFields(
|
|
389
|
+
ma: Model,
|
|
390
|
+
mb: Model,
|
|
391
|
+
ba: Boundary,
|
|
392
|
+
bb: Boundary,
|
|
393
|
+
tokA: (p: string) => string,
|
|
394
|
+
tokB: (p: string) => string,
|
|
395
|
+
): FieldChange[] {
|
|
360
396
|
const out: FieldChange[] = [];
|
|
361
397
|
if (ba.kind !== bb.kind) out.push(fieldChange("kind", ba.kind, bb.kind));
|
|
362
398
|
if (ba.t !== bb.t) out.push(fieldChange("t", str(ba.t), str(bb.t)));
|
|
363
399
|
if ((ba.air ?? false) !== (bb.air ?? false)) out.push(fieldChange("air", ba.air ? "1" : undefined, bb.air ? "1" : undefined));
|
|
364
400
|
if ((orientationMatters(ba) || orientationMatters(bb)) && tokA(ba.a) !== tokB(bb.a)) {
|
|
365
|
-
out.push(fieldChange("
|
|
401
|
+
out.push(fieldChange("orientation (a side)", ba.a, bb.a));
|
|
366
402
|
}
|
|
367
403
|
// 描かれた線 (ADR-0022) — 境界の実現そのものなので、動かせば建物の形が変わる。
|
|
368
404
|
// 面積の変化として空間側に間接的に出ることはあるが、それは導出値であって原因ではない。
|
|
@@ -371,16 +407,24 @@ function boundaryFields(ba: Boundary, bb: Boundary, tokA: (p: string) => string,
|
|
|
371
407
|
out.push(fieldChange("line", lineLabel(ba.drawn), lineLabel(bb.drawn)));
|
|
372
408
|
}
|
|
373
409
|
out.push(...attrFields(ba.attrs, bb.attrs));
|
|
374
|
-
// 開口 — (kind, edge, at) で対にし、対はフィールド差分、残りは追加/削除
|
|
410
|
+
// 開口 — 名 (あれば)、無ければ (kind, edge, at) で対にし、対はフィールド差分、残りは追加/削除
|
|
375
411
|
const oSerial = (o: Opening): string => JSON.stringify(canonicalOpeningEntry(o));
|
|
376
|
-
const ops = pairUp(keyed(ba.openings, openingKey, oSerial), keyed(bb.openings, openingKey, oSerial));
|
|
377
|
-
for (const [oa, ob] of ops.pairs) out.push(...openingFields(oa, ob));
|
|
378
|
-
for (const o of ops.added) out.push(fieldChange(openingLabel(o), undefined, describeOpening(o)));
|
|
379
|
-
for (const o of ops.removed) out.push(fieldChange(openingLabel(o), describeOpening(o), undefined));
|
|
380
|
-
// seg — (edge, at, w)
|
|
412
|
+
const ops = pairUp(keyed(ba.openings, openingKey(ma), oSerial), keyed(bb.openings, openingKey(mb), oSerial));
|
|
413
|
+
for (const [oa, ob] of ops.pairs) out.push(...openingFields(mb, oa, ob));
|
|
414
|
+
for (const o of ops.added) out.push(fieldChange(openingLabel(mb)(o), undefined, describeOpening(o)));
|
|
415
|
+
for (const o of ops.removed) out.push(fieldChange(openingLabel(ma)(o), describeOpening(o), undefined));
|
|
416
|
+
// seg — 名 (あれば)、無ければ (edge, at, w) で対にする
|
|
381
417
|
const gSerial = (g: Seg): string => JSON.stringify(canonicalSegEntry(g));
|
|
382
418
|
const sgs = pairUp(keyed(ba.segs, segKey, gSerial), keyed(bb.segs, segKey, gSerial));
|
|
383
|
-
for (const [ga, gb] of sgs.pairs)
|
|
419
|
+
for (const [ga, gb] of sgs.pairs) {
|
|
420
|
+
const lab = segLabel(gb);
|
|
421
|
+
// 名で対応づいた対は、辺も位置も幅もキーに入っていない (ADR-0039)
|
|
422
|
+
if ((ga.edge ?? "") !== (gb.edge ?? "")) out.push(fieldChange(`${lab} edge`, ga.edge, gb.edge));
|
|
423
|
+
const [pa, pb] = [String(ga.atRef ?? ga.at), String(gb.atRef ?? gb.at)];
|
|
424
|
+
if (pa !== pb) out.push(fieldChange(`${lab} at`, pa, pb));
|
|
425
|
+
if (ga.w !== gb.w) out.push(fieldChange(`${lab} w`, String(ga.w), String(gb.w)));
|
|
426
|
+
out.push(...attrFields(ga.attrs, gb.attrs, `${lab} `));
|
|
427
|
+
}
|
|
384
428
|
for (const g of sgs.added) {
|
|
385
429
|
out.push(fieldChange(segLabel(g), undefined, Object.entries(g.attrs).map(([k, v]) => `${k}:${v}`).join(" ")));
|
|
386
430
|
}
|
|
@@ -487,12 +531,12 @@ export function semanticDiff(a: Model, b: Model): ModelDiff {
|
|
|
487
531
|
// 何も伝えない。形が変わって頂点数も面積も同じなら、そう言う
|
|
488
532
|
const fields: FieldChange[] = [];
|
|
489
533
|
if (pa.points.length !== pb.points.length) {
|
|
490
|
-
fields.push(fieldChange("
|
|
534
|
+
fields.push(fieldChange("vertices", String(pa.points.length), String(pb.points.length)));
|
|
491
535
|
}
|
|
492
536
|
const ar = round2(polygonAreaM2(pa.points));
|
|
493
537
|
const br = round2(polygonAreaM2(pb.points));
|
|
494
|
-
if (ar !== br) fields.push(fieldChange("
|
|
495
|
-
if (fields.length === 0) fields.push(fieldChange("
|
|
538
|
+
if (ar !== br) fields.push(fieldChange("area", fmtArea(ar), fmtArea(br)));
|
|
539
|
+
if (fields.length === 0) fields.push(fieldChange("shape", "same vertex count and same area", "the vertices sit elsewhere"));
|
|
496
540
|
d.polygons.changed.push({ path, fields });
|
|
497
541
|
}
|
|
498
542
|
}
|
|
@@ -502,7 +546,7 @@ export function semanticDiff(a: Model, b: Model): ModelDiff {
|
|
|
502
546
|
{
|
|
503
547
|
const label = (c: ColumnDecl): string =>
|
|
504
548
|
[
|
|
505
|
-
`${c.size}
|
|
549
|
+
`${c.size} square`,
|
|
506
550
|
...(c.depth !== undefined ? [`d:${c.depth}`] : []),
|
|
507
551
|
c.levels.length > 2 ? `${c.levels[0]}..${c.levels[c.levels.length - 1]}` : c.levels.join(","),
|
|
508
552
|
...(c.xNames ? [`x:${c.xNames.join(",")}`] : []),
|
|
@@ -521,7 +565,7 @@ export function semanticDiff(a: Model, b: Model): ModelDiff {
|
|
|
521
565
|
for (const [lab, at] of ra) {
|
|
522
566
|
const to = rb.get(lab);
|
|
523
567
|
if (to !== undefined && to !== at) {
|
|
524
|
-
d.columns.changed.push({ path: lab, fields: [fieldChange("
|
|
568
|
+
d.columns.changed.push({ path: lab, fields: [fieldChange("rank", String(at), String(to))] });
|
|
525
569
|
}
|
|
526
570
|
}
|
|
527
571
|
}
|
|
@@ -582,7 +626,7 @@ export function semanticDiff(a: Model, b: Model): ModelDiff {
|
|
|
582
626
|
return kx < ky ? -1 : 1;
|
|
583
627
|
};
|
|
584
628
|
for (const [ba, bb] of bm.pairs) {
|
|
585
|
-
const fields = boundaryFields(ba, bb, tokA, tokB);
|
|
629
|
+
const fields = boundaryFields(a, b, ba, bb, tokA, tokB);
|
|
586
630
|
if (fields.length) {
|
|
587
631
|
d.boundaries.changed.push({
|
|
588
632
|
between: [bb.a, bb.b].sort() as [string, string],
|
|
@@ -652,25 +696,25 @@ export function renderDiff(d: ModelDiff): string[] {
|
|
|
652
696
|
for (const p of d.polygons.added) out.push(`+ polygon ${p}`);
|
|
653
697
|
for (const p of d.polygons.removed) out.push(`− polygon ${p}`);
|
|
654
698
|
for (const c of d.polygons.changed) out.push(`± polygon ${c.path}: ${fmtFields(c.fields)}`);
|
|
655
|
-
for (const r of d.zones.renamed) out.push(
|
|
656
|
-
for (const p of d.zones.added) out.push(`+
|
|
657
|
-
for (const p of d.zones.removed) out.push(`−
|
|
658
|
-
for (const c of d.zones.changed) out.push(`±
|
|
659
|
-
for (const r of d.spaces.renamed) out.push(
|
|
699
|
+
for (const r of d.zones.renamed) out.push(`renamed zone ${r.from} → ${r.to} (uid:${r.uid})`);
|
|
700
|
+
for (const p of d.zones.added) out.push(`+ zone ${p}`);
|
|
701
|
+
for (const p of d.zones.removed) out.push(`− zone ${p}`);
|
|
702
|
+
for (const c of d.zones.changed) out.push(`± zone ${c.path}: ${fmtFields(c.fields)}`);
|
|
703
|
+
for (const r of d.spaces.renamed) out.push(`renamed ${r.from} → ${r.to} (uid:${r.uid})`);
|
|
660
704
|
for (const s of d.spaces.added) {
|
|
661
|
-
out.push(`+
|
|
705
|
+
out.push(`+ space ${s.path} (${s.type}${s.areaM2 !== undefined ? ` ${s.areaM2.toFixed(2)} m2` : ""})`);
|
|
662
706
|
}
|
|
663
707
|
for (const s of d.spaces.removed) {
|
|
664
|
-
out.push(`−
|
|
708
|
+
out.push(`− space ${s.path} (${s.type}${s.areaM2 !== undefined ? ` ${s.areaM2.toFixed(2)} m2` : ""})`);
|
|
665
709
|
}
|
|
666
710
|
for (const c of d.spaces.changed) out.push(`± ${c.path}: ${fmtFields(c.fields)}`);
|
|
667
711
|
for (const x of d.boundaries.added) {
|
|
668
|
-
out.push(`+
|
|
712
|
+
out.push(`+ boundary ${betweenLabel(x)} (${x.kind}${x.t !== undefined ? ` t:${x.t}` : ""})`);
|
|
669
713
|
}
|
|
670
|
-
for (const x of d.boundaries.removed) out.push(`−
|
|
671
|
-
for (const c of d.boundaries.changed) out.push(`±
|
|
672
|
-
for (const c of d.columns.added) out.push(`+
|
|
673
|
-
for (const c of d.columns.removed) out.push(`−
|
|
674
|
-
for (const c of d.columns.changed) out.push(`±
|
|
714
|
+
for (const x of d.boundaries.removed) out.push(`− boundary ${betweenLabel(x)}`);
|
|
715
|
+
for (const c of d.boundaries.changed) out.push(`± boundary ${betweenLabel(c)}: ${fmtFields(c.fields)}`);
|
|
716
|
+
for (const c of d.columns.added) out.push(`+ column ${c.label}`);
|
|
717
|
+
for (const c of d.columns.removed) out.push(`− column ${c.label}`);
|
|
718
|
+
for (const c of d.columns.changed) out.push(`± column ${c.path}: ${fmtFields(c.fields)}`);
|
|
675
719
|
return out;
|
|
676
720
|
}
|
|
@@ -8,12 +8,13 @@
|
|
|
8
8
|
|
|
9
9
|
import { heff, isSemiOutdoor, levelsSorted, type Model, type Pt, type Space } from "./model.js";
|
|
10
10
|
import { areaOf, rectToPoly, subtract } from "./poly.js";
|
|
11
|
+
import { AREA_EPS } from "./tolerance.js";
|
|
11
12
|
import { runDecls } from "./vertical.js";
|
|
12
13
|
|
|
13
14
|
/** 天井面の見付け厚 mm (仕上げの面としての厚み) */
|
|
14
|
-
const CEILING_T = 30;
|
|
15
|
+
export const CEILING_T = 30;
|
|
15
16
|
/** 上に何も無いときの屋根版の厚さ mm (上階レベルの slab が無い場合の既定) */
|
|
16
|
-
const ROOF_T = 200;
|
|
17
|
+
export const ROOF_T = 200;
|
|
17
18
|
|
|
18
19
|
/** 空間の導出された領域。parse の出口で必ず埋まる (ADR-0022) — 割付への退避は持たない */
|
|
19
20
|
export const regionOf = (s: Space): Pt[][] =>
|
|
@@ -113,7 +114,7 @@ export function slabs(model: Model): Slab[] {
|
|
|
113
114
|
const t = upper?.slab ?? ROOF_T;
|
|
114
115
|
for (const outline of pieces) {
|
|
115
116
|
for (const tile of subtract(outline, covers)) {
|
|
116
|
-
if (areaOf([tile]) <
|
|
117
|
+
if (areaOf([tile]) < AREA_EPS) continue;
|
|
117
118
|
out.push({ kind: "roof", space: s.path, level: level.name, outline: tile, z0: top - t, z1: top });
|
|
118
119
|
}
|
|
119
120
|
}
|
|
@@ -4,8 +4,9 @@
|
|
|
4
4
|
// 空間の領域は矩形の合併 (L字など)。壁は合併の外周と共有辺から導出される。
|
|
5
5
|
|
|
6
6
|
import type { Boundary, Edge, Model, Opening, Pt, Rect, Space } from "./model.js";
|
|
7
|
-
import { rectToPoly, srcRef } from "./model.js";
|
|
7
|
+
import { canonicalBoundaryOrder, canonicalizeDrawn, rectToPoly, srcRef } from "./model.js";
|
|
8
8
|
import * as poly from "./poly.js";
|
|
9
|
+
import { EPS, PARALLEL_EPS, PROBE, SPAN_EPS } from "./tolerance.js";
|
|
9
10
|
|
|
10
11
|
/** 壁芯線分 (mm)。水平なら y1===y2、垂直なら x1===x2。
|
|
11
12
|
* 描かれた線 (ADR-0022) は斜めになりうる — その場合 diagonal が立つ */
|
|
@@ -21,35 +22,6 @@ export interface Segment {
|
|
|
21
22
|
edgeOfA?: Edge;
|
|
22
23
|
}
|
|
23
24
|
|
|
24
|
-
const EPS = 0.5;
|
|
25
|
-
|
|
26
|
-
/** 二つの矩形が共有する辺の線分 (触れていなければ undefined) */
|
|
27
|
-
export function sharedSegment(a: Rect, b: Rect): Segment | undefined {
|
|
28
|
-
for (const [x, ea] of [
|
|
29
|
-
[a.x2, "E"],
|
|
30
|
-
[a.x1, "W"],
|
|
31
|
-
] as const) {
|
|
32
|
-
const bx = ea === "E" ? b.x1 : b.x2;
|
|
33
|
-
if (Math.abs(x - bx) < EPS) {
|
|
34
|
-
const y1 = Math.max(a.y1, b.y1);
|
|
35
|
-
const y2 = Math.min(a.y2, b.y2);
|
|
36
|
-
if (y2 - y1 > EPS) return { x1: x, y1, x2: x, y2, horizontal: false, edgeOfA: ea };
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
for (const [y, ea] of [
|
|
40
|
-
[a.y2, "N"],
|
|
41
|
-
[a.y1, "S"],
|
|
42
|
-
] as const) {
|
|
43
|
-
const by = ea === "N" ? b.y1 : b.y2;
|
|
44
|
-
if (Math.abs(y - by) < EPS) {
|
|
45
|
-
const x1 = Math.max(a.x1, b.x1);
|
|
46
|
-
const x2 = Math.min(a.x2, b.x2);
|
|
47
|
-
if (x2 - x1 > EPS) return { x1, y1: y, x2, y2: y, horizontal: true, edgeOfA: ea };
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
return undefined;
|
|
51
|
-
}
|
|
52
|
-
|
|
53
25
|
/**
|
|
54
26
|
* 凸片の軸平行な辺 (向きから N/E/S/W を読む)。頂点列は反時計回りなので、
|
|
55
27
|
* +x へ進む辺が南、+y が東、-x が北、-y が西の面になる。
|
|
@@ -118,8 +90,8 @@ function pieceOutline(pieces: Pt[][], others: Pt[][]): Segment[] {
|
|
|
118
90
|
}
|
|
119
91
|
|
|
120
92
|
/**
|
|
121
|
-
* 二つの領域 (凸片の集合)
|
|
122
|
-
*
|
|
93
|
+
* 二つの領域 (凸片の集合) が共有する軸平行な辺。矩形どうしの共有辺ではなく凸片で見るので、
|
|
94
|
+
* 描かれた線で切られた形にも正しい。
|
|
123
95
|
* 斜めの辺は返さない — それは描かれた線であり、自分の境界が実現を持っている
|
|
124
96
|
*/
|
|
125
97
|
function sharedFromPieces(A: Pt[][], B: Pt[][]): Segment[] {
|
|
@@ -220,15 +192,33 @@ export function deriveDefaultBoundaries(model: Model): void {
|
|
|
220
192
|
*/
|
|
221
193
|
export function derivePieces(model: Model): void {
|
|
222
194
|
for (const s of model.spaces.values()) s.pieces = s.rects.map(rectToPoly);
|
|
223
|
-
// 線は宣言順に効く。derivePieces は parse の出口で一度だけ呼ぶ (冪等ではない)
|
|
224
195
|
|
|
225
|
-
|
|
196
|
+
// **線の向きを正準に揃えてから切る。**線分は向きを持たないので、正準JSONは端点の対を
|
|
197
|
+
// 解決座標の昇順に並べ替える。モデルの側が書き順のままだと、開口の `at:` の起点が
|
|
198
|
+
// 書き順で決まり、**正準JSONがバイト同一のまま扉が別の位置に出る** (ADR-0041)
|
|
199
|
+
for (const b of model.boundaries) if (b.drawn) canonicalizeDrawn(b.drawn);
|
|
200
|
+
|
|
201
|
+
// **正準の境界順で切る。**線の切り分けは直前の切り分けの結果を読むので順序が効くが、
|
|
202
|
+
// 正準JSONは境界の宣言順を捨てる。宣言順で切ると、同じ正準JSONから違う面積が出る
|
|
203
|
+
// (実測: 交差する二本の線で /L1/a が 27.00㎡ ↔ 22.50㎡)。並びは toCanonical と同じ規則
|
|
204
|
+
for (const b of canonicalBoundaryOrder(model)) {
|
|
226
205
|
if (!b.drawn) continue;
|
|
227
206
|
const sa = model.spaces.get(b.a);
|
|
228
207
|
const sb = model.spaces.get(b.b);
|
|
229
208
|
if (!sa || !sb) continue;
|
|
230
209
|
const cut = drawnCut(sa, sb, b.drawn.a, b.drawn.b);
|
|
231
|
-
if (!cut)
|
|
210
|
+
if (!cut) {
|
|
211
|
+
b.drawn.effect = "undetermined";
|
|
212
|
+
continue;
|
|
213
|
+
}
|
|
214
|
+
// **何を切ったかは、切るその場で記録する。**後から計算し直すと、既に切られた形を
|
|
215
|
+
// 相手に窓を組み立てることになる (ADR-0041)
|
|
216
|
+
const targets = cut.solo ? [cut.solo] : [sa, sb];
|
|
217
|
+
b.drawn.effect = targets.some((s) =>
|
|
218
|
+
poly.cutsInWindow(s.pieces, cut.window, b.drawn!.a, b.drawn!.b),
|
|
219
|
+
)
|
|
220
|
+
? "cut"
|
|
221
|
+
: "nothing";
|
|
232
222
|
|
|
233
223
|
if (cut.solo) {
|
|
234
224
|
// 外皮を切る線 — 持つ側だけが窓の中で自分の側へ切り落とされる。相手は面積を得ない
|
|
@@ -258,7 +248,7 @@ export function derivePieces(model: Model): void {
|
|
|
258
248
|
}
|
|
259
249
|
|
|
260
250
|
/**
|
|
261
|
-
* 描かれた線の切り方を一度に決める — 窓・残す側・片側かどうか (ADR-0022 /
|
|
251
|
+
* 描かれた線の切り方を一度に決める — 窓・残す側・片側かどうか (ADR-0022 / spec/derivation.md §1.2-1.3)。
|
|
262
252
|
*
|
|
263
253
|
* **窓と側は必ず一緒に決める。**別々に決めていたために、側は空間の全割付を無限直線で
|
|
264
254
|
* 測るのに切るのは線の近傍だけ、という母集団のずれが生まれ、線から遠い翼が符号を
|
|
@@ -282,7 +272,10 @@ export function drawnCut(
|
|
|
282
272
|
if (!poly.validWindow(w)) return undefined;
|
|
283
273
|
const side = poly.sideOfTouching(solo.pieces, w, a, b);
|
|
284
274
|
if (side === 0) return undefined; // 窓の中でちょうど二等分 — 残す側が決まらない (LIN01)
|
|
285
|
-
|
|
275
|
+
// **残す側は、領域を持つ側そのものが決める。**a/b の向きで符号を返していたので、
|
|
276
|
+
// `boundary /out /L1/room` と書くと残す側が反転していた (実測 26㎡ ↔ 34㎡、check は緑)。
|
|
277
|
+
// a/b の向きが意味を持つのは `edge` と `swing` だけで、形はそれに従わない (ADR-0041)
|
|
278
|
+
return { window: w, sideA: side, solo };
|
|
286
279
|
}
|
|
287
280
|
const w = poly.lineWindow(a, b, ba, bb);
|
|
288
281
|
if (!poly.validWindow(w)) return undefined;
|
|
@@ -295,11 +288,6 @@ export function drawnCut(
|
|
|
295
288
|
return { window: w, sideA: ia };
|
|
296
289
|
}
|
|
297
290
|
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
291
|
/** 境界の壁芯線分を導く。壁の位置は空間の割付から生成される — 壁を置く操作は存在しない */
|
|
304
292
|
export function segmentsFor(model: Model, b: Boundary): Segment[] {
|
|
305
293
|
const sa = model.spaces.get(b.a);
|
|
@@ -364,7 +352,7 @@ export function envelopeGaps(model: Model, s: Space): Segment[] {
|
|
|
364
352
|
gaps = gaps.flatMap((g) => subtractOverlap(g, seg));
|
|
365
353
|
}
|
|
366
354
|
}
|
|
367
|
-
return gaps.filter((g) => segmentLength(g) >
|
|
355
|
+
return gaps.filter((g) => segmentLength(g) > SPAN_EPS);
|
|
368
356
|
}
|
|
369
357
|
|
|
370
358
|
/** 軸平行の線分から、同一直線上で重なる区間を引く */
|
|
@@ -394,9 +382,6 @@ function piecesOf(s: Space): Pt[][] {
|
|
|
394
382
|
return s.pieces.length > 0 ? s.pieces : s.rects.map(rectToPoly);
|
|
395
383
|
}
|
|
396
384
|
|
|
397
|
-
/** 線の左右へ少し離れた点。どちらの空間に属するかを見るための探り */
|
|
398
|
-
const PROBE = 5;
|
|
399
|
-
|
|
400
385
|
/**
|
|
401
386
|
* 描かれた線のうち、この二空間が実際に向かい合っている区間だけを返す (ADR-0022)。
|
|
402
387
|
*
|
|
@@ -419,7 +404,7 @@ function drawnShare(model: Model, sa: Space, sb: Space, p: Pt, q: Pt): Segment[]
|
|
|
419
404
|
for (const poly of [...A, ...B]) {
|
|
420
405
|
for (let i = 0; i < poly.length; i++) {
|
|
421
406
|
const t = lineHit(p, q, poly[i]!, poly[(i + 1) % poly.length]!);
|
|
422
|
-
if (t !== undefined && t >
|
|
407
|
+
if (t !== undefined && t > PARALLEL_EPS && t < 1 - PARALLEL_EPS) cuts.add(t);
|
|
423
408
|
}
|
|
424
409
|
}
|
|
425
410
|
const ts = [...cuts].sort((x, y) => x - y);
|
|
@@ -455,8 +440,8 @@ function drawnShare(model: Model, sa: Space, sb: Space, p: Pt, q: Pt): Segment[]
|
|
|
455
440
|
last.y2 = end.y;
|
|
456
441
|
continue;
|
|
457
442
|
}
|
|
458
|
-
const horizontal = Math.abs(dy) <
|
|
459
|
-
const vertical = Math.abs(dx) <
|
|
443
|
+
const horizontal = Math.abs(dy) < EPS;
|
|
444
|
+
const vertical = Math.abs(dx) < EPS;
|
|
460
445
|
out.push({
|
|
461
446
|
x1: start.x,
|
|
462
447
|
y1: start.y,
|
|
@@ -476,10 +461,10 @@ function lineHit(p: Pt, q: Pt, u: Pt, v: Pt): number | undefined {
|
|
|
476
461
|
const sx = v.x - u.x;
|
|
477
462
|
const sy = v.y - u.y;
|
|
478
463
|
const d = rx * sy - ry * sx;
|
|
479
|
-
if (Math.abs(d) <
|
|
464
|
+
if (Math.abs(d) < PARALLEL_EPS) return undefined;
|
|
480
465
|
const t = ((u.x - p.x) * sy - (u.y - p.y) * sx) / d;
|
|
481
466
|
const w = ((u.x - p.x) * ry - (u.y - p.y) * rx) / d;
|
|
482
|
-
return w >= -
|
|
467
|
+
return w >= -PARALLEL_EPS && w <= 1 + PARALLEL_EPS ? t : undefined;
|
|
483
468
|
}
|
|
484
469
|
|
|
485
470
|
export function segmentLength(s: Segment): number {
|
|
@@ -559,15 +544,15 @@ export function placeBand(
|
|
|
559
544
|
let segs = segmentsFor(model, b);
|
|
560
545
|
if (band.edge) segs = segs.filter((s) => s.edgeOfA === band.edge);
|
|
561
546
|
if (segs.length === 0) {
|
|
562
|
-
return fail("04",
|
|
547
|
+
return fail("04", `No boundary segment can hold the ${label} (${b.a} | ${b.b})`);
|
|
563
548
|
}
|
|
564
549
|
if (segs.length > 1) {
|
|
565
|
-
return fail("05",
|
|
550
|
+
return fail("05", `There is more than one boundary segment; pick an edge with edge:N/E/S/W (${b.a} | ${b.b})`);
|
|
566
551
|
}
|
|
567
552
|
const seg = segs[0]!;
|
|
568
553
|
const len = segmentLength(seg);
|
|
569
554
|
if (band.w > len) {
|
|
570
|
-
return fail("06",
|
|
555
|
+
return fail("06", `The ${label} width ${band.w} exceeds the boundary segment length ${len}`);
|
|
571
556
|
}
|
|
572
557
|
const half = band.w / 2;
|
|
573
558
|
let pos: number;
|
|
@@ -576,7 +561,7 @@ export function placeBand(
|
|
|
576
561
|
if (seg.diagonal) {
|
|
577
562
|
return fail(
|
|
578
563
|
"07",
|
|
579
|
-
|
|
564
|
+
`The ${label} position ${band.atRef} cannot be used on a diagonal segment (write it as a ratio, at:0..1)`,
|
|
580
565
|
);
|
|
581
566
|
}
|
|
582
567
|
// 明示位置: 通り参照で置かれたものはクランプしない — はみ出しは言葉のエラーになる
|
|
@@ -584,9 +569,11 @@ export function placeBand(
|
|
|
584
569
|
if (!axisOk) {
|
|
585
570
|
return fail(
|
|
586
571
|
"07",
|
|
587
|
-
|
|
588
|
-
|
|
589
|
-
}
|
|
572
|
+
// **期待する軸を言う。**書かれた軸を言うと「X1+200 は Y系で書かれています」のような
|
|
573
|
+
// 偽の文になる (この枝は軸が食い違ったときにだけ通るので、書かれた軸は期待と逆である)
|
|
574
|
+
`The ${label} position ${band.atRef} is on the wrong axis: ${
|
|
575
|
+
seg.horizontal ? "a horizontal segment takes an X" : "a vertical segment takes a Y"
|
|
576
|
+
} grid line`,
|
|
590
577
|
);
|
|
591
578
|
}
|
|
592
579
|
const start = seg.horizontal ? seg.x1 : seg.y1;
|
|
@@ -594,9 +581,9 @@ export function placeBand(
|
|
|
594
581
|
if (pos < half - EPS || pos > len - half + EPS) {
|
|
595
582
|
return fail(
|
|
596
583
|
"08",
|
|
597
|
-
|
|
584
|
+
`At ${band.atRef} the ${label} (width ${band.w}) runs off the boundary segment (segment ${Math.round(
|
|
598
585
|
start,
|
|
599
|
-
)}
|
|
586
|
+
)}-${Math.round(start + len)}mm, center allowed ${Math.round(start + half)}-${Math.round(
|
|
600
587
|
start + len - half,
|
|
601
588
|
)}mm)`,
|
|
602
589
|
);
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
// koyu core — 採光の**入力**を返す (合否は言わない)
|
|
2
|
+
//
|
|
3
|
+
// 方針 §5.7: 「集計とグラフの問いは core が持つ。**ただし合否を言わない。**
|
|
4
|
+
// 開口面積と床面積を返す。」1/7 の判定は建築の側の規則なので、検証の面
|
|
5
|
+
// (src/validate/light.ts) が持つ。ここが返すのは数だけである。
|
|
6
|
+
//
|
|
7
|
+
// 対象は `daylight:1` を書いた空間だけ — 型からは推定しない (ADR-0020)。
|
|
8
|
+
// 「どの室に採光の問いを掛けるか」は書き手の宣言であって、core の推定ではない。
|
|
9
|
+
|
|
10
|
+
import { areaM2, isCoveredAbove, isSemiOutdoor, type Model, type Space } from "./model.js";
|
|
11
|
+
|
|
12
|
+
/** 庇下・バルコニー下 (上に空間がある半屋外) 越しの窓の係数 — 縁側補正に倣う粗い値。
|
|
13
|
+
* 上が開いた半屋外 (庭・最上階バルコニー) 越しは 1.0 (ADR-0009) */
|
|
14
|
+
export const COVERED_SEMI_FACTOR = 0.7;
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* 採光の問いの入力。**合否を持たない** — `need` も `ok` もここには無い。
|
|
18
|
+
* 閾値を掛けるのは検証の面である。
|
|
19
|
+
*/
|
|
20
|
+
export interface DaylightInput {
|
|
21
|
+
space: Space;
|
|
22
|
+
/** 床面積 m² (壁芯) */
|
|
23
|
+
floor: number;
|
|
24
|
+
/** 外部に面する窓の有効面積 m² (w×h×係数) */
|
|
25
|
+
window: number;
|
|
26
|
+
/** h未指定で数えられなかった窓があるか — 数が信用できないことの印 */
|
|
27
|
+
missingH: boolean;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
/**
|
|
31
|
+
* `daylight:1` と宣言された領域つき空間について、床面積と有効窓面積を返す。
|
|
32
|
+
* 係数は「窓の先が何か」の導出 — 外部に直接面すれば1、庇下の半屋外越しなら0.7、
|
|
33
|
+
* 上が開いた半屋外越しなら1.0。この係数は形の導出であって判定ではない。
|
|
34
|
+
*/
|
|
35
|
+
export function daylightInputs(model: Model): DaylightInput[] {
|
|
36
|
+
const out: DaylightInput[] = [];
|
|
37
|
+
for (const s of model.spaces.values()) {
|
|
38
|
+
if (s.rects.length === 0) continue;
|
|
39
|
+
if (s.attrs["daylight"] !== 1) continue;
|
|
40
|
+
const floor = areaM2(s)!;
|
|
41
|
+
let win = 0;
|
|
42
|
+
let missingH = false;
|
|
43
|
+
for (const b of model.boundaries) {
|
|
44
|
+
const other = b.a === s.path ? b.b : b.b === s.path ? b.a : undefined;
|
|
45
|
+
if (!other) continue;
|
|
46
|
+
const os = model.spaces.get(other);
|
|
47
|
+
if (!os) continue;
|
|
48
|
+
const factor =
|
|
49
|
+
os.type === "exterior"
|
|
50
|
+
? 1
|
|
51
|
+
: isSemiOutdoor(model, os)
|
|
52
|
+
? isCoveredAbove(model, os)
|
|
53
|
+
? COVERED_SEMI_FACTOR
|
|
54
|
+
: 1
|
|
55
|
+
: 0;
|
|
56
|
+
if (factor === 0) continue;
|
|
57
|
+
for (const o of b.openings) {
|
|
58
|
+
if (o.kind !== "window") continue;
|
|
59
|
+
if (o.h === undefined) {
|
|
60
|
+
missingH = true;
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
63
|
+
win += (o.w * o.h * factor) / 1e6;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
out.push({ space: s, floor, window: win, missingH });
|
|
67
|
+
}
|
|
68
|
+
return out;
|
|
69
|
+
}
|