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

B05_Profile/B05_Profile_Router_Confirm.py

@@ -118,11 +118,14 @@ async def sync_uphill_overrides_into_designs(
     from B06_Section.B06_Section_Repository import get_cross_section_designs
     from B06_Section.B06_Section_Repository_Bulk import merge_cross_section_designs
     from B06_Section.B06_Section_Router_Design import (
+        USER_TOUCHED_KEYS,
         ford_drop_at,
         ford_surface_drops,
         pavement_suggestions,
         read_cross_design_inputs,
         resolve_longitudinal_path,
+        stored_berm,
+        stored_cut_slope,
     )
 
     if not overrides:
@@ -172,23 +175,26 @@ async def sync_uphill_overrides_into_designs(
                 ground_type=str(design.get("ground_type", "soil")),
                 section_mode=next_mode,
                 ditch_side=side,
-                ditch_type=str(design.get("ditch_type", "standard")),
+                ditch_type=str(design.get("ditch_type") or "standard"),  # 측구 끔 = None 저장분
                 paved=bool(design.get("paved", False)),
                 standard=stored_standard,
                 rock_boundary_offset_m=design.get("rock_boundary_offset_m"),
                 two_stage_slope=bool(design.get("two_stage_slope", False)),
+                cut_slope_ratio=stored_cut_slope(design),  # 측점별 깎기 경사(429 ⑤)
                 ditch_enabled=design.get("ditch_enabled"),
                 ditch_choice=design.get("ditch_choice"),
                 surface_drop_m=ford_drop_at(float(chainage), ford_drops),
+                berm=stored_berm(design),  # 소단 · 쪽마다 옮긴 깊이(429 ⑤)
                 **curve_widening_args(cross_record),
                 **stored_shoulder_extend(design),  # 노견 확장(139-6)
                 **stored_tilt(design),  # 물넘이 · 맹암거 자리 측구 없음 · 기울기(286-2 · 287-4)
             )
             next_design["status"] = design.get("status", "provisional")
             next_design["pavement_suggested"] = design.get("pavement_suggested", pavement_suggested)
-            # 개별 표시 반폭 등 계산과 무관한 표시 설정은 그대로 이월한다.
-            if design.get("display_half_width_m") is not None:
-                next_design["display_half_width_m"] = design["display_half_width_m"]
+            # 사용자 조작값 승계(조절 · 소단 · 깎기 경사 · 글) — `enforce_design_lines` 와 같음
+            for key in USER_TOUCHED_KEYS:
+                if design.get(key) is not None:
+                    next_design[key] = design[key]
             out.append((float(chainage), next_design))
         return out