Merge remote-tracking branch 'origin/sub_laptop_8' into main_laptop_1

2026-10-16 12:07:59 +09:00
parent 6d118c8913 4a55092bf8
commit 5795f359cc
5 changed files with 278 additions and 16 deletions
@@ -0,0 +1,132 @@
+"""345-5 덧 — 노선 편집 평면의 보이는 영역(뜬 종단 판 위) · 노선 맞춤 · 글판 자리.
+
+`logic/B05_Profile_RouteEdit_Visible.ts` 를 tsc 로 옮겨 node 로 돌림 · 배선 · CSS 는 글로 봄.
+./venv/Scripts/python.exe -m pytest resources/tester/test_345_5b_plan_visible_area.py -q
+"""
+
+from __future__ import annotations
+
+import json
+import subprocess
+from pathlib import Path
+
+import pytest
+
+ROOT = Path(__file__).resolve().parents[2]
+B05 = ROOT / "B05_Profile"
+TS_FILE = B05 / "logic" / "B05_Profile_RouteEdit_Visible.ts"
+TSC = ROOT / "config" / "node_modules" / "typescript" / "bin" / "tsc"
+
+# 도엽 1000 × 800 m · 칸 1200 × 900 px · 노선 가운데 (500, 400) · 크기 300 × 200 m(+여유 200 m)
+_FIT = {
+    "mapWidthM": 1000,
+    "mapHeightM": 800,
+    "width": 1200,
+    "height": 900,
+    "centerXM": 500,
+    "centerYM": 400,
+    "wantWidthM": 700,
+    "wantHeightM": 600,
+}
+
+_RUNNER = """
+import { writeFileSync } from "node:fs";
+import * as visible from "./B05_Profile/logic/B05_Profile_RouteEdit_Visible.js";
+const { coveredBottomPx, fitRouteToVisible } = visible;
+const fit = JSON.parse(process.argv[3]);
+const rect = { x: 37.5, y: 0, width: 1125, height: 900 };
+const at = (coveredPx) => fitRouteToVisible({ ...fit, mapRect: rect, coveredPx });
+writeFileSync(process.argv[2], JSON.stringify({
+  cover: [
+    coveredBottomPx({ top: 0, bottom: 900 }, null),
+    coveredBottomPx({ top: 0, bottom: 900 }, { top: 360, bottom: 900 }),
+    coveredBottomPx({ top: 0, bottom: 900 }, { top: 500, bottom: 900 }),
+    coveredBottomPx({ top: 0, bottom: 900 }, { top: 899, bottom: 900 }),
+    coveredBottomPx({ top: 0, bottom: 900 }, { top: -50, bottom: 900 }),
+    coveredBottomPx({ top: 0, bottom: 900 }, { top: 950, bottom: 1300 }),
+  ],
+  none: at(0),
+  half: at(450),
+  most: at(880),
+}));
+"""
+
+
+def _run(tmp_path: Path) -> dict:
+    out = tmp_path / "js"
+    subprocess.run(  # noqa: S603 — 고정 실행 파일
+        [
+            "node",
+            str(TSC),
+            str(TS_FILE),
+            "--outDir",
+            str(out),
+            "--rootDir",
+            str(ROOT),
+            "--module",
+            "esnext",
+            "--target",
+            "es2022",
+            "--moduleResolution",
+            "bundler",
+            "--ignoreConfig",
+        ],
+        cwd=str(ROOT),
+        check=True,
+        capture_output=True,
+    )
+    (out / "runner.mjs").write_text(_RUNNER, encoding="utf-8")
+    result = tmp_path / "out.json"
+    subprocess.run(  # noqa: S603
+        ["node", str(out / "runner.mjs"), str(result), json.dumps(_FIT)],
+        cwd=str(ROOT),
+        check=True,
+        capture_output=True,
+    )
+    return json.loads(result.read_text(encoding="utf-8"))
+
+
+def _screen_center(fit: dict) -> tuple[float, float]:
+    """노선 가운데의 화면 자리 — B04 `createMetricProjector` 와 같은 식."""
+    rect = {"x": 37.5, "y": 0, "width": 1125, "height": 900}
+    s = fit["scale"]
+    nx = _FIT["centerXM"] / _FIT["mapWidthM"]
+    ny = 1 - _FIT["centerYM"] / _FIT["mapHeightM"]
+    x = rect["x"] * s + _FIT["width"] / 2 * (1 - s) + fit["offsetX"] + nx * rect["width"] * s
+    y = rect["y"] * s + _FIT["height"] / 2 * (1 - s) + fit["offsetY"] + ny * rect["height"] * s
+    return x, y
+
+
+@pytest.mark.skipif(not TSC.is_file(), reason="프론트엔드 의존성 미설치")
+def test_덮인_높이와_보이는_영역_맞춤(tmp_path: Path) -> None:
+    out = _run(tmp_path)
+    # 판 없음 · 판 높이 540 · 400 · 접힘(테두리만) · 칸보다 큼(칸 높이까지) · 칸 밖
+    assert out["cover"] == [0, 540, 400, 0, 900, 0]
+    # 덮인 높이 0 = B04 computeRouteView 와 같음(배율 = min(1000/700, 800/600) · 가운데 = 칸 가운데)
+    none = out["none"]
+    assert none["scale"] == pytest.approx(min(1000 / 700, 800 / 600))
+    assert _screen_center(none) == pytest.approx((600, 450))
+    # 아래 반을 덮음 — 노선 가운데 = 보이는 영역(0 ~ 450) 가운데 · 노선 높이가 그 영역 안
+    half = out["half"]
+    assert _screen_center(half) == pytest.approx((600, 225))
+    route_px = _FIT["wantHeightM"] * (900 / 800) * half["scale"]
+    assert route_px <= 450 + 1e-6
+    # 거의 다 덮음 — 남은 20 px 에 들게 줄임 · 가운데는 남은 20 px 가운데
+    most = out["most"]
+    assert most["scale"] == pytest.approx((800 / 600) * (20 / 900))
+    assert _screen_center(most)[1] == pytest.approx(10)
+
+
+def test_배선과_글판_자리() -> None:
+    view = (B05 / "B05_Profile_UI_RouteEdit_View.ts").read_text(encoding="utf-8")
+    assert "coveredPx: coveredPx()," in view and "computeRouteView(" not in view
+    assert 'wrap.classList.contains("b05-routeedit__canvas-wrap")) watchCover(wrap);' in view
+    cover = (B05 / "B05_Profile_UI_RouteEdit_Cover.ts").read_text(encoding="utf-8")
+    assert 'querySelector<HTMLElement>(".b05-route-profile")' in cover
+    assert 'setProperty("--b05-routeedit-cover"' in cover
+    css = (B05 / "B05_Profile_UI_Style_RouteEdit.css").read_text(encoding="utf-8")
+    # 상태 · 범례 · 잰 값 글판 = 판 바로 위(접으면 덮인 높이 0 = 원래 자리)
+    assert css.count("bottom: calc(var(--spacing-12) + var(--b05-routeedit-cover, 0px));") == 2
+    # 접힌 판은 높이 0 — 덮인 높이도 0 이 됨
+    style = (B05 / "B05_Profile_UI_Style.css").read_text(encoding="utf-8")
+    assert ".b05-route-profile.is-collapsed {\n  height: 0;" in style