diff --git a/A00_Common/group_workflow.ts b/A00_Common/group_workflow.ts index 0bde3c863..1d6c0eabe 100644 --- a/A00_Common/group_workflow.ts +++ b/A00_Common/group_workflow.ts @@ -37,8 +37,9 @@ const FLOWS: readonly GroupFlow[] = [ "DE_Step_Stab3D", "DE_Step_StabReport", "DE_Step_StabRock", + "DE_Step_StabArea", ], - icons: ["๐Ÿชจ", "๐Ÿ“", "๐ŸงŠ", "๐Ÿ“„", "โ›ฐ๏ธ"], + icons: ["๐Ÿชจ", "๐Ÿ“", "๐ŸงŠ", "๐Ÿ“„", "โ›ฐ๏ธ", "๐Ÿ—บ๏ธ"], }, ]; diff --git a/E05_StabReport/E05_StabReport_Area.py b/E05_StabReport/E05_StabReport_Area.py new file mode 100644 index 000000000..f62bb196e --- /dev/null +++ b/E05_StabReport/E05_StabReport_Area.py @@ -0,0 +1,78 @@ +"""E05 ๋ณด๊ณ ์„œ s7 ๊ด‘์—ญ์š”์•ฝ โ€” E07 ๊ด‘์—ญ ์ž์—ฐ์‚ฌ๋ฉด ์œ„ํ—˜ ์ €์žฅ๋ณธ โ†’ ์‹œํŠธ (PLAN 536-2). + +์นธ ์ž๋ฆฌ = `resources/master_template/report/stab_report_slots.md` s7. +E07 ์ €์žฅ๋ณธ์ด ์—†์œผ๋ฉด ใ€Œ๊ด‘์—ญ ํ•ด์„ ์ „ใ€. +""" + +from __future__ import annotations + +from pathlib import Path +from typing import Any + +from E07_StabArea.E07_StabArea_Engine import CLASS_KEYS, RISK_CLASS +from E07_StabArea.E07_StabArea_Router import RESULT, load + +CLASS_NAMES = ("", "์•ˆ์ •", "๋ณดํ†ต ์•ˆ์ •", "์ค€์•ˆ์ •", "์œ„ํ—˜ ํ•˜ํ•œ", "์œ„ํ—˜ ์ƒํ•œ", "๋ถˆ์•ˆ์ •") + + +def stamp(project_root: Path) -> list[int] | None: + """ํ•ด์„ ์ง€๋ฌธ์šฉ โ€” ์ €์žฅ๋ณธ ํฌ๊ธฐ ยท ๊ณ ์นœ ๋•Œ.""" + path = Path(project_root) / RESULT + return [path.stat().st_size, path.stat().st_mtime_ns] if path.is_file() else None + + +def read(project_root: Path) -> dict[str, Any] | None: + """์ €์žฅ๋ณธ์—์„œ ๋ณด๊ณ ์„œ์— ์“ฐ๋Š” ๊ฒƒ๋งŒ(๊ฒฉ์ž ๋ฐฐ์—ด ๋บŒ).""" + doc = load(project_root) + if not doc: + return None + return {k: doc[k] for k in ("settings", "computed_at", "stations", "summary")} + + +def _set(sheet: dict[str, Any], a1: str, value: Any, style: int | None = None) -> None: + cell = dict(sheet["์นธ"].get(a1) or {}) + cell["๊ฐ’"] = round(value, 6) if isinstance(value, float) else value + if style is not None: + cell["์„œ์‹"] = style + sheet["์นธ"][a1] = cell + + +def fill_area(sheet: dict[str, Any], area: dict[str, Any] | None, labels: dict[float, str]) -> None: + """s7 โ€” ์กฐ๊ฑด ๋„ท ยท ๋“ฑ๊ธ‰๋ณ„ ๋ฉด์  ์—ฌ์„ฏ ยท ์œ„ํ—˜ ์ธก์ (22 ํ–‰๋ถ€ํ„ฐ ํ•œ ์ค„์”ฉ).""" + if not area: + _set(sheet, "B5", "๊ด‘์—ญ ํ•ด์„ ์ „ โ€” E07 ๊ด‘์—ญ์—์„œ [ํ•ด์„] ๋’ค [๋ณด๊ณ ์„œ ๊ฐฑ์‹ ]") + return + s, summary = area["settings"], area["summary"] + _set(sheet, "B5", f"์ค‘์‹ฌ์„  ยฑ {s['band_m']:g} m ยท ๊ฒฉ์ž {s['cell_m']:g} m") + _set( + sheet, + "B6", + f"ฮณt {s['gamma_t']:g} ยท ฮณsat {s['gamma_sat']:g} kN/mยณ ยท c {s['c']:g}~{s['c_hi']:g} kPa ยท " + f"ฯ† {s['phi']:g}~{s['phi_hi']:g}ยฐ ยท ๋ฟŒ๋ฆฌ ์ ์ฐฉ {s['c_root']:g} kPa ยท " + f"ํ† ์ธต {s['soil_depth_m']:g} m", + ) + rain = ( + "์ง€ํ‘œ ํฌํ™”(m = 1)" + if s["scenario"] == "saturated" + else f"๊ฐ•์šฐ {s['rain_mm_h']:g} mm/h ยท ํˆฌ์ˆ˜๊ณ„์ˆ˜ {s['k_m_s']:g} m/s(์ •์ƒ๋ฅ˜ ํฌํ™”๋น„)" + ) + _set(sheet, "B7", rain) + _set(sheet, "B8", str(area["computed_at"]).replace("T", " ")) + for k in range(1, 7): + _set(sheet, f"C{11 + k}", float(summary["areas_m2"][CLASS_KEYS[k]])) + rows = [r for r in area["stations"] if r.get("worst_class", 0) >= RISK_CLASS] + template = {col: dict(sheet["์นธ"].get(f"{col}22") or {}) for col in "ABCDEFG"} + if not rows: + _set(sheet, "A22", "์œ„ํ—˜ ์ธก์  ์—†์Œ") + for i, row in enumerate(rows): + r = 22 + i + for col, cell in template.items(): + sheet["์นธ"][f"{col}{r}"] = dict(cell) + ch = float(row["chainage_m"]) + _set(sheet, f"A{r}", row.get("label") or labels.get(round(ch, 3)) or f"{ch:.2f}") + _set(sheet, f"B{r}", ch) + _set(sheet, f"C{r}", float(row["fs_min"])) + _set(sheet, f"D{r}", float(row["si_min"])) + _set(sheet, f"E{r}", CLASS_NAMES[int(row["worst_class"])]) + _set(sheet, f"F{r}", float(row["risk_area_m2"])) + _set(sheet, f"G{r}", float(row["slope_max_deg"])) diff --git a/E05_StabReport/E05_StabReport_Build.py b/E05_StabReport/E05_StabReport_Build.py index becbb50b0..cd9251d4b 100644 --- a/E05_StabReport/E05_StabReport_Build.py +++ b/E05_StabReport/E05_StabReport_Build.py @@ -1,13 +1,13 @@ """E05 ์•ˆ์ •์„ฑํ‰๊ฐ€ ๋ณด๊ณ ์„œ ๋นŒ๋”(์š”๊ตฌ 347-5 ยท 351 ยท ์š”๊ตฌ์„œ 4-3 ยท PLAN 534-3). ์ž…๋ ฅ = E02 ์ง€๋ฐ˜ ์กฐ๊ฑด(`ground.json`) ยท E03 2D ํŒŒ์ƒ ์ €์žฅ๋ณธ(`stab2d_summary` ๊ฐ€์žฅ ์ตœ๊ทผ ยท ์ธก์ ๋ณ„ -`stab2d_station`) ยท ๋Œ€ํ‘œ ๋‹จ๋ฉด(E03 ์ž๋™ + `representative.json` ์ผฌ/๋”) ยท E04 3D ์ €์žฅ๋ณธ ์š”์•ฝ(์žˆ์œผ๋ฉด) ยท +`stab2d_station`) ยท ๋Œ€ํ‘œ ๋‹จ๋ฉด(E03 ์ž๋™ + `representative.json` ์ผฌ/๋”) ยท E04 3D ์ €์žฅ๋ณธ ์š”์•ฝ(์žˆ์œผ๋ฉด) ยท E07 ๊ด‘์—ญ ์ €์žฅ๋ณธ(์žˆ์œผ๋ฉด) ยท E01 ๋ณต์‚ฌ๋ณธ(์ธก์  ยท ํšก๋‹จ ยท ๋…ธ์„ ). ์–‘์‹ = `resources/master_template/report/stab_report.json` ์นธ ์ž๋ฆฌ = ๊ฐ™์€ ํด๋” `stab_report_slots.md`. ๋ชซ: ์‚ฌ์šฉ์ž(ํ‘œ์ง€ s1 ยท ๊ฐœ์š” s2) = ์ฒ˜์Œ ๋งŒ๋“ค ๋•Œ๋งŒ ์ฑ„์›€ ยท -ํ”„๋กœ๊ทธ๋žจ(์ž…๋ ฅ์กฐ๊ฑด s3 ยท ์ธก์ ํ‘œ s4 ยท ๋Œ€ํ‘œ๋‹จ๋ฉด s5 ยท 3D์š”์•ฝ s6) +ํ”„๋กœ๊ทธ๋žจ(์ž…๋ ฅ์กฐ๊ฑด s3 ยท ์ธก์ ํ‘œ s4 ยท ๋Œ€ํ‘œ๋‹จ๋ฉด s5 ยท 3D์š”์•ฝ s6 ยท ๊ด‘์—ญ์š”์•ฝ s7) = [๋ณด๊ณ ์„œ ๊ฐฑ์‹ ] ๋•Œ ์–‘์‹์—์„œ ํ†ต์งธ๋กœ ๋‹ค์‹œ ์”€. ํŒ์ • ๊ธ€ ์นธ = ์—”์ง„ ํŒ์ • ๊ฐ’ + N.G ์„œ์‹ 10 ยท O.K ์„œ์‹ 11 ์„ ์ง์ ‘ ๋ถ™์ž„ (์ธ์‡„ HTML ยท xlsx ๋Š” ์กฐ๊ฑด๋ถ€ ์„œ์‹์„ ์•ˆ ๋จน์Œ). @@ -34,6 +34,7 @@ from E03_StabSection import E03_StabSection_View as view2d from E03_StabSection.E03_StabSection_Engine_Model import final_surface from E03_StabSection.E03_StabSection_Router import KIND_STATION, _latest_summary, _overrides from E04_Stab3D import E04_Stab3D_Run as run3d +from E05_StabReport import E05_StabReport_Area as area from E05_StabReport import E05_StabReport_Figure as figure ROOT = Path(__file__).resolve().parents[1] @@ -41,7 +42,7 @@ FORM_PATH = ROOT / "resources" / "master_template" / "report" / "stab_report.jso STAGE = "E05_StabReport" REPORT, META = "report.json", "report_meta.json" USER_SHEETS = ("s1", "s2") -PROGRAM_SHEETS = ("s3", "s4", "s5", "s6") +PROGRAM_SHEETS = ("s3", "s4", "s5", "s6", "s7") BLOCK = 28 # ๋Œ€ํ‘œ๋‹จ๋ฉด ํ•œ ์ชฝ = 28 ํ–‰ REPRESENTATIVE = Path("E03_StabSection") / "representative.json" BAND_KEY = "fig/3d_band.png" @@ -168,6 +169,7 @@ def analysis_fingerprint(project_root: Path) -> str: ] if folder.is_dir() else [], + "area": area.stamp(project_root), "form": hashlib.sha1(FORM_PATH.read_bytes()).hexdigest(), } text = json.dumps(body, ensure_ascii=False, sort_keys=True, default=str) @@ -216,6 +218,7 @@ def gather(project_root: Path) -> dict[str, Any]: "representatives": reps, "ground": ground, "sections3d": sorted(sections3d, key=lambda s: s["start_m"]), + "area": area.read(project_root), "fingerprint": analysis_fingerprint(project_root), } @@ -606,6 +609,7 @@ def build_program(book: dict[str, Any], inputs: dict[str, Any]) -> list[tuple[st fill_stations(by["s4"], inputs) jobs = fill_sections(by["s5"], inputs) jobs.append(fill_3d(by["s6"], inputs)) + area.fill_area(by["s7"], inputs["area"], _labels(inputs["stations"])) return jobs diff --git a/E07_StabArea/E07_StabArea_Engine.py b/E07_StabArea/E07_StabArea_Engine.py new file mode 100644 index 000000000..add8f867a --- /dev/null +++ b/E07_StabArea/E07_StabArea_Engine.py @@ -0,0 +1,283 @@ +"""E07 ๊ด‘์—ญ ์ž์—ฐ์‚ฌ๋ฉด ์œ„ํ—˜ โ€” ๋ฌดํ•œ์‚ฌ๋ฉด ์•ˆ์ „์œจ ยท SINMAP ์•ˆ์ • ์ง€์ˆ˜ (์š”๊ตฌ 345 ยท 351 ยท PLAN 536-2). + +์ˆœ์ˆ˜ ๊ณ„์‚ฐ(storage ๋ชจ๋ฆ„) โ€” D ์˜ˆ์ •๋…ธ์„  ์žฌํ•ด ์•ˆ์ „์„ฑ๋„ ๊ฐ™์€ ์—”์ง„์„ ์”€(ํ•œ ๋ฒŒ). +๊ทผ๊ฑฐ = ์ง€์‹DB `original/์˜ˆ์ •๋…ธ์„ /02` ยง1.1 ยท ยง2 โ‘  ยท `original/์•ˆ์ •์„ฑํ‰๊ฐ€/04`(๋ถ•์ ํ†  ๋ฒ”์œ„). + + ์ง€ํ˜• DEM โ†’ ๊ณ ๋ฅธ ๊ฒฉ์ž(cell_m) ยท ๊ฒฝ์‚ฌ ฮฒ(Horn 3ร—3) ยท D8 ํ๋ฆ„(์›…๋ฉ์ด ์ฑ„์›€ ยท ์ˆ˜์‹  ์…€ = B04 ๋ฐฐ์ˆ˜์œ ์—ญ + ํ•จ์ˆ˜ ์žฌ์‚ฌ์šฉ) ยท ๋‹จ์œ„ ์ง‘์ˆ˜๋ฉด์  a = ์ƒ๋ฅ˜ ์…€ ์ˆ˜ ร— cellยฒ/cell(๋“ฑ๊ณ ์„  ํญ = cell) + ํฌํ™”๋น„ m = 1(์ง€ํ‘œ ํฌํ™” ยท ๊ธฐ๋ณธ) | min(Rยทa / (Tยทsinฮฒ), 1) ยท T = Kยทz(์ •์ƒ๋ฅ˜ ยท SINMAP ยท SHALSTAB) + ์•ˆ์ „์œจ Fs = (c + c_r + [ฮณt z(1โˆ’m) + (ฮณsatโˆ’ฮณw) m z] cosยฒฮฒ tanฯ†) + / ([ฮณt z(1โˆ’m) + ฮณsat m z] sinฮฒ cosฮฒ) + ์•ˆ์ • ์ง€์ˆ˜ SI(SINMAP ยท Pack 1998) โ€” c โˆˆ [c, c_hi] ยท tanฯ† โˆˆ [tanฯ†, tanฯ†_hi] ๊ณ ๋ฅธ ๋ถ„ํฌ + Fs_min โ‰ฅ 1 โ†’ SI = Fs_min ยท Fs_max < 1 โ†’ SI = 0 + ยท ๊ทธ ์‚ฌ์ด โ†’ SI = P(Fs > 1)(๋‘ ๊ณ ๋ฅธ ๋ถ„ํฌ ํ•ฉ ยท ๋‹ซํžŒ ๊ผด) + ๋“ฑ๊ธ‰ 1 ์•ˆ์ •(SI โ‰ฅ 1.5) ยท 2 ๋ณดํ†ต ์•ˆ์ •(โ‰ฅ 1.25) ยท 3 ์ค€์•ˆ์ •(โ‰ฅ 1.0) ยท 4 ์œ„ํ—˜ ํ•˜ํ•œ(โ‰ฅ 0.5) + ยท 5 ์œ„ํ—˜ ์ƒํ•œ(> 0) ยท 6 ๋ถˆ์•ˆ์ •(SI = 0) ยท 0 = ์ž๋ฃŒ ์—†์Œ + +๊ฒฉ์ž ๊ผด = ํ–‰ 0 ์ด ๋‚จ์ชฝ(y0) ยท ์…€ (iy, ix) ์ค‘์‹ฌ = (x0 + ixยทdx, y0 + iyยทdx) โ€” E04 ๋ž˜์Šคํ„ฐ์™€ ๊ฐ™์Œ. +""" + +from __future__ import annotations + +import math +from dataclasses import dataclass +from types import SimpleNamespace +from typing import Any + +import numpy as np +from scipy.interpolate import RegularGridInterpolator +from scipy.spatial import cKDTree + +from B04_PreProcess.B04_PreProcess_Engine_Watershed_Grid import ( + compute_receivers, + condition_surface, +) + +GAMMA_W = 9.81 # kN/mยณ +SI_EDGES = (1.5, 1.25, 1.0, 0.5) # ๋“ฑ๊ธ‰ 1~4 ์•„๋ž˜ ๊ฒฝ๊ณ„ ยท 5 = (0, 0.5) ยท 6 = 0 +CLASS_KEYS = ("", "stable", "moderate", "quasi", "lower", "upper", "defended") +RISK_CLASS = 4 # ์ด ๋“ฑ๊ธ‰๋ถ€ํ„ฐ ์œ„ํ—˜(SI < 1) +FLAT_SLOPE_RAD = 1e-4 # ์ด๋ณด๋‹ค ํ‰ํ‰ํ•˜๋ฉด ํ™œ๋™ ์—†์Œ(Fs = โˆž) + + +@dataclass(frozen=True) +class AreaParams: + """ํ•œ ๋ฒˆ ํ•ด์„ ์กฐ๊ฑด โ€” ๋‹จ์œ„ kN/mยณ ยท kPa ยท ยฐ ยท m ยท mm/h ยท m/s.""" + + gamma_t: float + gamma_sat: float + c: float # ์ ์ฐฉ๋ ฅ ์•„๋ž˜(๊ฒฐ์ • Fs ยท SI ๋ฒ”์œ„ ์•„๋ž˜) + c_hi: float # SI ๋ฒ”์œ„ ์œ„ + phi: float + phi_hi: float + c_root: float = 0.0 # ๋ฟŒ๋ฆฌ ์ ์ฐฉ(๋‚˜์ง€ = 0) + soil_depth_m: float = 1.5 + scenario: str = "saturated" # saturated = ์ง€ํ‘œ ํฌํ™” m = 1 ยท rain = ์ •์ƒ๋ฅ˜ ๊ฐ•์šฐ + rain_mm_h: float = 30.0 + k_m_s: float = 1e-4 # ํฌํ™” ํˆฌ์ˆ˜๊ณ„์ˆ˜ + + +# --------------------------------------------------------------------------- +# ์ง€ํ˜• +# --------------------------------------------------------------------------- + + +def resample_dem(dem: dict[str, Any], cell_m: float) -> tuple[np.ndarray, float, float]: + """DTM npz(x ยท y ์˜ค๋ฆ„ ์ถ• ยท z (ny, nx) ยท valid_mask) โ†’ ๊ณ ๋ฅธ ๊ฒฉ์ž (z, x0, y0) ยท ๋ฐ– = NaN.""" + x = np.asarray(dem["x"], float) + y = np.asarray(dem["y"], float) + z = np.where(np.asarray(dem["valid_mask"], bool), np.asarray(dem["z"], float), np.nan) + nx = int(math.floor((x[-1] - x[0]) / cell_m)) + 1 + ny = int(math.floor((y[-1] - y[0]) / cell_m)) + 1 + gx = x[0] + np.arange(nx) * cell_m + gy = y[0] + np.arange(ny) * cell_m + yy, xx = np.meshgrid(gy, gx, indexing="ij") + f = RegularGridInterpolator((y, x), z, bounds_error=False, fill_value=np.nan) + return f(np.column_stack([yy.ravel(), xx.ravel()])).reshape(ny, nx), float(x[0]), float(y[0]) + + +def slope_rad(z: np.ndarray, cell_m: float) -> np.ndarray: + """Horn 3ร—3 ๊ฒฝ์‚ฌ(rad) โ€” ์ด์›ƒ์— NaN ์ด ์žˆ๊ฑฐ๋‚˜ ๊ฒฉ์ž ๋์ด๋ฉด NaN.""" + p = np.pad(z, 1, constant_values=np.nan) + + def at(dy: int, dx: int) -> np.ndarray: + return p[1 + dy : 1 + dy + z.shape[0], 1 + dx : 1 + dx + z.shape[1]] + + gx = ((at(-1, 1) + 2 * at(0, 1) + at(1, 1)) - (at(-1, -1) + 2 * at(0, -1) + at(1, -1))) / ( + 8 * cell_m + ) + gy = ((at(1, -1) + 2 * at(1, 0) + at(1, 1)) - (at(-1, -1) + 2 * at(-1, 0) + at(-1, 1))) / ( + 8 * cell_m + ) + return np.arctan(np.hypot(gx, gy)) + + +def catchment_area(z: np.ndarray, cell_m: float) -> np.ndarray: + """D8 ๋‹จ์œ„ ์ง‘์ˆ˜๋ฉด์  a(m) = ์ž๊ธฐ ํฌํ•จ ์ƒ๋ฅ˜ ์…€ ์ˆ˜ ร— cell. ๋ฐ– = NaN. + + ponytail: ์ง€ํ˜• ๊ฒฉ์ž ๋ ๋ฐ– ์ƒ๋ฅ˜๋Š” ๋ชจ๋ฆ„(๋ณต์‚ฌ DTM = ๋…ธ์„  ๋ ) โ€” ๋  ๋ ์…€์€ a ๊ฐ€ ์ž‘๊ฒŒ ๋‚˜์˜ด ยท + ๋„“์€ DEM(D ์˜ˆ์ •๋…ธ์„  ๋“ฑ)์ด๋ฉด ๊ทธ๋Œ€๋กœ ๋งž์Œ. + """ + filled, valid = condition_surface(z.astype(np.float32)) + spec = SimpleNamespace(n_rows=z.shape[0], n_cols=z.shape[1], cell_m=cell_m) + receiver, _ = compute_receivers(spec, filled, valid) + flat = filled.ravel() + order = np.flatnonzero(valid.ravel()) + order = order[np.argsort(-flat[order], kind="stable")].tolist() # ๋†’์€ ๋ฐ์„œ ๋‚ฎ์€ ๋ฐ๋กœ + acc = valid.ravel().astype(float).tolist() + recv = receiver.tolist() + for i in order: + r = recv[i] + if r != i: + acc[r] += acc[i] + out = np.asarray(acc).reshape(z.shape) * cell_m + return np.where(valid, out, np.nan) + + +# --------------------------------------------------------------------------- +# ๋ฌดํ•œ์‚ฌ๋ฉด ยท SINMAP +# --------------------------------------------------------------------------- + + +def wetness(beta: np.ndarray, a: np.ndarray, p: AreaParams) -> np.ndarray: + """ํฌํ™”๋น„ m(0~1) โ€” ์ง€ํ‘œ ํฌํ™” = 1 ยท ๊ฐ•์šฐ = min(Rยทa/(T sinฮฒ), 1).""" + if p.scenario == "saturated": + return np.ones_like(beta) + recharge = p.rain_mm_h / 1000.0 / 3600.0 # m/s + transmissivity = p.k_m_s * p.soil_depth_m # mยฒ/s + with np.errstate(divide="ignore", invalid="ignore"): + m = recharge * a / (transmissivity * np.sin(beta)) + return np.clip(np.nan_to_num(m, nan=1.0, posinf=1.0), 0.0, 1.0) + + +def _terms(beta: np.ndarray, m: np.ndarray, p: AreaParams) -> tuple[np.ndarray, np.ndarray]: + """Fs = (c + c_r)ยทA + tanฯ†ยทB ์˜ A ยท B(ํ‰ํ‰ํ•œ ์…€ = โˆž).""" + z = p.soil_depth_m + cos, sin = np.cos(beta), np.sin(beta) + normal = (p.gamma_t * z * (1 - m) + (p.gamma_sat - GAMMA_W) * m * z) * cos**2 + shear = (p.gamma_t * z * (1 - m) + p.gamma_sat * m * z) * sin * cos + flat = beta < FLAT_SLOPE_RAD + with np.errstate(divide="ignore", invalid="ignore"): + a = np.where(flat, np.inf, 1.0 / shear) + b = np.where(flat, np.inf, normal / shear) + return a, b + + +def infinite_slope_fs(beta: np.ndarray, m: np.ndarray, p: AreaParams) -> np.ndarray: + """๊ฒฐ์ • ์•ˆ์ „์œจ(c ยท ฯ† = ๋ฒ”์œ„ ์•„๋ž˜ = ๋ณด์ˆ˜) โ€” ์ง€์‹DB 02 ยง1.1 ์‹.""" + a, b = _terms(beta, m, p) + with np.errstate(invalid="ignore"): + return np.where( + np.isinf(a), np.inf, (p.c + p.c_root) * a + math.tan(math.radians(p.phi)) * b + ) + + +def _cdf_sum_uniform( + s: np.ndarray, a1: np.ndarray, a2: np.ndarray, b1: np.ndarray, b2: np.ndarray +) -> np.ndarray: + """P(X + Y โ‰ค s) ยท X ~ U[a1, a2] ยท Y ~ U[b1, b2] ๋…๋ฆฝ โ€” ํญ 0 ์ด๋ฉด ๊ทธ ๋ณ€์ˆ˜๋Š” ์ƒ์ˆ˜.""" + wa, wb = a2 - a1, b2 - b1 + eps = 1e-12 + + def g(u: np.ndarray) -> np.ndarray: + return np.maximum(u, 0.0) ** 2 / 2 + + with np.errstate(divide="ignore", invalid="ignore"): + both = (g(s - a1 - b1) - g(s - a2 - b1) - g(s - a1 - b2) + g(s - a2 - b2)) / (wa * wb) + only_a = (s - a1 - b1) / wa + only_b = (s - a1 - b1) / wb + step = (a1 + b1 <= s).astype(float) + out = np.where( + (wa > eps) & (wb > eps), both, np.where(wa > eps, only_a, np.where(wb > eps, only_b, step)) + ) + return np.clip(np.nan_to_num(out, nan=0.0), 0.0, 1.0) + + +def stability_index(beta: np.ndarray, m: np.ndarray, p: AreaParams) -> np.ndarray: + """SINMAP ์•ˆ์ • ์ง€์ˆ˜ โ€” Fs_min โ‰ฅ 1 โ†’ Fs_min ยท Fs_max < 1 โ†’ 0 ยท ๊ทธ ์‚ฌ์ด โ†’ P(Fs > 1).""" + a, b = _terms(beta, m, p) + t1, t2 = math.tan(math.radians(p.phi)), math.tan(math.radians(max(p.phi_hi, p.phi))) + c1, c2 = p.c + p.c_root, max(p.c_hi, p.c) + p.c_root + flat = np.isinf(a) + a = np.where(flat, 0.0, a) + b = np.where(flat, 0.0, b) + lo, hi = c1 * a + t1 * b, c2 * a + t2 * b + prob = 1.0 - _cdf_sum_uniform(np.ones_like(a), c1 * a, c2 * a, t1 * b, t2 * b) + si = np.where(lo >= 1.0, lo, np.where(hi < 1.0, 0.0, prob)) + return np.where(flat, np.inf, si) + + +def classify(si: np.ndarray) -> np.ndarray: + """SI โ†’ ๋“ฑ๊ธ‰ 1~6(0 = ์ž๋ฃŒ ์—†์Œ ยท NaN).""" + cls = np.full(si.shape, 6, dtype=np.uint8) + cls[si > 0] = 5 + for k, edge in enumerate(reversed(SI_EDGES)): # 0.5 โ†’ 4 ยท 1.0 โ†’ 3 ยท 1.25 โ†’ 2 ยท 1.5 โ†’ 1 + cls[si >= edge] = 4 - k + cls[np.isnan(si)] = 0 + return cls + + +def analyze_grid(z: np.ndarray, cell_m: float, p: AreaParams) -> dict[str, np.ndarray]: + """๊ณ ๋ฅธ ๊ฒฉ์ž ์ง€ํ˜• โ†’ {slope(rad) ยท a ยท m ยท fs ยท si ยท cls} ยท ๋ฐ– = NaN / 0.""" + beta = slope_rad(z, cell_m) + a = catchment_area(z, cell_m) if p.scenario == "rain" else np.full(z.shape, np.nan) + m = wetness(beta, a, p) + fs = infinite_slope_fs(beta, m, p) + si = stability_index(beta, m, p) + nodata = np.isnan(beta) + fs[nodata] = np.nan + si[nodata] = np.nan + m = np.where(nodata, np.nan, m) + return {"slope": beta, "a": a, "m": m, "fs": fs, "si": si, "cls": classify(si)} + + +# --------------------------------------------------------------------------- +# ๋…ธ์„  ๋  ยท ์ธก์  +# --------------------------------------------------------------------------- + + +def dense_line(line: np.ndarray, step_m: float = 0.5) -> np.ndarray: + """์ค‘์‹ฌ์„  [x, y, ๋ˆ„๊ฐ€] ๋ฅผ step ๊ฐ„๊ฒฉ์œผ๋กœ ์ด˜์ด˜ํžˆ(๊บพ์ธ ์  ์‚ฌ์ด ์…€๋„ ๋ฐ”๋ฅธ ๋ˆ„๊ฐ€).""" + out = [line[:1]] + for a, b in zip(line[:-1], line[1:]): + n = max(1, int(math.ceil(math.hypot(*(b[:2] - a[:2])) / step_m))) + out.append(a + (b - a) * np.linspace(0, 1, n + 1)[1:, None]) + return np.vstack(out) + + +def band_cells( + shape: tuple[int, int], x0: float, y0: float, cell_m: float, line: np.ndarray, half_m: float +) -> tuple[np.ndarray, np.ndarray]: + """๋…ธ์„  ๋ (์ค‘์‹ฌ์„  ยฑ half_m) ์…€ โ†’ (๋  ์•ˆ, ์…€์˜ ๊ฐ€์žฅ ๊ฐ€๊นŒ์šด ์ค‘์‹ฌ์„  ๋ˆ„๊ฐ€).""" + dense = dense_line(np.asarray(line, float)) + yy, xx = np.meshgrid( + y0 + np.arange(shape[0]) * cell_m, x0 + np.arange(shape[1]) * cell_m, indexing="ij" + ) + dist, at = cKDTree(dense[:, :2]).query(np.column_stack([xx.ravel(), yy.ravel()])) + return (dist <= half_m).reshape(shape), dense[at, 2].reshape(shape) + + +def station_table( + chainages: list[float], + cell_chain: np.ndarray, + inside: np.ndarray, + out: dict[str, np.ndarray], + cell_m: float, +) -> list[dict[str, Any]]: + """์ธก์ ๋งˆ๋‹ค ๋งก์€ ๋  ์…€(์ด์›ƒ ์ธก์ ๊ณผ ์ค‘๊ฐ„ ๋ˆ„๊ฐ€๋กœ ๋‚˜๋ˆ”) โ€” + ์ตœ์†Œ Fs ยท SI ยท ๊ฐ€์žฅ ๋‚˜์œ ๋“ฑ๊ธ‰ ยท ์œ„ํ—˜ ๋ฉด์ .""" + chs = np.asarray(sorted(chainages), float) + if not len(chs): + return [] + mids = (chs[:-1] + chs[1:]) / 2 + owner = np.searchsorted(mids, cell_chain) + have = inside & (out["cls"] > 0) + rows = [] + for k, ch in enumerate(chs): + sel = have & (owner == k) + n = int(sel.sum()) + if not n: + rows.append({"chainage_m": float(ch), "cells": 0}) + continue + cls = out["cls"][sel] + fs = out["fs"][sel] + si = out["si"][sel] + rows.append( + { + "chainage_m": float(ch), + "cells": n, + "fs_min": round(float(np.min(fs)), 3), + "si_min": round(float(np.min(si)), 3), + "worst_class": int(cls.max()), + "risk_area_m2": round(float((cls >= RISK_CLASS).sum()) * cell_m**2, 1), + "slope_max_deg": round(float(np.degrees(np.nanmax(out["slope"][sel]))), 1), + } + ) + return rows + + +def class_areas(cls: np.ndarray, inside: np.ndarray, cell_m: float) -> dict[str, float]: + """๋  ์•ˆ ๋“ฑ๊ธ‰๋ณ„ ๋ฉด์  mยฒ.""" + return { + CLASS_KEYS[k]: round(float(((cls == k) & inside).sum()) * cell_m**2, 1) for k in range(1, 7) + } diff --git a/E07_StabArea/E07_StabArea_Router.py b/E07_StabArea/E07_StabArea_Router.py new file mode 100644 index 000000000..dfae623ff --- /dev/null +++ b/E07_StabArea/E07_StabArea_Router.py @@ -0,0 +1,337 @@ +"""E07 ๊ด‘์—ญ ์ž์—ฐ์‚ฌ๋ฉด ์œ„ํ—˜ ์ง€๋„ API (์š”๊ตฌ 345 ยท 351 ยท ์š”๊ตฌ์„œ 4-2 2์ฐจ ยท PLAN 536-2). + +- `POST /api/projects/{id}/stab/area/analyze` โ€” ํ•ด์„(๋’ค์—์„œ) ยท ์ž…๋ ฅ ์ง€๋ฌธ์ด ์ €์žฅ๋ณธ๊ณผ ๊ฐ™์œผ๋ฉด + `cached` ยท force = ๋‹ค์‹œ +- `GET โ€ฆ/stab/area/progress` โ€” ์ง„ํ–‰๋ฅ  +- `GET โ€ฆ/stab/area` โ€” ๊ธฐ๋ณธ๊ฐ’(E02 ๋ถ•์ ํ† ) ยท ๋ฌผ์„ฑ ๋ชฉ๋ก ยท ๋…ธ์„  ยท ์ธก์  ยท ์ €์žฅ๋ณธ(๊ฒฉ์ž ยท ์ธก์ ํ‘œ ยท ์š”์•ฝ) + +๊ณ„์‚ฐ ์ž๋ฆฌ = โ‘ข ์„œ๋ฒ„ ๋‹จ๋…(์—”์ง„ `E07_StabArea_Engine` ยท ์ˆœ์ˆ˜). ์ง€ํ˜• = ๋ณต์‚ฌ๋ณธ ์›์ง€ํ˜• DTM +(๋…ธ์„ ๋ฉด ํ•ฉ์„ฑ ์•ˆ ํ•จ โ€” ๋…ธ์„  ์œ„ ยท ์•„๋ž˜ ์ž์—ฐ์‚ฌ๋ฉด). +ํŒŒ์ƒ ์ €์žฅ๋ณธ = `E07_StabArea/_derived/area.json`(์ง€๋ฌธ์ด ๊ฐ™์œผ๋ฉด ์•ˆ ์…ˆ). +๊ถŒํ•œ = main.py `protected_with_company`(์ง€์ •๋ฐ›์€ ํšŒ์‚ฌ = GET ๋งŒ). + +๊ฒฉ์ž ๊ผด(ํ™”๋ฉด `logic/E07_StabArea_Raster.ts` ์™€ ๊ฐ™์€ ์—ด์‡ ) โ€” grid = {x0, y0, dx, nx, ny} +(ํ–‰ 0 = ๋‚จ์ชฝ) ยท fs ยท si = uint16 ร—1000(65535 = ์ž๋ฃŒ ์—†์Œ ยท 65.534 ์œ„๋กœ ์ž๋ฆ„) ยท +cls = uint8 ๋“ฑ๊ธ‰(0 ์—†์Œ ยท 1~6) ยท slope = uint16 ร—10 ยฐ ยท m = uint8 ร—100(255 ์—†์Œ) +โ€” ๋ชจ๋‘ ์ค„ ์šฐ์„  ยท ์ž‘์€ ๋ base64 ยท ๋  ๋ฐ– ์…€ = ์ž๋ฃŒ ์—†์Œ. +""" + +from __future__ import annotations + +import asyncio +import base64 +import hashlib +import json +import logging +import time +from collections.abc import Callable +from datetime import datetime +from pathlib import Path +from typing import Any, Literal +from uuid import UUID + +import aiomysql +import numpy as np +from fastapi import APIRouter, Depends, HTTPException +from pydantic import BaseModel, Field, model_validator + +from common_util.common_util_auth import require_company +from common_util.common_util_json import atomic_write_json +from common_util.common_util_storage import resolve_stored_project_path +from config.config_db import get_db_pool +from E01_StabRegister import E01_StabRegister_Source as source +from E02_StabGround import E02_StabGround_Model as ground_model +from E07_StabArea import E07_StabArea_Engine as engine + +logger = logging.getLogger(__name__) +router = APIRouter(prefix="/api/projects", tags=["E07 Stab Area"]) + +ENGINE_VERSION = "e07-1" # ์—”์ง„ ํŒ โ€” ๋ฐ”๋€Œ๋ฉด ์ง€๋ฌธ์ด ๋‹ฌ๋ผ์ ธ ๋‹ค์‹œ ์…ˆ +RESULT = Path("E07_StabArea") / "_derived" / "area.json" +DEFAULT_MATERIAL = "colluvium" # ํ‘œ์ธต ๋ถ•๊ดด์— ๊ฐ€์žฅ ์ทจ์•ฝ(์ง€์‹DB ์•ˆ์ •์„ฑํ‰๊ฐ€/04 ๋ถ•์ ํ† ) +RANGE_C_KPA, RANGE_PHI_DEG = ( + 5.0, + 3.0, +) # SI ๋ฒ”์œ„ ์œ„ = ์•„๋ž˜ + ์ด ํญ(04 ๋ถ•์ ํ†  ๋ฒ”์œ„ c 0~10 ยท ฯ† 25~30 ํญ์˜ ๋ฐ˜) + +_JOBS: dict[str, dict[str, Any]] = {} +_TASKS: set[asyncio.Task] = set() +_IDLE = {"running": False, "percent": 0, "message": None, "error": None} + + +class AreaRequest(BaseModel): + band_m: float = Field(100.0, ge=10.0, le=500.0) # ๋…ธ์„  ๋  = ์ค‘์‹ฌ์„  ยฑ ์ด ํญ + cell_m: float = Field(2.0, ge=1.0, le=10.0) + material_id: str | None = None # ์ด๋ฆ„ํ‘œ๋งŒ(๊ฐ’์€ ์•„๋ž˜ ์นธ) + gamma_t: float = Field(..., gt=0.0, le=30.0) + gamma_sat: float = Field(..., gt=engine.GAMMA_W, le=30.0) + c: float = Field(..., ge=0.0, le=500.0) + c_hi: float = Field(..., ge=0.0, le=500.0) + phi: float = Field(..., ge=0.0, le=60.0) + phi_hi: float = Field(..., ge=0.0, le=60.0) + c_root: float = Field(0.0, ge=0.0, le=50.0) + soil_depth_m: float = Field(1.5, ge=0.1, le=10.0) + scenario: Literal["saturated", "rain"] = "saturated" + rain_mm_h: float = Field(30.0, ge=0.0, le=300.0) + k_m_s: float = Field(1e-4, ge=1e-8, le=1e-1) + force: bool = False + + @model_validator(mode="after") + def _ranges(self) -> AreaRequest: + if self.c_hi < self.c or self.phi_hi < self.phi: + raise ValueError("๋ฒ”์œ„ ์œ„๊ฐ€ ์•„๋ž˜๋ณด๋‹ค ์ž‘์Šต๋‹ˆ๋‹ค(c ยท ฯ†).") + return self + + +# --------------------------------------------------------------------------- +# ์ž…๋ ฅ ยท ์ง€๋ฌธ ยท ์ €์žฅ๋ณธ +# --------------------------------------------------------------------------- + + +def _ground(project_root: Path) -> dict[str, Any]: + for path in (ground_model.ground_path(project_root), ground_model.initial_path(project_root)): + if path.is_file(): + return json.loads(path.read_text(encoding="utf-8")) + return ground_model.pick(ground_model.load_defaults()) + + +def defaults(project_root: Path) -> dict[str, Any]: + """๊ธฐ๋ณธ ์กฐ๊ฑด โ€” E02 ๋ถ•์ ํ† (์—†์œผ๋ฉด ์ฒซ ๋ฌผ์„ฑ) ยท ๋ฒ”์œ„ ์œ„ = + 5 kPa ยท + 3ยฐ.""" + materials = _ground(project_root).get("materials") or [] + mat = next((m for m in materials if m.get("id") == DEFAULT_MATERIAL), None) or materials[0] + return { + **{ + k: f.default + for k, f in AreaRequest.model_fields.items() + if not f.is_required() and k != "force" + }, + "material_id": mat.get("id"), + "gamma_t": float(mat["gamma_t"]), + "gamma_sat": float(mat["gamma_sat"]), + "c": float(mat["c"]), + "c_hi": float(mat["c"]) + RANGE_C_KPA, + "phi": float(mat["phi"]), + "phi_hi": float(mat["phi"]) + RANGE_PHI_DEG, + } + + +def fingerprint(source_fingerprint: str, settings: dict[str, Any]) -> str: + body = {"source": source_fingerprint, "settings": settings, "engine": ENGINE_VERSION} + text = json.dumps(body, ensure_ascii=False, sort_keys=True) + return hashlib.sha1(text.encode("utf-8")).hexdigest() + + +def load(project_root: Path) -> dict[str, Any] | None: + path = Path(project_root) / RESULT + return json.loads(path.read_text(encoding="utf-8")) if path.is_file() else None + + +def _route_line(root: Path) -> np.ndarray: + points = sorted( + source.db_snapshot(root).get("route_points") or [], key=lambda p: p["sequence_num"] + ) + return np.array([[p["model_x"], p["model_y"], p["chainage_m"]] for p in points], float) + + +def _b64(values: np.ndarray, dtype: str) -> str: + return base64.b64encode(np.ascontiguousarray(values, dtype=dtype).tobytes()).decode("ascii") + + +def _u16(values: np.ndarray, scale: float, keep: np.ndarray) -> str: + v = np.round(np.clip(np.nan_to_num(values * scale, nan=-1.0, posinf=65534.0), -1, 65534)) + return _b64(np.where(keep & (v >= 0), v, 65535), " dict[str, Any]: + """ํ•ด์„ ํ•œ ๋ฒˆ โ†’ ์ €์žฅ๋ณธ ์“ฐ๊ณ  ์š”์•ฝ ๋Œ๋ ค์คŒ.""" + started = time.perf_counter() + cell = float(settings["cell_m"]) + report(5, "์ง€ํ˜• ๊ฒฉ์ž") + with np.load(source.terrain_grid_path(root)) as npz: + dem = {k: npz[k] for k in ("x", "y", "z", "valid_mask")} + z, x0, y0 = engine.resample_dem(dem, cell) + report(25, "๊ฒฝ์‚ฌ ยท ์ง‘์ˆ˜๋ฉด์  ยท ์•ˆ์ „์œจ") + keys = ( + "gamma_t", + "gamma_sat", + "c", + "c_hi", + "phi", + "phi_hi", + "c_root", + "soil_depth_m", + "scenario", + "rain_mm_h", + "k_m_s", + ) + out = engine.analyze_grid(z, cell, engine.AreaParams(**{k: settings[k] for k in keys})) + report(75, "๋…ธ์„  ๋  ยท ์ธก์ ") + stations = sorted(source.stations(root), key=lambda s: float(s["chainage_m"])) + inside, chain = engine.band_cells( + z.shape, x0, y0, cell, _route_line(root), float(settings["band_m"]) + ) + rows = engine.station_table([s["chainage_m"] for s in stations], chain, inside, out, cell) + labels = {round(float(s["chainage_m"]), 3): s.get("label") for s in stations} + for row in rows: + row["label"] = labels.get(round(row["chainage_m"], 3)) + # ๋  ์ƒ์ž๋กœ ์ž˜๋ผ ์ €์žฅ + iy, ix = np.nonzero(inside) + if not len(iy): + raise ValueError("๋…ธ์„  ๋ ๊ฐ€ ์ง€ํ˜• ๊ฒฉ์ž์™€ ๊ฒน์น˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค.") + win = (slice(iy.min(), iy.max() + 1), slice(ix.min(), ix.max() + 1)) + keep = inside[win] & (out["cls"][win] > 0) + areas = engine.class_areas(out["cls"], inside, cell) + have = inside & (out["cls"] > 0) + summary = { + "areas_m2": areas, + "band_area_m2": round(float(inside.sum()) * cell**2, 1), + "covered_area_m2": round(float(have.sum()) * cell**2, 1), + "risk_area_m2": round( + sum(v for k, v in areas.items() if engine.CLASS_KEYS.index(k) >= engine.RISK_CLASS), 1 + ), + "fs_min": round(float(np.min(out["fs"][have])), 3) if have.any() else None, + "risk_stations": [ + r["chainage_m"] for r in rows if r.get("worst_class", 0) >= engine.RISK_CLASS + ], + "stations": len(rows), + } + doc = { + "fingerprint": finger, + "engine": ENGINE_VERSION, + "settings": settings, + "computed_at": datetime.now().isoformat(timespec="seconds"), + "elapsed_s": round(time.perf_counter() - started, 2), + "grid": { + "x0": x0 + int(ix.min()) * cell, + "y0": y0 + int(iy.min()) * cell, + "dx": cell, + "nx": int(keep.shape[1]), + "ny": int(keep.shape[0]), + }, + "fs": _u16(out["fs"][win], 1000, keep), + "si": _u16(out["si"][win], 1000, keep), + "cls": _b64(np.where(keep, out["cls"][win], 0), "u1"), + "slope": _u16(np.degrees(out["slope"][win]), 10, keep), + "m": _b64(np.where(keep, np.round(np.nan_to_num(out["m"][win], nan=0) * 100), 255), "u1"), + "stations": rows, + "summary": summary, + } + report(95, "์ €์žฅ") + atomic_write_json(Path(project_root) / RESULT, doc) + return summary + + +# --------------------------------------------------------------------------- +# ๊ธธ +# --------------------------------------------------------------------------- + + +async def _project_root(project_id: UUID) -> Path: + async with ( + get_db_pool().acquire() as connection, + connection.cursor(aiomysql.DictCursor) as cursor, + ): + await cursor.execute( + "SELECT storage_path FROM projects" + " WHERE id = %s AND project_kind = 'STABILITY' AND deleted_at IS NULL", + (str(project_id),), + ) + row = await cursor.fetchone() + if not row or not row["storage_path"]: + raise HTTPException(status_code=404, detail="์•ˆ์ •์„ฑํ‰๊ฐ€ ํ”„๋กœ์ ํŠธ๊ฐ€ ์•„๋‹™๋‹ˆ๋‹ค.") + return Path(resolve_stored_project_path(row["storage_path"])) + + +def _source_root(project_root: Path) -> Path: + root = source.source_dir(project_root) + if not (root / source.MANIFEST_NAME).is_file(): + raise HTTPException(status_code=409, detail="์›๋ณธ ๋ณต์‚ฌ๋ณธ์ด ์—†์Šต๋‹ˆ๋‹ค.") + return root + + +@router.post("/{project_id}/stab/area/analyze", response_model=None) +async def analyze(project_id: UUID, payload: AreaRequest) -> dict[str, Any]: + """[ํ•ด์„] โ€” ์ง€๋ฌธ์ด ๊ฐ™์œผ๋ฉด `cached`(์•ˆ ์…ˆ) ยท ๋‹ค๋ฅด๊ฑฐ๋‚˜ force ๋ฉด ๋’ค์—์„œ ์…ˆ.""" + pid = str(project_id) + project_root = await _project_root(project_id) + root = _source_root(project_root) + settings = payload.model_dump(exclude={"force"}) + finger = fingerprint(source.manifest(root)["source_fingerprint"], settings) + saved = await asyncio.to_thread(load, project_root) + if not payload.force and saved and saved["fingerprint"] == finger: + return {"status": "cached", "summary": saved["summary"]} + if (_JOBS.get(pid) or {}).get("running"): + raise HTTPException(status_code=409, detail="์ด๋ฏธ ๊ด‘์—ญ ํ•ด์„์ด ๋Œ๊ณ  ์žˆ์Šต๋‹ˆ๋‹ค.") + job = {**_IDLE, "running": True, "message": "์‹œ์ž‘"} + _JOBS[pid] = job + + def report(percent: int, message: str) -> None: + job.update(percent=max(0, min(99, int(percent))), message=message) + + async def work() -> None: + try: + await asyncio.to_thread(run, project_root, root, settings, finger, report) + job.update(percent=100, message="๋") + except Exception as error: # noqa: BLE001 โ€” ์ง„ํ–‰๋ฅ ์— ๊นŒ๋‹ญ์„ ๊ทธ๋Œ€๋กœ ์˜ฌ๋ฆผ + logger.exception("E07 ๊ด‘์—ญ ํ•ด์„ ์‹คํŒจ: project_id=%s", pid) + job["error"] = str(error) + finally: + job["running"] = False + + task = asyncio.create_task(work(), name=f"E07 area {pid}") + _TASKS.add(task) + task.add_done_callback(_TASKS.discard) + return {"status": "accepted"} + + +@router.get("/{project_id}/stab/area/progress", response_model=None) +async def progress(project_id: UUID) -> dict[str, Any]: + return {"status": "success", **dict(_JOBS.get(str(project_id)) or _IDLE)} + + +def _overview(project_root: Path, root: Path) -> dict[str, Any]: + saved = load(project_root) + if saved: + current = fingerprint(source.manifest(root)["source_fingerprint"], saved["settings"]) + saved["stale"] = saved["fingerprint"] != current + return { + "defaults": defaults(project_root), + "materials": _ground(project_root).get("materials") or [], + "line": _route_line(root).round(3).tolist(), + "stations": [ + { + "chainage_m": s["chainage_m"], + "label": s["label"], + "x": s["center_x"], + "y": s["center_y"], + } + for s in sorted(source.stations(root), key=lambda s: float(s["chainage_m"])) + ], + "result": saved, + } + + +async def _editable(project_id: UUID, session: dict[str, Any]) -> bool: + """[ํ•ด์„] ๊ฐ€๋Šฅ = ์‹œ์Šคํ…œ ๊ด€๋ฆฌ์ž ยท ๊ฐ™์€ ํšŒ์‚ฌ(์ง€์ •๋ฐ›์€ ํšŒ์‚ฌ๋Š” ๋ณด๊ธฐ๋งŒ).""" + if session.get("role") == "SYSTEM_ADMIN": + return True + async with get_db_pool().acquire() as connection, connection.cursor() as cursor: + await cursor.execute("SELECT company_id FROM projects WHERE id = %s", (str(project_id),)) + row = await cursor.fetchone() + return bool(row) and row[0] == session.get("company_id") + + +@router.get("/{project_id}/stab/area", response_model=None) +async def area( + project_id: UUID, session: dict[str, Any] = Depends(require_company) +) -> dict[str, Any]: + project_root = await _project_root(project_id) + root = _source_root(project_root) + overview = await asyncio.to_thread(_overview, project_root, root) + return {"status": "success", "editable": await _editable(project_id, session), **overview} diff --git a/E07_StabArea/E07_StabArea_UI_Map.ts b/E07_StabArea/E07_StabArea_UI_Map.ts new file mode 100644 index 000000000..b2a77b581 --- /dev/null +++ b/E07_StabArea/E07_StabArea_UI_Map.ts @@ -0,0 +1,296 @@ +/* ============================================================================= + * E07_StabArea_UI_Map.ts + * E07 ๊ฐ€์šด๋ฐ ํ‰๋ฉด ์ง€๋„(PLAN 536-2) โ€” ๋“ฑ๊ธ‰(SI) ยท ์•ˆ์ „์œจ ์ƒ‰ ๊ฒฉ์ž ยท ๋…ธ์„  ๋  ยท ๋…ธ์„  ยท ์ธก์  ยท ๊ณ ๋ฅธ ์ธก์  ยท + * ๋ฐฉ์œ„ ยท ์ถ•์ฒ™ ยท ์…€ ํˆดํŒ. ํœ  = ํ™•๋Œ€ ยท ๋Œ๊ธฐ = ์˜ฎ๊น€ ยท ๋‘ ๋ฒˆ ๋ˆ„๋ฆ„ = ๋งž์ถค. ์ƒ‰ ยท ํ’€๊ธฐ = logic/E07_StabArea_Raster. + * ========================================================================== */ + +import { el } from "@ui/ui_template_elements"; +import { t, type LocaleKey } from "@ui/ui_template_locale"; +import { CLASS_KEYS, cellIndex, rasterRgba, type Decoded } from "./logic/E07_StabArea_Raster"; + +export type MapLayer = "cls" | "fs"; + +export interface StationPoint { + chainage_m: number; + label: string | null; + x: number; + y: number; +} + +export interface AreaMap { + root: HTMLElement; + setRoute: (line: number[][], stations: StationPoint[]) => void; + setBand: (halfWidthM: number) => void; + setResult: (data: Decoded | null) => void; + setLayer: (layer: MapLayer) => void; + focus: (chainage: number) => void; + dispose: () => void; +} + +interface View { + cx: number; + cy: number; + scale: number; // px / m +} + +const shortLabel = (label: string): string => label.replace(/^STA\./, "").replace(/\.0+$/, ""); + +const css = (name: string, fallback: string): string => + getComputedStyle(document.documentElement).getPropertyValue(name).trim() || fallback; + +export function createAreaMap(): AreaMap { + const root = el("div", { className: "e07-map" }); + const canvas = el("canvas", { className: "e07-map__canvas" }); + const tip = el("div", { className: "e07-map__tip" }); + const empty = el("p", { className: "e07-map__empty", text: t("E07_Map_Empty") }); + tip.hidden = true; + root.append(canvas, tip, empty); + const ctx = canvas.getContext("2d")!; + + let line: number[][] = []; + let stations: StationPoint[] = []; + let band = 100; + let data: Decoded | null = null; + let layer: MapLayer = "cls"; + let image: HTMLCanvasElement | null = null; + let picked: number | null = null; + let view: View = { cx: 0, cy: 0, scale: 1 }; + let width = 0; + let height = 0; + + const toScreen = (x: number, y: number): [number, number] => [ + width / 2 + (x - view.cx) * view.scale, + height / 2 - (y - view.cy) * view.scale, + ]; + const toModel = (px: number, py: number): [number, number] => [ + view.cx + (px - width / 2) / view.scale, + view.cy - (py - height / 2) / view.scale, + ]; + + function buildImage(): void { + image = null; + if (!data) return; + const { nx, ny } = data.grid; + const off = document.createElement("canvas"); + off.width = nx; + off.height = ny; + off.getContext("2d")!.putImageData(new ImageData(rasterRgba(data, layer), nx, ny), 0, 0); + image = off; + } + + function fit(): void { + const xs = line.map((p) => p[0]); + const ys = line.map((p) => p[1]); + if (!xs.length || !width || !height) return; + const pad = band; + const [x0, x1] = [Math.min(...xs) - pad, Math.max(...xs) + pad]; + const [y0, y1] = [Math.min(...ys) - pad, Math.max(...ys) + pad]; + const scale = Math.min(width / Math.max(x1 - x0, 1), height / Math.max(y1 - y0, 1)) * 0.92; + view = { cx: (x0 + x1) / 2, cy: (y0 + y1) / 2, scale }; + } + + function path(): void { + ctx.beginPath(); + line.forEach((p, i) => + i ? ctx.lineTo(...toScreen(p[0], p[1])) : ctx.moveTo(...toScreen(p[0], p[1])), + ); + } + + function drawRoute(text: string, accent: string): void { + if (line.length < 2) return; + ctx.lineJoin = ctx.lineCap = "round"; + // ๋…ธ์„  ๋  โ€” ์ค‘์‹ฌ์„  ยฑ band(์˜…์€ ๋ ) + ctx.globalAlpha = 0.12; + ctx.strokeStyle = accent; + ctx.lineWidth = Math.max(2 * band * view.scale, 1); + path(); + ctx.stroke(); + ctx.globalAlpha = 1; + ctx.strokeStyle = text; + ctx.lineWidth = 2; + path(); + ctx.stroke(); + const gap = stations.length > 1 ? 20 * view.scale : 999; + const every = [1, 2, 5, 10, 25, 50, 100].find((n) => n * gap >= 70) ?? 100; + ctx.font = "11px sans-serif"; + ctx.textBaseline = "middle"; + stations.forEach((s, i) => { + const [px, py] = toScreen(s.x, s.y); + if (px < -50 || py < -50 || px > width + 50 || py > height + 50) return; + const on = picked !== null && Math.abs(s.chainage_m - picked) < 1e-6; + ctx.fillStyle = on ? accent : text; + ctx.beginPath(); + ctx.arc(px, py, on ? 6 : i % every === 0 ? 3 : 1.5, 0, Math.PI * 2); + ctx.fill(); + if ((on || i % every === 0) && s.label) ctx.fillText(shortLabel(s.label), px + 7, py - 9); + }); + } + + function drawFurniture(text: string): void { + ctx.fillStyle = text; + ctx.strokeStyle = text; + ctx.beginPath(); + ctx.moveTo(width - 24, 14); + ctx.lineTo(width - 30, 34); + ctx.lineTo(width - 18, 34); + ctx.closePath(); + ctx.fill(); + ctx.font = "bold 12px sans-serif"; + ctx.textAlign = "center"; + ctx.fillText("N", width - 24, 46); + const target = 100 / view.scale; + const pow = 10 ** Math.floor(Math.log10(target)); + const meters = [1, 2, 5, 10].map((k) => k * pow).find((m) => m >= target) ?? target; + const px = meters * view.scale; + ctx.fillStyle = css("--color-surface", "#ffffff"); + ctx.globalAlpha = 0.85; + ctx.fillRect(width - 24 - px, height - 42, px + 16, 34); + ctx.globalAlpha = 1; + ctx.fillStyle = text; + ctx.lineWidth = 2; + ctx.beginPath(); + ctx.moveTo(width - 16 - px, height - 16); + ctx.lineTo(width - 16, height - 16); + ctx.stroke(); + ctx.fillText(`${meters} m`, width - 16 - px / 2, height - 26); + ctx.textAlign = "start"; + } + + function draw(): void { + const dpr = window.devicePixelRatio || 1; + width = root.clientWidth; + height = root.clientHeight; + if (!width || !height) return; + if (canvas.width !== Math.round(width * dpr) || canvas.height !== Math.round(height * dpr)) { + canvas.width = Math.round(width * dpr); + canvas.height = Math.round(height * dpr); + } + ctx.setTransform(dpr, 0, 0, dpr, 0, 0); + ctx.clearRect(0, 0, width, height); + const text = css("--color-text", "#1f2937"); + const accent = css("--color-primary", "#6d28d9"); + if (data && image) { + const g = data.grid; + const [left, top] = toScreen(g.x0 - g.dx / 2, g.y0 + (g.ny - 0.5) * g.dx); + ctx.imageSmoothingEnabled = false; + ctx.drawImage(image, left, top, g.nx * g.dx * view.scale, g.ny * g.dx * view.scale); + } + drawRoute(text, accent); + drawFurniture(text); + empty.hidden = Boolean(data); + } + + let drag: { x: number; y: number; view: View } | null = null; + canvas.addEventListener("wheel", (event) => { + event.preventDefault(); + const rect = canvas.getBoundingClientRect(); + const [mx, my] = toModel(event.clientX - rect.left, event.clientY - rect.top); + const k = Math.exp(-event.deltaY * 0.0015); + view = { scale: view.scale * k, cx: mx - (mx - view.cx) / k, cy: my - (my - view.cy) / k }; + draw(); + }); + canvas.addEventListener("pointerdown", (event) => { + drag = { x: event.clientX, y: event.clientY, view: { ...view } }; + canvas.setPointerCapture(event.pointerId); + }); + canvas.addEventListener("pointerup", () => (drag = null)); + canvas.addEventListener("dblclick", () => { + fit(); + draw(); + }); + canvas.addEventListener("pointerleave", () => (tip.hidden = true)); + canvas.addEventListener("pointermove", (event) => { + if (drag) { + view = { + ...drag.view, + cx: drag.view.cx - (event.clientX - drag.x) / view.scale, + cy: drag.view.cy + (event.clientY - drag.y) / view.scale, + }; + draw(); + return; + } + const rect = canvas.getBoundingClientRect(); + const [mx, my] = toModel(event.clientX - rect.left, event.clientY - rect.top); + const i = data ? cellIndex(data.grid, mx, my) : -1; + if (i < 0 || !data!.cls[i]) return void (tip.hidden = true); + const near = stations.reduce( + (best, s) => + !best || (s.x - mx) ** 2 + (s.y - my) ** 2 < (best.x - mx) ** 2 + (best.y - my) ** 2 + ? s + : best, + null, + ); + const m = data!.m[i]; + tip.textContent = [ + t(`E07_Class_${CLASS_KEYS[data!.cls[i] - 1]}` as LocaleKey), + `SI ${data!.si[i].toFixed(3)} ยท Fs ${data!.fs[i].toFixed(3)}`, + `${t("E07_Tip_Slope")} ${data!.slope[i].toFixed(1)}ยฐ${Number.isNaN(m) ? "" : ` ยท m ${m.toFixed(2)}`}`, + near ? `${t("E07_Tip_Station")} ${near.label ?? near.chainage_m.toFixed(1)}` : "", + ] + .filter(Boolean) + .join("\n"); + tip.style.left = `${event.clientX - rect.left + 14}px`; + tip.style.top = `${event.clientY - rect.top + 14}px`; + tip.hidden = false; + }); + + const resize = new ResizeObserver(() => { + const first = !width; + draw(); + if (first) { + fit(); + draw(); + } + }); + resize.observe(root); + const theme = new MutationObserver(draw); + theme.observe(document.documentElement, { attributes: true, attributeFilter: ["data-theme"] }); + + // ๊ฒ€์ฆ ์ฐฝ๊ตฌ โ€” ๋ชจ๋ธ ์ขŒํ‘œ โ†’ ํ™”๋ฉด(client) ์ขŒํ‘œ ยท ์ง€๊ธˆ ๊ฒฉ์ž ยท ์ธต + const probe = { + project: (x: number, y: number) => { + const rect = canvas.getBoundingClientRect(); + const [px, py] = toScreen(x, y); + return { x: rect.left + px, y: rect.top + py }; + }, + data: () => data, + layer: () => layer, + }; + (window as unknown as { __e07Map?: typeof probe }).__e07Map = probe; + + return { + root, + setRoute(nextLine, nextStations) { + line = nextLine; + stations = nextStations; + fit(); + draw(); + }, + setBand(halfWidthM) { + band = halfWidthM; + draw(); + }, + setResult(next) { + data = next; + buildImage(); + draw(); + }, + setLayer(next) { + layer = next; + buildImage(); + draw(); + }, + focus(chainage) { + picked = chainage; + const s = stations.find((x) => Math.abs(x.chainage_m - chainage) < 1e-6); + if (s) view = { ...view, cx: s.x, cy: s.y }; + draw(); + }, + dispose() { + resize.disconnect(); + theme.disconnect(); + if ((window as unknown as { __e07Map?: unknown }).__e07Map === probe) + delete (window as unknown as { __e07Map?: unknown }).__e07Map; + }, + }; +} diff --git a/E07_StabArea/E07_StabArea_UI_Page.ts b/E07_StabArea/E07_StabArea_UI_Page.ts new file mode 100644 index 000000000..f31216547 --- /dev/null +++ b/E07_StabArea/E07_StabArea_UI_Page.ts @@ -0,0 +1,478 @@ +/* ============================================================================= + * E07_StabArea_UI_Page.ts + * E07 ๊ด‘์—ญ ์ž์—ฐ์‚ฌ๋ฉด ์œ„ํ—˜ ์ง€๋„(์š”๊ตฌ 345 ยท 351 ยท ์š”๊ตฌ์„œ 4-2 2์ฐจ ยท PLAN 536-2) โ€” B05~B09 ํ‹€(group_workflow). + * ์ขŒ = ํ† ์ธต ๋ฌผ์„ฑ(E02 ๋ฌผ์„ฑ ๊ณ ๋ฆ„ ยท ๋ฒ”์œ„) ยท ๊ฐ•์šฐ(์ง€ํ‘œ ํฌํ™” ยท ๊ฐ•์šฐ ๊ฐ•๋„) ยท ๋…ธ์„  ๋  ยท [ํ•ด์„] ยท ์ง„ํ–‰๋ฅ  + * ๊ฐ€์šด๋ฐ = ํ‰๋ฉด ์ง€๋„(SINMAP ๋“ฑ๊ธ‰ ยท ์•ˆ์ „์œจ) ยท ๋ฒ”๋ก€ + * ์šฐ = ์š”์•ฝ(๋“ฑ๊ธ‰๋ณ„ ๋ฉด์  ยท ์œ„ํ—˜ ๋ฉด์ ) ยท ์ธก์ ๋ณ„ ์œ„ํ—˜ ํ‘œ(๋ˆ„๋ฆ„ = ์ง€๋„ ๊ทธ ์ธก์ ) + * ๊ณ„์‚ฐ = ์„œ๋ฒ„ ๋‹จ๋…(POST โ€ฆ/stab/area/analyze ยท ๋’ค์—์„œ) ยท ํ™”๋ฉด์€ ๊ฐ’ ยท ๊ทธ๋ฆผ๋งŒ. ์กฐ๊ฑด = sessionStorage. + * ========================================================================== */ + +import "./E07_StabArea_UI_Style.css"; +import { API_BASE_URL, CURRENT_PROJECT_ID_KEY, ROUTES } from "@config/config_frontend"; +import { attachCollapsible, createPanelCard } from "@ui/ui_template_collapsible"; +import { + createButton, + createInputField, + createSelectField, + el, + showToast, + type InputFieldHandle, +} from "@ui/ui_template_elements"; +import { t, type LocaleKey } from "@ui/ui_template_locale"; +import { createSidePanels } from "@ui/ui_template_side_panels"; +import { mountGroupStep } from "../A00_Common/group_workflow"; +import { createAreaMap, type MapLayer, type StationPoint } from "./E07_StabArea_UI_Map"; +import { + CLASS_COLORS, + CLASS_KEYS, + FS_STEPS, + RISK_CLASS, + decode, + type AreaResult, +} from "./logic/E07_StabArea_Raster"; + +interface Material { + id: string; + name: string; + gamma_t: number; + gamma_sat: number; + c: number; + phi: number; +} + +type Settings = Record; + +interface Overview { + editable: boolean; + defaults: Settings; + materials: Material[]; + line: number[][]; + stations: StationPoint[]; + result: AreaResult | null; +} + +interface Progress { + running: boolean; + percent: number; + message: string | null; + error: string | null; +} + +const NUMBER_FIELDS: [string, LocaleKey, "soil" | "rain" | "band"][] = [ + ["gamma_t", "E07_GammaT", "soil"], + ["gamma_sat", "E07_GammaSat", "soil"], + ["c", "E07_C", "soil"], + ["c_hi", "E07_CHi", "soil"], + ["phi", "E07_Phi", "soil"], + ["phi_hi", "E07_PhiHi", "soil"], + ["c_root", "E07_CRoot", "soil"], + ["soil_depth_m", "E07_Depth", "soil"], + ["rain_mm_h", "E07_Rain", "rain"], + ["k_m_s", "E07_K", "rain"], + ["band_m", "E07_Band", "band"], + ["cell_m", "E07_Cell", "band"], +]; + +const cacheKey = (projectId: string): string => `e07_settings:${projectId}`; +const shortLabel = (label: string | null, ch: number): string => + (label ?? `${ch.toFixed(1)} m`).replace(/^STA\./, "").replace(/\.0+$/, ""); + +async function api(path: string, init?: RequestInit): Promise { + const response = await fetch(`${API_BASE_URL}${path}`, { + credentials: "include", + headers: { "Content-Type": "application/json" }, + ...init, + }); + const body = (await response.json().catch(() => ({}))) as T & { detail?: unknown }; + if (!response.ok) { + const detail = body.detail; + const text = Array.isArray(detail) + ? detail.map((d) => (d as { msg?: string }).msg ?? "").join(" ยท ") + : detail; + throw new Error(typeof text === "string" && text ? text : `HTTP ${response.status}`); + } + return body; +} + +function swatch(color: string): HTMLElement { + const chip = el("i", { className: "e07-chip" }); + chip.style.background = color; + return chip; +} + +function legend(layer: MapLayer): HTMLElement { + const box = el("div", { className: "e07-legend" }); + box.append(el("strong", { text: t(layer === "cls" ? "E07_Legend_Class" : "E07_Legend_FS") })); + const rows = + layer === "cls" + ? CLASS_KEYS.map((k, i) => ({ + color: CLASS_COLORS[i], + label: t(`E07_Class_${k}` as LocaleKey), + })) + : FS_STEPS.map((s, i) => ({ + color: s.color, + label: + i === 0 + ? `< ${s.below.toFixed(1)}` + : s.below === Infinity + ? `โ‰ฅ ${FS_STEPS[i - 1].below.toFixed(1)}` + : `${FS_STEPS[i - 1].below.toFixed(1)} โ€“ ${s.below.toFixed(1)}`, + })); + for (const row of rows) { + const item = el("span", { className: "e07-legend__row" }); + item.append(swatch(row.color), el("span", { text: row.label })); + box.append(item); + } + return box; +} + +export function renderE07StabArea(root: HTMLElement): void { + const projectId = localStorage.getItem(CURRENT_PROJECT_ID_KEY); + const panel = el("div", { className: "ui-sidebar-panel e07-panel" }); + const main = el("div", { className: "e07-page" }); + mountGroupStep(root, ROUTES.E07_STAB_AREA, { mainContent: main, leftPanel: panel }); + if (!projectId) + return void main.append(el("p", { className: "e07-empty", text: t("E07_NoProject") })); + + // ---- ๊ฐ€์šด๋ฐ ---- + const map = createAreaMap(); + let layer: MapLayer = "cls"; + const legendSlot = el("div", { className: "e07-legend-slot" }); + const paintLegend = (): void => legendSlot.replaceChildren(legend(layer)); + const toggle = el("div", { className: "e07-toggle" }); + const layerButtons = ( + [ + ["E07_Layer_Class", "cls"], + ["E07_Layer_FS", "fs"], + ] as [LocaleKey, MapLayer][] + ).map(([key, value], i) => { + const button = createButton({ label: t(key), variant: "ghost", size: "sm" }); + button.dataset.value = value; + button.classList.toggle("is-on", i === 0); + button.addEventListener("click", () => { + layerButtons.forEach((b) => b.classList.toggle("is-on", b === button)); + layer = value; + map.setLayer(layer); + paintLegend(); + }); + return button; + }); + toggle.append(...layerButtons); + const stage = el("div", { className: "e07-stage" }); + stage.append(map.root, legendSlot); + const center = el("div", { className: "e07-center" }); + center.append(toggle, stage); + paintLegend(); + + // ---- ์šฐ ---- + const resultBody = el("div", { className: "e07-result" }); + const side = createSidePanels({ + prefKey: "e07-stab-area-result", + panels: [{ id: "result", title: t("E07_Result_Title"), body: resultBody }], + defaultOpen: "result", + defaultWidth: 380, + follow: false, + }); + const row = el("div", { className: "ui-side-panels-row e07-row" }); + row.append(center, side.root); + main.append(row); + + // ---- ์ขŒ ---- + const fields = new Map(); + const cards = { + soil: createPanelCard(t("E07_Card_Soil"), false), + rain: createPanelCard(t("E07_Card_Rain"), false), + band: createPanelCard(t("E07_Card_Band"), false), + }; + const material = createSelectField({ label: t("E07_Material"), options: [], compact: true }); + const scenario = createSelectField({ + label: t("E07_Scenario"), + options: [ + { value: "saturated", text: t("E07_Scenario_saturated") }, + { value: "rain", text: t("E07_Scenario_rain") }, + ], + compact: true, + }); + cards.soil.append(material.root); + cards.rain.append(scenario.root); + for (const [key, label, card] of NUMBER_FIELDS) { + const field = createInputField({ label: t(label), type: "number", compact: true }); + field.input.step = "any"; + field.input.dataset.key = key; + fields.set(key, field); + cards[card].append(field.root); + } + const progressBar = el("progress", { className: "e07-progress", attrs: { max: "100" } }); + const progressText = el("p", { className: "e07-progress__text" }); + const progressBox = el("div", { className: "e07-progress-box" }); + progressBox.append(progressBar, progressText); + progressBox.hidden = true; + const defaultsButton = createButton({ + label: t("E07_Defaults"), + variant: "ghost", + onClick: () => overview && write(overview.defaults), + }); + const analyzeButton = createButton({ + label: t("E07_Analyze"), + variant: "filled", + onClick: () => void analyze(false), + }); + const reanalyzeButton = createButton({ + label: t("E07_Reanalyze"), + variant: "ghost", + onClick: () => void analyze(true), + }); + const actions = el("div", { className: "ui-sidebar-actions" }); + actions.append(defaultsButton, reanalyzeButton, analyzeButton); + const readOnly = el("p", { className: "e07-hint", text: t("E07_ReadOnly") }); + readOnly.hidden = true; + panel.append( + el("p", { className: "e07-hint", text: t("E07_Hint") }), + readOnly, + cards.soil, + cards.rain, + cards.band, + progressBox, + actions, + ); + attachCollapsible(panel); + + // ---- ์ƒํƒœ ---- + let overview: Overview | null = null; + let running = false; + + function read(): Settings { + const out: Settings = { material_id: material.select.value || null }; + out.scenario = scenario.select.value; + for (const [key, field] of fields) out[key] = Number(field.input.value); + return out; + } + + function write(values: Settings): void { + for (const [key, field] of fields) field.input.value = String(values[key] ?? ""); + material.select.value = String(values.material_id ?? ""); + scenario.select.value = String(values.scenario ?? "saturated"); + paintScenario(); + remember(); + } + + function paintScenario(): void { + const rain = scenario.select.value === "rain"; + for (const key of ["rain_mm_h", "k_m_s"]) fields.get(key)!.root.hidden = !rain; + map.setBand(Number(fields.get("band_m")!.input.value) || 100); + } + + const remember = (): void => sessionStorage.setItem(cacheKey(projectId), JSON.stringify(read())); + panel.addEventListener("input", remember); + scenario.select.addEventListener("change", () => { + paintScenario(); + remember(); + }); + fields.get("band_m")!.input.addEventListener("input", paintScenario); + material.select.addEventListener("change", () => { + const m = overview?.materials.find((x) => x.id === material.select.value); + if (!m) return; + const set = (key: string, v: number) => (fields.get(key)!.input.value = String(v)); + const rangeC = Number(overview!.defaults.c_hi) - Number(overview!.defaults.c); + const rangePhi = Number(overview!.defaults.phi_hi) - Number(overview!.defaults.phi); + set("gamma_t", m.gamma_t); + set("gamma_sat", m.gamma_sat); + set("c", m.c); + set("c_hi", m.c + rangeC); + set("phi", m.phi); + set("phi_hi", m.phi + rangePhi); + remember(); + }); + + function paintButtons(): void { + const editable = Boolean(overview?.editable); + analyzeButton.disabled = reanalyzeButton.disabled = !editable || running || !overview; + readOnly.hidden = !overview || editable; + } + + function paintResult(): void { + const result = overview?.result; + if (!result) { + resultBody.replaceChildren(el("p", { className: "e07-empty", text: t("E07_Result_None") })); + return; + } + const s = result.summary; + const list = el("dl", { className: "e07-summary" }); + const pairs: [LocaleKey, string][] = [ + ["E07_Sum_FsMin", s.fs_min === null ? "-" : s.fs_min.toFixed(3)], + ["E07_Sum_Risk", `${Math.round(s.risk_area_m2).toLocaleString()} mยฒ`], + ["E07_Sum_RiskStations", `${s.risk_stations.length} / ${s.stations}`], + [ + "E07_Sum_Covered", + `${Math.round(s.covered_area_m2).toLocaleString()} / ${Math.round(s.band_area_m2).toLocaleString()} mยฒ`, + ], + [ + "E07_Sum_Time", + `${result.elapsed_s.toFixed(1)} s ยท ${result.computed_at.replace("T", " ")}`, + ], + ]; + for (const [key, value] of pairs) + list.append( + el("dt", { text: t(key) }), + el("dd", { text: value, attrs: { "data-field": key } }), + ); + const areas = el("table", { className: "e07-table e07-areas" }); + const total = Object.values(s.areas_m2).reduce((a, b) => a + b, 0) || 1; + areas.append( + el("tr", { + children: [ + el("th", { text: t("E07_Col_Class") }), + el("th", { text: t("E07_Col_Area") }), + el("th", { text: "%" }), + ], + }), + ...CLASS_KEYS.map((k, i) => { + const name = el("td"); + name.append( + swatch(CLASS_COLORS[i]), + el("span", { text: t(`E07_Class_${k}` as LocaleKey) }), + ); + return el("tr", { + attrs: { "data-class": k }, + children: [ + name, + el("td", { text: Math.round(s.areas_m2[k] ?? 0).toLocaleString() }), + el("td", { text: (((s.areas_m2[k] ?? 0) / total) * 100).toFixed(1) }), + ], + }); + }), + ); + const table = el("table", { className: "e07-table e07-stations" }); + table.append( + el("tr", { + children: [ + el("th", { text: t("E07_Col_Station") }), + el("th", { text: t("E07_Col_FsMin") }), + el("th", { text: t("E07_Col_SiMin") }), + el("th", { text: t("E07_Col_Worst") }), + el("th", { text: t("E07_Col_RiskArea") }), + ], + }), + ...result.stations.map((r) => { + const worst = el("td"); + if (r.worst_class) + worst.append( + swatch(CLASS_COLORS[r.worst_class - 1]), + el("span", { text: t(`E07_Class_${CLASS_KEYS[r.worst_class - 1]}` as LocaleKey) }), + ); + const tr = el("tr", { + className: (r.worst_class ?? 0) >= RISK_CLASS ? "is-risk" : "", + attrs: { "data-chainage": String(r.chainage_m) }, + children: [ + el("td", { text: shortLabel(r.label, r.chainage_m) }), + el("td", { text: r.fs_min === undefined ? "-" : r.fs_min.toFixed(2) }), + el("td", { text: r.si_min === undefined ? "-" : r.si_min.toFixed(2) }), + worst, + el("td", { + text: + r.risk_area_m2 === undefined ? "-" : Math.round(r.risk_area_m2).toLocaleString(), + }), + ], + }); + tr.addEventListener("click", () => { + table.querySelectorAll("tr.is-on").forEach((x) => x.classList.remove("is-on")); + tr.classList.add("is-on"); + map.focus(r.chainage_m); + }); + return tr; + }), + ); + const notes: HTMLElement[] = []; + if (result.stale) notes.push(el("p", { className: "e07-warn", text: t("E07_Result_Stale") })); + notes.push(el("p", { className: "e07-note", text: t("E07_Result_Note") })); + resultBody.replaceChildren( + list, + el("h4", { text: t("E07_Areas_Title") }), + areas, + el("h4", { text: t("E07_Stations_Title") }), + table, + ...notes, + ); + } + + async function refresh(): Promise { + overview = await api(`/projects/${projectId}/stab/area`); + material.setOptions( + overview.materials.map((m) => ({ value: m.id, text: m.name })), + String(overview.defaults.material_id ?? ""), + ); + map.setResult(overview.result ? decode(overview.result) : null); + paintButtons(); + paintResult(); + } + + async function poll(): Promise { + while (root.isConnected) { + const p = await api(`/projects/${projectId}/stab/area/progress`).catch(() => null); + if (!p) break; + running = p.running; + progressBox.hidden = !p.running; + progressBar.value = p.percent; + progressText.textContent = `${t("E07_Running")} ${p.percent}% ยท ${p.message ?? ""}`; + paintButtons(); + if (!p.running) { + if (p.error) showToast(p.error, "error"); + else showToast(t("E07_Done"), "success"); + await refresh(); + return; + } + await new Promise((resolve) => setTimeout(resolve, 500)); + } + } + + async function analyze(force: boolean): Promise { + try { + const body = await api<{ status: string }>(`/projects/${projectId}/stab/area/analyze`, { + method: "POST", + body: JSON.stringify({ ...read(), force }), + }); + if (body.status === "cached") { + showToast(t("E07_Cached"), "info"); + await refresh(); + return; + } + running = true; + paintButtons(); + progressBox.hidden = false; + void poll(); + } catch (error) { + showToast(error instanceof Error ? error.message : String(error), "error"); + } + } + + // ---- ์ฒ˜์Œ ---- + paintButtons(); + void (async () => { + try { + await refresh(); + } catch (error) { + main.replaceChildren( + el("p", { + className: "e07-empty", + text: error instanceof Error ? error.message : String(error), + }), + ); + return; + } + const ov = overview!; + const cached = JSON.parse( + sessionStorage.getItem(cacheKey(projectId)) ?? "null", + ) as Settings | null; + write(cached ?? (ov.result?.settings as Settings | undefined) ?? ov.defaults); + map.setRoute(ov.line, ov.stations); + const p = await api(`/projects/${projectId}/stab/area/progress`).catch(() => null); + if (p?.running) void poll(); + })(); + + const leave = new MutationObserver(() => { + if (root.isConnected && main.isConnected) return; + leave.disconnect(); + map.dispose(); + }); + leave.observe(document.body, { childList: true, subtree: true }); +} diff --git a/E07_StabArea/E07_StabArea_UI_Style.css b/E07_StabArea/E07_StabArea_UI_Style.css new file mode 100644 index 000000000..ee82afbc2 --- /dev/null +++ b/E07_StabArea/E07_StabArea_UI_Style.css @@ -0,0 +1,231 @@ +/* ============================================================================= + * E07_StabArea_UI_Style.css + * E07 ๊ด‘์—ญ ์œ„ํ—˜ ์ง€๋„ โ€” ์ขŒ์ธก ์กฐ๊ฑด ยท ์ง„ํ–‰ / ๊ฐ€์šด๋ฐ ์ง€๋„ ยท ๋ฒ”๋ก€ / ์šฐ์ธก ์š”์•ฝ ยท ์ธก์  ํ‘œ + * ์ƒ‰์€ ํ…Œ๋งˆ ํ† ํฐ๋งŒ(๋ฐ์Œ ยท ์–ด๋‘์›€ ๊ฐ™์ด) ยท ๋“ฑ๊ธ‰ ยท ์•ˆ์ „์œจ ์ƒ‰๋งŒ logic ๊ณ ์ •์ƒ‰ + * ========================================================================== */ + +.e07-page { + height: 100dvh; + box-sizing: border-box; +} + +.e07-row { + height: 100%; +} + +.e07-center { + display: flex; + flex-direction: column; + gap: var(--spacing-8); + height: 100%; + min-height: 0; + padding: var(--spacing-12) 0 var(--spacing-12) var(--spacing-12); + box-sizing: border-box; +} + +.e07-toggle { + display: inline-flex; + gap: var(--spacing-4); +} + +.e07-toggle .ui-btn.is-on { + border-color: var(--color-primary); + background: var(--color-primary); + color: var(--color-primary-text); +} + +.e07-stage { + position: relative; + flex: 1 1 auto; + min-height: 320px; + border-radius: var(--radius-sm); + background: var(--color-surface-raised); + overflow: hidden; +} + +.e07-map { + position: absolute; + inset: 0; +} + +.e07-map__canvas { + display: block; + width: 100%; + height: 100%; + touch-action: none; + cursor: grab; +} + +.e07-map__tip { + position: absolute; + padding: var(--spacing-4) var(--spacing-8); + border-radius: var(--radius-sm); + background: var(--color-surface); + color: var(--color-text); + border: 1px solid var(--color-border); + font-size: 12px; + white-space: pre; + pointer-events: none; +} + +.e07-map__empty { + position: absolute; + inset: auto 0 45% 0; + margin: 0; + text-align: center; + color: var(--color-text-muted); + pointer-events: none; +} + +.e07-legend-slot { + position: absolute; + left: var(--spacing-8); + bottom: var(--spacing-8); + pointer-events: none; +} + +.e07-legend { + display: flex; + flex-direction: column; + gap: 2px; + padding: var(--spacing-8); + border-radius: var(--radius-sm); + background: var(--color-surface); + color: var(--color-text); + border: 1px solid var(--color-border); + font-size: 12px; +} + +.e07-legend__row { + display: flex; + align-items: center; + gap: var(--spacing-8); +} + +.e07-chip { + display: inline-block; + width: 14px; + height: 10px; + flex: none; + margin-right: var(--spacing-4); + border-radius: 2px; + border: 1px solid var(--color-border); + vertical-align: middle; +} + +/* ์ขŒ์ธก */ +.e07-hint, +.e07-note { + margin: 0 0 var(--spacing-8); + color: var(--color-text-muted); + font-size: 12px; + line-height: 1.5; +} + +.e07-panel .ui-field[hidden] { + display: none; +} + +.e07-progress-box { + display: flex; + flex-direction: column; + gap: var(--spacing-4); + margin: var(--spacing-8) 0; +} + +.e07-progress-box[hidden] { + display: none; +} + +.e07-progress { + width: 100%; +} + +.e07-progress__text { + margin: 0; + color: var(--color-text); + font-size: 12px; +} + +/* ์šฐ์ธก */ +.e07-result { + padding: var(--spacing-12); + color: var(--color-text); +} + +.e07-result h4 { + margin: var(--spacing-16) 0 var(--spacing-8); + font-size: 13px; +} + +.e07-summary { + display: grid; + grid-template-columns: auto 1fr; + gap: var(--spacing-8) var(--spacing-12); + margin: 0; + font-size: 13px; +} + +.e07-summary dt { + color: var(--color-text-muted); +} + +.e07-summary dd { + margin: 0; + font-weight: 600; + text-align: right; +} + +.e07-table { + width: 100%; + border-collapse: collapse; + font-size: 12px; +} + +.e07-table th, +.e07-table td { + padding: var(--spacing-4) var(--spacing-8); + border-bottom: 1px solid var(--color-border); + text-align: right; + white-space: nowrap; +} + +.e07-table th:first-child, +.e07-table td:first-child, +.e07-stations td:nth-child(4) { + text-align: left; +} + +.e07-table th { + color: var(--color-text-muted); + font-weight: 600; +} + +.e07-stations tr[data-chainage] { + cursor: pointer; +} + +.e07-stations tr[data-chainage]:hover { + background: var(--color-surface-raised); +} + +.e07-stations tr.is-risk td { + color: var(--color-danger); + font-weight: 600; +} + +.e07-stations tr.is-on { + outline: 2px solid var(--color-primary); + outline-offset: -2px; +} + +.e07-warn { + margin: var(--spacing-12) 0 0; + color: var(--color-danger); + font-size: 12px; +} + +.e07-empty { + margin: var(--spacing-16); + color: var(--color-text-muted); +} diff --git a/E07_StabArea/draft/E07_StabArea_Route.ts b/E07_StabArea/draft/E07_StabArea_Route.ts new file mode 100644 index 000000000..08b2db164 --- /dev/null +++ b/E07_StabArea/draft/E07_StabArea_Route.ts @@ -0,0 +1,16 @@ +/* ============================================================================= + * E07_StabArea_Route.ts + * ๊ธธ ์„ ์–ธ(PLAN 536-2) โ€” ๋ผ์šฐํ„ฐ๊ฐ€ ํŽ˜์ด์ง€ ํด๋”๋งˆ๋‹ค draft/*_Route.ts ๋ฅผ glob ํ•ด ๋“ฑ๋ก. + * ๋กœ๊ทธ์ธ ยท ํšŒ์‚ฌ ยท ํ˜„์žฌ ํ”„๋กœ์ ํŠธ ํ•„์š” ยท ๊ผฌ๋ฆฌ๋ง ์—†์Œ ยท ๋ณธ๋ฌธ = E07 ๊ด‘์—ญ ์œ„ํ—˜ ์ง€๋„ ํŽ˜์ด์ง€ + * ========================================================================== */ + +import { ROUTES } from "@config/config_frontend"; +import type { DraftRoute } from "../../A00_Common/router"; + +export const ROUTE: DraftRoute = { + path: ROUTES.E07_STAB_AREA, + workflow: true, + project: true, + footerless: true, + load: async () => (await import("../E07_StabArea_UI_Page")).renderE07StabArea, +}; diff --git a/E07_StabArea/logic/E07_StabArea_Raster.ts b/E07_StabArea/logic/E07_StabArea_Raster.ts new file mode 100644 index 000000000..a9a00b8e7 --- /dev/null +++ b/E07_StabArea/logic/E07_StabArea_Raster.ts @@ -0,0 +1,153 @@ +/* ============================================================================= + * E07_StabArea_Raster.ts + * E07 ๊ด‘์—ญ ์œ„ํ—˜ ์ง€๋„ ํ™”๋ฉด ๊ณ„์‚ฐ(PLAN 536-2) โ€” ์ €์žฅ๋ณธ ๊ฒฉ์ž ํ’€๊ธฐ ยท ๋“ฑ๊ธ‰ ยท ์•ˆ์ „์œจ ์ƒ‰ ยท RGBA ยท ์…€ ์ฐพ๊ธฐ. + * ๊ฒฉ์ž ๊ผด = ์„œ๋ฒ„ `E07_StabArea_Router.py` ๋จธ๋ฆฌ ์ฃผ์„(fs ยท si uint16 ร—1000 ยท cls uint8 ยท slope ร—10 ยท + * m ร—100 ยท ์ž‘์€ ๋ base64 ยท ํ–‰ 0 = ๋‚จ์ชฝ). ์ˆœ์ˆ˜ ํ•จ์ˆ˜๋งŒ(DOM ยท fetch ๊ธˆ์ง€). + * ========================================================================== */ + +export interface Grid { + x0: number; + y0: number; + dx: number; + nx: number; + ny: number; +} + +export interface StationRow { + chainage_m: number; + label: string | null; + cells: number; + fs_min?: number; + si_min?: number; + worst_class?: number; + risk_area_m2?: number; + slope_max_deg?: number; +} + +export interface AreaSummary { + areas_m2: Record; + band_area_m2: number; + covered_area_m2: number; + risk_area_m2: number; + fs_min: number | null; + risk_stations: number[]; + stations: number; +} + +export interface AreaResult { + stale?: boolean; + computed_at: string; + elapsed_s: number; + settings: Record; + grid: Grid; + fs: string; + si: string; + cls: string; + slope: string; + m: string; + stations: StationRow[]; + summary: AreaSummary; +} + +/** ํ’€์–ด ๋‘” ๊ฒฉ์ž โ€” ์ž๋ฃŒ ์—†์Œ = NaN(fs ยท si ยท slope ยท m) ยท 0(cls) */ +export interface Decoded { + grid: Grid; + fs: Float32Array; + si: Float32Array; + cls: Uint8Array; + slope: Float32Array; + m: Float32Array; +} + +/** ๋“ฑ๊ธ‰ ์—ด์‡ (์„œ๋ฒ„ CLASS_KEYS ์ฐจ๋ก€ ยท 1~6) */ +export const CLASS_KEYS = ["stable", "moderate", "quasi", "lower", "upper", "defended"] as const; +export const RISK_CLASS = 4; + +/** ๋“ฑ๊ธ‰ ์ƒ‰ 1~6 โ€” SINMAP ๊ด€๋ก€(์ดˆ๋ก โ†’ ๋นจ๊ฐ•) */ +export const CLASS_COLORS = ["#1a9850", "#91cf60", "#d9ef8b", "#fee08b", "#fc8d59", "#d73027"]; + +/** ์•ˆ์ „์œจ ์ƒ‰ ๋‹จ๊ณ„ โ€” 1.0 ยท 1.2 ยท 1.5 ๊ฒฝ๊ณ„ */ +export const FS_STEPS: readonly { below: number; color: string }[] = [ + { below: 1.0, color: "#a50026" }, + { below: 1.2, color: "#f46d43" }, + { below: 1.5, color: "#fee08b" }, + { below: 2.0, color: "#a6d96a" }, + { below: Infinity, color: "#1a9850" }, +]; + +function bytes(text: string): Uint8Array { + const raw = atob(text); + const out = new Uint8Array(raw.length); + for (let i = 0; i < raw.length; i += 1) out[i] = raw.charCodeAt(i); + return out; +} + +function u16(text: string, scale: number): Float32Array { + const b = bytes(text); + const view = new DataView(b.buffer); + const out = new Float32Array(b.length / 2); + for (let i = 0; i < out.length; i += 1) { + const v = view.getUint16(i * 2, true); + out[i] = v === 65535 ? NaN : v / scale; + } + return out; +} + +export function decode(result: AreaResult): Decoded { + const m = bytes(result.m); + return { + grid: result.grid, + fs: u16(result.fs, 1000), + si: u16(result.si, 1000), + cls: bytes(result.cls), + slope: u16(result.slope, 10), + m: Float32Array.from(m, (v) => (v === 255 ? NaN : v / 100)), + }; +} + +function rgb(hex: string): [number, number, number] { + const n = Number.parseInt(hex.slice(1), 16); + return [(n >> 16) & 255, (n >> 8) & 255, n & 255]; +} + +export function fsColor(value: number): string { + return (FS_STEPS.find((s) => value < s.below) ?? FS_STEPS[FS_STEPS.length - 1]).color; +} + +/** ๊ฒฉ์ž โ†’ RGBA(์ค„ 0 = ๋ถ์ชฝ ๋ ยท ์บ”๋ฒ„์Šค ๊ทธ๋ฆผ์šฉ) ยท ์ž๋ฃŒ ์—†์Œ = ํˆฌ๋ช… */ +export function rasterRgba(data: Decoded, layer: "cls" | "fs"): Uint8ClampedArray { + const { nx, ny } = data.grid; + const out = new Uint8ClampedArray(nx * ny * 4); + const classRgb = CLASS_COLORS.map(rgb); + const fsRgb = FS_STEPS.map((s) => rgb(s.color)); + for (let iy = 0; iy < ny; iy += 1) { + const row = ny - 1 - iy; + for (let ix = 0; ix < nx; ix += 1) { + const i = iy * nx + ix; + const k = data.cls[i]; + if (!k) continue; + const j = FS_STEPS.findIndex((s) => data.fs[i] < s.below); + const color = layer === "cls" ? classRgb[k - 1] : fsRgb[j < 0 ? fsRgb.length - 1 : j]; + const at = (row * nx + ix) * 4; + out[at] = color[0]; + out[at + 1] = color[1]; + out[at + 2] = color[2]; + out[at + 3] = 255; + } + } + return out; +} + +/** ๋ชจ๋ธ ์ขŒํ‘œ โ†’ ์…€ ๋ฒˆํ˜ธ(๊ฒฉ์ž ๋ฐ– = -1) */ +export function cellIndex(grid: Grid, x: number, y: number): number { + const ix = Math.round((x - grid.x0) / grid.dx); + const iy = Math.round((y - grid.y0) / grid.dx); + return ix < 0 || iy < 0 || ix >= grid.nx || iy >= grid.ny ? -1 : iy * grid.nx + ix; +} + +/** ๋“ฑ๊ธ‰๋ณ„ ์…€ ์ˆ˜(1~6) โ€” ๋ฒ”๋ก€ ยท ๊ฒ€์ฆ์šฉ */ +export function classCounts(data: Decoded): number[] { + const out = [0, 0, 0, 0, 0, 0]; + for (const k of data.cls) if (k) out[k - 1] += 1; + return out; +} diff --git a/common_util/common_util_project_kind.py b/common_util/common_util_project_kind.py index b62289bfa..2ebca164c 100644 --- a/common_util/common_util_project_kind.py +++ b/common_util/common_util_project_kind.py @@ -26,6 +26,7 @@ KIND_STAGE_DIRS = { "E04_Stab3D", "E05_StabReport", "E06_StabRock", + "E07_StabArea", ), } diff --git a/config/config_frontend.ts b/config/config_frontend.ts index 2b373e02c..e256ad5e0 100644 --- a/config/config_frontend.ts +++ b/config/config_frontend.ts @@ -131,6 +131,7 @@ export const ROUTES = { E04_STAB_3D: "e04-stab-3d", E05_STAB_REPORT: "e05-stab-report", E06_STAB_ROCK: "e06-stab-rock", + E07_STAB_AREA: "e07-stab-area", } as const; /** D ์˜ˆ์ •๋…ธ์„  ๋‹จ๊ณ„ ์ฃผ์†Œ(D02 โ†’ D04 ยท ๋“ฑ๋ก D01 ์€ ๋‹จ๊ณ„ ๋ฐ–) */ @@ -140,13 +141,14 @@ export const PLAN_STEP_ROUTES = [ ROUTES.D04_PLAN_CONFIRM, ] as const; -/** E ์•ˆ์ •์„ฑํ‰๊ฐ€ ๋‹จ๊ณ„ ์ฃผ์†Œ(E02 โ†’ E06 ยท ์ƒ์„ฑ E01 ์€ ๋‹จ๊ณ„ ๋ฐ–) */ +/** E ์•ˆ์ •์„ฑํ‰๊ฐ€ ๋‹จ๊ณ„ ์ฃผ์†Œ(E02 โ†’ E06 ยท ๊ด‘์—ญ E07 ยท ์ƒ์„ฑ E01 ์€ ๋‹จ๊ณ„ ๋ฐ–) */ export const STAB_STEP_ROUTES = [ ROUTES.E02_STAB_GROUND, ROUTES.E03_STAB_SECTION, ROUTES.E04_STAB_3D, ROUTES.E05_STAB_REPORT, ROUTES.E06_STAB_ROCK, + ROUTES.E07_STAB_AREA, ] as const; export type RouteKey = keyof typeof ROUTES; diff --git a/config/config_system.py b/config/config_system.py index 26c19abdc..4c49991d3 100644 --- a/config/config_system.py +++ b/config/config_system.py @@ -221,6 +221,7 @@ PROJECT_STORAGE_STAGE_DIRS = frozenset( "E04_Stab3D", "E05_StabReport", "E06_StabRock", + "E07_StabArea", } ) diff --git a/main.py b/main.py index 0e6c54572..f36ca04af 100644 --- a/main.py +++ b/main.py @@ -83,6 +83,7 @@ from E01_StabRegister.E01_StabRegister_Router import router as e01_stab_register from E02_StabGround.E02_StabGround_Router import router as e02_stab_ground_router from E04_Stab3D.E04_Stab3D_Router import router as e04_stab_3d_router from E05_StabReport.E05_StabReport_Router import router as e05_stab_report_router +from E07_StabArea.E07_StabArea_Router import router as e07_stab_area_router from E03_StabSection.E03_StabSection_Router import router as e03_stab_section_router from E06_StabRock.E06_StabRock_Router import router as e06_stab_rock_router from M01_MasterData.M01_MasterData_Router import router as m01_master_data_router @@ -494,6 +495,7 @@ app.include_router(d04_plan_link_router, dependencies=protected_with_company) app.include_router(e02_stab_ground_router, dependencies=protected_with_company) app.include_router(e04_stab_3d_router, dependencies=protected_with_company) app.include_router(e05_stab_report_router, dependencies=protected_with_company) +app.include_router(e07_stab_area_router, dependencies=protected_with_company) app.include_router(e03_stab_section_router, dependencies=protected_with_company) app.include_router(e06_stab_rock_router, dependencies=protected_with_company) app.include_router(b05_corridor_router, dependencies=protected_with_company) diff --git a/resources/master_template/report/stab_report.json b/resources/master_template/report/stab_report.json index 9ded03dad..42a350b7e 100644 --- a/resources/master_template/report/stab_report.json +++ b/resources/master_template/report/stab_report.json @@ -2600,6 +2600,484 @@ } } ] + }, + { + "id": "s7", + "์ด๋ฆ„": "๊ด‘์—ญ์š”์•ฝ", + "์นธ": { + "A1": { + "๊ฐ’": "๊ด‘์—ญ ์ž์—ฐ์‚ฌ๋ฉด ์œ„ํ—˜ ์š”์•ฝ", + "์„œ์‹": 1 + }, + "B1": { + "์„œ์‹": 1 + }, + "C1": { + "์„œ์‹": 1 + }, + "D1": { + "์„œ์‹": 1 + }, + "E1": { + "์„œ์‹": 1 + }, + "F1": { + "์„œ์‹": 1 + }, + "G1": { + "์„œ์‹": 1 + }, + "H1": { + "์„œ์‹": 1 + }, + "A2": { + "๊ฐ’": "๋…ธ์„  ๋  ๋ฌดํ•œ์‚ฌ๋ฉด ยท SINMAP ์•ˆ์ • ์ง€์ˆ˜ โ€” ๋…ธ์„  ์œ„ ยท ์•„๋ž˜ ์ž์—ฐ์‚ฌ๋ฉด ํ‘œ์ธต ๋ถ•๊ดด ์œ„ํ—˜ ยท ๋ฌธํ—Œ ์ถ”์ •์น˜", + "์„œ์‹": 2 + }, + "B2": { + "์„œ์‹": 2 + }, + "C2": { + "์„œ์‹": 2 + }, + "D2": { + "์„œ์‹": 2 + }, + "E2": { + "์„œ์‹": 2 + }, + "F2": { + "์„œ์‹": 2 + }, + "G2": { + "์„œ์‹": 2 + }, + "H2": { + "์„œ์‹": 2 + }, + "A4": { + "๊ฐ’": "1. ํ•ด์„ ์กฐ๊ฑด", + "์„œ์‹": 3 + }, + "B4": { + "์„œ์‹": 3 + }, + "C4": { + "์„œ์‹": 3 + }, + "D4": { + "์„œ์‹": 3 + }, + "E4": { + "์„œ์‹": 3 + }, + "F4": { + "์„œ์‹": 3 + }, + "G4": { + "์„œ์‹": 3 + }, + "H4": { + "์„œ์‹": 3 + }, + "A5": { + "๊ฐ’": "๋…ธ์„  ๋ ", + "์„œ์‹": 4 + }, + "B5": { + "์„œ์‹": 5 + }, + "C5": { + "์„œ์‹": 5 + }, + "D5": { + "์„œ์‹": 5 + }, + "E5": { + "์„œ์‹": 5 + }, + "F5": { + "์„œ์‹": 5 + }, + "G5": { + "์„œ์‹": 5 + }, + "H5": { + "์„œ์‹": 5 + }, + "A6": { + "๊ฐ’": "ํ† ์ธต ๋ฌผ์„ฑ", + "์„œ์‹": 4 + }, + "B6": { + "์„œ์‹": 5 + }, + "C6": { + "์„œ์‹": 5 + }, + "D6": { + "์„œ์‹": 5 + }, + "E6": { + "์„œ์‹": 5 + }, + "F6": { + "์„œ์‹": 5 + }, + "G6": { + "์„œ์‹": 5 + }, + "H6": { + "์„œ์‹": 5 + }, + "A7": { + "๊ฐ’": "๊ฐ•์šฐ ยท ํฌํ™”", + "์„œ์‹": 4 + }, + "B7": { + "์„œ์‹": 5 + }, + "C7": { + "์„œ์‹": 5 + }, + "D7": { + "์„œ์‹": 5 + }, + "E7": { + "์„œ์‹": 5 + }, + "F7": { + "์„œ์‹": 5 + }, + "G7": { + "์„œ์‹": 5 + }, + "H7": { + "์„œ์‹": 5 + }, + "A8": { + "๊ฐ’": "ํ•ด์„ ๋•Œ", + "์„œ์‹": 4 + }, + "B8": { + "์„œ์‹": 5 + }, + "C8": { + "์„œ์‹": 5 + }, + "D8": { + "์„œ์‹": 5 + }, + "E8": { + "์„œ์‹": 5 + }, + "F8": { + "์„œ์‹": 5 + }, + "G8": { + "์„œ์‹": 5 + }, + "H8": { + "์„œ์‹": 5 + }, + "A10": { + "๊ฐ’": "2. ๋“ฑ๊ธ‰๋ณ„ ๋ฉด์ ", + "์„œ์‹": 3 + }, + "B10": { + "์„œ์‹": 3 + }, + "C10": { + "์„œ์‹": 3 + }, + "D10": { + "์„œ์‹": 3 + }, + "E10": { + "์„œ์‹": 3 + }, + "F10": { + "์„œ์‹": 3 + }, + "G10": { + "์„œ์‹": 3 + }, + "H10": { + "์„œ์‹": 3 + }, + "A11": { + "๊ฐ’": "๋“ฑ๊ธ‰", + "์„œ์‹": 6 + }, + "B11": { + "๊ฐ’": "์•ˆ์ • ์ง€์ˆ˜ SI", + "์„œ์‹": 6 + }, + "C11": { + "๊ฐ’": "๋ฉด์  (mยฒ)", + "์„œ์‹": 6 + }, + "D11": { + "๊ฐ’": "๋น„์œจ (%)", + "์„œ์‹": 6 + }, + "A12": { + "๊ฐ’": "์•ˆ์ •", + "์„œ์‹": 7 + }, + "B12": { + "๊ฐ’": "SI โ‰ฅ 1.5", + "์„œ์‹": 7 + }, + "C12": { + "์„œ์‹": 14 + }, + "D12": { + "์‹": "IF(SUM(C$12:C$17)>0,C12/SUM(C$12:C$17)*100,\"\")", + "์„œ์‹": 16 + }, + "A13": { + "๊ฐ’": "๋ณดํ†ต ์•ˆ์ •", + "์„œ์‹": 7 + }, + "B13": { + "๊ฐ’": "1.25 โ‰ค SI < 1.5", + "์„œ์‹": 7 + }, + "C13": { + "์„œ์‹": 14 + }, + "D13": { + "์‹": "IF(SUM(C$12:C$17)>0,C13/SUM(C$12:C$17)*100,\"\")", + "์„œ์‹": 16 + }, + "A14": { + "๊ฐ’": "์ค€์•ˆ์ •", + "์„œ์‹": 7 + }, + "B14": { + "๊ฐ’": "1.0 โ‰ค SI < 1.25", + "์„œ์‹": 7 + }, + "C14": { + "์„œ์‹": 14 + }, + "D14": { + "์‹": "IF(SUM(C$12:C$17)>0,C14/SUM(C$12:C$17)*100,\"\")", + "์„œ์‹": 16 + }, + "A15": { + "๊ฐ’": "์œ„ํ—˜ ํ•˜ํ•œ", + "์„œ์‹": 7 + }, + "B15": { + "๊ฐ’": "0.5 โ‰ค SI < 1.0", + "์„œ์‹": 7 + }, + "C15": { + "์„œ์‹": 14 + }, + "D15": { + "์‹": "IF(SUM(C$12:C$17)>0,C15/SUM(C$12:C$17)*100,\"\")", + "์„œ์‹": 16 + }, + "A16": { + "๊ฐ’": "์œ„ํ—˜ ์ƒํ•œ", + "์„œ์‹": 7 + }, + "B16": { + "๊ฐ’": "0 < SI < 0.5", + "์„œ์‹": 7 + }, + "C16": { + "์„œ์‹": 14 + }, + "D16": { + "์‹": "IF(SUM(C$12:C$17)>0,C16/SUM(C$12:C$17)*100,\"\")", + "์„œ์‹": 16 + }, + "A17": { + "๊ฐ’": "๋ถˆ์•ˆ์ •", + "์„œ์‹": 7 + }, + "B17": { + "๊ฐ’": "SI = 0", + "์„œ์‹": 7 + }, + "C17": { + "์„œ์‹": 14 + }, + "D17": { + "์‹": "IF(SUM(C$12:C$17)>0,C17/SUM(C$12:C$17)*100,\"\")", + "์„œ์‹": 16 + }, + "A18": { + "๊ฐ’": "ํ•ฉ๊ณ„", + "์„œ์‹": 4 + }, + "B18": { + "์„œ์‹": 4 + }, + "C18": { + "์‹": "SUM(C12:C17)", + "์„œ์‹": 14 + }, + "D18": { + "์„œ์‹": 16 + }, + "A20": { + "๊ฐ’": "3. ์œ„ํ—˜ ์ธก์  (SI < 1 ์…€์ด ์žˆ๋Š” ์ธก์ )", + "์„œ์‹": 3 + }, + "B20": { + "์„œ์‹": 3 + }, + "C20": { + "์„œ์‹": 3 + }, + "D20": { + "์„œ์‹": 3 + }, + "E20": { + "์„œ์‹": 3 + }, + "F20": { + "์„œ์‹": 3 + }, + "G20": { + "์„œ์‹": 3 + }, + "H20": { + "์„œ์‹": 3 + }, + "A21": { + "๊ฐ’": "์ธก์ ", + "์„œ์‹": 6 + }, + "B21": { + "๊ฐ’": "๋ˆ„๊ฐ€๊ฑฐ๋ฆฌ (m)", + "์„œ์‹": 6 + }, + "C21": { + "๊ฐ’": "์ตœ์†Œ Fs", + "์„œ์‹": 6 + }, + "D21": { + "๊ฐ’": "์ตœ์†Œ SI", + "์„œ์‹": 6 + }, + "E21": { + "๊ฐ’": "๊ฐ€์žฅ ๋‚˜์œ ๋“ฑ๊ธ‰", + "์„œ์‹": 6 + }, + "F21": { + "๊ฐ’": "์œ„ํ—˜ ๋ฉด์  (mยฒ)", + "์„œ์‹": 6 + }, + "G21": { + "๊ฐ’": "์ตœ๋Œ€ ๊ฒฝ์‚ฌ (ยฐ)", + "์„œ์‹": 6 + }, + "A22": { + "์„œ์‹": 7 + }, + "B22": { + "์„œ์‹": 17 + }, + "C22": { + "์„œ์‹": 8 + }, + "D22": { + "์„œ์‹": 8 + }, + "E22": { + "์„œ์‹": 7 + }, + "F22": { + "์„œ์‹": 14 + }, + "G22": { + "์„œ์‹": 16 + } + }, + "๋ณ‘ํ•ฉ": [ + "A1:H1", + "A2:H2", + "A4:H4", + "B5:H5", + "B6:H6", + "B7:H7", + "B8:H8", + "A10:H10", + "A20:H20" + ], + "์—ด": { + "A": { + "ํญ": 14 + }, + "B": { + "ํญ": 15 + }, + "C": { + "ํญ": 11 + }, + "D": { + "ํญ": 11 + }, + "E": { + "ํญ": 13 + }, + "F": { + "ํญ": 13 + }, + "G": { + "ํญ": 12 + }, + "H": { + "ํญ": 6 + } + }, + "ํ–‰": { + "1": { + "๋†’์ด": 36 + }, + "2": { + "๋†’์ด": 20 + }, + "4": { + "๋†’์ด": 22 + }, + "10": { + "๋†’์ด": 22 + }, + "20": { + "๋†’์ด": 22 + }, + "21": { + "๋†’์ด": 32 + } + }, + "๋ณด๊ธฐ": { + "๋ˆˆ๊ธˆ์„ ": false + }, + "์ธ์‡„": { + "์šฉ์ง€": "A4", + "๋ฐฉํ–ฅ": "portrait", + "๋งž์ถค": { + "ํญ": 1, + "๋†’์ด": 0 + }, + "์—ฌ๋ฐฑ": { + "์œ„": 15, + "์•„๋ž˜": 15, + "์™ผ": 10, + "์˜ค๋ฅธ": 10 + }, + "๋จธ๋ฆฌํ–‰": [ + 21, + 21 + ] + } } ], "ํ™œ์„ฑ": "s1" diff --git a/resources/master_template/report/stab_report_slots.md b/resources/master_template/report/stab_report_slots.md index 3fb11f4c7..b9bafb828 100644 --- a/resources/master_template/report/stab_report_slots.md +++ b/resources/master_template/report/stab_report_slots.md @@ -79,3 +79,13 @@ | 20 ํ–‰๋ถ€ํ„ฐ ๊ตฌ๊ฐ„ ํ•˜๋‚˜ = ํ•œ ์ค„ | A ๊ตฌ๊ฐ„ ยท B ์‹œ์ž‘ ์ธก์  ยท C ๋ ์ธก์ (์„œ์‹ 7) ยท D 3D ์ตœ์†Œ Fs ยท E 2D ์ตœ์†Œ Fs(์„œ์‹ 8) ยท **F 3D/2D ๋น„ = ์ˆ˜์‹ `IF(E{r}>0,D{r}/E{r},"")`**(์„œ์‹ 8) ยท G ์ž„๊ณ„ ์ฒด์  mยณ(์„œ์‹ 14) ยท H ํŒ์ •(์„œ์‹ 7 โ†’ N.G 10 ยท O.K 11) | - 20 ํ–‰ ์„œ์‹์„ ์ค„๋งˆ๋‹ค ๋ณต์‚ฌ. + +## s7 ๊ด‘์—ญ์š”์•ฝ (ํ”„๋กœ๊ทธ๋žจ ๋ชซ ยท ๋จธ๋ฆฌ ์ค„ 21 ํ–‰ ๋ฐ˜๋ณต ยท E07 ๊ด‘์—ญ ์ €์žฅ๋ณธ ยท ์—†์œผ๋ฉด `B5` ์— ใ€Œ๊ด‘์—ญ ํ•ด์„ ์ „ใ€) + +| ์นธ | ๋‚ด์šฉ | +| --- | --- | +| `B5` `B6` `B7` `B8` (๊ฐ B:H ๋ณ‘ํ•ฉ ยท ์„œ์‹ 5) | ๋…ธ์„  ๋  ยท ํ† ์ธต ๋ฌผ์„ฑ ยท ๊ฐ•์šฐ ยท ํฌํ™” ยท ํ•ด์„ ๋•Œ ๊ธ€ | +| `C12`~`C17` | ๋“ฑ๊ธ‰ 1~6(์•ˆ์ • ยท ๋ณดํ†ต ์•ˆ์ • ยท ์ค€์•ˆ์ • ยท ์œ„ํ—˜ ํ•˜ํ•œ ยท ์œ„ํ—˜ ์ƒํ•œ ยท ๋ถˆ์•ˆ์ •) ๋ฉด์  mยฒ(์„œ์‹ 14) ยท `D` ๋น„์œจ = ์–‘์‹ ์ˆ˜์‹ ยท `C18` ํ•ฉ๊ณ„ = ์–‘์‹ ์ˆ˜์‹ | +| 22 ํ–‰๋ถ€ํ„ฐ ์œ„ํ—˜ ์ธก์  ํ•˜๋‚˜ = ํ•œ ์ค„ | A ์ธก์ (์„œ์‹ 7) ยท B ๋ˆ„๊ฐ€๊ฑฐ๋ฆฌ(17) ยท C ์ตœ์†Œ Fs ยท D ์ตœ์†Œ SI(8) ยท E ๊ฐ€์žฅ ๋‚˜์œ ๋“ฑ๊ธ‰ ๊ธ€(7) ยท F ์œ„ํ—˜ ๋ฉด์  mยฒ(14) ยท G ์ตœ๋Œ€ ๊ฒฝ์‚ฌ ยฐ(16) ยท ์—†์œผ๋ฉด `A22` ใ€Œ์œ„ํ—˜ ์ธก์  ์—†์Œใ€ | + +- 22 ํ–‰ ์„œ์‹์„ ์ค„๋งˆ๋‹ค ๋ณต์‚ฌ. ์œ„ํ—˜ ์ธก์  = ๋งก์€ ๋  ์…€์— SI < 1(๋“ฑ๊ธ‰ 4 ์ด์ƒ)์ด ์žˆ๋Š” ์ธก์ . diff --git a/resources/tester/test_534_3_e05_report.py b/resources/tester/test_534_3_e05_report.py index 63c43062c..b0de02cb3 100644 --- a/resources/tester/test_534_3_e05_report.py +++ b/resources/tester/test_534_3_e05_report.py @@ -221,6 +221,79 @@ def test_์ฒ˜์Œ_๋งŒ๋“ฆ_์ธก์ ์ˆ˜_NG_๊ทธ๋ฆผ(project): assert saved["fingerprint"] == build.analysis_fingerprint(project) +def test_๊ด‘์—ญ์š”์•ฝ_E07_์ €์žฅ๋ณธ(project): + """E07 ์ €์žฅ๋ณธ ์—†์Œ = ใ€Œ๊ด‘์—ญ ํ•ด์„ ์ „ใ€ ยท ์ƒ๊น€ = ์ง€๋ฌธ ๋ฐ”๋€œ โ†’ ๊ฐฑ์‹  ๋’ค ๋“ฑ๊ธ‰ ๋ฉด์  ยท ์œ„ํ—˜ ์ธก์  ์ค„.""" + _create(project) + book, meta = store.load(project) + assert _sheets(book)["๊ด‘์—ญ์š”์•ฝ"]["์นธ"]["B5"]["๊ฐ’"].startswith("๊ด‘์—ญ ํ•ด์„ ์ „") + keys = ("stable", "moderate", "quasi", "lower", "upper", "defended") + area = { + "settings": { + "band_m": 100.0, + "cell_m": 2.0, + "gamma_t": 17.5, + "gamma_sat": 18.5, + "c": 5.0, + "c_hi": 10.0, + "phi": 27.0, + "phi_hi": 30.0, + "c_root": 0.0, + "soil_depth_m": 1.5, + "scenario": "saturated", + "rain_mm_h": 30.0, + "k_m_s": 1e-4, + }, + "computed_at": "2026-10-25T21:00:00", + "stations": [ + { + "chainage_m": 0.0, + "cells": 9, + "fs_min": 1.6, + "si_min": 1.6, + "worst_class": 1, + "risk_area_m2": 0.0, + "slope_max_deg": 12.0, + "label": "No.0", + }, + { + "chainage_m": 20.0, + "cells": 9, + "fs_min": 0.8, + "si_min": 0.0, + "worst_class": 6, + "risk_area_m2": 36.0, + "slope_max_deg": 41.5, + "label": "No.1", + }, + { + "chainage_m": 40.0, + "cells": 9, + "fs_min": 0.95, + "si_min": 0.7, + "worst_class": 4, + "risk_area_m2": 8.0, + "slope_max_deg": 33.0, + "label": "No.2", + }, + ], + "summary": {"areas_m2": dict(zip(keys, (100.0, 20.0, 12.0, 8.0, 0.0, 36.0)))}, + } + path = project / "E07_StabArea" / "_derived" / "area.json" + path.parent.mkdir(parents=True) + path.write_text(json.dumps(area, ensure_ascii=False), encoding="utf-8") + assert build.analysis_fingerprint(project) != meta["fingerprint"] + store.refresh(project) + book, _ = store.load(project) + s7 = _sheets(book)["๊ด‘์—ญ์š”์•ฝ"]["์นธ"] + assert [s7[f"C{r}"]["๊ฐ’"] for r in range(12, 18)] == [100.0, 20.0, 12.0, 8.0, 0.0, 36.0] + assert [s7[f"A{r}"]["๊ฐ’"] for r in (22, 23)] == ["No.1", "No.2"] and "A24" not in s7 + assert ( + s7["E22"]["๊ฐ’"] == "๋ถˆ์•ˆ์ •" and s7["F23"]["๊ฐ’"] == 8.0 and s7["B7"]["๊ฐ’"].startswith("์ง€ํ‘œ") + ) + vals = book["๊ณ„์‚ฐ๊ฐ’"]["s7"] + assert vals["C18"] == {"์ˆ˜": "176"} and vals["D17"]["์ˆ˜"].startswith("20.45") + + def test_๊ฐฑ์‹ _์‚ฌ์šฉ์ž๋ชซ_๋ถˆ๋ณ€_๋ฎ์ž„(project): _create(project) book, _ = store.load(project) @@ -278,7 +351,7 @@ def test_xlsx_๋˜์ฝ๊ธฐ_pdf_์ชฝ์ˆ˜(project): figs = store.figures_of(project, book) assert len(figs) == len(REPS) + 1 wb = load_workbook(io.BytesIO(workbook_to_xlsx(book, figs))) - assert wb.sheetnames == ["ํ‘œ์ง€", "๊ฐœ์š”", "์ž…๋ ฅ์กฐ๊ฑด", "์ธก์ ํ‘œ", "๋Œ€ํ‘œ๋‹จ๋ฉด", "3D์š”์•ฝ"] + assert wb.sheetnames == ["ํ‘œ์ง€", "๊ฐœ์š”", "์ž…๋ ฅ์กฐ๊ฑด", "์ธก์ ํ‘œ", "๋Œ€ํ‘œ๋‹จ๋ฉด", "3D์š”์•ฝ", "๊ด‘์—ญ์š”์•ฝ"] assert len(wb["๋Œ€ํ‘œ๋‹จ๋ฉด"]._images) == len(REPS) and len(wb["3D์š”์•ฝ"]._images) == 1 assert [b.id for b in wb["๋Œ€ํ‘œ๋‹จ๋ฉด"].row_breaks.brk] == [28, 56, 84] assert wb["์ธก์ ํ‘œ"]["J9"].value == "N.G" and wb["์ธก์ ํ‘œ"]["J9"].fill.fgColor.rgb.endswith( @@ -294,8 +367,8 @@ def test_xlsx_๋˜์ฝ๊ธฐ_pdf_์ชฝ์ˆ˜(project): texts = [p.extract_text() for p in PdfReader(io.BytesIO(pdf)).pages] stab = [i for i, t in enumerate(texts) if "์‚ฐ์ • ์•ˆ์ „์œจ" in t] assert stab and all("์‚ฐ์ • ์•ˆ์ „์œจ" in texts[i] for i in stab) - # ํ‘œ์ง€ 1 + ๊ฐœ์š” 1 + ์ž…๋ ฅ์กฐ๊ฑด 1 + ์ธก์ ํ‘œ n + ๋Œ€ํ‘œ๋‹จ๋ฉด 3 + 3D 1 - assert len(texts) == 3 + len(stab) + len(REPS) + 1 + # ํ‘œ์ง€ 1 + ๊ฐœ์š” 1 + ์ž…๋ ฅ์กฐ๊ฑด 1 + ์ธก์ ํ‘œ n + ๋Œ€ํ‘œ๋‹จ๋ฉด 3 + 3D 1 + ๊ด‘์—ญ 1 + assert len(texts) == 3 + len(stab) + len(REPS) + 1 + 1 def test_๋‹จ๋ฉด_๊ทธ๋ฆผ_SVG(): @@ -333,7 +406,7 @@ def test_๊ธธ_์ €์žฅ_409_๊ฐฑ์‹ _์ดˆ๊ธฐํ™”_๋‚ด๋ณด๋‚ด๊ธฐ(project, monkeypatch): got = client.get(url).json() except PrintError as error: pytest.skip(f"๋ธŒ๋ผ์šฐ์ € ์—†์Œ โ€” {error}") - assert got["editable"] and got["stale"] is False and len(got["book"]["์‹œํŠธ"]) == 6 + assert got["editable"] and got["stale"] is False and len(got["book"]["์‹œํŠธ"]) == 7 book = got["book"] _sheets(book)["ํ‘œ์ง€"]["์นธ"]["C10"] = {"๊ฐ’": "์‚ฐ๋ฆผ์ฒญ", "์„œ์‹": 5} assert client.put(url, json={"rev": "์˜›ํŒ", "book": book}).status_code == 409 diff --git a/resources/tester/test_534_3_stab_report_form.py b/resources/tester/test_534_3_stab_report_form.py index 89ac63e32..8eee5c646 100644 --- a/resources/tester/test_534_3_stab_report_form.py +++ b/resources/tester/test_534_3_stab_report_form.py @@ -36,7 +36,7 @@ STYLE_KEYS = { } # fmt: skip PRINT_KEYS = {"์šฉ์ง€", "๋ฐฉํ–ฅ", "๋ฐฐ์œจ", "๋งž์ถค", "์—ฌ๋ฐฑ", "๋จธ๋ฆฌํ–‰", "์ชฝ๋‚˜๋ˆ”"} A1 = re.compile(r"^([A-Z]{1,3})(\d+)$") -NAMES = ["ํ‘œ์ง€", "๊ฐœ์š”", "์ž…๋ ฅ์กฐ๊ฑด", "์ธก์ ํ‘œ", "๋Œ€ํ‘œ๋‹จ๋ฉด", "3D์š”์•ฝ"] +NAMES = ["ํ‘œ์ง€", "๊ฐœ์š”", "์ž…๋ ฅ์กฐ๊ฑด", "์ธก์ ํ‘œ", "๋Œ€ํ‘œ๋‹จ๋ฉด", "3D์š”์•ฝ", "๊ด‘์—ญ์š”์•ฝ"] needs_node = pytest.mark.skipif(shutil.which("node") is None, reason="node ๊ฐ€ ์—†์Œ") @@ -148,7 +148,7 @@ def test_์–‘์‹_๊ณ„์•ฝ(): book = _form() _contract(book) assert [s["์ด๋ฆ„"] for s in book["์‹œํŠธ"]] == NAMES - assert [s["id"] for s in book["์‹œํŠธ"]] == ["s1", "s2", "s3", "s4", "s5", "s6"] + assert [s["id"] for s in book["์‹œํŠธ"]] == ["s1", "s2", "s3", "s4", "s5", "s6", "s7"] def test_์–‘์‹_์ธ์‡„_์ชฝ๋‚˜๋ˆ”_๋จธ๋ฆฌํ–‰_๊ทธ๋ฆผ(): @@ -159,7 +159,15 @@ def test_์–‘์‹_์ธ์‡„_์ชฝ๋‚˜๋ˆ”_๋จธ๋ฆฌํ–‰_๊ทธ๋ฆผ(): assert by["์ธก์ ํ‘œ"]["์ธ์‡„"]["๋ฐฉํ–ฅ"] == "landscape" and by["์ธก์ ํ‘œ"]["์ธ์‡„"]["๋จธ๋ฆฌํ–‰"] == [4, 5] assert by["๋Œ€ํ‘œ๋‹จ๋ฉด"]["์ธ์‡„"]["์ชฝ๋‚˜๋ˆ”"] == [BLOCK] figs = {n: len(s.get("๊ทธ๋ฆผ", [])) for n, s in by.items()} - assert figs == {"ํ‘œ์ง€": 0, "๊ฐœ์š”": 0, "์ž…๋ ฅ์กฐ๊ฑด": 0, "์ธก์ ํ‘œ": 0, "๋Œ€ํ‘œ๋‹จ๋ฉด": 1, "3D์š”์•ฝ": 1} + assert figs == { + "ํ‘œ์ง€": 0, + "๊ฐœ์š”": 0, + "์ž…๋ ฅ์กฐ๊ฑด": 0, + "์ธก์ ํ‘œ": 0, + "๋Œ€ํ‘œ๋‹จ๋ฉด": 1, + "3D์š”์•ฝ": 1, + "๊ด‘์—ญ์š”์•ฝ": 0, + } # N.G ๋นจ๊ฐ• ์กฐ๊ฑด๋ถ€ ์„œ์‹ โ€” ์ธก์ ํ‘œ ํŒ์ • ์—ด ยท ์„œ์‹ ํ‘œ์— N.G ์นธ ์„œ์‹(๋นŒ๋”๊ฐ€ ์ธ์‡„ ยท xlsx ์šฉ์œผ๋กœ ์ง์ ‘ ์”€) assert by["์ธก์ ํ‘œ"]["์กฐ๊ฑด๋ถ€์„œ์‹"][0]["๋ฒ”์œ„"][0]["c0"] == 9 assert any(st.get("๊ธ€์ž์ƒ‰") == "#C00000" and st.get("์ฑ„์›€") for st in _form()["์„œ์‹"]) @@ -222,8 +230,8 @@ def test_๊ฒฌ๋ณธ_pdf_์ชฝ์ˆ˜_๋จธ๋ฆฌํ–‰(png): ) sections = [i for i, t in enumerate(texts) if "๋Œ€ํ‘œ ๋‹จ๋ฉด" in t and "์•ˆ์ „์œจ Fs" in t] assert len(sections) == 2 # ๋‹จ๋ฉด๋งˆ๋‹ค ํ•œ ์ชฝ - # ํ‘œ์ง€ 1 + ๊ฐœ์š” 1 + ์ž…๋ ฅ์กฐ๊ฑด 1 + ์ธก์ ํ‘œ n + ๋Œ€ํ‘œ๋‹จ๋ฉด 2 + 3D 1 - assert len(pages) == 1 + 1 + 1 + len(stab) + 2 + 1 + # ํ‘œ์ง€ 1 + ๊ฐœ์š” 1 + ์ž…๋ ฅ์กฐ๊ฑด 1 + ์ธก์ ํ‘œ n + ๋Œ€ํ‘œ๋‹จ๋ฉด 2 + 3D 1 + ๊ด‘์—ญ 1 + assert len(pages) == 1 + 1 + 1 + len(stab) + 2 + 1 + 1 assert all(float(pages[i].mediabox.width) > float(pages[i].mediabox.height) for i in stab) html = spreadsheet.print_htmls([{"book": book, "figures": {k: png for k in figs}}])[0] assert html.count(" float: + p = engine.AreaParams(**{**SOIL, **kw}) + return float(engine.infinite_slope_fs(np.array([math.radians(beta_deg)]), np.array([m]), p)[0]) + + +def test_๋ฌดํ•œ์‚ฌ๋ฉด_ํ•ด์„ํ•ด_๊ฑด์กฐ_ํฌํ™”_์ ์ฐฉ(): + t = math.tan(math.radians(35)) / math.tan(math.radians(30)) + assert _fs(30, 0.0) == pytest.approx(t, rel=1e-12) # ๊ฑด์กฐ c = 0 โ†’ tanฯ† / tanฮฒ + assert _fs(30, 1.0) == pytest.approx((20 - 9.81) / 20 * t, rel=1e-12) # ํฌํ™” โ†’ ฮณ' / ฮณsat ๋ฐฐ + # ์†๊ณ„์‚ฐ โ€” c 5 ยท ๋ฟŒ๋ฆฌ 2 ยท z 1.5 ยท ฮฒ 35ยฐ ยท m 0.5 + b, z = math.radians(35), 1.5 + w = 18 * z * 0.5 + 20 * z * 0.5 + n = (18 * z * 0.5 + (20 - 9.81) * z * 0.5) * math.cos(b) ** 2 + hand = (7 + n * math.tan(math.radians(35))) / (w * math.sin(b) * math.cos(b)) + assert _fs(35, 0.5, c=5.0, c_root=2.0) == pytest.approx(hand, rel=1e-12) + assert math.isinf(_fs(0, 1.0)) # ํ‰ํ‰ = ํ™œ๋™ ์—†์Œ + + +def test_SINMAP_์•ˆ์ •์ง€์ˆ˜_๋‹ซํžŒ๊ผด_ํ‘œ๋ณธ(): + p = engine.AreaParams(gamma_t=17.5, gamma_sat=18.5, c=0.0, c_hi=8.0, phi=25.0, phi_hi=38.0) + beta = np.radians(np.array([10.0, 30.0, 35.0, 40.0, 60.0])) + m = np.ones_like(beta) + si = engine.stability_index(beta, m, p) + a, b = engine._terms(beta, m, p) + rng = np.random.default_rng(1) + c = rng.uniform(0, 8, 400_000) + t = rng.uniform(math.tan(math.radians(25)), math.tan(math.radians(38)), 400_000) + for k in range(len(beta)): + lo = 0 * a[k] + math.tan(math.radians(25)) * b[k] + fs = c * a[k] + t * b[k] + if lo >= 1: + assert si[k] == pytest.approx(lo) # Fs_min โ‰ฅ 1 โ†’ SI = Fs_min + elif fs.max() < 1: + assert si[k] == 0.0 + else: + assert si[k] == pytest.approx((fs > 1).mean(), abs=3e-3) # P(Fs > 1) + assert si[0] >= 1 and 0 < si[1] < 1 and si[4] == 0 # ์„ธ ๊ฐˆ๋ž˜ ๋ชจ๋‘ ์ง€๋‚จ + # ํญ 0(๋ฒ”์œ„ ์—†์Œ) โ€” ๊ฒฐ์ • Fs ์™€ ๊ฐ™๊ฑฐ๋‚˜ 0 + q = engine.AreaParams(**SOIL) + fs = engine.infinite_slope_fs(beta, m, q) + si0 = engine.stability_index(beta, m, q) + assert np.allclose(si0, np.where(fs >= 1, fs, 0.0)) + + +def test_SINMAP_๋“ฑ๊ธ‰_๊ฒฝ๊ณ„(): + si = np.array([np.inf, 1.5, 1.4999, 1.25, 1.2499, 1.0, 0.9999, 0.5, 0.4999, 1e-9, 0.0, np.nan]) + assert engine.classify(si).tolist() == [1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 0] + + +def test_D8_์ง‘์ˆ˜๋ฉด์ _๊ธฐ์šดํ‰๋ฉด_V๊ณจ์งœ๊ธฐ(): + cell = 2.0 + ny, nx = 5, 7 + xx = np.arange(nx)[None, :] * cell + plane = np.repeat(100.0 - 0.5 * xx, ny, axis=0) # ๋™์ชฝ์œผ๋กœ ๊ธฐ์›€ โ†’ ํ–‰๋งˆ๋‹ค ๋™์ชฝ์œผ๋กœ ํ๋ฆ„ + a = engine.catchment_area(plane, cell) + assert np.allclose(a, (np.arange(nx)[None, :] + 1) * cell) + yy = np.arange(9)[:, None] * cell + valley = 100.0 + np.abs(yy - 8.0) * 1.0 - 0.1 * np.arange(nx)[None, :] * cell + a = engine.catchment_area(valley, cell) + assert a[4, -1] == pytest.approx(9 * nx * cell) # ์ „๋ถ€๊ฐ€ ๊ณจ ์ถœ๊ตฌ๋กœ + assert np.all(a[4, :-1] < a[4, 1:]) # ๊ณจ ๋”ฐ๋ผ ๋Š˜์–ด๋‚จ + + +def test_๊ฐ•์šฐ_ํฌํ™”๋น„(): + p = engine.AreaParams(**SOIL, scenario="rain", rain_mm_h=36.0, k_m_s=1e-4, soil_depth_m=2.0) + beta = np.radians(np.array([30.0, 30.0])) + a = np.array([10.0, 1e6]) + m = engine.wetness(beta, a, p) + assert m[0] == pytest.approx(1e-5 * 10 / (2e-4 * 0.5)) # R a / (T sinฮฒ) + assert m[1] == 1.0 + assert engine.wetness(beta, a, engine.AreaParams(**SOIL)).tolist() == [1.0, 1.0] + + +def _decode(text: str, dtype: str, grid: dict) -> np.ndarray: + return np.frombuffer(base64.b64decode(text), dtype=dtype).reshape(grid["ny"], grid["nx"]) + + +@pytest.fixture() +def project(tmp_path, monkeypatch): + """๊ฐ€์งœ E ๋ณต์‚ฌ๋ณธ โ€” ์„œ์ชฝ์ด ๋‚ฎ์€ 30ยฐ ๋น„ํƒˆ(๋™์„œ 200 m ยท ๋‚จ๋ถ 100 m) ยท ๋…ธ์„  = ๋‚จ๋ถ ์ค‘์‹ฌ์„ .""" + x = np.arange(0.0, 200.5, 0.5) + y = np.arange(0.0, 100.5, 0.5) + z = np.repeat((x * math.tan(math.radians(30)))[None, :], len(y), axis=0) + valid = np.ones_like(z, bool) + valid[:, x > 180] = False # ๋™์ชฝ ๋ = ์ง€ํ˜• ์—†์Œ + dem = tmp_path / "dtm.npz" + np.savez( + dem, + x=x.astype(np.float32), + y=y.astype(np.float32), + z=z.astype(np.float32), + valid_mask=valid, + ) + stations = [ + {"chainage_m": float(c), "label": f"No.{i}", "center_x": 100.0, "center_y": float(c)} + for i, c in enumerate(range(0, 101, 20)) + ] + route = [ + {"sequence_num": i, "model_x": 100.0, "model_y": float(c), "chainage_m": float(c)} + for i, c in enumerate((0, 100)) + ] + src = router_mod.source + monkeypatch.setattr(src, "terrain_grid_path", lambda _r: dem) + monkeypatch.setattr(src, "stations", lambda _r: stations) + monkeypatch.setattr(src, "db_snapshot", lambda _r: {"route_points": route}) + return tmp_path + + +def test_๊ธธ_๋ _์ธก์ ํ‘œ_์ €์žฅ๋ณธ(project): + settings = {**router_mod.defaults(project), "band_m": 30.0, "cell_m": 2.0} + assert settings["material_id"] == "colluvium" and settings["c_hi"] == settings["c"] + 5 + steps = [] + summary = router_mod.run(project, project, settings, "fp", lambda p, m: steps.append(p)) + doc = router_mod.load(project) + assert steps == sorted(steps) and doc["fingerprint"] == "fp" + g = doc["grid"] + cls = _decode(doc["cls"], "u1", g) + fs = _decode(doc["fs"], " 0] + assert np.median(inner) / 1000 == pytest.approx(hand, abs=2e-3) + assert summary["fs_min"] == pytest.approx(hand, abs=5e-3) + # ๋  = ์ค‘์‹ฌ์„  ยฑ 30 m(๊ฒฉ์ž ์ƒ์ž๋„ ๋ ๋งŒํผ) ยท ๋“ฑ๊ธ‰ ๋ฉด์  ํ•ฉ = ๋ฎ์ธ ๋ฉด์  + assert g["nx"] * g["dx"] <= 62 + 1e-9 and g["ny"] * g["dx"] <= 102 + 1e-9 + assert sum(summary["areas_m2"].values()) == pytest.approx(summary["covered_area_m2"]) + assert summary["covered_area_m2"] == pytest.approx((cls > 0).sum() * 4.0) + rows = doc["stations"] + assert [r["chainage_m"] for r in rows] == [0, 20, 40, 60, 80, 100] + assert all(r["label"] == f"No.{i}" and r["worst_class"] >= 4 for i, r in enumerate(rows)) + assert summary["risk_stations"] == [0, 20, 40, 60, 80, 100] + assert sum(r["cells"] for r in rows) == (cls > 0).sum() + # ์ง€๋ฌธ = ์„ค์ •์— ๋”ฐ๋ผ ๋ฐ”๋€œ + assert router_mod.fingerprint("s", settings) != router_mod.fingerprint( + "s", {**settings, "c": 6} + ) + json.dumps(doc) # ๊ทธ๋Œ€๋กœ JSON diff --git a/ui_template/ui_template_locale.ts b/ui_template/ui_template_locale.ts index 7972847af..3d8827e53 100644 --- a/ui_template/ui_template_locale.ts +++ b/ui_template/ui_template_locale.ts @@ -16,6 +16,7 @@ * - ui_template_locale_b5.ts : B ๊ทธ๋ฃน ๋ (B08~B11) * - ui_template_locale_de.ts : D ์˜ˆ์ •๋…ธ์„  ยท E ์•ˆ์ •์„ฑํ‰๊ฐ€ ยท ๋Œ€์‹œ๋ณด๋“œ [+] ๊ณ ๋ฅด๊ธฐ * - ui_template_locale_e04.ts : E04 ์•ˆ์ •์„ฑํ‰๊ฐ€ 3D ํ•ด์„ + * - ui_template_locale_e07.ts : E07 ์•ˆ์ •์„ฑํ‰๊ฐ€ ๊ด‘์—ญ ์œ„ํ—˜ ์ง€๋„ * * ์ด ํŒŒ์ผ์˜ export ์‹œ๊ทธ๋‹ˆ์ฒ˜๋Š” ๋ถ„ํ•  ์ด์ „๊ณผ ๋™์ผํ•˜๋ฏ€๋กœ ์†Œ๋น„์ฒ˜ import ์ˆ˜์ •์€ ๋ถˆํ•„์š”ํ•˜๋‹ค. * ========================================================================== */ @@ -36,6 +37,7 @@ import { ui_locales_de } from "./ui_template_locale_de"; import { ui_locales_e } from "./ui_template_locale_e"; import { ui_locales_e05 } from "./ui_template_locale_e05"; import { ui_locales_e06 } from "./ui_template_locale_e06"; +import { ui_locales_e07 } from "./ui_template_locale_e07"; /** ์ง€์› ์–ธ์–ด ์ธ๋ฑ์Šค: 0 = ํ•œ๊ตญ์–ด, 1 = ์˜์–ด */ export const LANGUAGES = ["ko", "en"] as const; @@ -79,6 +81,7 @@ export const ui_locales = { ...ui_locales_e, ...ui_locales_e05, ...ui_locales_e06, + ...ui_locales_e07, } as const; export type LocaleKey = keyof typeof ui_locales; diff --git a/ui_template/ui_template_locale_de.ts b/ui_template/ui_template_locale_de.ts index 03c017e1e..9f17c0750 100644 --- a/ui_template/ui_template_locale_de.ts +++ b/ui_template/ui_template_locale_de.ts @@ -18,6 +18,7 @@ export const ui_locales_de = { DE_Step_Stab3D: ["3D ํ•ด์„", "3D Analysis"], DE_Step_StabReport: ["๋ณด๊ณ ์„œ", "Report"], DE_Step_StabRock: ["์•”๋ฐ˜ ํ•ด์„", "Rock Analysis"], + DE_Step_StabArea: ["๊ด‘์—ญ ์œ„ํ—˜", "Area Hazard"], DE_Step_Empty: ["์ค€๋น„ ์ค‘์ธ ๋‹จ๊ณ„์ž…๋‹ˆ๋‹ค.", "This step is not ready yet."], /* --- D04 ํ™•์ • ยท ์—…์ฒด ยท ๋‚ด๋ณด๋‚ด๊ธฐ ยท B03 ์˜ˆ์ •๋…ธ์„  ๊ฐ€์ ธ์˜ค๊ธฐ(531-3) --- */ diff --git a/ui_template/ui_template_locale_e07.ts b/ui_template/ui_template_locale_e07.ts new file mode 100644 index 000000000..036187a13 --- /dev/null +++ b/ui_template/ui_template_locale_e07.ts @@ -0,0 +1,83 @@ +/* ============================================================================= + * ui_template_locale_e07.ts + * ๋‹ค๊ตญ์–ด ์‚ฌ์ „ โ€” E07 ์•ˆ์ •์„ฑํ‰๊ฐ€ ๊ด‘์—ญ ์ž์—ฐ์‚ฌ๋ฉด ์œ„ํ—˜ ์ง€๋„(์š”๊ตฌ 345 ยท 351 ยท PLAN 536-2) + * + * ์‹ ๊ทœ ๋ฌธ๊ตฌ๋Š” ํ•ด๋‹น ์„น์…˜ ์ตœํ•˜๋‹จ์— ์ถ”๊ฐ€. + * ========================================================================== */ + +import type { LocaleEntry } from "./ui_template_locale_common"; + +export const ui_locales_e07 = { + /* --- E07 ๊ด‘์—ญ ์œ„ํ—˜ ์ง€๋„ --- */ + E07_NoProject: ["ํ”„๋กœ์ ํŠธ๋ฅผ ๋จผ์ € ๊ณ ๋ฅด์„ธ์š”.", "Pick a project first."], + E07_Hint: [ + "๋…ธ์„  ๋  ์•ˆ ์ž์—ฐ์‚ฌ๋ฉด์˜ ํ‘œ์ธต ๋ถ•๊ดด ์œ„ํ—˜ โ€” ๋ฌดํ•œ์‚ฌ๋ฉด ์•ˆ์ „์œจ๊ณผ SINMAP ์•ˆ์ • ์ง€์ˆ˜(SI)๋กœ ๋“ฑ๊ธ‰์„ ๋งค๊น๋‹ˆ๋‹ค. ์ง€ํ˜• = ๋ณต์‚ฌํ•œ ์›์ง€ํ˜•.", + "Shallow-landslide hazard of natural slopes in the route band โ€” infinite-slope Fs and SINMAP stability index (SI). Terrain = copied original DTM.", + ], + E07_ReadOnly: ["๋ณด๊ธฐ๋งŒ ํ—ˆ์šฉ๋œ ํ”„๋กœ์ ํŠธ์ž…๋‹ˆ๋‹ค.", "This project is view-only."], + E07_Card_Soil: ["ํ† ์ธต ๋ฌผ์„ฑ", "Soil layer"], + E07_Card_Rain: ["๊ฐ•์šฐ ยท ํฌํ™”", "Rain ยท saturation"], + E07_Card_Band: ["๋…ธ์„  ๋  ยท ๊ฒฉ์ž", "Route band ยท grid"], + E07_Material: ["๋ฌผ์„ฑ(E02 ์ง€๋ฐ˜ ์กฐ๊ฑด)", "Material (E02 ground)"], + E07_GammaT: ["ฮณt (kN/mยณ)", "ฮณt (kN/mยณ)"], + E07_GammaSat: ["ฮณsat (kN/mยณ)", "ฮณsat (kN/mยณ)"], + E07_C: ["c ์•„๋ž˜ (kPa)", "c low (kPa)"], + E07_CHi: ["c ์œ„ (kPa)", "c high (kPa)"], + E07_Phi: ["ฯ† ์•„๋ž˜ (ยฐ)", "ฯ† low (ยฐ)"], + E07_PhiHi: ["ฯ† ์œ„ (ยฐ)", "ฯ† high (ยฐ)"], + E07_CRoot: ["๋ฟŒ๋ฆฌ ์ ์ฐฉ (kPa)", "Root cohesion (kPa)"], + E07_Depth: ["ํ† ์ธต ๋‘๊ป˜ (m)", "Soil depth (m)"], + E07_Scenario: ["์‹œ๋‚˜๋ฆฌ์˜ค", "Scenario"], + E07_Scenario_saturated: ["์ง€ํ‘œ ํฌํ™” (m = 1)", "Fully saturated (m = 1)"], + E07_Scenario_rain: ["๊ฐ•์šฐ ๊ฐ•๋„ (์ •์ƒ๋ฅ˜)", "Rainfall (steady state)"], + E07_Rain: ["๊ฐ•์šฐ ๊ฐ•๋„ (mm/h)", "Rainfall (mm/h)"], + E07_K: ["ํˆฌ์ˆ˜๊ณ„์ˆ˜ (m/s)", "Hydraulic conductivity (m/s)"], + E07_Band: ["๋  ํญ ยฑ (m)", "Band half-width (m)"], + E07_Cell: ["๊ฒฉ์ž (m)", "Cell (m)"], + E07_Defaults: ["๊ธฐ๋ณธ๊ฐ’", "Defaults"], + E07_Analyze: ["ํ•ด์„", "Analyze"], + E07_Reanalyze: ["๋‹ค์‹œ ํ•ด์„", "Re-analyze"], + E07_Running: ["ํ•ด์„ ์ค‘", "Analyzing"], + E07_Done: ["๊ด‘์—ญ ํ•ด์„์„ ๋งˆ์ณค์Šต๋‹ˆ๋‹ค.", "Area analysis finished."], + E07_Cached: ["๊ฐ™์€ ์กฐ๊ฑด์˜ ๊ฒฐ๊ณผ๊ฐ€ ์žˆ์Šต๋‹ˆ๋‹ค.", "A result with the same inputs exists."], + E07_Layer_Class: ["๋“ฑ๊ธ‰ (SI)", "Class (SI)"], + E07_Layer_FS: ["์•ˆ์ „์œจ Fs", "Safety factor Fs"], + E07_Legend_Class: ["SINMAP ๋“ฑ๊ธ‰", "SINMAP class"], + E07_Legend_FS: ["๋ฌดํ•œ์‚ฌ๋ฉด Fs", "Infinite-slope Fs"], + E07_Class_stable: ["์•ˆ์ • (SI โ‰ฅ 1.5)", "Stable (SI โ‰ฅ 1.5)"], + E07_Class_moderate: ["๋ณดํ†ต ์•ˆ์ • (โ‰ฅ 1.25)", "Moderately stable (โ‰ฅ 1.25)"], + E07_Class_quasi: ["์ค€์•ˆ์ • (โ‰ฅ 1.0)", "Quasi-stable (โ‰ฅ 1.0)"], + E07_Class_lower: ["์œ„ํ—˜ ํ•˜ํ•œ (โ‰ฅ 0.5)", "Lower threshold (โ‰ฅ 0.5)"], + E07_Class_upper: ["์œ„ํ—˜ ์ƒํ•œ (> 0)", "Upper threshold (> 0)"], + E07_Class_defended: ["๋ถˆ์•ˆ์ • (SI = 0)", "Defended (SI = 0)"], + E07_Map_Empty: [ + "[ํ•ด์„] ์„ ๋ˆ„๋ฅด๋ฉด ์œ„ํ—˜ ์ง€๋„๊ฐ€ ๋‚˜์˜ต๋‹ˆ๋‹ค.", + "Press [Analyze] to draw the hazard map.", + ], + E07_Tip_Slope: ["๊ฒฝ์‚ฌ", "Slope"], + E07_Tip_Station: ["๊ฐ€๊นŒ์šด ์ธก์ ", "Nearest station"], + E07_Result_Title: ["๊ด‘์—ญ ๊ฒฐ๊ณผ", "Area result"], + E07_Result_None: ["์•„์ง ํ•ด์„ ๊ฒฐ๊ณผ๊ฐ€ ์—†์Šต๋‹ˆ๋‹ค.", "No result yet."], + E07_Result_Stale: [ + "์—”์ง„์ด ๋ฐ”๋€Œ์–ด ๊ฒฐ๊ณผ๊ฐ€ ์˜›๊ฒƒ์ž…๋‹ˆ๋‹ค โ€” [๋‹ค์‹œ ํ•ด์„].", + "The engine changed โ€” re-analyze.", + ], + E07_Result_Note: [ + "๋ฌธํ—Œ ์ถ”์ •์น˜ ยท ํ˜„์žฅ ์‹œํ—˜ ์—†์Œ. SI = c ยท ฯ† ๋ฒ”์œ„ ์•ˆ์—์„œ Fs > 1 ์ผ ํ™•๋ฅ (SI โ‰ฅ 1 ์ด๋ฉด ๊ฐ€์žฅ ๋‚˜์œ ๊ฐ’์˜ Fs). ์ง€ํ˜• ๊ฒฉ์ž ๋ ๋ฐ– ์ƒ๋ฅ˜๋Š” ์ง‘์ˆ˜๋ฉด์ ์— ์•ˆ ๋“ค์–ด๊ฐ‘๋‹ˆ๋‹ค.", + "Literature values, no field tests. SI = probability of Fs > 1 over the c ยท ฯ† ranges (worst-case Fs when SI โ‰ฅ 1). Upslope area beyond the terrain grid is not counted.", + ], + E07_Sum_FsMin: ["๋  ์•ˆ ์ตœ์†Œ Fs", "Min Fs in band"], + E07_Sum_Risk: ["์œ„ํ—˜ ๋ฉด์  (SI < 1)", "Hazard area (SI < 1)"], + E07_Sum_RiskStations: ["์œ„ํ—˜ ์ธก์ ", "Hazard stations"], + E07_Sum_Covered: ["์ง€ํ˜• ์žˆ๋Š” ๋  / ๋ ", "Band with terrain / band"], + E07_Sum_Time: ["ํ•ด์„", "Computed"], + E07_Areas_Title: ["๋“ฑ๊ธ‰๋ณ„ ๋ฉด์ ", "Area by class"], + E07_Stations_Title: ["์ธก์ ๋ณ„ ์œ„ํ—˜ (๋ˆ„๋ฅด๋ฉด ์ง€๋„๋กœ)", "Hazard by station (click to locate)"], + E07_Col_Class: ["๋“ฑ๊ธ‰", "Class"], + E07_Col_Area: ["๋ฉด์  (mยฒ)", "Area (mยฒ)"], + E07_Col_Station: ["์ธก์ ", "Station"], + E07_Col_FsMin: ["์ตœ์†Œ Fs", "Min Fs"], + E07_Col_SiMin: ["์ตœ์†Œ SI", "Min SI"], + E07_Col_Worst: ["๋‚˜์œ ๋“ฑ๊ธ‰", "Worst class"], + E07_Col_RiskArea: ["์œ„ํ—˜ mยฒ", "Hazard mยฒ"], +} as const satisfies Record;