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

D03_PlanAnalysis/D03_PlanAnalysis_Router.py

@@ -3,7 +3,8 @@
 - `GET /api/projects/{id}/plan/terrain/extent` — 받기 전 범위(상자 · 도엽 · 칸 수 · 받은 범위)
 - `POST …/plan/terrain` — 사업 전체 지형 한 벌 받기(뒤에서 · 누를 때만) · 끝나면 `surface_models` 행
 - `GET …/plan/progress` — 일의 진행률
-- `GET …/plan/layers/sheet?key=` · `…/cadastral` · `…/raster?kind=slope` — 지도 겹(PLAN 569-1)
+- `GET …/plan/layers/sheet?key=` · `…/cadastral` · `…/raster?kind=slope|hillshade` ·
+  `…/zones` · `…/bands` — 지도 겹(PLAN 569-1 · 581-1)
 
 범위 = 전체 시점 · 종점(D02 정본 `load_base`) + 그은 점(`extra`) 상자 + 여유.
 노선 정본(손 그은 선)은
@@ -197,12 +198,37 @@ async def plan_layer_cadastral(project_id: UUID, request: Request) -> Response:
 
 @router.get("/{project_id}/plan/layers/raster", response_model=None)
 async def plan_layer_raster(project_id: UUID, kind: str = "slope") -> dict[str, Any]:
-    """급경사 단계 그림(15° · 35° · 40°) — 격자 지문 같으면 저장본."""
-    if kind != "slope":
+    """급경사 단계 그림(15° · 35° · 40°) · 음영기복(`hillshade`) — 격자 지문 같으면 저장본."""
+    if kind not in layers.RASTER_KINDS:
         raise HTTPException(status_code=400, detail=f"없는 그림 겹: {kind}")
     root, epsg, _ = await _layer_root(project_id)
     try:
-        value = await asyncio.to_thread(layers.slope_layer, root, terrain.models_dir_of(root), epsg)
+        value = await asyncio.to_thread(
+            layers.slope_layer, root, terrain.models_dir_of(root), epsg, kind
+        )
     except FileNotFoundError as error:
         raise HTTPException(status_code=404, detail=str(error)) from error
     return {"status": "success", "kind": kind, **value}
+
+
+@router.get("/{project_id}/plan/layers/zones", response_model=None)
+async def plan_layer_zones(project_id: UUID, request: Request) -> Response:
+    """보호 · 규제 구역 GeoJSON(여덟 종 · `summary` = 종류별 개수 · 넓이) — 범위 밖이면 받음."""
+    root, epsg, box = await _layer_root(project_id)
+    processed = root / terrain.STAGE / "processed"
+    try:
+        got = await asyncio.to_thread(layers.ensure_zones, processed, box, epsg)
+    except RuntimeError as error:
+        raise HTTPException(status_code=502, detail=str(error)) from error
+    return cached_file_response(request, got["path"], "application/geo+json")
+
+
+@router.get("/{project_id}/plan/layers/bands", response_model=None)
+async def plan_layer_bands(project_id: UUID) -> dict[str, Any]:
+    """계류 100 m · 도로 300 m 띠(넓이 · 받은 범위 비율) — 두 도엽 겹 지문 같으면 저장본."""
+    root, epsg, box = await _layer_root(project_id)
+    try:
+        value = await asyncio.to_thread(layers.band_layer, root, epsg, box)
+    except FileNotFoundError as error:
+        raise HTTPException(status_code=404, detail=str(error)) from error
+    return {"status": "success", **value}