Merge remote-tracking branch 'origin/dev' into sub_laptop_3

A00_Common/design/logic/design_calc_node.ts

@@ -12,7 +12,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` 키 ·
+ *          chainage_m? }] · facilities?: { pipes · structures }(시설 구간 · 511-B B-4) } ·
  *          berm?: { structures: 구조물 정본 목록 · chainages: [측점 m] } ·
  *          rebase? · carry?(노선 바뀐 [저장] · `design_calc_node_carry.ts`) ·
  *          stages?(묶음 단계 · `design_calc_node_stages.ts` · 511-B) ·
@@ -26,9 +27,9 @@
 
 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";
+import type { CulvertPipePoint } from "@util/common_util_culvert_sets";
 import { pipeTrenchWidthM, wallTrenchAreaM2, wallTrenchWidthM } from "@util/common_util_excavation";
 import { computeMassHaul, massHaulPayload } from "@util/common_util_mass_haul";
 import type { MassHaulResult } from "@util/common_util_mass_haul";
@@ -37,6 +38,12 @@ import type { RoutePoint } from "../../../B05_Profile/B05_Profile_Api_Fetch";
 import { buildCorridor } from "../../../B05_Profile/B05_Profile_UI_Corridor_Build";
 import { corridorHash, serialize } from "../../../B05_Profile/B05_Profile_UI_Corridor_Envelope";
 import type { SectionDetailResponse } from "../../../B06_Section/B06_Section_Api_Fetch";
+import {
+  facilityAt,
+  facilityRanges,
+  type FacilityStructure,
+} from "../../../B06_Section/logic/B06_Section_Cross_Enforce";
+import { crossOptions } from "../../../B06_Section/logic/B06_Section_Cross_Save";
 import {
   applyStructureAreaRows,
   extraWallRows,
@@ -85,59 +92,14 @@ interface CalcInputs extends FollowInputs, CarryInputs, TrialInputs, StagesInput
       samples: CrossGroundSample[];
       design_elevation_m: number | null;
       options: Record<string, unknown>;
+      /** 시설 구간을 얹을 누가거리(`facilities` 와 함께 · 511-B B-4) */
+      chainage_m?: number;
     }>;
+    /** 관 지점 · 구조물 정본 → 측점마다 포장 · 기울임 · 세월교 하강(`facilityRanges` · C3) */
+    facilities?: { pipes: CulvertPipePoint[]; structures: FacilityStructure[] };
   };
 }
 
-/** 파이썬 `compute_cross_design` 키 → TS 짝 키(거울 시험 test_b06_cross_design_mirror 표와 같음). */
-const CROSS_OPTION_KEYS: Record<string, keyof CrossDesignOptions> = {
-  ground_type: "groundType",
-  section_mode: "sectionMode",
-  ditch_side: "ditchSide",
-  ditch_type: "ditchType",
-  paved: "paved",
-  rock_boundary_offset_m: "rockBoundaryOffsetM",
-  two_stage_slope: "twoStageSlope",
-  cut_slope_ratio: "cutSlopeRatio",
-  ditch_enabled: "ditchEnabled",
-  ditch_choice: "ditchChoice",
-  surface_drop_m: "surfaceDropM",
-  plan_radius_m: "planRadiusM",
-  curve_outer_side: "curveOuterSide",
-  curve_widening_m: "curveWideningM",
-  shoulder_extend_left_m: "shoulderExtendLeftM",
-  shoulder_extend_right_m: "shoulderExtendRightM",
-  tilted: "tilted",
-  tilt_pct: "tiltPct",
-};
-
-/** 파이썬 BermSpec(NamedTuple → dict) → TS BermSpec. */
-function bermOf(value: unknown): BermSpec | null {
-  if (!value || typeof value !== "object") return null;
-  const berm = value as Record<string, number | null>;
-  return {
-    widthM: berm.width_m as number,
-    intervalM: berm.interval_m as number,
-    slopeDeg: berm.slope_deg as number,
-    depthM: berm.depth_m as number,
-    depthLeftM: berm.depth_left_m ?? null,
-    depthRightM: berm.depth_right_m ?? null,
-  };
-}
-
-function crossOptions(
-  raw: Record<string, unknown>,
-  standard: CrossDesignOptions["standard"],
-): CrossDesignOptions {
-  const options: Record<string, unknown> = { standard };
-  for (const [key, value] of Object.entries(raw)) {
-    if (key === "berm") options.berm = bermOf(value);
-    else if (key in CROSS_OPTION_KEYS) options[CROSS_OPTION_KEYS[key]] = value;
-    else throw new Error(`모르는 횡단 설계 키: ${key}`);
-  }
-  return options as unknown as CrossDesignOptions;
-}
-
 /** 한 번 돌림 — 같은 id 는 한 번만 셈(memo) · 앞 id 는 `need` 로 · 단계 id 는 약속(기다림). */
 async function runDesignCalc(run: readonly string[], inputs: CalcInputs) {
   const memo = new Map<string, unknown>();
@@ -208,9 +170,15 @@ async function runDesignCalc(run: readonly string[], inputs: CalcInputs) {
     // 측점마다 TS 짝(`computeCrossDesign`) — 못 세우면 그 자리 { error }(파이썬은 ValueError 로 되던짐).
     "cross.design": () => {
       const batch = inputs.cross_design;
+      const ranges = batch?.facilities
+        ? facilityRanges(batch.facilities.pipes, batch.facilities.structures)
+        : null;
       return (batch?.stations ?? []).map((station) => {
         try {
-          const options = crossOptions(station.options, batch!.standard);
+          const options = {
+            ...crossOptions(station.options, batch!.standard),
+            ...(ranges && station.chainage_m != null ? facilityAt(ranges, station.chainage_m) : {}),
+          };
           return computeCrossDesign(station.samples, station.design_elevation_m, options);
         } catch (error) {
           return { error: error instanceof Error ? error.message : String(error) };