Merge remote-tracking branches 'origin/main_laptop_1' and 'origin/sub_laptop_2' into sub_laptop_3

A00_Common/design/logic/design_calc_node.ts

@@ -11,7 +11,8 @@
  *          excavation?: { pipes: [{ diameter_mm }] · walls: [{ height_m · average_thickness_m ·
  *          has_foundation }] } ·
  *          cross_design?: { standard: 표준 횡단(config 위에 저장분 덮은 한 벌) ·
- *          stations: [{ samples · design_elevation_m · options: 파이썬 `compute_cross_design` 키 }] } } }
+ *          stations: [{ samples · design_elevation_m · options: 파이썬 `compute_cross_design` 키 }] } ·
+ *          berm?: { structures: 구조물 정본 목록 · chainages: [측점 m] } } }
  *   출력  { results: { [id]: 값 }, available: [id…] }
  *         — 차례는 요청 차례가 아니라 기댐 차례(누가토량 앞에 구조물 면적을 상세에 얹음 ·
  *           server-calc 묶음과 같은 차례).
@@ -19,6 +20,7 @@
  * ========================================================================== */
 
 import { readFileSync, writeFileSync } from "node:fs";
+import { bermSpansFromStructures, bermSpecAt } from "@util/common_util_berm_spans";
 import type { BermSpec } from "@util/common_util_cross_berm";
 import { computeCrossDesign } from "@util/common_util_cross_design";
 import type { CrossDesignOptions, CrossGroundSample } from "@util/common_util_cross_design";
@@ -63,6 +65,10 @@ interface CalcInputs {
       has_foundation?: boolean;
     }>;
   };
+  berm?: {
+    structures: Parameters<typeof bermSpansFromStructures>[0];
+    chainages: number[];
+  };
   cross_design?: {
     standard: CrossDesignOptions["standard"];
     stations?: Array<{
@@ -179,6 +185,11 @@ function runDesignCalc(run: readonly string[], inputs: CalcInputs) {
         ),
       })),
     }),
+    // 소단 구간(C4) — 구조물 정본 → 구간 · 측점마다 제원(겹치면 먼저 놓은 것).
+    "cross.berm_spans": () => {
+      const spans = bermSpansFromStructures(inputs.berm?.structures ?? []);
+      return { spans, at: (inputs.berm?.chainages ?? []).map((c) => bermSpecAt(spans, c)) };
+    },
     // 측점마다 TS 짝(`computeCrossDesign`) — 못 세우면 그 자리 { error }(파이썬은 ValueError 로 되던짐).
     "cross.design": () => {
       const batch = inputs.cross_design;

A00_Common/design/logic/design_calc_registry.ts

@@ -365,11 +365,10 @@ export const CALC_REGISTRY: readonly CalcEntry[] = [
     site: "browser_now",
     stage: "cross",
     ts: `${U}common_util_cross_design.ts#computeCrossDesign`,
-    runner: `py:${B06}B06_Section_Engine_Design.py#compute_cross_design`,
-    until: "472-4",
+    runner: "node:cross.design",
     pair: `${B06}B06_Section_Engine_Design.py#compute_cross_design`,
     mirror: ["test_b06_cross_design_mirror", "test_178_2_berm_fill_mirror"],
-    note: "파이썬 짝은 B07 · 추천 · Route_Save · B05 확정도 부름 — 짝 남음",
+    note: "[저장] · [확정] 다시 셈 = Node(472-4 ②) · 파이썬 짝 남음(B07 · 추천 · Route_Save · B05 확정 · 넓힘 찾기) · 알려진 차 = 설계선 점 반올림 동점 1e-4 m",
   },
   {
     id: "cross.areas",
@@ -380,11 +379,10 @@ export const CALC_REGISTRY: readonly CalcEntry[] = [
     site: "browser_now",
     stage: "cross",
     ts: `${U}common_util_cross_design_areas.ts#splitCutAreas`,
-    runner: `py:${B06}B06_Section_Engine_Areas.py#_split_cut_areas`,
-    until: "472-4",
+    runner: "node:cross.design",
     pair: `${B06}B06_Section_Engine_Areas.py#_split_cut_areas`,
     mirror: ["test_b06_cross_design_mirror"],
-    note: "X3 — 표준 측점 = 파이썬 · 구조물 측점 = Node(structure.layouts)",
+    note: "설계선과 한 셈(cross.design) · X3 한 갈래 — 표준 측점 · 구조물 측점(structure.layouts) 모두 Node",
   },
   {
     id: "cross.enforce",
@@ -398,6 +396,7 @@ export const CALC_REGISTRY: readonly CalcEntry[] = [
     runner: `py:${B06}B06_Section_Router_Design.py#enforce_design_lines`,
     until: "472-4",
     pair: `${B06}B06_Section_Router_Design.py#enforce_design_lines`,
+    note: "구간 판정 = 파이썬 짝(Router_Design_Ranges) · 다시 세운 설계 = Node cross.design",
     mirror: ["test_349_0n_cross_enforce_mirror"],
   },
   {
@@ -408,12 +407,11 @@ export const CALC_REGISTRY: readonly CalcEntry[] = [
     outputs: ["소단 구간"],
     site: "browser_now",
     stage: null,
-    ts: `${B06}B06_Section_UI_Page_Persist.ts#bermSpansFromStructures`,
-    runner: `py:${B06}B06_Section_Engine_Structures_Wall.py#load_berm_spans`,
-    until: "472-4",
+    ts: `${U}common_util_berm_spans.ts#bermSpansFromStructures`,
+    runner: "node:cross.berm_spans",
     pair: `${B06}B06_Section_Engine_Structures_Wall.py#load_berm_spans`,
     mirror: ["test_272_berm_source"],
-    note: "TS 가 화면 파일 안 — common_util 로(472-4 ②)",
+    note: "[저장] 다시 셈 = Node(472-4 ②) · 파이썬 짝은 Node 못 부를 때만",
   },
   {
     id: "cross.berm_slope",
@@ -424,9 +422,9 @@ export const CALC_REGISTRY: readonly CalcEntry[] = [
     site: "browser_now",
     stage: "cross",
     ts: `${U}common_util_cross_berm.ts#cutProfilePoints`,
-    runner: `py:${U}common_util_cross_berm.py#cut_profile_points`,
-    until: "472-4",
+    runner: "node:cross.design",
     pair: `${U}common_util_cross_berm.py#cut_profile_points`,
+    note: "설계선 셈 안(cross.design) · 파이썬 짝 남음(cross.design 과 같은 까닭)",
     mirror: ["test_178_2_berm_fill_mirror"],
   },
   {