From 7fd95ba6f9a17c5b8937bea5f7fafcbf3b051601 Mon Sep 17 00:00:00 2001
From: ljpark <mind-one005@mind-one.co.kr>
Date: Fri, 4 Sep 2026 10:32:36 +0900
Subject: [PATCH 01/13] =?UTF-8?q?sn:=20src/shared/util/util.ts=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9=20=EC=99=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/fldngHstry/fldngHstryTypes.ts  | 20 +++++++---------
 .../floodDngrMap/floodDngrMapTypes.ts         | 17 ++++++-------
 .../sbmrgDngrMap/sbmrgDngrMapTypes.ts         | 13 +++++-----
 .../map/components/sinkhole/sinkholeTypes.ts  | 20 +++++++---------
 .../ui/CtyFldngPrvtnBizListPage.tsx           | 24 ++++++++++---------
 .../features/obsltPpl/ui/ObsltPplListPage.tsx | 24 ++++++++++---------
 6 files changed, 57 insertions(+), 61 deletions(-)

diff --git a/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryTypes.ts b/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryTypes.ts
index bca73fc0e..3d5649b7f 100644
--- a/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryTypes.ts
+++ b/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryTypes.ts
@@ -1,6 +1,7 @@
 "use client";
 
 import type { UiHeadProps } from "@common/business_components/ui";
+import { appendApiSearchParams } from "@/shared/util/util";
 
 export const FLOOD_HISTORY_POPUP_KEY = "fldngHstryPopup";
 export const FLDNG_HSTRY_ROW_SELECT_MESSAGE = "SN_FLOOD_HISTORY_ROW_SELECT";
@@ -419,17 +420,14 @@ export const buildFldngHstryListQueryString = (
     size: String(size),
   });
 
-  if (normalized.ctpvCd !== "0")
-    params.set("ctpvCd", normalized.ctpvCd.slice(0, 2));
-  if (normalized.sggCd !== "0")
-    params.set("sggCd", normalized.sggCd.slice(0, 5));
-  if (normalized.floodYear) params.set("fldngYr", normalized.floodYear);
-  if (normalized.disasterName)
-    params.set("fldngDstrNm", normalized.disasterName);
-  if (normalized.rainStartDate)
-    params.set("rainBgngTm", normalized.rainStartDate);
-  if (normalized.districtName)
-    params.set("fldngDstrctNm", normalized.districtName);
+  appendApiSearchParams(params, {
+    ctpvCd: normalized.ctpvCd === "0" ? "0" : normalized.ctpvCd.slice(0, 2),
+    sggCd: normalized.sggCd === "0" ? "0" : normalized.sggCd.slice(0, 5),
+    fldngYr: normalized.floodYear,
+    fldngDstrNm: normalized.disasterName,
+    rainBgngTm: normalized.rainStartDate,
+    fldngDstrctNm: normalized.districtName,
+  });
   return params.toString();
 };
 
diff --git a/apps/sn/app/(map-layout)/map/components/floodDngrMap/floodDngrMapTypes.ts b/apps/sn/app/(map-layout)/map/components/floodDngrMap/floodDngrMapTypes.ts
index ab03f132d..1d4d2df65 100644
--- a/apps/sn/app/(map-layout)/map/components/floodDngrMap/floodDngrMapTypes.ts
+++ b/apps/sn/app/(map-layout)/map/components/floodDngrMap/floodDngrMapTypes.ts
@@ -1,6 +1,7 @@
 "use client";
 
 import type { UiHeadProps } from "@common/business_components/ui";
+import { appendApiSearchParams } from "@/shared/util/util";
 
 export const FLOOD_DNGR_MAP_POPUP_KEY = "floodDngrMapPopup";
 export const FLOOD_DNGR_MAP_LAYER_TYPE = "tb_ms_flood_dngr_map";
@@ -89,16 +90,12 @@ export const buildFloodDngrMapListQueryString = (
     page: String(page),
     size: String(size),
   });
-  if (filters.ctpvCd && filters.ctpvCd !== "0")
-    params.set("ctpvCd", filters.ctpvCd.slice(0, 2));
-  if (filters.sggCd && filters.sggCd !== "0")
-    params.set("sggCd", filters.sggCd.slice(0, 5));
-  if (filters.sbmrgDpthlCd && filters.sbmrgDpthlCd !== "0") {
-    params.set("sbmrgDpthlCd", filters.sbmrgDpthlCd);
-  }
-  if (filters.sbmrgFrqExpln && filters.sbmrgFrqExpln !== "0") {
-    params.set("sbmrgFrqExpln", filters.sbmrgFrqExpln);
-  }
+  appendApiSearchParams(params, {
+    ctpvCd: filters.ctpvCd === "0" ? "0" : filters.ctpvCd.slice(0, 2),
+    sggCd: filters.sggCd === "0" ? "0" : filters.sggCd.slice(0, 5),
+    sbmrgDpthlCd: filters.sbmrgDpthlCd,
+    sbmrgFrqExpln: filters.sbmrgFrqExpln,
+  });
   return params.toString();
 };
 
diff --git a/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/sbmrgDngrMapTypes.ts b/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/sbmrgDngrMapTypes.ts
index bf225784e..3d27a82c9 100644
--- a/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/sbmrgDngrMapTypes.ts
+++ b/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/sbmrgDngrMapTypes.ts
@@ -1,6 +1,7 @@
 "use client";
 
 import type { UiHeadProps } from "@common/business_components/ui";
+import { appendApiSearchParams } from "@/shared/util/util";
 
 export const SBMRG_DNGR_MAP_POPUP_KEY = "sbmrgDngrMapPopup";
 export const SBMRG_DNGR_MAP_LAYER_TYPE = "tb_ms_sbmrg_dngr_map";
@@ -74,13 +75,11 @@ export const buildSbmrgDngrMapListQueryString = (
     page: String(page),
     size: String(size),
   });
-  if (filters.ctpvCd && filters.ctpvCd !== "0")
-    params.set("ctpvCd", filters.ctpvCd.slice(0, 2));
-  if (filters.sggCd && filters.sggCd !== "0")
-    params.set("sggCd", filters.sggCd.slice(0, 5));
-  if (filters.floodWtlvFrqVl && filters.floodWtlvFrqVl !== "0") {
-    params.set("floodWtlvFrqVl", filters.floodWtlvFrqVl);
-  }
+  appendApiSearchParams(params, {
+    ctpvCd: filters.ctpvCd === "0" ? "0" : filters.ctpvCd.slice(0, 2),
+    sggCd: filters.sggCd === "0" ? "0" : filters.sggCd.slice(0, 5),
+    floodWtlvFrqVl: filters.floodWtlvFrqVl,
+  });
   return params.toString();
 };
 
diff --git a/apps/sn/app/(map-layout)/map/components/sinkhole/sinkholeTypes.ts b/apps/sn/app/(map-layout)/map/components/sinkhole/sinkholeTypes.ts
index 401029745..e526ec992 100644
--- a/apps/sn/app/(map-layout)/map/components/sinkhole/sinkholeTypes.ts
+++ b/apps/sn/app/(map-layout)/map/components/sinkhole/sinkholeTypes.ts
@@ -2,6 +2,7 @@
 
 import type { SelectDataType } from "@common/business_components";
 import type { IUserInfo } from "@/shared/store";
+import { appendApiSearchParams } from "@/shared/util/util";
 
 export const SINKHOLE_CONTROL_NODE_ID = "SN_SINKHOLE";
 export const SINKHOLE_LAYER_TYPE = "tb_sn_sinkhole_info";
@@ -284,19 +285,16 @@ export const buildSinkholeListQueryString = (
     size: String(size),
   });
 
-  if (filters.startYmd) params.set("startYmd", filters.startYmd);
-  if (filters.endYmd) params.set("endYmd", filters.endYmd);
-
   const ctpvNm = resolveRegionNameByCode(filters.ctpvCd, ctpvOptions, 2);
   const sggNm = resolveRegionNameByCode(filters.sggCd, sggOptions, 5);
-  if (ctpvNm) params.set("ctpvNm", ctpvNm);
-  if (sggNm) params.set("sggNm", sggNm);
-  if (filters.restoreStatus && filters.restoreStatus !== "0") {
-    params.set("restoreStatus", filters.restoreStatus);
-  }
-  if (filters.coordStatus && filters.coordStatus !== "0") {
-    params.set("coordStatus", filters.coordStatus);
-  }
+  appendApiSearchParams(params, {
+    startYmd: filters.startYmd,
+    endYmd: filters.endYmd,
+    ctpvNm,
+    sggNm,
+    restoreStatus: filters.restoreStatus,
+    coordStatus: filters.coordStatus,
+  });
   if (options?.includeCoordStatus === false) {
     params.set("includeCoordStatus", "false");
   }
diff --git a/apps/sn/src/features/ctyFldngPrvtnBiz/ui/CtyFldngPrvtnBizListPage.tsx b/apps/sn/src/features/ctyFldngPrvtnBiz/ui/CtyFldngPrvtnBizListPage.tsx
index 12666c3be..031511650 100644
--- a/apps/sn/src/features/ctyFldngPrvtnBiz/ui/CtyFldngPrvtnBizListPage.tsx
+++ b/apps/sn/src/features/ctyFldngPrvtnBiz/ui/CtyFldngPrvtnBizListPage.tsx
@@ -717,17 +717,19 @@ export function CtyFldngPrvtnBizListPage() {
             />
           </div>
 
-          <Button type="submit" className="w-[7.4rem]">
-            조회
-          </Button>
-          <Button
-            type="button"
-            color="white"
-            className="w-[8.8rem]"
-            onClick={handleReset}
-          >
-            초기화
-          </Button>
+          <div className="flex min-w-fit flex-1 items-center justify-end gap-2">
+            <Button type="submit" className="w-[7.4rem]">
+              조회
+            </Button>
+            <Button
+              type="button"
+              color="white"
+              className="w-[8.8rem]"
+              onClick={handleReset}
+            >
+              초기화
+            </Button>
+          </div>
         </form>
       </div>
       {notice && (
diff --git a/apps/sn/src/features/obsltPpl/ui/ObsltPplListPage.tsx b/apps/sn/src/features/obsltPpl/ui/ObsltPplListPage.tsx
index 214eca881..d27f76b49 100644
--- a/apps/sn/src/features/obsltPpl/ui/ObsltPplListPage.tsx
+++ b/apps/sn/src/features/obsltPpl/ui/ObsltPplListPage.tsx
@@ -619,17 +619,19 @@ export function ObsltPplListPage() {
             />
           </div>
 
-          <Button type="submit" className="w-[7.4rem]">
-            조회
-          </Button>
-          <Button
-            type="button"
-            color="white"
-            className="w-[8.8rem]"
-            onClick={handleReset}
-          >
-            초기화
-          </Button>
+          <div className="flex min-w-fit flex-1 items-center justify-end gap-2">
+            <Button type="submit" className="w-[7.4rem]">
+              조회
+            </Button>
+            <Button
+              type="button"
+              color="white"
+              className="w-[8.8rem]"
+              onClick={handleReset}
+            >
+              초기화
+            </Button>
+          </div>
         </form>
       </div>
 

From 10d3fc096a298a0068c9822a254143d302f82d69 Mon Sep 17 00:00:00 2001
From: ljpark <mind-one005@mind-one.co.kr>
Date: Fri, 4 Sep 2026 11:00:38 +0900
Subject: [PATCH 02/13] =?UTF-8?q?sn:=20=EC=8B=9C=EB=8F=84=20=EC=A0=84?=
 =?UTF-8?q?=EC=B2=B4=EC=9D=BC=20=EB=95=8C,=20=EC=8B=9C=EA=B5=B0=EA=B5=AC?=
 =?UTF-8?q?=20=EB=AA=A9=EB=A1=9D=20=EB=B9=84=EC=9A=B0=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../map/components/agedPipe/AgedPipePopupPage.tsx            | 2 +-
 .../map/components/fldngHstry/FldngHstryPopupPage.tsx        | 2 +-
 .../map/components/floodDngrMap/FloodDngrMapPopupPage.tsx    | 2 +-
 .../map/components/pipeAnalysis/PipeAnalysisPopupPage.tsx    | 2 +-
 .../map/components/sbmrgDngrMap/SbmrgDngrMapPopupPage.tsx    | 2 +-
 .../map/components/sinkhole/SinkholePopupPage.tsx            | 2 +-
 .../map/components/waterRisk/WaterRiskPopupPage.tsx          | 4 ++--
 apps/sn/app/(with-base-layout)/oper/dredging/page.tsx        | 2 +-
 .../sn/app/html/(map-layout)/aged-pipe/AgedPipeListModal.tsx | 2 +-
 .../fldngPredcPrst/ui/FldngPredcPrstPopupContent.tsx         | 2 +-
 apps/sn/src/features/obsltPpl/lib/obslt-ppl-region.ts        | 5 ++++-
 11 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/apps/sn/app/(map-layout)/map/components/agedPipe/AgedPipePopupPage.tsx b/apps/sn/app/(map-layout)/map/components/agedPipe/AgedPipePopupPage.tsx
index 5a8caf2d9..b2a12c783 100644
--- a/apps/sn/app/(map-layout)/map/components/agedPipe/AgedPipePopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/agedPipe/AgedPipePopupPage.tsx
@@ -57,7 +57,7 @@ export default function AgedPipePopupPage() {
   const sggOptions = useMemo(
     () =>
       filters.ctpvCd === "0"
-        ? sgg
+        ? []
         : sgg.filter((item) =>
             String(item.val).startsWith(filters.ctpvCd.slice(0, 2)),
           ),
diff --git a/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryPopupPage.tsx
index 9191a4be5..42750f87d 100644
--- a/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryPopupPage.tsx
@@ -126,7 +126,7 @@ export default function FldngHstryPopupPage() {
   const sggOptions = useMemo(
     () =>
       filters.ctpvCd === "0"
-        ? sgg
+        ? []
         : sgg.filter((item) =>
             String(item.val).startsWith(filters.ctpvCd.slice(0, 2)),
           ),
diff --git a/apps/sn/app/(map-layout)/map/components/floodDngrMap/FloodDngrMapPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/floodDngrMap/FloodDngrMapPopupPage.tsx
index b65c7b38f..62821229f 100644
--- a/apps/sn/app/(map-layout)/map/components/floodDngrMap/FloodDngrMapPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/floodDngrMap/FloodDngrMapPopupPage.tsx
@@ -101,7 +101,7 @@ export default function FloodDngrMapPopupPage() {
             availableSggCodes.has(String(item.val).trim().slice(0, 5)),
           );
     return filters.ctpvCd === "0"
-      ? scopedOptions
+      ? []
       : scopedOptions.filter((item) =>
           String(item.val).startsWith(filters.ctpvCd.slice(0, 2)),
         );
diff --git a/apps/sn/app/(map-layout)/map/components/pipeAnalysis/PipeAnalysisPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/pipeAnalysis/PipeAnalysisPopupPage.tsx
index 725921045..e657c6f2d 100644
--- a/apps/sn/app/(map-layout)/map/components/pipeAnalysis/PipeAnalysisPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/pipeAnalysis/PipeAnalysisPopupPage.tsx
@@ -388,7 +388,7 @@ export default function PipeAnalysisPopupPage() {
   const sggOptions = useMemo(
     () =>
       draftFilters.ctpvCd === "0"
-        ? sgg
+        ? []
         : sgg.filter((item) =>
             String(item.val).startsWith(draftFilters.ctpvCd.slice(0, 2)),
           ),
diff --git a/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/SbmrgDngrMapPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/SbmrgDngrMapPopupPage.tsx
index 4cb3987fe..a6e2190e4 100644
--- a/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/SbmrgDngrMapPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/SbmrgDngrMapPopupPage.tsx
@@ -85,7 +85,7 @@ export default function SbmrgDngrMapPopupPage() {
             availableSggCodes.has(String(item.val).trim().slice(0, 5)),
           );
     return filters.ctpvCd === "0"
-      ? scopedOptions
+      ? []
       : scopedOptions.filter((item) =>
           String(item.val).startsWith(filters.ctpvCd.slice(0, 2)),
         );
diff --git a/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholePopupPage.tsx b/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholePopupPage.tsx
index c837cefdf..c5268b167 100644
--- a/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholePopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholePopupPage.tsx
@@ -197,7 +197,7 @@ export default function SinkholePopupPage() {
   const sggOptions = useMemo(
     () =>
       filters.ctpvCd === "0"
-        ? sgg
+        ? []
         : sgg.filter((item) =>
             String(item.val).startsWith(filters.ctpvCd.slice(0, 2)),
           ),
diff --git a/apps/sn/app/(map-layout)/map/components/waterRisk/WaterRiskPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/waterRisk/WaterRiskPopupPage.tsx
index 2077532aa..6758738f5 100644
--- a/apps/sn/app/(map-layout)/map/components/waterRisk/WaterRiskPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/waterRisk/WaterRiskPopupPage.tsx
@@ -366,7 +366,7 @@ export default function WaterRiskPopupPage(_props: WindowPopupContentProps) {
     areaOptions
       .filter(
         (option) =>
-          draftResultFilters.ctpvCd === "ALL" ||
+          draftResultFilters.ctpvCd !== "ALL" &&
           option.ctpvCd === draftResultFilters.ctpvCd,
       )
       .forEach((option) => {
@@ -382,7 +382,7 @@ export default function WaterRiskPopupPage(_props: WindowPopupContentProps) {
     () =>
       areaOptions.filter(
         (option) =>
-          (draftResultFilters.ctpvCd === "ALL" ||
+          (draftResultFilters.ctpvCd !== "ALL" &&
             option.ctpvCd === draftResultFilters.ctpvCd) &&
           (draftResultFilters.sggCd === "ALL" ||
             option.sggCd === draftResultFilters.sggCd),
diff --git a/apps/sn/app/(with-base-layout)/oper/dredging/page.tsx b/apps/sn/app/(with-base-layout)/oper/dredging/page.tsx
index aa9e18396..7e041a273 100644
--- a/apps/sn/app/(with-base-layout)/oper/dredging/page.tsx
+++ b/apps/sn/app/(with-base-layout)/oper/dredging/page.tsx
@@ -361,7 +361,7 @@ const Page = () => {
 
   /** 선택한 시도 코드와 앞 두 자리가 같은 시군구만 후보로 제공한다. */
   const availableSggOptions = useMemo(() => {
-    if (ctpvCd === "0") return sggRegionOptions;
+    if (ctpvCd === "0") return [];
     const ctpvPrefix = ctpvCd.slice(0, 2);
     return sggRegionOptions.filter((option) =>
       String(option.val).startsWith(ctpvPrefix),
diff --git a/apps/sn/app/html/(map-layout)/aged-pipe/AgedPipeListModal.tsx b/apps/sn/app/html/(map-layout)/aged-pipe/AgedPipeListModal.tsx
index a5c90e184..45a04331b 100644
--- a/apps/sn/app/html/(map-layout)/aged-pipe/AgedPipeListModal.tsx
+++ b/apps/sn/app/html/(map-layout)/aged-pipe/AgedPipeListModal.tsx
@@ -41,7 +41,7 @@ export default function AgedPipeListModal({
   const { ctpv, sgg } = useStore();
   const lastClickRef = useRef<{ index: number; clickedAt: number } | null>(null);
   const sggOptions = filters.ctpvCd === "0"
-    ? sgg
+    ? []
     : sgg.filter((item) => String(item.val).startsWith(filters.ctpvCd.slice(0, 2)));
 
   const handleRowClick = (index?: number) => {
diff --git a/apps/sn/src/features/fldngPredcPrst/ui/FldngPredcPrstPopupContent.tsx b/apps/sn/src/features/fldngPredcPrst/ui/FldngPredcPrstPopupContent.tsx
index b16991eb1..38abae35b 100644
--- a/apps/sn/src/features/fldngPredcPrst/ui/FldngPredcPrstPopupContent.tsx
+++ b/apps/sn/src/features/fldngPredcPrst/ui/FldngPredcPrstPopupContent.tsx
@@ -240,7 +240,7 @@ export default function FldngPredcPrstPopupContent() {
   const sggOptions = useMemo(
     () =>
       filters.ctpvCd === "0"
-        ? sgg
+        ? []
         : sgg.filter((item) =>
             String(item.val).startsWith(filters.ctpvCd.slice(0, 2)),
           ),
diff --git a/apps/sn/src/features/obsltPpl/lib/obslt-ppl-region.ts b/apps/sn/src/features/obsltPpl/lib/obslt-ppl-region.ts
index 2fc38854e..46547c757 100644
--- a/apps/sn/src/features/obsltPpl/lib/obslt-ppl-region.ts
+++ b/apps/sn/src/features/obsltPpl/lib/obslt-ppl-region.ts
@@ -40,12 +40,15 @@ export const buildObsltPplRepresentativeSggOptions = (
   sggOptions: RegionOption[],
   ctpvCd: string,
 ) => {
+  // 시도가 전체(0)이면 시군구를 선택할 수 없도록 목록을 비운다.
+  if (ctpvCd === "0") return [];
+
   const representativeMap = new Map<string, RegionOption>();
 
   sggOptions
     .filter((option) => {
       const optionCode = String(option.val ?? "").trim();
-      return ctpvCd === "0" || optionCode.startsWith(ctpvCd.slice(0, 2));
+      return optionCode.startsWith(ctpvCd.slice(0, 2));
     })
     .forEach((option) => {
       const representativeName = normalizeObsltPplSigunName(option.text);

From 9067e645b30d1f11951f019fa4f92d3988512ba0 Mon Sep 17 00:00:00 2001
From: ljpark <mind-one005@mind-one.co.kr>
Date: Fri, 4 Sep 2026 14:33:25 +0900
Subject: [PATCH 03/13] =?UTF-8?q?sn:=20=EC=A0=95=EB=B3=B4=EA=B2=80?=
 =?UTF-8?q?=EC=83=89=20=EA=B8=B0=EB=B3=B8=EC=A0=95=EB=B3=B4=20=EA=B5=AC?=
 =?UTF-8?q?=EB=B6=84=EB=9E=80=20=ED=99=94=EB=A9=B4=EC=9D=B4=20=EC=A4=84?=
 =?UTF-8?q?=EC=97=88=EC=9D=84=20=EB=95=8C,=20=EB=94=94=EC=9E=90=EC=9D=B8?=
 =?UTF-8?q?=20=EC=99=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/sn/app/(map-layout)/map/searchModal/basicTab.tsx     | 2 +-
 apps/sn/app/(map-layout)/map/searchModal/fldngWtlvMap.tsx | 4 ++--
 apps/sn/app/(map-layout)/map/searchModal/stofcbr.tsx      | 4 ++--
 apps/sn/app/(map-layout)/map/searchModal/swageMhl.tsx     | 4 ++--
 apps/sn/app/(map-layout)/map/searchModal/swagePmstn.tsx   | 4 ++--
 apps/sn/app/(map-layout)/map/searchModal/swagePpl.tsx     | 4 ++--
 .../sn/app/(map-layout)/map/searchModal/swagePrcsFclt.tsx | 4 ++--
 .../sn/app/(map-layout)/map/searchModal/swagePrcsZone.tsx | 4 ++--
 .../sn/app/html/(map-layout)/map/searchModal/basicTab.tsx | 8 ++++----
 .../src/ui/standard_data_table/index.tsx                  | 2 +-
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/apps/sn/app/(map-layout)/map/searchModal/basicTab.tsx b/apps/sn/app/(map-layout)/map/searchModal/basicTab.tsx
index 769c33036..0d1ebe18d 100644
--- a/apps/sn/app/(map-layout)/map/searchModal/basicTab.tsx
+++ b/apps/sn/app/(map-layout)/map/searchModal/basicTab.tsx
@@ -55,7 +55,7 @@ const BasicTab: React.FC = () => {
           selectContentClass="z-[101]"
         />
       </div>
-      <div className="min-w-0 flex-[1_1_60rem]">
+      <div className="contents">
         {basicType === "tb_ms_swage_ppl" && <SwagePpl />} {/* 하수관로 */}
         {basicType === "tb_il_swage_prcs_fclt" && <SwagePrcsFclt />}{" "}
         {/** 하수처리시설 */}
diff --git a/apps/sn/app/(map-layout)/map/searchModal/fldngWtlvMap.tsx b/apps/sn/app/(map-layout)/map/searchModal/fldngWtlvMap.tsx
index 35d08b98f..47248ab07 100644
--- a/apps/sn/app/(map-layout)/map/searchModal/fldngWtlvMap.tsx
+++ b/apps/sn/app/(map-layout)/map/searchModal/fldngWtlvMap.tsx
@@ -23,8 +23,8 @@ const FldngWtlvMap: React.FC = () => {
   const { handleSearch, handleResetSearch } = useSearchModal();
 
   return (
-    <div className="min-w-0">
-      <div className="flex flex-wrap items-center gap-x-4 gap-y-3">
+    <div className="contents">
+      <div className="contents">
         <CtpvSggPrcsFcltSelectBox
           sido={ctpvCd}
           sigungu={sggCd}
diff --git a/apps/sn/app/(map-layout)/map/searchModal/stofcbr.tsx b/apps/sn/app/(map-layout)/map/searchModal/stofcbr.tsx
index f65c2122d..610735a2b 100644
--- a/apps/sn/app/(map-layout)/map/searchModal/stofcbr.tsx
+++ b/apps/sn/app/(map-layout)/map/searchModal/stofcbr.tsx
@@ -53,8 +53,8 @@ const Stofcbr: React.FC = () => {
   const { handleSearch, handleResetSearch } = useSearchModal();
 
   return (
-    <div className="min-w-0">
-      <div className="flex flex-wrap items-center gap-x-4 gap-y-3">
+    <div className="contents">
+      <div className="contents">
         {/* 시도, 시군구 */}
         <CtpvSggPrcsFcltSelectBox
           sido={ctpvCd}
diff --git a/apps/sn/app/(map-layout)/map/searchModal/swageMhl.tsx b/apps/sn/app/(map-layout)/map/searchModal/swageMhl.tsx
index d03605ef8..e13164602 100644
--- a/apps/sn/app/(map-layout)/map/searchModal/swageMhl.tsx
+++ b/apps/sn/app/(map-layout)/map/searchModal/swageMhl.tsx
@@ -77,8 +77,8 @@ const SwageMhl: React.FC = () => {
   const { handleSearch, handleResetSearch } = useSearchModal();
 
   return (
-    <div className="min-w-0">
-      <div className="flex flex-wrap items-center gap-x-4 gap-y-3">
+    <div className="contents">
+      <div className="contents">
         <CtpvSggPrcsFcltSelectBox
           sido={ctpvCd}
           sigungu={sggCd}
diff --git a/apps/sn/app/(map-layout)/map/searchModal/swagePmstn.tsx b/apps/sn/app/(map-layout)/map/searchModal/swagePmstn.tsx
index 15269bed1..4d18aeef0 100644
--- a/apps/sn/app/(map-layout)/map/searchModal/swagePmstn.tsx
+++ b/apps/sn/app/(map-layout)/map/searchModal/swagePmstn.tsx
@@ -78,8 +78,8 @@ const SwagePmstn: React.FC = () => {
   const { handleSearch, handleResetSearch } = useSearchModal();
 
   return (
-    <div className="min-w-0">
-      <div className="flex flex-wrap items-center gap-x-4 gap-y-3">
+    <div className="contents">
+      <div className="contents">
         {/* 시도, 시군구 */}
         <CtpvSggPrcsFcltSelectBox
           sido={ctpvCd}
diff --git a/apps/sn/app/(map-layout)/map/searchModal/swagePpl.tsx b/apps/sn/app/(map-layout)/map/searchModal/swagePpl.tsx
index 26cfa0858..f694dc590 100644
--- a/apps/sn/app/(map-layout)/map/searchModal/swagePpl.tsx
+++ b/apps/sn/app/(map-layout)/map/searchModal/swagePpl.tsx
@@ -84,8 +84,8 @@ const SwagePpl: React.FC = () => {
   const { handleSearch, handleResetSearch } = useSearchModal();
 
   return (
-    <div className="min-w-0">
-      <div className="flex flex-wrap items-center gap-x-4 gap-y-3">
+    <div className="contents">
+      <div className="contents">
         <CtpvSggPrcsFcltSelectBox
           sido={ctpvCd}
           sigungu={sggCd}
diff --git a/apps/sn/app/(map-layout)/map/searchModal/swagePrcsFclt.tsx b/apps/sn/app/(map-layout)/map/searchModal/swagePrcsFclt.tsx
index e808fed89..1f97b567e 100644
--- a/apps/sn/app/(map-layout)/map/searchModal/swagePrcsFclt.tsx
+++ b/apps/sn/app/(map-layout)/map/searchModal/swagePrcsFclt.tsx
@@ -81,8 +81,8 @@ const SwagePrcsFclt: React.FC = () => {
   const { handleSearch, handleResetSearch } = useSearchModal();
 
   return (
-    <div className="min-w-0">
-      <div className="flex flex-wrap items-center gap-x-4 gap-y-3">
+    <div className="contents">
+      <div className="contents">
         <CtpvSggPrcsFcltSelectBox
           sido={ctpvCd}
           sigungu={sggCd}
diff --git a/apps/sn/app/(map-layout)/map/searchModal/swagePrcsZone.tsx b/apps/sn/app/(map-layout)/map/searchModal/swagePrcsZone.tsx
index 42ae6e265..9993a6c4c 100644
--- a/apps/sn/app/(map-layout)/map/searchModal/swagePrcsZone.tsx
+++ b/apps/sn/app/(map-layout)/map/searchModal/swagePrcsZone.tsx
@@ -34,8 +34,8 @@ const swagePrcsZone: React.FC = () => {
   const { handleSearch, handleResetSearch } = useSearchModal();
 
   return (
-    <div className="min-w-0">
-      <div className="flex flex-wrap items-center gap-x-4 gap-y-3">
+    <div className="contents">
+      <div className="contents">
         <CtpvSggPrcsFcltSelectBox
           sido={ctpvCd}
           sigungu={sggCd}
diff --git a/apps/sn/app/html/(map-layout)/map/searchModal/basicTab.tsx b/apps/sn/app/html/(map-layout)/map/searchModal/basicTab.tsx
index c21dc8ca4..af33c0c55 100644
--- a/apps/sn/app/html/(map-layout)/map/searchModal/basicTab.tsx
+++ b/apps/sn/app/html/(map-layout)/map/searchModal/basicTab.tsx
@@ -34,9 +34,9 @@ const BasicTab: React.FC = () => {
   const { basicType, setBasicType } = useSearchModalStore();
 
   return (
-    <div className="relative border rounded-lg pt-5 px-5 w-full min-h-[10vh]">
+    <div className="relative flex w-full min-h-[10vh] flex-wrap items-center gap-x-4 gap-y-3 rounded-lg border px-5 pt-5">
       {/* 구분 */}
-      <div className="mb-3 flex items-center justify-between gap-4">
+      <div className="flex shrink-0 items-center">
         <div className="flex items-center">
           <Label className="text-xl text-gray-600 font-medium whitespace-nowrap mr-2">구분</Label>
           <SelectBox
@@ -52,7 +52,7 @@ const BasicTab: React.FC = () => {
           />
         </div>
       </div>
-      {/* 조회 조건 */}
+      {/* 조회 조건: 구분 선택과 같은 행에 배치 */}
       {basicType === "tb_ms_swage_ppl" && (<SwagePpl />)}  {/* 하수관로 */}
       {basicType === "tb_il_swage_prcs_fclt" && (<SwagePrcsFclt />)} {/* 하수처리시설 */}
       {basicType === "tb_ms_swage_prcs_zone" && (<SwagePrcsZone />)} {/* 하수처리구역 */}
@@ -63,4 +63,4 @@ const BasicTab: React.FC = () => {
   );
 };
 
-export default React.memo(BasicTab);
\ No newline at end of file
+export default React.memo(BasicTab);
diff --git a/packages/common/business_components/src/ui/standard_data_table/index.tsx b/packages/common/business_components/src/ui/standard_data_table/index.tsx
index 0753d8f23..f044b851c 100644
--- a/packages/common/business_components/src/ui/standard_data_table/index.tsx
+++ b/packages/common/business_components/src/ui/standard_data_table/index.tsx
@@ -277,7 +277,7 @@ function StandardDataTable<T>({
 
       <div
         className={cn(
-          "card !m-[1.2rem] min-w-0 overflow-hidden !p-0",
+          "card !mx-[0.4rem] !my-[1.2rem] min-w-0 overflow-hidden !p-0",
           shouldFillAvailableHeight && "flex min-h-0 flex-1 flex-col",
         )}
       >

From aa5a71ae6818ea240dc3147b1c6c76eb271cc79a Mon Sep 17 00:00:00 2001
From: ljpark <mind-one005@mind-one.co.kr>
Date: Fri, 4 Sep 2026 14:52:11 +0900
Subject: [PATCH 04/13] =?UTF-8?q?sn:=20=EC=B9=A8=EC=9E=85=EC=88=98,=20RDII?=
 =?UTF-8?q?=20=EC=A0=9C=EB=AA=A9=EB=9E=80=20=EC=A1=B0=EA=B8=88=20=EB=84=93?=
 =?UTF-8?q?=EA=B2=8C=20=EC=99=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../popupComponent/chart/infilChart.tsx       |  2 +-
 .../popupComponent/chart/rdiiChart.tsx        |  2 +-
 .../(with-base-layout)/ii/irsetting/page.tsx  |  1 +
 .../app/(with-base-layout)/ii/rdii/page.tsx   |  1 +
 apps/sn/app/components/ui/fileUploadForm.tsx  |  8 +++----
 .../src/ui/standard_form/index.tsx            | 24 ++++++++++++-------
 6 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx
index c75fcdb5e..515d6ad8a 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx
@@ -244,7 +244,7 @@ const InfilChart = ({
 
   const renderResultPanel = () => (
     <section className="card card-border !m-0 min-w-0 overflow-hidden !p-[1.2rem]">
-      <StandardFormSection title="침입수 분석결과" columns={2}>
+      <StandardFormSection title="침입수 분석결과" columns={2} wideLabels>
         <StandardFormField label="상수사용량 적용연월" columns={2}>
           <div className="flex min-h-[3.2rem] items-center justify-end text-[1.35rem] font-semibold tabular-nums text-foreground">
             {selectedAplcnYm
diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx
index 5c9b09683..0a5abc436 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx
@@ -218,7 +218,7 @@ const RdiiChart = ({
 
   const renderResultPanel = () => (
     <section className="card card-border !m-0 min-w-0 overflow-hidden !p-[1.2rem]">
-      <StandardFormSection title="RDII 분석결과" columns={2}>
+      <StandardFormSection title="RDII 분석결과" columns={2} wideLabels>
         <StandardFormField label="상수사용 적용연월" columns={2}>
           <div className="flex min-h-[3.2rem] items-center justify-end text-[1.35rem] font-semibold tabular-nums text-foreground">
             {selectedAplcnYm
diff --git a/apps/sn/app/(with-base-layout)/ii/irsetting/page.tsx b/apps/sn/app/(with-base-layout)/ii/irsetting/page.tsx
index 927e9581a..4e7f7a237 100644
--- a/apps/sn/app/(with-base-layout)/ii/irsetting/page.tsx
+++ b/apps/sn/app/(with-base-layout)/ii/irsetting/page.tsx
@@ -485,6 +485,7 @@ const IrSetting = () => {
             key="irsetting-layout-key"
             title="분석 조건 및 자료"
             columns={2}
+            wideLabels
           >
             <StandardFormField label="상수사용량 적용월" required columns={2}>
               {/* 연월 선택 라이브러리로 수정 필요 */}
diff --git a/apps/sn/app/(with-base-layout)/ii/rdii/page.tsx b/apps/sn/app/(with-base-layout)/ii/rdii/page.tsx
index d0b72ef21..e5757f572 100644
--- a/apps/sn/app/(with-base-layout)/ii/rdii/page.tsx
+++ b/apps/sn/app/(with-base-layout)/ii/rdii/page.tsx
@@ -518,6 +518,7 @@ export default function RTKForm() {
             key="form-section"
             title="분석 조건 및 자료"
             columns={2}
+            wideLabels
           >
             <StandardFormField label="RTK계수 출처" required columns={2}>
               <Input {...form.register("rtkSource")} className="w-full" />
diff --git a/apps/sn/app/components/ui/fileUploadForm.tsx b/apps/sn/app/components/ui/fileUploadForm.tsx
index 8af347679..0277bc836 100644
--- a/apps/sn/app/components/ui/fileUploadForm.tsx
+++ b/apps/sn/app/components/ui/fileUploadForm.tsx
@@ -168,16 +168,16 @@ const FileUploadForm = ({
   }
 
   return (
-    <div>
+    <div className="w-full">
       {" "}
       {/* 컴포넌트 루트 div */}
-      <div className="card p-6">
+      <div className="card w-full p-6">
         {" "}
         {/* 카드 스타일링 */}
-        <div className="flex items-center gap-2">
+        <div className="flex w-full items-center gap-2">
           {" "}
           {/* FileUploader와 Button을 정렬하는 메인 flex 컨테이너 */}
-          <div className="mr-4 w-[300px]">
+          <div className="min-w-0 flex-1">
             {" "}
             {/* FileUploader의 너비와 오른쪽 여백을 제어하는 컨테이너 */}
             <FileUploader
diff --git a/packages/common/business_components/src/ui/standard_form/index.tsx b/packages/common/business_components/src/ui/standard_form/index.tsx
index eba028b18..a60716cf1 100644
--- a/packages/common/business_components/src/ui/standard_form/index.tsx
+++ b/packages/common/business_components/src/ui/standard_form/index.tsx
@@ -1,4 +1,4 @@
-import type { ReactNode } from "react";
+import { createContext, useContext, type ReactNode } from "react";
 
 import { Label } from "@common/components";
 
@@ -31,8 +31,11 @@ type StandardFormSectionProps = {
   children: ReactNode;
   columns?: StandardFormColumns;
   className?: string;
+  wideLabels?: boolean;
 };
 
+const StandardFormWideLabelsContext = createContext(false);
+
 type StandardFormFieldProps = {
   id?: string;
   label: ReactNode;
@@ -50,6 +53,7 @@ function StandardFormSection({
   children,
   columns = 3,
   className = "",
+  wideLabels = false,
 }: StandardFormSectionProps) {
   return (
     <section
@@ -58,11 +62,13 @@ function StandardFormSection({
       <h4 className="border-b border-border bg-container px-4 py-3 text-[1.4rem] font-semibold text-label">
         {title}
       </h4>
-      <div
-        className={`grid grid-cols-1 gap-px bg-border ${SECTION_GRID_CLASS[columns]}`}
-      >
-        {children}
-      </div>
+      <StandardFormWideLabelsContext.Provider value={wideLabels}>
+        <div
+          className={`grid grid-cols-1 gap-px bg-border ${SECTION_GRID_CLASS[columns]}`}
+        >
+          {children}
+        </div>
+      </StandardFormWideLabelsContext.Provider>
     </section>
   );
 }
@@ -78,9 +84,11 @@ function StandardFormField({
   children,
   className = "",
 }: StandardFormFieldProps) {
+  const wideLabels = useContext(StandardFormWideLabelsContext);
+
   return (
     <div
-      className={`grid min-w-0 grid-cols-[9rem_minmax(0,1fr)] bg-background sm:grid-cols-[11.5rem_minmax(0,1fr)] ${FIELD_SPAN_CLASS[columns][span]} ${className}`}
+      className={`grid min-w-0 grid-cols-[9rem_minmax(0,1fr)] bg-background ${wideLabels ? "sm:grid-cols-[18rem_minmax(0,1fr)]" : "sm:grid-cols-[11.5rem_minmax(0,1fr)]"} ${FIELD_SPAN_CLASS[columns][span]} ${className}`}
     >
       <Label
         htmlFor={id}
@@ -89,7 +97,7 @@ function StandardFormField({
         {required ? <span className="mr-1 text-red-600">*</span> : null}
         {label}
       </Label>
-      <div className="min-w-0 p-3">
+      <div className="flex min-w-0 flex-col justify-center p-3">
         {children}
         {error ? (
           <p className="mt-1 text-[1.2rem] text-red-600" role="alert">

From 34ba09ce1b694d58e2dc01abe9b9618203887c4b Mon Sep 17 00:00:00 2001
From: mind-one001 <mind-one001@mind-one.co.kr>
Date: Fri, 4 Sep 2026 15:24:17 +0900
Subject: [PATCH 05/13] =?UTF-8?q?=EC=A4=80=EC=84=A4=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EB=B3=B4=EC=99=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DredgingDetailPopupPage.tsx    | 87 +++++++++++++++----
 .../components/DredgingRegisterModal.tsx      | 38 +++++---
 .../001-qa-SFR-010-012-준설관리-검증결과.md   | 42 +++++++++
 .../001-fe-SFR-010-012-준설관리-구현기록.md   | 22 +++++
 4 files changed, 159 insertions(+), 30 deletions(-)

diff --git a/apps/sn/app/(with-base-layout)/oper/dredging/components/DredgingDetailPopupPage.tsx b/apps/sn/app/(with-base-layout)/oper/dredging/components/DredgingDetailPopupPage.tsx
index 5f0909de1..200e9203c 100644
--- a/apps/sn/app/(with-base-layout)/oper/dredging/components/DredgingDetailPopupPage.tsx
+++ b/apps/sn/app/(with-base-layout)/oper/dredging/components/DredgingDetailPopupPage.tsx
@@ -14,6 +14,7 @@ import {
   TableRow,
 } from "@common/components";
 import { MS_SWAGE_PPL_CODES } from "@/app/(map-layout)/map/components/common/table";
+import { fileDownload } from "@/components/lib/utils/fileDownload";
 import { useAlertStore } from "@/shared/lib";
 import { useEffect, useMemo, useRef, useState } from "react";
 
@@ -119,6 +120,8 @@ const DredgingDetailPopupPage = ({
   const [matchError, setMatchError] = useState<string | null>(null);
   const [isMatching, setIsMatching] = useState(false);
   const [isSaving, setIsSaving] = useState(false);
+  // 원본 다운로드 중 연속 클릭을 막고 선택한 사진의 다운로드 진행 상태를 표시한다.
+  const [isDownloadingPhoto, setIsDownloadingPhoto] = useState(false);
   const [statusMessage, setStatusMessage] = useState("");
   const uploadedAttachmentsRef = useRef(new Map<string, AttachmentReference>());
 
@@ -221,6 +224,31 @@ const DredgingDetailPopupPage = ({
       null)
     : null;
 
+  /** 저장된 사진은 공통 첨부 원본을 받고, 아직 저장하지 않은 신규 사진은 로컬 File을 내려받는다. */
+  const handlePhotoDownload = async () => {
+    // 다운로드 중 선택을 바꾸더라도 클릭한 시점의 파일과 파일명을 함께 유지한다.
+    const existingPhoto = selectedExistingPhoto;
+    const newPhoto = selectedNewPhoto;
+    if (isDownloadingPhoto || (!existingPhoto && !newPhoto)) return;
+
+    setIsDownloadingPhoto(true);
+    try {
+      if (newPhoto) {
+        fileDownload(newPhoto.file, newPhoto.file.name);
+      } else if (existingPhoto) {
+        const original = await fetchDredgingPhotoBlob(existingPhoto.atflId);
+        fileDownload(
+          original,
+          existingPhoto.originalFileName || `준설사진_${existingPhoto.photoSn}`,
+        );
+      }
+    } catch {
+      alert("사진을 다운로드하지 못했습니다. 잠시 후 다시 시도해주세요.");
+    } finally {
+      setIsDownloadingPhoto(false);
+    }
+  };
+
   const pipeInfo = [
     ["시도", record.ctpv || "확인불가"],
     ["시군구", record.sgg || "확인불가"],
@@ -481,10 +509,10 @@ const DredgingDetailPopupPage = ({
           </Button>
         </div>
       }
-      bodyClassName="sn-dredging-register block overflow-y-auto"
+      bodyClassName="sn-dredging-register !overflow-hidden"
     >
-      <div className="grid min-h-0 grid-cols-[minmax(44rem,48rem)_minmax(0,1fr)] gap-3">
-        <aside className="flex min-h-0 flex-col gap-3 pr-1">
+      <div className="grid h-full min-h-0 flex-1 grid-cols-[minmax(44rem,48rem)_minmax(0,1fr)] gap-3">
+        <aside className="flex min-h-0 min-w-0 flex-col gap-3 overflow-y-auto overscroll-contain pr-1 [scrollbar-gutter:stable]">
           <section className="card card-border !m-0 shrink-0 overflow-hidden !p-0">
             <div className="card-header !m-0">
               <h2 className="text-2xl font-medium text-label">관로 정보</h2>
@@ -562,7 +590,11 @@ const DredgingDetailPopupPage = ({
             </div>
           </section>
 
-          <section className="card card-border !m-0 flex min-h-[36rem] flex-1 flex-col overflow-hidden !p-0">
+          {/* 사진 수·원본 크기와 무관하게 남은 화면 높이를 사용하며, 작은 창에서만 좌측 정보가 스크롤된다. */}
+          <section
+            className="card card-border !m-0 flex !min-h-[40rem] flex-1 flex-col overflow-hidden !p-0"
+            data-testid="dredging-detail-photo-panel"
+          >
             <div className="card-header !m-0 shrink-0 gap-2">
               <h2 className="text-2xl font-medium text-label">준설 사진</h2>
               <div className="flex shrink-0 flex-wrap items-center justify-end gap-2">
@@ -599,7 +631,7 @@ const DredgingDetailPopupPage = ({
             </div>
 
             {editable && registrationMode === "PHOTO" ? (
-              <div className="sn-dredging-photo-upload shrink-0 border-b border-border p-3">
+              <div className="sn-dredging-photo-upload flex h-[5.2rem] shrink-0 items-center border-b border-border p-3">
                 <FileUpload
                   files={newPhotos.map((photo) => photo.file)}
                   setFiles={(files) => void handleNewFiles(files)}
@@ -608,14 +640,18 @@ const DredgingDetailPopupPage = ({
                 />
               </div>
             ) : editable ? (
-              <div className="bg-secondary/30 shrink-0 border-b border-border px-3 py-3 text-center text-sm text-muted-foreground">
+              <div className="bg-secondary/30 flex h-[5.2rem] shrink-0 items-center justify-center border-b border-border px-3 py-3 text-center text-sm text-muted-foreground">
                 사진 없이 지도에서 준설위치를 직접 지정합니다.
               </div>
             ) : null}
 
-            <div className="shrink-0 border-b border-border p-3">
+            {/* 목록의 높이와 스크롤바 자리를 예약해 추가·삭제·로딩 상태에도 미리보기 위치를 유지한다. */}
+            <div
+              className="h-[12rem] shrink-0 overflow-y-auto overscroll-contain border-b border-border p-3 [scrollbar-gutter:stable]"
+              data-testid="dredging-detail-photo-list-viewport"
+            >
               {isLoading ? (
-                <p className="flex h-[8.8rem] items-center justify-center text-sm text-muted-foreground">
+                <p className="flex h-full items-center justify-center text-sm text-muted-foreground">
                   등록된 사진을 불러오는 중입니다.
                 </p>
               ) : error ? (
@@ -729,7 +765,7 @@ const DredgingDetailPopupPage = ({
                   })}
                 </div>
               ) : (
-                <p className="flex h-[8.8rem] items-center justify-center text-sm text-muted-foreground">
+                <p className="flex h-full items-center justify-center text-sm text-muted-foreground">
                   {editable && registrationMode === "PHOTO"
                     ? "사진을 추가하거나 사진 없이 직접 등록을 선택해주세요."
                     : "등록된 사진이 없습니다."}
@@ -737,22 +773,41 @@ const DredgingDetailPopupPage = ({
               )}
             </div>
 
-            {/* 사진 미리보기는 밝은 사진의 경계를 보장하는 미디어 캔버스이므로 고정 암색을 유지한다. */}
+            {/* 사진 미리보기는 밝은 사진의 경계를 보장하는 미디어 캔버스이므로 고정 암색을 유지한다.
+                이미지를 절대 배치해 원본 고유 크기가 부모 높이를 늘리지 않도록 한다. */}
             <div
-              className="flex min-h-[22rem] flex-1 items-center justify-center overflow-hidden bg-slate-900 p-2"
+              className="relative flex min-h-0 flex-1 items-center justify-center overflow-hidden bg-slate-900 p-2"
               data-testid="dredging-detail-photo-preview"
             >
+              {/* 미리보기 위에 겹쳐 배치해 다운로드 버튼이 고정 사진 영역의 높이를 바꾸지 않게 한다. */}
+              <div className="absolute right-2 top-2 z-10">
+                <Button
+                  type="button"
+                  size="sm"
+                  color="white"
+                  disabled={
+                    isLoading ||
+                    isSaving ||
+                    isDownloadingPhoto ||
+                    (!selectedExistingPhoto && !selectedNewPhoto)
+                  }
+                  onClick={() => void handlePhotoDownload()}
+                  data-testid="dredging-photo-download"
+                >
+                  {isDownloadingPhoto ? "다운로드 중..." : "사진 다운로드"}
+                </Button>
+              </div>
               {selectedExistingPhoto?.previewUrl ? (
                 <img
                   src={selectedExistingPhoto.previewUrl}
                   alt={selectedExistingPhoto.originalFileName || "준설사진"}
-                  className="h-full w-full object-contain"
+                  className="absolute inset-0 h-full w-full object-contain p-2"
                 />
               ) : selectedNewPhoto ? (
                 <img
                   src={selectedNewPhoto.previewUrl}
                   alt={selectedNewPhoto.file.name}
-                  className="h-full w-full object-contain"
+                  className="absolute inset-0 h-full w-full object-contain p-2"
                 />
               ) : selectedExistingPhoto?.loadError ? (
                 <p className="px-4 text-center text-sm text-rose-200">
@@ -814,7 +869,7 @@ const DredgingDetailPopupPage = ({
                 </div>
               </div>
               <div
-                className="bg-secondary/30 px-4 py-2 text-sm text-muted-foreground"
+                className="bg-secondary/30 h-[5.2rem] overflow-y-auto px-4 py-2 text-sm text-muted-foreground"
                 data-testid="dredging-edit-status"
               >
                 {statusMessage ||
@@ -836,7 +891,7 @@ const DredgingDetailPopupPage = ({
               </span>
             ) : null}
           </div>
-          <div className="min-h-[56rem] flex-1 p-2">
+          <div className="min-h-0 flex-1 p-2">
             <DredgingLocationMap
               value={isEditingLocation ? locationDraft : location}
               matchedPipe={
@@ -851,7 +906,7 @@ const DredgingDetailPopupPage = ({
                     ? "현재 준설위치와 자동 연결된 관로를 표시하고 있습니다."
                     : "준설위치와 자동 연결된 관로를 표시하고 있습니다."
               }
-              height="h-full min-h-[56rem]"
+              height="h-full min-h-0"
             />
           </div>
         </section>
diff --git a/apps/sn/app/(with-base-layout)/oper/dredging/components/DredgingRegisterModal.tsx b/apps/sn/app/(with-base-layout)/oper/dredging/components/DredgingRegisterModal.tsx
index cbe771f01..e085aa8c9 100644
--- a/apps/sn/app/(with-base-layout)/oper/dredging/components/DredgingRegisterModal.tsx
+++ b/apps/sn/app/(with-base-layout)/oper/dredging/components/DredgingRegisterModal.tsx
@@ -558,7 +558,7 @@ const DredgingRegisterModal = ({
       className={
         presentation === "popup"
           ? "sn-dredging-register flex h-full min-h-0 flex-col overflow-hidden"
-          : "sn-dredging-register"
+          : "sn-dredging-register flex h-[min(72rem,70dvh)] min-h-0 flex-col overflow-hidden"
       }
     >
       <div className="bg-secondary/40 mb-3 flex shrink-0 flex-wrap items-center gap-x-4 gap-y-1 rounded-sm border border-border px-4 py-2 text-sm text-label">
@@ -576,7 +576,7 @@ const DredgingRegisterModal = ({
             groups.findIndex((group) => group.id === activeGroup.id) + 1
           }`}
         >
-          <aside className="flex min-h-0 min-w-0 flex-col gap-3 pr-1">
+          <aside className="flex min-h-0 min-w-0 flex-col gap-3 overflow-y-auto overscroll-contain pr-1 [scrollbar-gutter:stable]">
             <section className="card card-border !m-0 shrink-0 overflow-hidden !p-0">
               <div className="card-header !m-0">
                 <h3 className="text-2xl font-medium text-label">등록 정보</h3>
@@ -684,7 +684,11 @@ const DredgingRegisterModal = ({
               </div>
             </section>
 
-            <section className="card card-border !m-0 shrink-0 overflow-hidden !p-0">
+            {/* 등록 건별 사진 수가 달라도 목록 카드 높이를 고정해 지도와 하단 정보가 밀리지 않게 한다. */}
+            <section
+              className="card card-border !m-0 flex h-[28rem] shrink-0 flex-col overflow-hidden !p-0"
+              data-testid="dredging-register-photo-panel"
+            >
               <div className="card-header !m-0 flex-wrap gap-2">
                 <div>
                   <h3 className="text-2xl font-medium text-label">준설 사진</h3>
@@ -725,10 +729,10 @@ const DredgingRegisterModal = ({
                   </Button>
                 </div>
               </div>
-              <div className="p-3">
+              <div className="flex min-h-0 flex-1 flex-col p-3">
                 {activeGroup.registrationMode === "PHOTO" ? (
                   <>
-                    <div className="sn-dredging-photo-upload">
+                    <div className="sn-dredging-photo-upload shrink-0">
                       <FileUpload
                         files={activeGroup.photos.map((photo) => photo.file)}
                         setFiles={(files) => {
@@ -740,7 +744,10 @@ const DredgingRegisterModal = ({
                     </div>
 
                     {activeGroup.photos.length > 0 ? (
-                      <div className="mt-2 rounded-sm border border-border">
+                      <div
+                        className="mt-2 min-h-0 flex-1 overflow-y-auto overscroll-contain rounded-sm border border-border [scrollbar-gutter:stable]"
+                        data-testid="dredging-register-photo-list-viewport"
+                      >
                         <Table className="table-fixed" variant="default">
                           <TableHeader>
                             <TableRow>
@@ -750,7 +757,9 @@ const DredgingRegisterModal = ({
                               </TableHead>
                               <TableHead className="w-[16%]">위치</TableHead>
                               <TableHead className="w-[17%]">상태</TableHead>
-                              <TableHead className="w-[8%]">삭제</TableHead>
+                              <TableHead className="w-[8%] whitespace-nowrap px-1">
+                                삭제
+                              </TableHead>
                             </TableRow>
                           </TableHeader>
                           <TableBody>
@@ -779,9 +788,10 @@ const DredgingRegisterModal = ({
                                     ? "GPS"
                                     : "지정 필요"}
                                 </TableCell>
-                                <TableCell className="px-3">
+                                <TableCell className="overflow-hidden px-3">
                                   <span
-                                    className={`whitespace-nowrap rounded-sm px-2 py-1 text-sm font-medium ${
+                                    title={statusLabel(photo.metadata.status)}
+                                    className={`inline-block max-w-full truncate rounded-sm px-2 py-1 align-middle text-sm font-medium ${
                                       photo.metadata.status === "COMPLETE"
                                         ? "bg-emerald-100 text-emerald-800"
                                         : "bg-amber-100 text-amber-800"
@@ -812,14 +822,14 @@ const DredgingRegisterModal = ({
                         </Table>
                       </div>
                     ) : (
-                      <div className="bg-secondary/30 mt-2 rounded-sm border border-dashed border-border px-3 py-2 text-center text-sm text-muted-foreground">
+                      <div className="bg-secondary/30 mt-2 flex min-h-0 flex-1 items-center justify-center rounded-sm border border-dashed border-border px-3 py-2 text-center text-sm text-muted-foreground">
                         준설사진을 선택하면 촬영일과 위치정보를 자동으로
                         확인합니다.
                       </div>
                     )}
                   </>
                 ) : (
-                  <div className="bg-secondary/30 rounded-sm border border-dashed border-border px-3 py-3 text-center text-sm text-muted-foreground">
+                  <div className="bg-secondary/30 flex min-h-0 flex-1 items-center justify-center rounded-sm border border-dashed border-border px-3 py-3 text-center text-sm text-muted-foreground">
                     사진 없이 지도에서 준설위치를 직접 지정합니다.
                   </div>
                 )}
@@ -945,7 +955,7 @@ const DredgingRegisterModal = ({
                 위치 선택 지도
               </h3>
             </div>
-            <div className="min-h-[52rem] flex-1 p-2">
+            <div className="min-h-0 flex-1 p-2">
               <DredgingLocationMap
                 value={
                   isEditingActiveLocation
@@ -966,7 +976,7 @@ const DredgingRegisterModal = ({
                       : "위치등록 버튼을 누른 뒤 지도에서 준설위치를 선택해주세요."
                 }
                 onChange={changeLocationDraft}
-                height="h-full min-h-[52rem]"
+                height="h-full min-h-0"
               />
             </div>
           </section>
@@ -1002,7 +1012,7 @@ const DredgingRegisterModal = ({
             </Button>
           </div>
         }
-        bodyClassName="block overflow-y-auto"
+        bodyClassName="!overflow-hidden"
       >
         {modalBody}
       </StandardPopupLayout>
diff --git a/apps/sn/docs/작업검증/SFR-010-012-준설관리/001-qa-SFR-010-012-준설관리-검증결과.md b/apps/sn/docs/작업검증/SFR-010-012-준설관리/001-qa-SFR-010-012-준설관리-검증결과.md
index fabf5fa86..968ca1b21 100644
--- a/apps/sn/docs/작업검증/SFR-010-012-준설관리/001-qa-SFR-010-012-준설관리-검증결과.md
+++ b/apps/sn/docs/작업검증/SFR-010-012-준설관리/001-qa-SFR-010-012-준설관리-검증결과.md
@@ -371,3 +371,45 @@ Chrome 확장의 파일 URL 접근 권한이 꺼져 있어 이번 회귀에서 E
 
 - 검증 화면: `COMMON_DOCS_ROOT/작업내용/SFR-010-012-준설관리/검증/20260828/03-수정화면-촬영일자-날짜만.png`.
 - 사용자 실행 중인 3002 개발서버를 보호하기 위해 Next build는 수행하지 않았다.
+
+## 16. 2026-09-04 사진 영역 높이 고정 검증
+
+- 실제 로컬 등록·수정 팝업 DOM에서 합성 가로/세로/정사각형 사진으로 검증했다. 수정 사진 조회 응답은 테스트용 ID에만 가로챈 응답을 사용했고, 신규 파일은 로컬 선택만 했다. 저장·업로드·DB 변경은 수행하지 않았다.
+- 수정 전 1440×900에서 이미지 전환 시 미리보기 높이는 220 → 1872 → 475.5px, 팝업 스크롤 높이는 883 → 2535 → 1139px로 변했다.
+
+| 검증 항목 | 결과 |
+| --- | --- |
+| 기존 사진 가로·세로·정사각 전환 | 같은 창 크기에서 미리보기 높이·위치 동일 |
+| 1920×1080 수정 팝업 | 미리보기 360px 유지, 전체 스크롤 초과 0px |
+| 1440×900 수정 팝업 | 미리보기 180px 유지, 전체 스크롤 초과 0px |
+| 1366×768 수정 팝업 | 미리보기 최소 180px 유지, 좌측 정보만 스크롤, 전체 스크롤 초과 0px |
+| 기존 5장 삭제 후 0장·신규 세로/가로 사진 선택 | 미리보기 높이 유지 |
+| 빈 사진 목록·조회 실패 응답 | 예약된 사진 목록·미리보기 높이 유지 |
+| 등록 사진 0~5장·등록 건 1/2 전환 | 사진 카드 280px 유지, 지도·팝업 전체 스크롤 초과 0px |
+| 긴 사진 목록 | 내부 스크롤로 5번째 사진까지 접근 확인 |
+| TypeScript | `tsc --noEmit --incremental false --ignoreDeprecations 5.0` 종료코드 0 |
+| Prettier | 변경 두 TSX 파일 포맷 적용 |
+
+- 증빙: `COMMON_DOCS_ROOT/작업내용/SFR-010-012-준설관리/검증/20260904/01-photo-preview-fixed.png`, `02-registration-photo-list-fixed.png`.
+- 사용자 실행 3002 서버를 종료·재시작하지 않았고 Next build는 생략했다. 낮은 창 높이에서 좌측 정보 스크롤은 정보 잘림을 방지하기 위해 유지한다.
+
+## 17. 2026-09-04 사진 다운로드 검증
+
+| 검증 항목 | 결과 |
+| --- | --- |
+| 실제 등록 사진 다운로드 | 목록에서 관로 4115732847 선택 후 수정 팝업에서 `test2.jpg` 다운로드 성공 |
+| 원본 보존 | 실제 파일 2,219,776바이트. 미리보기용 공통 첨부 원본과 다운로드 파일 SHA-256 일치 |
+| 선택 사진 전환 | 합성 파일 1·2를 선택해 각각 해당 파일명으로 다운로드 |
+| 한글·공백·확장자 | `준설 사진_원본1.png`, `준설 사진_원본2.png` 유지 |
+| 합성 원본 바이트 | 가로·세로 테스트 PNG와 다운로드 파일 SHA-256 일치 |
+| 진행 상태 | 다운로드 처리 중 비활성화 및 완료 후 재활성화 |
+| 미선택 | 선택한 사진을 화면에서 제거하면 다운로드 버튼 비활성화 |
+| 실패·재시도 | 합성 HTTP 500에서 사용자용 안내 표시, HTML 오류 본문 미노출, 재시도 성공 |
+| 신규 사진 | 아직 저장하지 않은 `tall.png` 원본 다운로드, 첨부서비스 추가 호출 0건, 원본 해시 일치 |
+| 고정 레이아웃 | 1440×900에서 다운로드 전후 미리보기 높이 180px 유지 |
+| TypeScript | SN 전체 `tsc --noEmit --incremental false --ignoreDeprecations 5.0` 종료코드 0 |
+
+- 합성 사진 조회·실패 응답은 테스트 ID에만 적용했다. 실제 등록 사진 다운로드는 대체 응답 없이 기존 서버로 검증했다.
+- 준설 저장·삭제는 수행하지 않았고 검사에 사용한 다운로드 사본은 정리했다.
+- 화면 증빙: `COMMON_DOCS_ROOT/작업내용/SFR-010-012-준설관리/검증/20260904/03-photo-download.png` (합성 사진).
+- 사용자 실행 3002 서버는 유지했으며 Next build는 실행하지 않았다.
diff --git a/apps/sn/docs/작업내용/SFR-010-012-준설관리/001-fe-SFR-010-012-준설관리-구현기록.md b/apps/sn/docs/작업내용/SFR-010-012-준설관리/001-fe-SFR-010-012-준설관리-구현기록.md
index 30a52ba89..e0691aa09 100644
--- a/apps/sn/docs/작업내용/SFR-010-012-준설관리/001-fe-SFR-010-012-준설관리-구현기록.md
+++ b/apps/sn/docs/작업내용/SFR-010-012-준설관리/001-fe-SFR-010-012-준설관리-구현기록.md
@@ -353,3 +353,25 @@
 - 존재하지 않는 날짜나 빈 값은 기존 화면별 fallback(`-`, `촬영일시 없음`)을 유지한다.
 - EXIF 원본 `capturedAt`, 첨부정보와 백엔드 저장 payload는 변경하지 않고 화면 렌더링만 변경했다.
 - 추적 근거는 요구사항 `SFR-010-012`, 화면설계서 슬라이드 53의 `SN_MN040201`이며 세부 시간 숨김은 사용자 지시에 따른 표출 보완이다.
+
+## 22. 2026-09-04 사진 영역 높이 고정
+
+- 수정 팝업의 높이가 제한되지 않은 grid/flex와 일반 흐름의 이미지 때문에 원본 이미지 비율이 사진·지도 영역 높이를 바꾸는 문제를 확인했다.
+- 팝업 본문과 좌우 영역을 창 높이에 맞추고 사진은 고정된 미리보기 안에서 `object-contain`으로 비율을 유지한다. 이미지 고유 크기는 부모 크기 계산에 참여하지 않는다.
+- 기존·신규 사진 목록은 12rem 높이를 예약하고 목록 내부만 스크롤한다. 로딩·빈 목록·오류 상태도 같은 공간을 사용한다.
+- 등록 화면 사진 카드는 28rem 높이로 고정한다. 사진 0~5장, 등록 건 전환, 수동 등록에서도 카드 높이를 유지한다.
+- 작은 창에서는 좌측 정보만 내부 스크롤하며 지도와 팝업 전체 높이는 유지한다. 수정 상태 안내 높이도 고정해 마지막 사진 삭제 안내가 미리보기를 밀지 않게 했다.
+- 변경 범위는 `DredgingDetailPopupPage.tsx`, `DredgingRegisterModal.tsx`이며 공통 패키지·API·DB·업로드와 저장 처리에는 변경이 없다.
+- 추적 근거: 요구사항정의서 sheet3 G84:I85의 `SFR-010-012/013`, 화면설계서 53~55번 슬라이드의 `SN_MN040201/040202`. 사진 높이 고정은 사용자 지시에 따른 UI 보완이다.
+- 롤백은 위 두 화면의 레이아웃 클래스 변경을 되돌리는 것으로 가능하며 데이터 이관은 필요하지 않다.
+
+## 23. 2026-09-04 선택 사진 원본 다운로드
+
+- 수정 화면의 사진 미리보기 우측 상단에 `사진 다운로드` 버튼을 추가했다. 기존 고정 사진 영역 위에 겹쳐 배치하므로 영역 높이는 변하지 않는다.
+- 저장된 사진은 기존 `fetchDredgingPhotoBlob`을 통해 공통 첨부서비스 `/attach-service/api/v1/download/{atflId}` 원본을 받아 SN `fileDownload` 유틸리티로 저장한다. 서버 원본파일명과 확장자를 유지한다.
+- 저장 전 신규 사진은 로컬 `File`을 그대로 내려받으며 공통 첨부 업로드나 준설 저장을 호출하지 않는다.
+- 미선택·로딩·저장·다운로드 진행 중에는 버튼을 비활성화한다. 다운로드 중 선택을 바꾸어도 클릭 당시 사진과 파일명을 함께 유지한다.
+- 실패 시 공통 안내창에 사용자용 메시지만 표시하며 재시도가 가능하다. 서버 오류 본문은 화면에 출력하지 않는다.
+- 변경 범위는 `DredgingDetailPopupPage.tsx`와 기능 문서다. 공통 컴포넌트·유틸리티, 백엔드 API, DB 스키마는 변경하지 않았다.
+- 근거: 원본 `SFR-010-012/013`, 화면 `SN_MN040201`의 사진 확인 흐름에 사용자가 요청한 다운로드 동작을 추가했다.
+- 롤백은 선택 사진 다운로드 핸들러·진행 상태·버튼만 제거하면 되며 앞선 사진 영역 고정 변경은 유지할 수 있다.

From 2b3502161c3d4697108454d7f76ef97e4c424b66 Mon Sep 17 00:00:00 2001
From: mind-one001 <mind-one001@mind-one.co.kr>
Date: Fri, 4 Sep 2026 17:16:32 +0900
Subject: [PATCH 06/13] =?UTF-8?q?=EC=8B=9C=EC=84=A4=EB=AC=BC=20=20?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=EC=B0=BD=20=EA=B9=A8=EC=A7=90=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../popupComponent/featureClickEventPopup.tsx | 20 +++---
 .../001-qa-SN-시설상세레이아웃-검증결과.md    | 67 +++++++++++++++++++
 2 files changed, 77 insertions(+), 10 deletions(-)
 create mode 100644 apps/sn/docs/검증/SFR-012-001-시설상세레이아웃/001-qa-SN-시설상세레이아웃-검증결과.md

diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/featureClickEventPopup.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/featureClickEventPopup.tsx
index 96ff8edb2..29654473d 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/featureClickEventPopup.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/featureClickEventPopup.tsx
@@ -1018,13 +1018,14 @@ const FeatureClickEventPopup = ({
   return (
     <div
       id="popup"
-      className="absolute right-0 top-0 z-[50] flex h-[calc(100vh-5rem)] w-[350px] flex-col overflow-hidden border-r border-border bg-background transition-all duration-300"
+      className="absolute right-0 top-0 z-[50] flex h-full max-h-[calc(100dvh-6rem)] w-[350px] max-w-full flex-col overflow-hidden border-r border-border bg-background transition-all duration-300"
     >
       <LoadingOverlay isLoading={isLoading} />
-      <div className="card-header relative flex items-center justify-between bg-primary p-4 pr-12">
-        <div className="flex flex-1 items-center space-x-4">
+      {/* 제목·기능 버튼·닫기 버튼의 칸을 분리해 시설 종류나 제목 길이에 관계없이 겹침을 방지한다. */}
+      <div className="card-header relative !mx-0 !grid shrink-0 grid-cols-[minmax(0,1fr)_auto_auto] items-center gap-2 bg-primary p-4">
+        <div className="min-w-0">
           {surveyMode && (
-            <h3 className="whitespace-nowrap text-2xl font-medium text-primary-foreground">
+            <h3 className="break-words text-2xl font-medium text-primary-foreground">
               조사관리 <br />
               관로번호 :{" "}
               {featureData?.get?.("gisManagementNo") ??
@@ -1034,16 +1035,14 @@ const FeatureClickEventPopup = ({
             </h3>
           )}
           <h3
-            className={`${surveyMode ? "hidden" : ""} whitespace-nowrap text-2xl font-medium text-primary-foreground`}
+            className={`${surveyMode ? "hidden" : ""} break-words text-2xl font-medium text-primary-foreground`}
           >
             {layerNm}
             {tableData?.usg_cd && <>({tableData.usg_cd})</>} 정보 <br />
             관리번호 : {layerSpecificNm}
           </h3>
         </div>
-        <div
-          className={`flex shrink-0 items-center space-x-3 ${layerNm === "하수관로" ? "mr-8" : ""}`}
-        >
+        <div className="flex items-center gap-2">
           {/* 하수관로일 때만 Infil/RDII 버튼 표시 */}
           {layerNm === "하수관로" && (
             <>
@@ -1099,7 +1098,7 @@ const FeatureClickEventPopup = ({
         </div>
         <Button
           onClick={onClose}
-          className="text-primary-foreground/80 absolute right-2 top-1/2 z-10 h-8 w-8 -translate-y-1/2 p-0 hover:text-primary-foreground focus:outline-none"
+          className="text-primary-foreground/80 h-8 w-8 shrink-0 p-0 hover:text-primary-foreground focus:outline-none"
           size="xs"
           aria-label="시설 상세정보 닫기"
           title="닫기"
@@ -1107,8 +1106,9 @@ const FeatureClickEventPopup = ({
           <span aria-hidden="true">✕</span>
         </Button>
       </div>
+      {/* 표 카드를 flex로 압축하지 않고 내용 높이대로 쌓아 본문에서만 스크롤한다. */}
       <div
-        className="flex flex-1 flex-col overflow-y-auto overflow-x-hidden"
+        className="min-h-0 min-w-0 flex-1 overflow-y-auto overflow-x-hidden"
         ref={contentRef}
       >
         <VerticalTable
diff --git a/apps/sn/docs/검증/SFR-012-001-시설상세레이아웃/001-qa-SN-시설상세레이아웃-검증결과.md b/apps/sn/docs/검증/SFR-012-001-시설상세레이아웃/001-qa-SN-시설상세레이아웃-검증결과.md
new file mode 100644
index 000000000..86a835cb5
--- /dev/null
+++ b/apps/sn/docs/검증/SFR-012-001-시설상세레이아웃/001-qa-SN-시설상세레이아웃-검증결과.md
@@ -0,0 +1,67 @@
+# 시설 상세 패널 레이아웃 수정 검증
+
+## 목적 및 원본 근거
+
+- 검증일: 2026-09-04
+- 대상: 하수관망도 우측 시설 상세 패널에서 기본정보·입력정보·유지관리 이력 표가 겹치는 현상
+- 화면설계서: 36번 슬라이드 `SN_MN010303 / SFR-012-001`, 48번 슬라이드 `SN_MN040107 / SFR-010-004`, 10번 슬라이드 `SN_MN010103`
+- 요구사항정의서: `3. (기능)요구사항정의 및 추적표` 96행 `SFR-012-001`, 92행 `SFR-011-006`
+- 기존 시설 속성과 추가 현황정보 표시 기능을 유지하는 레이아웃 수정이다. 데이터·API·저장 계약은 변경하지 않는다.
+
+## 원인 및 수정
+
+- 본문의 `display:flex; flex-direction:column` 때문에 내용이 긴 카드가 가용 높이 안으로 압축됐다. 카드 안의 실제 table은 원래 높이를 유지해 다음 카드 위로 넘쳤다.
+- 실제 관로 `61582`에서 기본정보 카드 높이는 약 204px인데 표 높이는 약 853px, 입력정보 카드 높이는 약 86px인데 표 높이는 약 362px였다.
+- `featureClickEventPopup.tsx` 본문을 일반 블록 흐름으로 복구하고 `min-h-0 min-w-0 flex-1`로 단일 본문 스크롤 영역을 유지했다.
+- 상단 헤더는 `shrink-0`으로 고정하고 음수 좌우 마진을 제거했다.
+- 패널은 지도 부모 높이를 사용하되 공통 상단 헤더(6rem) 아래 가용 화면 높이를 넘지 않도록 제한했다.
+- 침수흔적 심선·위선 선택부, 표 컴포넌트, 입력 폼, 저장 및 닫기 콜백은 변경하지 않았다.
+
+## 실제 브라우저 검증
+
+`localhost:3002/map → 정보검색 → 시설 구분 조회 → 목록의 시설번호 선택` 흐름으로 실행했다.
+
+| 시나리오 | 확인 결과 |
+| --- | --- |
+| 관로 61582 상세 | 기본정보 → 입력정보 → 보수 및 갱신 → 청소 및 준설 → 점검 및 진단 순서 정상 |
+| 관로, 1920×900, 상단·중간·하단 스크롤 | 카드 밖 표 넘침 0건, 인접 영역 겹침 0건, 패널 하단 900px |
+| 관로, 1366×600, 상단·중간·하단 스크롤 | 카드 밖 표 넘침 0건, 인접 영역 겹침 0건, 패널 하단 600px |
+| 관로 입력값 임시 변경·스크롤 | 입력값 유지 확인 후 원래 값으로 복원; 서버 저장 미실행 |
+| 관로 X 닫기·다시 선택 | 닫힘 및 재진입 정상 |
+| 맨홀 1101909890 상세 | 기본정보·입력정보 표 넘침 0건 |
+| 하수처리구역 41830PB009R 상세 | 표 넘침 및 인접 영역 겹침 0건 |
+| 침수흔적위선 관리번호 1 상세 | 기본정보 겹침 0건. 해당 데이터에는 연결 심선/위선 선택 버튼이 없어 버튼 클릭은 검증하지 않음 |
+| 지도 브라우저 콘솔 | 검증 중 error 0건 |
+
+화면 크기 변경 시 기존 300ms transition이 끝난 뒤 최종 배치를 측정했다.
+
+캡처:
+
+- `D:/workspace/IIPBS/docs/작업내용/SFR-012-001-시설상세레이아웃/검증/after-pipe-input-history.png`
+- `D:/workspace/IIPBS/docs/작업내용/SFR-012-001-시설상세레이아웃/검증/after-pipe-1366x600-bottom.png`
+
+## 정적 검사 및 제한
+
+- `git diff --check`: 통과
+- SN 타입 검사: 실패. 기존 HEAD의 `DredgingRegisterModal.tsx:792`에 `statusLabel` 미정의 오류(TS2304)가 존재한다. 이번 수정 파일의 타입 오류는 보고되지 않았다.
+- 실행 명령: `tsc -p apps/sn/tsconfig.json --noEmit --ignoreDeprecations 5.0`
+- 사용자 개발 서버를 보호하기 위해 Next build 및 서버 종료/재시작은 실행하지 않았다.
+- 저장·삭제·업로드 등 DB 변경 검증은 수행하지 않았다.
+
+## 영향 및 롤백
+
+- 변경 코드: `apps/sn/app/(map-layout)/map/components/popupComponent/featureClickEventPopup.tsx` 한 파일
+- 같은 상세 패널을 사용하는 SN 시설 유형에 적용된다. WR·FO·DM 및 공용 패키지는 수정하지 않는다.
+- 롤백은 해당 파일의 패널/헤더/본문 레이아웃 클래스와 추가 주석 변경만 되돌리면 된다.
+
+## 추가 검증: 헤더 기능 버튼과 X 겹침
+
+- 하수관로에만 우측 여백을 주고 X는 절대 위치에 놓았던 구조라 맨홀의 `상류관로 보기`와 X가 겹쳤다.
+- 헤더를 제목 / 기능 버튼 / 닫기 버튼의 3열 grid로 변경했다. X의 절대 위치와 관로 전용 임의 여백을 제거하고 긴 제목은 자신의 칸 안에서 줄바꿈하도록 했다.
+- 맨홀 `1101909890`, 관로 `1102086715`, 하수처리구역 `41830PB009R`을 실제 정보검색에서 선택하여 1920×900 및 1366×600에서 검증했다.
+- 6개 조합 모두 영역 겹침 0건, 헤더 외부 버튼 넘침 0건. 각 버튼 중앙 hit test도 해당 버튼을 가리켰다.
+- 맨홀 상류관로 버튼과 X, 관로 RDII 버튼과 X 간격은 모두 5px이다.
+- `상류관로 보기` 실제 클릭 시 `GET /api/v1/fcltmhl/upperPpls/1101909890` 응답 200. 해당 표본에서는 찾을 수 없다는 기존 공통 메시지가 표시됐다. 메시지 확인 후 X로 상세 패널을 닫았다.
+- 헤더 수정은 클릭/저장 콜백을 변경하지 않는다. 앞서 수정한 본문 스크롤 구조도 유지한다.
+- 추가 캡처: 같은 검증 폴더의 `after-manhole-header.png`, `after-pipe-header.png`.
+- 타입 검사는 동일한 기존 `DredgingRegisterModal.tsx:792 statusLabel` 오류만 보고됐다. `git diff --check`는 통과했다.

From 479cf5c4a0333ff35b992224ae8d81b5a7f9bf4c Mon Sep 17 00:00:00 2001
From: ljpark <mind-one005@mind-one.co.kr>
Date: Mon, 7 Sep 2026 16:56:35 +0900
Subject: [PATCH 07/13] =?UTF-8?q?sn:=20=EB=8B=A4=EB=8B=A8header=20?=
 =?UTF-8?q?=EB=AC=B6=EC=9D=8C=20=EC=B2=98=EB=A6=AC=20=EC=99=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AgedPipeStatusByCtpvPopupPage.tsx         | 77 +++++++++++-----
 .../agedPipeStatusByCtpvExport.ts             | 80 +++++++++++++----
 .../001-fe-SFR-011-001-시도별 노후관로현황-작업카드.md |  9 +-
 .../components/src/ui/data-table/index.tsx    | 90 ++++++++++++-------
 .../common/components/src/ui/table/table.css  | 12 +++
 5 files changed, 192 insertions(+), 76 deletions(-)

diff --git a/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/AgedPipeStatusByCtpvPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/AgedPipeStatusByCtpvPopupPage.tsx
index 293ae3fe3..05dd3447c 100644
--- a/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/AgedPipeStatusByCtpvPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/AgedPipeStatusByCtpvPopupPage.tsx
@@ -2,14 +2,23 @@
 
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { Button, Input } from "@common/components";
-import { StandardPopupLayout } from "@common/business_components";
+import {
+  StandardDataTable,
+  StandardPopupLayout,
+} from "@common/business_components";
+import {
+  getCoreRowModel,
+  getPaginationRowModel,
+  useReactTable,
+  type ColumnDef,
+  type PaginationState,
+} from "@tanstack/react-table";
 import { getRawJson } from "@/components/lib/api";
 import LoadingOverlay from "@/components/ui/LoadingBar";
 import { useAlertStore } from "@/shared/lib";
 import { windowPopupDefinitions } from "@/features/windowPopup/model/popupDefinitions";
 import {
   AGED_PIPE_STATUS_BY_CTPV_DEFAULT_ELAPSED_YEARS,
-  buildAgedPipeStatusByCtpvHeadList,
   buildAgedPipeStatusYearOptions,
   getAgedPipeStatusByCtpvValidationMessage,
   normalizeAgedPipeStatusByCtpvResponse,
@@ -20,7 +29,6 @@ import {
   type AgedPipeStatusByCtpvRow,
 } from "./agedPipeStatusByCtpvUtils";
 import { downloadAgedPipeStatusByCtpvExcel } from "./agedPipeStatusByCtpvExport";
-import MapPopupDataTable from "@/features/windowPopup/ui/MapPopupDataTable";
 import PopupSearchPanel from "@/features/windowPopup/ui/PopupSearchPanel";
 
 // CS 목록과 동일하게 한 페이지에는 최대 10개 시도만 표시한다.
@@ -52,21 +60,48 @@ export default function AgedPipeStatusByCtpvPopupPage() {
   const [currentPage, setCurrentPage] = useState(1);
 
   const yearOptions = useMemo(() => buildAgedPipeStatusYearOptions(), []);
-  const headList = useMemo(
+  const columns = useMemo<ColumnDef<AgedPipeStatusByCtpvRow>[]>(
     () => [
-      { id: "rowNumber", title: "순번", widthPercent: 7 },
-      ...buildAgedPipeStatusByCtpvHeadList(years),
+      { accessorKey: "rowNumber", header: "순번" },
+      { accessorKey: "ctpvNm", header: "시도" },
+      ...years.map((year) => ({
+        id: `year_${year}`,
+        header: `${year}년`,
+        columns: [
+          {
+            accessorKey: `year${year}TotalLengthKm`,
+            header: "전체관로연장(km)",
+          },
+          {
+            accessorKey: `year${year}AgedLengthKm`,
+            header: "노후관로연장(km)",
+          },
+          {
+            accessorKey: `year${year}AgedRate`,
+            header: "노후화율(%)",
+          },
+        ],
+      })),
     ],
     [years],
   );
-  const pageRows = useMemo(
-    () =>
-      rows.slice(
-        (currentPage - 1) * AGED_PIPE_STATUS_PAGE_SIZE,
-        currentPage * AGED_PIPE_STATUS_PAGE_SIZE,
-      ),
-    [currentPage, rows],
-  );
+
+  const pagination: PaginationState = {
+    pageIndex: currentPage - 1,
+    pageSize: AGED_PIPE_STATUS_PAGE_SIZE,
+  };
+  const table = useReactTable({
+    data: rows,
+    columns,
+    state: { pagination },
+    getCoreRowModel: getCoreRowModel(),
+    getPaginationRowModel: getPaginationRowModel(),
+    onPaginationChange: (updater) => {
+      const next =
+        typeof updater === "function" ? updater(pagination) : updater;
+      setCurrentPage(next.pageIndex + 1);
+    },
+  });
 
   const loadRows = useCallback(
     async (nextFilters: AgedPipeStatusByCtpvFilters) => {
@@ -249,18 +284,12 @@ export default function AgedPipeStatusByCtpvPopupPage() {
         </div>
       </PopupSearchPanel>
 
-      <MapPopupDataTable
-        rows={
-          pageRows as Array<AgedPipeStatusByCtpvRow & Record<string, unknown>>
-        }
-        headlist={headList}
+      <StandardDataTable
+        table={table}
         title="시도별 노후관로 목록"
         total={rows.length}
-        page={currentPage}
-        pageSize={AGED_PIPE_STATUS_PAGE_SIZE}
-        onPageChange={setCurrentPage}
-        scrollMode={years.length > 2 ? "horizontal" : "none"}
-        minTableWidth={years.length > 2 ? "120rem" : "100%"}
+        scrollMode="horizontal"
+        minTableWidth={years.length > 0 ? "120rem" : "100%"}
         actions={
           <Button type="button" onClick={handleDownload}>
             엑셀다운로드
diff --git a/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvExport.ts b/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvExport.ts
index 888e1db17..9946bc815 100644
--- a/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvExport.ts
+++ b/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvExport.ts
@@ -1,32 +1,80 @@
 "use client";
 
-import { postBlobData } from "@/components/lib/api";
-import { fileDownload } from "@/components/lib/utils/fileDownload";
+import * as XLSX from "xlsx";
+import { getRawJson } from "@/components/lib/api";
 import {
   getAgedPipeStatusByCtpvValidationMessage,
   normalizeAgedPipeStatusByCtpvFilters,
   type AgedPipeStatusByCtpvFilters,
+  type AgedPipeStatusByCtpvResponse,
 } from "./agedPipeStatusByCtpvUtils";
 
-/** 시도별 노후관로현황 XLSX 다운로드를 요청한다. */
+/** 적용조건의 시도별 노후관로현황 전체를 조회해 연도 그룹 Excel로 생성한다. */
 export const downloadAgedPipeStatusByCtpvExcel = async (
   filters: AgedPipeStatusByCtpvFilters,
 ) => {
   const validationMessage = getAgedPipeStatusByCtpvValidationMessage(filters);
   if (validationMessage) throw new Error(validationMessage);
-
-  const normalizedFilters = normalizeAgedPipeStatusByCtpvFilters(filters);
-  const { blob, fileName } = await postBlobData(
-    "v1/swagePpl/aged-status-by-ctpv/exportJobs/download",
-    {
-      startYear: normalizedFilters.startYear,
-      endYear: normalizedFilters.endYear,
-      elapsedYears: normalizedFilters.elapsedYears,
-      format: "xlsx",
-    },
+  const normalized = normalizeAgedPipeStatusByCtpvFilters(filters);
+  const params = new URLSearchParams({
+    startYear: String(normalized.startYear),
+    endYear: String(normalized.endYear),
+    elapsedYears: String(normalized.elapsedYears),
+  });
+  const response: any = await getRawJson(
+    `v1/swagePpl/aged-status-by-ctpv?${params.toString()}`,
   );
+  const payload = (response?.data ?? response) as AgedPipeStatusByCtpvResponse;
+  const years = Array.isArray(payload?.years)
+    ? payload.years.map(Number).filter(Number.isFinite)
+    : [];
+  const rows = Array.isArray(payload?.rows) ? payload.rows : [];
+  if (rows.length === 0) throw new Error("다운로드할 데이터가 없습니다.");
 
-  const resolvedFileName = fileName || "시도별_노후관로현황.xlsx";
-  fileDownload(blob, resolvedFileName);
-  return resolvedFileName;
+  const headers = ["순번", "시도"];
+  years.forEach((year) => headers.push(`${year}년`, "", ""));
+  const subHeaders = ["", ""];
+  years.forEach(() =>
+    subHeaders.push("전체관로연장(km)", "노후관로연장(km)", "노후화율(%)"),
+  );
+  const data = rows.map((row, rowIndex) => {
+    const statsByYear = new Map(
+      (row.yearStats ?? []).map((stat) => [Number(stat.year), stat]),
+    );
+    const values: Array<string | number> = [rowIndex + 1, row.ctpvNm || "-"];
+    years.forEach((year) => {
+      const stat = statsByYear.get(year);
+      values.push(
+        stat ? Number(stat.totalLengthKm ?? 0) : "-",
+        stat ? Number(stat.agedLengthKm ?? 0) : "-",
+        stat ? Number(stat.agedRate ?? 0) : "-",
+      );
+    });
+    return values;
+  });
+
+  const worksheet = XLSX.utils.aoa_to_sheet([headers, subHeaders, ...data]);
+  worksheet["!merges"] = [
+    { s: { r: 0, c: 0 }, e: { r: 1, c: 0 } },
+    { s: { r: 0, c: 1 }, e: { r: 1, c: 1 } },
+    ...years.map((_, index) => ({
+      s: { r: 0, c: 2 + index * 3 },
+      e: { r: 0, c: 4 + index * 3 },
+    })),
+  ];
+  worksheet["!cols"] = [
+    { wch: 8 },
+    { wch: 18 },
+    ...years.flatMap(() => [{ wch: 18 }, { wch: 18 }, { wch: 14 }]),
+  ];
+  worksheet["!autofilter"] = {
+    ref: `A2:${XLSX.utils.encode_col(headers.length - 1)}${data.length + 2}`,
+  };
+  const workbook = XLSX.utils.book_new();
+  XLSX.utils.book_append_sheet(workbook, worksheet, "시도별 노후관로현황");
+  XLSX.writeFile(workbook, "시도별_노후관로현황.xlsx", {
+    bookType: "xlsx",
+    compression: true,
+    cellStyles: true,
+  });
 };
diff --git a/apps/sn/docs/작업계획/SFR-011-001-시도별 노후관로현황/001-fe-SFR-011-001-시도별 노후관로현황-작업카드.md b/apps/sn/docs/작업계획/SFR-011-001-시도별 노후관로현황/001-fe-SFR-011-001-시도별 노후관로현황-작업카드.md
index e8cbd094a..6620d21ab 100644
--- a/apps/sn/docs/작업계획/SFR-011-001-시도별 노후관로현황/001-fe-SFR-011-001-시도별 노후관로현황-작업카드.md	
+++ b/apps/sn/docs/작업계획/SFR-011-001-시도별 노후관로현황/001-fe-SFR-011-001-시도별 노후관로현황-작업카드.md	
@@ -1,5 +1,10 @@
 # SFR-011-001 시도별 노후관로현황 FE 작업카드
 
+## 유지보수 반영 (2026-09-04)
+
+- 목록의 연도별 결과 컬럼을 연도 그룹 헤더로 묶어 표시한다.
+- 엑셀 다운로드는 조회 결과를 프론트엔드에서 XLSX로 생성하며, 목록과 동일한 연도 그룹 헤더와 하위 컬럼을 사용한다.
+
 ## 1. 작업 목적
 - 하수관망도 우측 분석도구에서 `시도별 노후관로현황` 팝업을 열고 기준년도 구간별 시도 집계를 조회한다.
 
@@ -7,7 +12,7 @@
 - `AnalysisPopupMenu`에 진입 버튼 추가
 - `windowPopup` registry에 새 popup key 추가
 - 전용 popup page 구현
-- 기준년도 시작/종료, 경과년도 기본값 30년, CSV 다운로드 연결
+- 기준년도 시작/종료, 경과년도 기본값 30년, FE XLSX 다운로드 연결
 
 ## 3. 구현 기준
 - 기존 `노후관로 현황` popup의 레이아웃 톤과 다운로드 UX를 최대한 재사용한다.
@@ -16,4 +21,4 @@
 
 ## 4. 연동 API
 - `GET /api/v1/swagePpl/aged-status-by-ctpv`
-- `POST /api/v1/swagePpl/aged-status-by-ctpv/exportJobs/download`
+- 별도 백엔드 Excel API를 호출하지 않고 조회 응답으로 FE에서 XLSX 생성
diff --git a/packages/common/components/src/ui/data-table/index.tsx b/packages/common/components/src/ui/data-table/index.tsx
index bcd027757..6872eae20 100644
--- a/packages/common/components/src/ui/data-table/index.tsx
+++ b/packages/common/components/src/ui/data-table/index.tsx
@@ -77,47 +77,69 @@ function DataTable<T>({
 function THead<T>({ table }: { table: TableInstance<T> }) {
   return (
     <TableHeader>
-      {table.getHeaderGroups().map((headerGroup) => (
-        <TableRow key={headerGroup.id}>
-          {headerGroup.headers.map((header) => {
-            const columnRelativeDepth = header.depth - header.column.depth;
-            if (
-              !header.isPlaceholder &&
-              columnRelativeDepth > 1 &&
-              header.id === header.column.id
-            ) {
-              return null;
-            }
+      {table
+        .getHeaderGroups()
+        .map((headerGroup, headerGroupIndex, headerGroups) => (
+          <TableRow
+            key={headerGroup.id}
+            className={cn(
+              headerGroups.length > 1 &&
+                headerGroupIndex === 0 &&
+                "!border-b-0",
+            )}
+          >
+            {headerGroup.headers.map((header) => {
+              const columnRelativeDepth = header.depth - header.column.depth;
+              if (
+                !header.isPlaceholder &&
+                columnRelativeDepth > 1 &&
+                header.id === header.column.id
+              ) {
+                return null;
+              }
 
-            let rowSpan = 1;
-            if (header.isPlaceholder) {
-              const leafs = header.getLeafHeaders();
-              rowSpan = (leafs?.[leafs.length - 1]?.depth ?? 0) - header.depth;
-            }
+              let rowSpan = 1;
+              if (header.isPlaceholder) {
+                const leafs = header.getLeafHeaders();
+                rowSpan =
+                  (leafs?.[leafs.length - 1]?.depth ?? 0) - header.depth;
+              }
 
-            const { meta } = header.column.columnDef;
+              const { meta } = header.column.columnDef;
 
-            return (
-              <TableHead
-                key={header.id}
-                className="sticky top-0 z-10"
-                colSpan={header.colSpan}
-                rowSpan={rowSpan}
-                {...meta}
-              >
-                {flexRender(
-                  header.column.columnDef.header,
-                  header.getContext(),
-                )}
-              </TableHead>
-            );
-          })}
-        </TableRow>
-      ))}
+              const isNestedGroupHeader =
+                !header.isPlaceholder && hasNestedColumns(header.column);
+
+              return (
+                <TableHead
+                  key={header.id}
+                  className={cn(
+                    "sticky top-0 z-10",
+                    isNestedGroupHeader && "data-table-group-header",
+                  )}
+                  colSpan={header.colSpan}
+                  rowSpan={rowSpan}
+                  {...meta}
+                >
+                  {flexRender(
+                    header.column.columnDef.header,
+                    header.getContext(),
+                  )}
+                </TableHead>
+              );
+            })}
+          </TableRow>
+        ))}
     </TableHeader>
   );
 }
 
+function hasNestedColumns<T>(
+  column: import("@tanstack/react-table").Column<T, unknown>,
+) {
+  return column.columns.length > 0;
+}
+
 function Pagination<T>({ table }: { table: TableInstance<T> }) {
   const pageCount = table.getPageCount();
   const currentPage = table.getState().pagination.pageIndex;
diff --git a/packages/common/components/src/ui/table/table.css b/packages/common/components/src/ui/table/table.css
index 4d25604c8..2a0897d39 100644
--- a/packages/common/components/src/ui/table/table.css
+++ b/packages/common/components/src/ui/table/table.css
@@ -18,6 +18,18 @@
   .table-ui.default th {
     @apply bg-[#5987bf] text-[#fff];
   }
+  .table-ui th.data-table-group-header {
+    background-image: linear-gradient(
+      to right,
+      transparent 0.2rem,
+      var(--background) 0.2rem,
+      var(--background) calc(100% - 0.2rem),
+      transparent calc(100% - 0.2rem)
+    );
+    background-position: left bottom;
+    background-repeat: no-repeat;
+    background-size: 100% 1px;
+  }
   .table-ui.default td {
     @apply border-b border-b-border text-label;
   }

From 7e82c6a8025b2f210bad26e8fcc5d8dbb4f61d1f Mon Sep 17 00:00:00 2001
From: LEEKYUHYUN <lkhyun0807106@gmail.com>
Date: Mon, 7 Sep 2026 17:44:46 +0900
Subject: [PATCH 08/13] =?UTF-8?q?"=EB=94=94=EC=A7=80=ED=84=B8=ED=95=98?=
 =?UTF-8?q?=EC=88=98=EA=B4=80=EB=A1=9C"=20UI=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/sn/.env.local                            |   4 +-
 apps/sn/AGENTS.md                             |  33 ++++
 .../agedPipe/AgedPipeLayerSettingPanel.tsx    |  19 +-
 .../analysisMenu/AnalysisPopupMenu.tsx        |  80 +++++----
 .../components/exmn/ExmnLayerSettingPanel.tsx |  10 +-
 .../FldngHstryLayerSettingPanel.tsx           |  50 ++----
 .../map/components/gisEdit/GisEditToolbar.tsx |   2 +-
 .../layerSetting/LayerSettingCard.tsx         |  16 +-
 .../sinkhole/SinkholeLayerSettingPanel.tsx    |  34 ++--
 apps/sn/app/(map-layout)/map/page.tsx         |  68 +++++--
 .../001-fe-FE-MAP-레이어패널헤더-구현기록.md  |  79 +++++++++
 .../business_components/src/ui/map/Gis.js     |  17 +-
 .../src/ui/map/GisMapToggle.js                |  89 +++++++---
 .../src/ui/map/GisToolBar.js                  | 167 +++++++++++-------
 .../business_components/src/ui/map/GisTree.js | 141 ++++++++++-----
 .../src/ui/map/lib/css/gis.common.css         |  56 +++++-
 .../src/ui/map/searchBar/procSearchBar.tsx    |  72 ++++++++
 17 files changed, 660 insertions(+), 277 deletions(-)
 create mode 100644 apps/sn/docs/작업내용/FE-MAP-레이어패널헤더/001-fe-FE-MAP-레이어패널헤더-구현기록.md

diff --git a/apps/sn/.env.local b/apps/sn/.env.local
index dce96bf40..3d871b007 100644
--- a/apps/sn/.env.local
+++ b/apps/sn/.env.local
@@ -12,8 +12,8 @@ NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver
 NEXT_PUBLIC_NGII_URL = https://map.ngii.go.kr
 NEXT_PUBLIC_NGII_PARAM = 04trYP9_xwLAfALjwZ-B8g&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={x}&tilerow={y}
 SERVER_API_URL = http://dev.onasys.co.kr:8000
-SEWERAGE_API_URL = http://localhost:8883
-# SEWERAGE_API_URL = http://con.mind-one.co.kr:11083
+# SEWERAGE_API_URL = http://localhost:8883
+SEWERAGE_API_URL = http://con.mind-one.co.kr:11083
 DC_URL     = https://apigateway.apps.rsonesoft.com
 # NEXT_PUBLIC_CM_LOGIN_PAGE_URL = http://dev.onasys.co.kr:3000/auth/login
 NEXT_PUBLIC_CM_LOGIN_PAGE_URL = /auth/login
diff --git a/apps/sn/AGENTS.md b/apps/sn/AGENTS.md
index 3c369a72d..037aa402a 100644
--- a/apps/sn/AGENTS.md
+++ b/apps/sn/AGENTS.md
@@ -6,6 +6,39 @@
 현재 목표는 리팩토링 전용 작업이 아니라, 하수관로 운영관리 시스템 2차사업 고도화를 수행하는 것이다.
 즉, 기존 `sn` 화면과 흐름을 안정적으로 유지하면서 2차 요구사항에 해당하는 화면 개발, 기능 확장, 백엔드 연동 보완을 수행해야 한다.
 
+## 사용자 작업 범위: UI/UX 및 퍼블리싱
+
+현재 사용자와 진행하는 작업의 기본 범위는 UI/UX 및 프론트엔드 퍼블리싱으로 제한한다.
+사용자가 별도로 명시하지 않는 한 아래 기준을 모든 후속 작업에 적용한다.
+
+### 허용 범위
+
+- 화면 레이아웃과 시각적 위계 조정
+- JSX 마크업, Tailwind CSS, CSS 스타일 수정
+- 색상, 여백, 간격, 크기, 타이포그래피, 아이콘, 테두리, 배경 조정
+- 반응형 화면, 접근성, 포커스와 시각적 상태 개선
+- 표시 전용 컴포넌트 구성과 퍼블리싱 품질 개선
+- 기존 화면 내용과 동작을 유지하는 범위의 UI 구조 정리
+
+### 기본 금지 범위
+
+- 백엔드 코드, API 계약, 요청·응답 데이터 구조 변경
+- `.env*`, middleware, 프록시, 인증과 권한 설정 변경
+- 업무 로직, 상태 모델, 데이터 가공 및 저장 흐름 변경
+- 데이터베이스, 서버 프로세스와 배포 설정 변경
+- 패키지 설치·업데이트와 의존성 구조 변경
+- 사용자 요청 없이 화면의 문구, 데이터 항목, 기능 동작 변경
+
+금지 범위의 변경이 필요해 보이면 직접 수정하지 않고 원인과 필요한 작업만 사용자에게 설명한다.
+
+### UI 검증 안전 기준
+
+- 사용자가 실행한 개발 서버가 있는지 실제 앱 포트까지 먼저 확인한다.
+- 개발 서버 실행 중에는 같은 앱의 `next build`를 실행하지 않는다.
+- UI 작업의 기본 검증은 실행 중인 개발 서버의 HMR, 브라우저 화면 확인, `git diff --check`로 제한한다.
+- 개발 서버 종료, `.next` 정리, 전체 빌드와 프로세스 재시작은 사용자가 명시적으로 승인한 경우에만 수행한다.
+- UI 변경 전후에 기존 문구, 데이터, 이벤트와 업무 동작이 유지되는지 확인한다.
+
 ---
 
 ## 공통 시작 기준
diff --git a/apps/sn/app/(map-layout)/map/components/agedPipe/AgedPipeLayerSettingPanel.tsx b/apps/sn/app/(map-layout)/map/components/agedPipe/AgedPipeLayerSettingPanel.tsx
index 9dda96f8f..94edaeaef 100644
--- a/apps/sn/app/(map-layout)/map/components/agedPipe/AgedPipeLayerSettingPanel.tsx
+++ b/apps/sn/app/(map-layout)/map/components/agedPipe/AgedPipeLayerSettingPanel.tsx
@@ -54,23 +54,18 @@ export default function AgedPipeLayerSettingPanel({
   };
 
   const inputClass =
-    "h-[20px] !rounded border border-input bg-background px-[1px] text-center text-[1.1rem] leading-none text-foreground";
-  const numberInputClass = inputClass + " w-[40px]";
+    "h-[26px] !rounded border border-input bg-background px-2 py-0 text-center text-[12px] leading-none text-foreground";
+  const numberInputClass = inputClass + " min-w-0 flex-1";
   const applyButtonClass =
-    "grid h-[16px] w-[16px] shrink-0 place-items-center rounded-full bg-primary text-[0.85rem] font-bold leading-none text-primary-foreground";
-  const indicator = (
-    <span className="h-2 w-2 shrink-0 rounded-full bg-primary" />
-  );
-
+    "h-[26px] shrink-0 rounded border border-[#A9C5E5] bg-[#EDF4FC] px-2 py-0 text-[12px] font-medium leading-none text-[#2463A6]";
   const settingRow = (
-    <div className="flex min-h-[26px] items-center gap-1 whitespace-nowrap text-[1.15rem] font-medium text-label">
-      <div className="flex min-w-0 items-center gap-1">
-        {indicator}
+    <div className="flex min-h-[26px] flex-col items-stretch gap-1.5 whitespace-nowrap text-[1.15rem] font-medium text-label">
+      <div className="flex min-w-0 items-center">
         <label htmlFor="aged-pipe-elapsed-years" className="shrink-0">
           노후관로 경과년도(년)
         </label>
       </div>
-      <div className="ml-auto flex shrink-0 items-center gap-1">
+      <div className="flex w-full items-center gap-1">
         <input
           id="aged-pipe-elapsed-years"
           className={numberInputClass}
@@ -95,7 +90,7 @@ export default function AgedPipeLayerSettingPanel({
           title="적용"
           aria-label="경과년도 적용"
         >
-          <span className="relative left-[1px]">✓</span>
+          확인
         </button>
       </div>
     </div>
diff --git a/apps/sn/app/(map-layout)/map/components/analysisMenu/AnalysisPopupMenu.tsx b/apps/sn/app/(map-layout)/map/components/analysisMenu/AnalysisPopupMenu.tsx
index fa6aa96c3..3a11a4f99 100644
--- a/apps/sn/app/(map-layout)/map/components/analysisMenu/AnalysisPopupMenu.tsx
+++ b/apps/sn/app/(map-layout)/map/components/analysisMenu/AnalysisPopupMenu.tsx
@@ -3,7 +3,6 @@
 import { useEffect, useState, type ComponentType, type ReactNode } from "react";
 import {
   ChartColumnBig,
-  ChevronDown,
   ChevronUp,
   PanelsTopLeft,
   PencilRuler,
@@ -32,10 +31,10 @@ type MenuIconProps = {
   isActive: boolean;
 };
 
-const InftwtMenuIcon = ({ isActive }: MenuIconProps) => (
+const InftwtMenuIcon = () => (
   <svg
     viewBox="0 0 24 24"
-    className={`h-[15px] w-[15px] shrink-0 ${isActive ? "text-primary" : "text-label"}`}
+    className="h-[15px] w-[15px] shrink-0 text-current"
     aria-hidden="true"
     fill="none"
   >
@@ -167,31 +166,44 @@ export default function AnalysisPopupMenu({
   }, [initialActiveKey]);
 
   return (
-    <div className="absolute right-[15px] top-[8px] z-[45]">
-      <div className="flex w-[154px] flex-col overflow-hidden rounded-[6px] border border-border bg-background shadow-[0_8px_18px_rgba(15,23,42,0.14)]">
-        <div className="flex h-[36px] shrink-0 items-center justify-between gap-2 border-b border-border bg-secondary pl-[10px] pr-[4px] text-[13px] font-bold text-foreground">
-          <div className="flex items-center gap-2">
-            <PanelsTopLeft className="h-4 w-4 text-primary" />
-            <span>분석도구</span>
+    <div className="pointer-events-none absolute right-[68px] top-[16px] z-[45] flex flex-col items-end gap-[8px]">
+      <button
+        type="button"
+        className={`pointer-events-auto flex h-[40px] w-[40px] shrink-0 items-center justify-center overflow-hidden rounded-[3px] p-0 shadow-[0_1px_2px_rgba(60,64,67,0.3),0_1px_3px_1px_rgba(60,64,67,0.15)] ${
+          isOpen
+            ? "bg-[#0279FA] text-white"
+            : "bg-white text-[#666666] hover:bg-[#0279FA] hover:text-white"
+        }`}
+        onClick={() => setIsOpen((value) => !value)}
+        title={isOpen ? "분석 메뉴 숨기기" : "분석도구"}
+        aria-label={isOpen ? "분석 메뉴 숨기기" : "분석 메뉴 보이기"}
+        aria-expanded={isOpen}
+        aria-controls="analysis-popup-menu"
+      >
+        <PanelsTopLeft className="h-[20px] w-[20px]" aria-hidden="true" />
+      </button>
+
+      {isOpen ? (
+        <div
+          id="analysis-popup-menu"
+          className="pointer-events-auto flex w-max min-w-[154px] flex-col overflow-hidden rounded-[6px] bg-background shadow-[0_1px_2px_rgba(60,64,67,0.3),0_1px_3px_1px_rgba(60,64,67,0.15)]"
+        >
+          <div className="flex h-[36px] shrink-0 items-center justify-between gap-2 border-b border-border bg-white pl-[10px] pr-[4px] text-[13px] font-bold text-foreground">
+            <div className="flex items-center gap-2">
+              <PanelsTopLeft className="h-4 w-4 text-primary" />
+              <span>분석도구</span>
+            </div>
+            <button
+              type="button"
+              className="flex h-[28px] w-[28px] shrink-0 items-center justify-center rounded-[4px] text-label hover:bg-accent hover:text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-[#0279FA]"
+              onClick={() => setIsOpen(false)}
+              title="분석 메뉴 숨기기"
+              aria-label="분석 메뉴 숨기기"
+            >
+              <ChevronUp className="h-4 w-4" aria-hidden="true" />
+            </button>
           </div>
 
-          <button
-            type="button"
-            className="flex h-[28px] w-[28px] shrink-0 items-center justify-center rounded-[4px] text-label transition hover:bg-accent hover:text-primary"
-            onClick={() => setIsOpen((value) => !value)}
-            title={isOpen ? "분석 메뉴 숨기기" : "분석 메뉴 보이기"}
-            aria-label={isOpen ? "분석 메뉴 숨기기" : "분석 메뉴 보이기"}
-            aria-expanded={isOpen}
-          >
-            {isOpen ? (
-              <ChevronUp className="h-4 w-4" />
-            ) : (
-              <ChevronDown className="h-4 w-4" />
-            )}
-          </button>
-        </div>
-
-        {isOpen ? (
           <div className="flex flex-col gap-[3px] p-[6px]">
             {ANALYSIS_POPUP_ITEMS.map((item) => {
               const Icon = item.icon;
@@ -208,7 +220,7 @@ export default function AnalysisPopupMenu({
                 <button
                   key={item.key}
                   type="button"
-                  className={`relative flex h-[33px] items-center gap-[7px] rounded-[5px] border px-[8px] pl-[10px] text-left text-[12px] font-semibold transition ${
+                  className={`relative flex h-[33px] items-center gap-[7px] rounded-[5px] border px-[8px] pl-[10px] text-left text-[12px] font-semibold transition focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-[#0279FA] ${
                     isActive
                       ? "border-primary bg-secondary font-bold text-primary before:absolute before:bottom-[7px] before:left-0 before:top-[7px] before:w-[3px] before:rounded-r-[2px] before:bg-primary"
                       : "border-transparent bg-background text-foreground hover:border-border hover:bg-accent hover:text-primary"
@@ -244,19 +256,17 @@ export default function AnalysisPopupMenu({
                 >
                   {item.renderIcon ? item.renderIcon({ isActive }) : null}
                   {Icon ? (
-                    <Icon
-                      className={`h-[15px] w-[15px] shrink-0 ${
-                        isActive ? "text-primary" : "text-label"
-                      }`}
-                    />
+                    <Icon className="h-[15px] w-[15px] shrink-0 text-current" />
                   ) : null}
-                  <span className="whitespace-nowrap">{label}</span>
+                  <span className="whitespace-nowrap" title={label}>
+                    {label}
+                  </span>
                 </button>
               );
             })}
           </div>
-        ) : null}
-      </div>
+        </div>
+      ) : null}
     </div>
   );
 }
diff --git a/apps/sn/app/(map-layout)/map/components/exmn/ExmnLayerSettingPanel.tsx b/apps/sn/app/(map-layout)/map/components/exmn/ExmnLayerSettingPanel.tsx
index a8e0a020f..42131793e 100644
--- a/apps/sn/app/(map-layout)/map/components/exmn/ExmnLayerSettingPanel.tsx
+++ b/apps/sn/app/(map-layout)/map/components/exmn/ExmnLayerSettingPanel.tsx
@@ -30,7 +30,7 @@ export default function ExmnLayerSettingPanel({
     });
   };
   const selectClass =
-    "h-[20px] w-[62px] rounded border border-input bg-background px-[1px] text-center text-[1.1rem] leading-none text-foreground outline-none focus:border-primary";
+    "h-[26px] w-full rounded border border-input bg-background px-2 py-0 text-center text-[12px] leading-none text-foreground outline-none focus:border-primary";
   const labelClass = "shrink-0 text-[1.15rem] font-medium text-label";
   const title = jobType === "PPL" ? "관로조사" : "맨홀조사";
 
@@ -41,8 +41,8 @@ export default function ExmnLayerSettingPanel({
       onEnabledChange={onEnabledChange}
       onClose={onClose}
     >
-      <div className="space-y-[1px]">
-        <label className="flex min-h-[24px] items-center justify-between ">
+      <div className="space-y-[6px]">
+        <label className="flex min-h-[24px] flex-col items-stretch gap-1">
           <span className={`flex items-center gap-1 ${labelClass}`}>
             <span
               className={`h-2 w-2 rounded-full ${jobType === "PPL" ? "bg-[#facc15]" : "bg-[#8b5cf6]"}`}
@@ -59,7 +59,7 @@ export default function ExmnLayerSettingPanel({
             onChange={(event) => updateFilter("bizCycl", event.target.value)}
           />
         </label>
-        <label className="flex min-h-[24px] items-center justify-between ">
+        <label className="flex min-h-[24px] flex-col items-stretch gap-1">
           <span className={labelClass}>구조적 상태등급</span>
           <select
             className={selectClass}
@@ -75,7 +75,7 @@ export default function ExmnLayerSettingPanel({
             ))}
           </select>
         </label>
-        <label className="flex min-h-[24px] items-center justify-between ">
+        <label className="flex min-h-[24px] flex-col items-stretch gap-1">
           <span className={labelClass}>운영적 상태등급</span>
           <select
             className={selectClass}
diff --git a/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryLayerSettingPanel.tsx b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryLayerSettingPanel.tsx
index 0cf554a46..ac00e2220 100644
--- a/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryLayerSettingPanel.tsx
+++ b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryLayerSettingPanel.tsx
@@ -6,6 +6,7 @@ import {
   normalizeFloodHistoryYearRange,
   type FloodHistoryYearRange,
 } from "./fldngHstryTypes";
+import LayerSettingCard from "../layerSetting/LayerSettingCard";
 
 type Props = {
   yearRange: FloodHistoryYearRange;
@@ -36,7 +37,7 @@ export default function FldngHstryLayerSettingPanel({
     .filter((year) => Number(year) >= Number(normalizedRange.startYear))
     .map((year) => ({ val: year, text: year }));
   const yearSelectClass =
-    "h-[20px] w-[62px] !rounded border border-input bg-background px-[1px] text-center text-[1.1rem] leading-none text-foreground";
+    "!h-[26px] w-full !rounded border border-input bg-background px-2 py-0 text-center text-[12px] leading-none text-foreground";
 
   const changeYear = (key: keyof FloodHistoryYearRange, value: string) => {
     onYearRangeChange(
@@ -48,41 +49,16 @@ export default function FldngHstryLayerSettingPanel({
   };
 
   return (
-    <div className="w-full overflow-visible rounded-[6px] border border-border bg-background shadow-blur">
-      <div className="flex min-h-[28px] items-center justify-between border-b border-border px-2">
-        <span className="text-[1.15rem] font-semibold text-label">
-          침수흔적도
-        </span>
-        <div className="flex shrink-0 items-center gap-2">
-          <button
-            type="button"
-            role="switch"
-            aria-checked={enabled}
-            aria-label="침수년도 필터 적용 여부"
-            title={enabled ? "침수년도 필터 적용 중" : "침수년도 필터 미적용"}
-            className={`relative h-[16px] w-[28px] rounded-full border transition-colors ${enabled ? "border-primary bg-primary" : "border-[#94a3b8] bg-[#cbd5e1]"}`}
-            onClick={() => onEnabledChange(!enabled)}
-          >
-            <span
-              className={`absolute top-1/2 h-[12px] w-[12px] -translate-y-1/2 rounded-full bg-white shadow-sm transition-[left] ${enabled ? "left-[14px]" : "left-[2px]"}`}
-            />
-          </button>
-          <button
-            type="button"
-            aria-label="침수년도 설정 닫기"
-            title="닫기"
-            className="grid h-[20px] w-[20px] place-items-center bg-transparent text-[1.3rem] leading-none text-muted-foreground hover:text-foreground"
-            onClick={onClose}
-          >
-            ×
-          </button>
-        </div>
-      </div>
-      <div className="flex min-h-[30px] items-center gap-1.5 px-2 py-1 text-[1.15rem] font-medium text-label">
-        <span className="h-2 w-2 shrink-0 rounded-full bg-primary" />
+    <LayerSettingCard
+      title="침수흔적도"
+      enabled={enabled}
+      onEnabledChange={onEnabledChange}
+      onClose={onClose}
+    >
+      <div className="flex flex-col gap-1.5 font-medium text-label">
         <span className="shrink-0">침수년도</span>
-        <div className="ml-auto flex shrink-0 items-center gap-1.5">
-          <div className="w-[62px]">
+        <div className="flex w-full items-center gap-1.5">
+          <div className="min-w-0 flex-1">
             <SelectBox
               className="w-full"
               selectClass={yearSelectClass}
@@ -97,7 +73,7 @@ export default function FldngHstryLayerSettingPanel({
           <span className="px-[1px] text-[0.95rem] font-normal text-muted-foreground">
             ~
           </span>
-          <div className="w-[62px]">
+          <div className="min-w-0 flex-1">
             <SelectBox
               className="w-full"
               selectClass={yearSelectClass}
@@ -111,6 +87,6 @@ export default function FldngHstryLayerSettingPanel({
           </div>
         </div>
       </div>
-    </div>
+    </LayerSettingCard>
   );
 }
diff --git a/apps/sn/app/(map-layout)/map/components/gisEdit/GisEditToolbar.tsx b/apps/sn/app/(map-layout)/map/components/gisEdit/GisEditToolbar.tsx
index 932146b33..b12290773 100644
--- a/apps/sn/app/(map-layout)/map/components/gisEdit/GisEditToolbar.tsx
+++ b/apps/sn/app/(map-layout)/map/components/gisEdit/GisEditToolbar.tsx
@@ -55,7 +55,7 @@ export default function GisEditToolbar({
       data-testid="gis-edit-toolbar"
       className="absolute bottom-4 left-1/2 z-[60] flex w-[min(980px,calc(100%-2rem))] -translate-x-1/2 flex-col"
     >
-      <div className="card card-border !m-0 flex !bg-background !p-[0.8rem] shadow-[0_8px_24px_rgba(23,42,70,0.18)]">
+      <div className="card !m-0 flex !border-0 !bg-background !p-[0.8rem] shadow-[0_1px_2px_rgba(60,64,67,0.3),0_1px_3px_1px_rgba(60,64,67,0.15)]">
         <div className="flex w-full items-center gap-3 overflow-hidden">
           <div className="flex w-[168px] shrink-0 flex-col justify-center border-r border-border pr-3">
             <span className="whitespace-nowrap text-[1.3rem] font-semibold leading-5 text-label">
diff --git a/apps/sn/app/(map-layout)/map/components/layerSetting/LayerSettingCard.tsx b/apps/sn/app/(map-layout)/map/components/layerSetting/LayerSettingCard.tsx
index 04429c927..91c9766f8 100644
--- a/apps/sn/app/(map-layout)/map/components/layerSetting/LayerSettingCard.tsx
+++ b/apps/sn/app/(map-layout)/map/components/layerSetting/LayerSettingCard.tsx
@@ -22,8 +22,16 @@ export default function LayerSettingCard({
 }: Props) {
   return (
     <div className="w-full overflow-visible rounded-[6px] border border-border bg-background shadow-blur">
-      <div className="flex min-h-[28px] items-center justify-between border-b border-border px-2">
-        <span className="text-[1.15rem] font-semibold text-label">{title}</span>
+      <div className="flex min-h-[28px] items-center justify-between border-b border-border pl-[0.8rem] pr-2">
+        <div className="flex min-w-0 items-center gap-2">
+          <span
+            aria-hidden="true"
+            className="h-[7px] w-[7px] shrink-0 rotate-45 bg-[#7CCE5C]"
+          />
+          <span className="truncate text-[12px] font-semibold text-label">
+            {title}
+          </span>
+        </div>
         <div className="flex shrink-0 items-center gap-2">
           {showToggle ? (
             <button
@@ -52,7 +60,9 @@ export default function LayerSettingCard({
         </div>
       </div>
       {children ? (
-        <div className="px-2 py-1 text-[1.15rem] text-label">{children}</div>
+        <div className="flex flex-col gap-[6px] p-[0.8rem] text-[1.15rem] text-label">
+          {children}
+        </div>
       ) : null}
     </div>
   );
diff --git a/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholeLayerSettingPanel.tsx b/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholeLayerSettingPanel.tsx
index 3765cbba5..7448849ba 100644
--- a/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholeLayerSettingPanel.tsx
+++ b/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholeLayerSettingPanel.tsx
@@ -101,7 +101,7 @@ export default function SinkholeLayerSettingPanel({
 
   const currentYear = new Date().getFullYear();
   const yearSelectClass =
-    "h-[20px] !w-[58px] !rounded border border-input bg-background px-[1px] text-center text-[1.1rem] leading-none text-foreground";
+    "!h-[26px] !w-full !rounded border border-input bg-background px-2 py-0 text-center text-[12px] leading-none text-foreground";
   const startYearOptions = Array.from(
     { length: currentYear - SINKHOLE_MIN_SEARCH_YEAR + 1 },
     (_, index) => String(currentYear - index),
@@ -124,24 +124,19 @@ export default function SinkholeLayerSettingPanel({
     .map((year) => ({ val: year, text: year }));
 
   const inputClass =
-    "h-[20px] !rounded border border-input bg-background px-[1px] text-center text-[1.1rem] leading-none text-foreground";
-  const numberInputClass = inputClass + " w-[40px]";
+    "h-[26px] !rounded border border-input bg-background px-2 py-0 text-center text-[12px] leading-none text-foreground";
+  const numberInputClass = inputClass + " min-w-0 flex-1";
   const applyButtonClass =
-    "grid h-[16px] w-[16px] shrink-0 place-items-center rounded-full bg-primary text-[0.85rem] font-bold leading-none text-primary-foreground";
-  const indicator = (
-    <span className="h-2 w-2 shrink-0 rounded-full bg-primary" />
-  );
-
+    "h-[26px] shrink-0 rounded border border-[#A9C5E5] bg-[#EDF4FC] px-2 py-0 text-[12px] font-medium leading-none text-[#2463A6]";
   const settingRows = (
     <div className="space-y-1.5 text-[1.15rem] font-medium text-label">
-      <div className="flex min-h-[26px] items-center gap-1.5 whitespace-nowrap">
-        <div className="flex min-w-0 items-center gap-1">
-          {indicator}
+      <div className="flex min-h-[26px] flex-col items-stretch gap-1.5 whitespace-nowrap">
+        <div className="flex min-w-0 items-center">
           <label htmlFor="sinkhole-radius" className="shrink-0">
             지반침하반경(m)
           </label>
         </div>
-        <div className="ml-auto flex shrink-0 items-center gap-1">
+        <div className="flex w-full items-center gap-1">
           <input
             id="sinkhole-radius"
             className={numberInputClass}
@@ -165,19 +160,18 @@ export default function SinkholeLayerSettingPanel({
             title="적용"
             aria-label="반경 적용"
           >
-            <span className="relative left-[1px]">✓</span>
+            확인
           </button>
         </div>
       </div>
-      <div className="flex min-h-[26px] items-center gap-1.5 whitespace-nowrap">
-        <div className="flex min-w-0 items-center gap-1">
-          {indicator}
+      <div className="flex min-h-[26px] flex-col items-stretch gap-1.5 whitespace-nowrap">
+        <div className="flex min-w-0 items-center">
           <label htmlFor="sinkhole-start-year" className="shrink-0">
             발생년도
           </label>
         </div>
-        <div className="ml-auto flex shrink-0 items-center gap-1.5">
-          <div id="sinkhole-start-year" className="w-[62px]">
+        <div className="flex w-full items-center gap-1.5">
+          <div id="sinkhole-start-year" className="min-w-0 flex-1">
             <SelectBox
               className="w-full"
               selectClass={yearSelectClass}
@@ -194,7 +188,7 @@ export default function SinkholeLayerSettingPanel({
           <span className="px-[1px] text-[0.95rem] font-normal text-muted-foreground">
             ~
           </span>
-          <div id="sinkhole-end-year" className="w-[62px]">
+          <div id="sinkhole-end-year" className="min-w-0 flex-1">
             <SelectBox
               className="w-full"
               selectClass={yearSelectClass}
@@ -215,7 +209,7 @@ export default function SinkholeLayerSettingPanel({
             title="적용"
             aria-label="연도범위 적용"
           >
-            <span className="relative left-[1px]">✓</span>
+            확인
           </button>
         </div>
       </div>
diff --git a/apps/sn/app/(map-layout)/map/page.tsx b/apps/sn/app/(map-layout)/map/page.tsx
index ff0c97513..e5266b909 100644
--- a/apps/sn/app/(map-layout)/map/page.tsx
+++ b/apps/sn/app/(map-layout)/map/page.tsx
@@ -18,6 +18,7 @@
 "use client";
 
 import dynamic from "next/dynamic";
+import { ListTree } from "lucide-react";
 import {
   Fragment,
   useCallback,
@@ -6764,17 +6765,17 @@ const Map = () => {
             showToggle={false}
           >
             {isWaterDepthLegendEnabled ? (
-              <div className="space-y-1">
+              <div className="space-y-[6px]">
                 {waterDepthLegendItems.map((item) => (
                   <div key={item.key} className="flex items-center gap-2">
                     <span
-                      className="inline-block h-4 w-10 shrink-0"
+                      className="inline-block h-6 w-10 shrink-0"
                       style={{
                         backgroundColor: item.color,
                         border: `1px solid ${item.borderColor}`,
                       }}
                     />
-                    <span className="text-[1rem] font-medium text-label">
+                    <span className="text-[11px] font-medium text-label">
                       {item.label}
                     </span>
                   </div>
@@ -6852,16 +6853,19 @@ const Map = () => {
     if (activeLayerSettingItems.length === 0) return null;
 
     return (
-      <div className="mt-3 flex h-[34vh] max-h-[32rem] min-h-[24rem] flex-col overflow-hidden rounded-sm border border-border bg-background shadow-[0_4px_14px_rgba(15,23,42,0.08)]">
-        <div className="border-b border-border bg-secondary px-3 py-2">
-          <span className="text-[1.2rem] font-semibold text-label">
+      <div className="flex h-[34vh] max-h-[32rem] min-h-[24rem] flex-col overflow-hidden rounded-[6px] border border-border bg-background shadow-[0_4px_14px_rgba(15,23,42,0.08)]">
+        <div className="flex h-[38px] shrink-0 items-center gap-2 border-b border-border px-3">
+          <span className="flex h-8 w-8 shrink-0 items-center justify-center rounded-sm bg-[#EDF8EA] text-[#65B84A]">
+            <ListTree size={14} strokeWidth={2} />
+          </span>
+          <span className="text-[1.4rem] font-bold text-foreground">
             선택 레이어 설정
           </span>
         </div>
         <div
           ref={restoreActiveLayerSettingScroll}
           onScroll={handleActiveLayerSettingScroll}
-          className="min-h-0 flex-1 overflow-y-scroll px-1 py-2 [scrollbar-gutter:stable] [scrollbar-width:thin] [&::-webkit-scrollbar]:w-[4px]"
+          className="min-h-0 flex-1 overflow-y-scroll px-2 py-2 [scrollbar-gutter:stable] [scrollbar-width:thin] [&::-webkit-scrollbar]:w-[4px]"
         >
           <div className="flex flex-col gap-2">
             {activeLayerSettingItems.map((item) => (
@@ -9379,7 +9383,7 @@ const Map = () => {
           >
             <GisEditSessionPanel
               {...gisEditSessionSnapshot}
-              className="max-h-[calc(50dvh-82px)]"
+              className="max-h-[calc(50dvh-82px)] !border-0 !shadow-[0_1px_2px_rgba(60,64,67,0.3),0_1px_3px_1px_rgba(60,64,67,0.15)]"
               variant="inline"
               onOpenPopup={handleOpenGisEditSessionPopup}
               onRemoveFocusedChange={gisEdit.removeFocusedChange}
@@ -9423,10 +9427,13 @@ const Map = () => {
           setIsSearchModalOpen={setIsSearchModalOpen}
           onCheckedLayersChange={handleCheckedLayersChange}
           onOpenPopup={handleOpenLayerPopup}
+          searchBarContainerClassName="!top-[16px] ml-[12px]"
+          alwaysVisibleMapTabs={true}
           searchBar={
             <ProcSearchBar
               gisMaps={gisMaps}
               facilityTypes={facilityTypes}
+              integrated
               sidoSearchZoom={
                 isAgedPipeChecked ? AGED_PIPE_GUIDE_MIN_ZOOM : undefined
               }
@@ -9435,15 +9442,17 @@ const Map = () => {
           }
           waterDepth={undefined}
           layerSettingView={ActiveLayerSettingView}
-          treeSectionClassName="rounded-sm border border-border bg-background px-1 py-2 text-foreground"
+          treeSectionClassName="px-1 py-2 text-foreground"
           detachedTreeToggleButton={true}
           showLayerPanelTitle={false}
+          sectionedTreePanel={true}
           isPlaying={isPlaying}
           setIsPlaying={setIsPlaying as any}
           targetLayerTypes={WATER_DEPTH_LAYER_TYPES as any}
           checkInterval={2500}
           checkedLayerChangeDelay={0}
           showZoomLevel={true}
+          toolBarIconSize={20}
           showZoomScaleInfo={true}
           showFloatingSearchButton={false}
           treeTogglePosition="center"
@@ -9497,9 +9506,19 @@ const Map = () => {
         )}
         <style jsx global>{`
           .sn-map-control-layout .mapbtn {
-            top: auto;
-            right: 15px;
-            bottom: 439px;
+            top: 16px;
+            right: 120px;
+            bottom: auto;
+          }
+
+          .sn-map-control-layout .map-type-tabs,
+          .sn-map-control-layout .tool-bar ul,
+          .sn-map-control-layout .zoom-level-panel,
+          .sn-map-control-layout .zoom-level-summary {
+            border: 0;
+            box-shadow:
+              0 1px 2px rgba(60, 64, 67, 0.3),
+              0 1px 3px 1px rgba(60, 64, 67, 0.15);
           }
 
           .sn-map-control-layout .custom-toolbar {
@@ -9507,19 +9526,32 @@ const Map = () => {
           }
 
           .sn-map-control-layout .tool-bar {
-            top: auto;
-            right: 15px;
-            bottom: 230px;
+            top: 16px;
+            right: 16px;
+            bottom: auto;
+          }
+
+          .sn-map-control-layout .tool-bar-vector-icons ul li div {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            background-image: none !important;
+            color: #666;
+            line-height: 1;
+          }
+
+          .sn-map-control-layout .tool-bar-vector-icons ul li div:hover {
+            color: #fff;
           }
 
           .sn-map-control-layout .zoom-level-control {
-            right: 15px;
-            bottom: 36px;
+            right: 16px;
+            bottom: 16px;
           }
 
           .sn-map-control-layout .zoom-level-summary {
             right: 56px;
-            bottom: -15px;
+            bottom: 0;
           }
 
           .sn-map-control-layout .ol-scale-line {
diff --git a/apps/sn/docs/작업내용/FE-MAP-레이어패널헤더/001-fe-FE-MAP-레이어패널헤더-구현기록.md b/apps/sn/docs/작업내용/FE-MAP-레이어패널헤더/001-fe-FE-MAP-레이어패널헤더-구현기록.md
new file mode 100644
index 000000000..2e89c064b
--- /dev/null
+++ b/apps/sn/docs/작업내용/FE-MAP-레이어패널헤더/001-fe-FE-MAP-레이어패널헤더-구현기록.md
@@ -0,0 +1,79 @@
+# FE-MAP 레이어 패널 헤더 구현 기록
+
+## 작업 목적
+
+- 사용자 제공 기준 이미지에 맞춰 지도 좌측 패널을 `레이어 관리`와 `선택 레이어 설정` 두 영역으로 구분한다.
+- 레이어 트리, 체크 상태, 선택 레이어별 설정 내용과 동작은 변경하지 않는다.
+
+## 적용 기준
+
+- 지도형 화면은 기존 `Gis` 조합을 유지한다.
+- 사용자 지정 스타일은 패널 외곽 여백 `4px`, 영역 사이 간격 `6px`, 패널 배경 `#E5E5E5`이다.
+- 두 영역은 흰색 카드와 제목 헤더로 구분한다.
+
+## 수정 대상
+
+- `apps/sn/app/(map-layout)/map/page.tsx`
+- `packages/common/business_components/src/ui/map/Gis.js`
+- `packages/common/business_components/src/ui/map/GisTree.js`
+
+## 변경 내용
+
+- 공통 GIS 패널에 기본값이 비활성인 섹션형 패널 옵션을 추가했다.
+- `sn` 관망도에서만 옵션을 활성화해 다른 앱의 기존 GIS 패널에는 영향을 주지 않는다.
+- `레이어 관리`와 `선택 레이어 설정`에 구분 아이콘과 고정 높이 헤더를 적용했다.
+- 두 카드 모두 헤더와 스크롤 본문을 형제 영역으로 분리해 헤더 아래에서만 콘텐츠가 스크롤되도록 통일했다.
+- 두 스크롤바는 카드 본문 오른쪽 끝에 배치하고 동일한 `4px` 두께와 안정적인 스크롤 여백을 적용했다.
+- 레이어 트리의 목록 액션은 아이콘 전용 표시를 해제하고 기존 `목록보기` 텍스트 버튼으로 복원했다.
+- 선택 레이어 설정 카드 제목 왼쪽에는 `#7CCE5C` 다이아몬드 표식을 공통 적용했다.
+- 설정 카드의 필드 제목과 입력 컨트롤은 위아래 배치로 정리했다.
+- 카드 제목의 다이아몬드는 `7px × 7px`, 카드 제목은 `13px`, 입력 텍스트는 `12px`로 조정했다.
+- 적용용 원형 체크 버튼은 입력과 동일한 `20px` 높이의 `확인` 텍스트 버튼으로 변경하고, 입력과 함께 카드 본문 너비를 채우도록 배치했다.
+- `sn` 레이어 관리 행의 마우스 호버 배경은 `#E8F0FD`로 적용했다.
+- `확인` 버튼은 배경 `#EDF4FC`, 글자 `#2463A6`, `1px` `#A9C5E5` 테두리로 통일했다.
+- 설정 카드 제목은 `12px`, 본문은 `8px` 패딩과 `6px` 간격으로 조정했다.
+- 침수심 범례 항목 텍스트는 `11px`로 조정했다.
+- 관망도 전용 패널 접기·열기 버튼은 너비를 `20px`로 유지하면서 아이콘을 `32px`로 확대하고 아이콘 색상을 `#666666`으로 적용했다.
+- 패널에 맞닿는 버튼의 좌측 위·아래 모서리는 각지게 하고 우측 모서리만 `4px` 둥글게 처리했다.
+
+## 지도 검색바 퍼블리싱
+
+- 실제 관망도에서만 활성화되는 `integrated` 옵션으로 기존 검색 상태와 조회 동작을 유지했다.
+- 검색바는 `656px × 44px`, 셀렉트 3개는 각각 `192px`, 조회 버튼은 `80px`로 구성했다.
+- 셀렉트 사이 간격과 래퍼 패딩을 제거하고 첫 셀렉트 왼쪽과 조회 버튼 오른쪽에만 `8px` 모서리를 적용했다.
+- 첫 번째와 두 번째 셀렉트 오른쪽 내부에 `24px` 높이의 `#D5DCE5` 구분선을 배치했다.
+- 셀렉트 글자·화살표·말줄임과 조회 버튼 타이포그래피를 요청 사양에 맞추고 Radix Portal 드롭다운 구조는 유지했다.
+- 선택값은 기본 `line-clamp` 표시 영향을 제거하고 `20px` 행간의 한 줄 말줄임으로 고정해 글자 세로 잘림을 방지했다.
+- 셀렉트 포커스·열림 라인은 `#2094FA`로 적용하고, 포커스된 영역 옆 구분선은 숨겨 라인이 겹치지 않도록 했다.
+- 전체 래퍼의 `8px` 모서리로 셀렉트와 조회 버튼을 함께 클리핑해 우측 라운드를 정확히 맞추고 조회 버튼 배경을 `#2094FA`로 적용했다.
+- 셀렉트 포커스·열림 라인은 `2px`로 조정하고, 첫 번째 시도 셀렉트는 왼쪽 위·아래에 검색바와 동일한 `8px` 모서리를 적용했다.
+- 세 셀렉트의 아래 방향 화살표는 모두 `32px × 32px`로 확대했다.
+- GIS 편집 세션, 검색바, 분석도구의 상단 기준을 `8px`로 통일했다.
+- 검색바는 편집 세션 노출 여부와 관계없이 오른쪽 `12px` 위치에 고정해 GIS 편집을 켜고 끌 때 움직이지 않도록 했다.
+- 분리형 레이어 패널 토글은 상태별 버튼을 교체하지 않고 하나의 버튼을 유지하며, 패널과 같은 `300ms` 동안 `left` 위치를 이동해 패널 가장자리에 붙은 채 함께 열리고 닫히도록 했다.
+- 관망도 섹션형 패널은 열고 닫을 때 투명도 변화를 제거하고 불투명 상태에서 좌우 이동만 적용했다.
+- 패널과 토글 버튼 모두 동일한 `transform`, `300ms`, `ease-in-out` 방식으로 정확히 `250px` 이동시켜 애니메이션 중 버튼이 패널에서 떨어지지 않도록 맞췄다.
+- 관망도 베이스맵 선택은 숨겨진 `sprite_gis viewer` 메뉴 대신 `일반지도`와 `위성지도`를 처음부터 보여주는 탭으로 변경하고 기존 레이어 전환 함수는 유지했다.
+- 분석도구는 기존 지도 버튼과 같은 외형의 아이콘 버튼으로 축소하고, 클릭 시 버튼 아래 `8px` 간격으로 우측 정렬된 기존 메뉴가 열리도록 변경했다.
+- 지도 위젯은 지도 가장자리에서 `16px` 떨어뜨리고, 우측 상단에 도구 모음 → 분석도구 → 지도 선택 탭 순서로 `12px` 간격을 두어 상단 정렬했다.
+- 우측 상단 지도 선택·분석도구·도구 모음 버튼의 높이는 모두 `40px`로 통일했다.
+- 조회 버튼과 지도 유형 활성 탭의 배경은 `#0279FA`로 통일하고, 지도 유형 탭 버튼은 외곽 안쪽에서 `4px` 떨어지도록 배치했다.
+- 지도 위 검색바, 지도 선택, 분석도구, 도구 모음, 줌·축척 및 편집 위젯의 외곽 보더를 제거하고 Google Maps 계열의 2중 그림자로 통일했다.
+- 분석도구 실행 버튼과 우측 확대·축소·거리측정·면적측정·리셋 아이콘은 버튼 크기를 유지하면서 `20px × 20px` 벡터 아이콘으로 통일했다.
+- 분석도구 메뉴가 열린 동안 아이콘 버튼은 `#0279FA` 배경과 흰색 아이콘으로 표시한다.
+- 분석도구 메뉴는 화면 진입 시 기본으로 펼치고, 상위 배치 영역은 클릭을 통과시켜 메뉴가 열린 상태에서도 일반지도·위성지도 탭을 조작할 수 있게 했다.
+- 선택 레이어 설정의 드롭다운·입력·확인 버튼 높이는 `26px`로 통일하고 수직 패딩을 제거해 가운데 정렬했다.
+- 지반침하정보·노후관로 등 공통 설정 카드 제목의 왼쪽 패딩과 본문 전체 패딩은 `0.8rem`으로 조정했다.
+- 분석도구 하위 메뉴는 첨부 기준처럼 `15px` 아이콘과 `12px` 텍스트가 한 줄에 놓이는 세로 목록으로 복원하고, 긴 항목에 맞춰 너비가 자동 확장되도록 했다.
+- 분석도구 제목은 흰색 콘텐츠 영역 안에 배치하고 하단 구분선과 접기 버튼을 유지했다.
+- 분석도구 실행 버튼과 하위 메뉴에는 키보드 탐색 시에만 나타나는 `2px` `#0279FA` `focus-visible` 링을 적용했다.
+- 검색바는 복잡한 지도 배경에서도 경계가 분명하도록 `0 2px 4px rgba(60, 64, 67, 0.3), 0 4px 10px rgba(60, 64, 67, 0.18)` 그림자로 강화했다.
+- 줌 게이지와 줌레벨·축척 요약 박스는 지도 하단 `16px` 기준으로 아래맞춤 정렬했다.
+- 기존 트리 행과 선택 레이어 설정 카드 본문은 유지했다.
+
+## 검증 기준
+
+- 두 카드의 외곽 여백이 상하좌우 `4px`인지 확인한다.
+- 두 카드 사이 간격이 `6px`인지 확인한다.
+- 패널 바깥 배경이 `#E5E5E5`인지 확인한다.
+- 레이어 체크, 펼침/접힘, 설정 카드 입력과 스크롤이 기존과 동일하게 동작하는지 확인한다.
diff --git a/packages/common/business_components/src/ui/map/Gis.js b/packages/common/business_components/src/ui/map/Gis.js
index 81d5c4c13..13a5de5f3 100644
--- a/packages/common/business_components/src/ui/map/Gis.js
+++ b/packages/common/business_components/src/ui/map/Gis.js
@@ -57,6 +57,10 @@ function Gis({
   // 외부 업무 흐름에서 특정 시설물 레이어를 기존 체크 상태에 추가하도록 요청한다.
   checkedLayerRequest = null,
   searchBar: SearchBar,
+  // 화면별 상단 정렬과 인접 패널 회피를 위한 검색바 위치 전용 클래스다.
+  searchBarContainerClassName = "",
+  // sn 관망도처럼 베이스맵 선택지를 항상 노출하는 화면에서만 탭 형태를 사용한다.
+  alwaysVisibleMapTabs = false,
   waterDepth: WaterDepth = null,
   layerSettingView: LayerSettingView = null,
   inlineLayerSettingView,
@@ -65,6 +69,8 @@ function Gis({
   layerLegendIconVisible,
   // 목록·액션 아이콘이 지도 레이어 체크를 선행 조건으로 요구하는지 여부다.
   layerIconRequiresChecked = true,
+  // 목록 액션의 기능은 유지하면서 텍스트를 목록 아이콘으로 표시할지 여부다.
+  layerActionIconOnly = false,
   isPlaying = false,
   setIsPlaying = () => { },
   targetLayerTypes = [],
@@ -79,11 +85,14 @@ function Gis({
   viewExtent,
   viewMinZoom,
   showZoomLevel = false,
+  toolBarIconSize,
   zoomGuide,
   showFloatingSearchButton = true,
   treeTogglePosition = "center",
   detachedTreeToggleButton = false,
   showLayerPanelTitle = true,
+  // sn 관망도처럼 트리와 선택 설정을 카드 두 개로 구분해야 하는 화면에서만 활성화한다.
+  sectionedTreePanel = false,
   showZoomScaleInfo = false,
 }) {
   const mapRef = useRef();
@@ -322,6 +331,7 @@ function Gis({
               layerIconVisible={layerIconVisible}
               layerLegendIconVisible={layerLegendIconVisible}
               layerIconRequiresChecked={layerIconRequiresChecked}
+              layerActionIconOnly={layerActionIconOnly}
               sinkholeLegendIconVisible={sinkholeLegendIconVisible}
               isPlaying={isPlaying}
               setIsPlaying={setIsPlaying}
@@ -334,6 +344,7 @@ function Gis({
               toggleButtonPosition={treeTogglePosition}
               detachedToggleButton={detachedTreeToggleButton}
               showLayerPanelTitle={showLayerPanelTitle}
+              sectionedPanel={sectionedTreePanel}
             />
 
             {typeof WaterDepth === "function" && (
@@ -363,15 +374,15 @@ function Gis({
             )}
             {/* 시도/시군구 조회 영역 */}
             {SearchBar && (
-              <div className="absolute left-1/2 top-4 z-30 w-max -translate-x-1/2 rounded">
+              <div className={`absolute left-1/2 top-4 z-30 w-max -translate-x-1/2 rounded ${searchBarContainerClassName}`}>
                 {SearchBar}
               </div>
             )}
-            <GisToolBar />
+            <GisToolBar iconSize={toolBarIconSize} />
             {showZoomLevel && (
               <GisZoomLevel zoomGuide={zoomGuide} showZoomScaleInfo={showZoomScaleInfo} />
             )}
-            <GisMapToggle />
+            <GisMapToggle alwaysVisibleTabs={alwaysVisibleMapTabs} />
             <GisSelect
               onFeatureSelect={handleFeatureSelect}
               onMapBlankClick={onMapBlankClick}
diff --git a/packages/common/business_components/src/ui/map/GisMapToggle.js b/packages/common/business_components/src/ui/map/GisMapToggle.js
index c890f75f8..fc7079611 100644
--- a/packages/common/business_components/src/ui/map/GisMapToggle.js
+++ b/packages/common/business_components/src/ui/map/GisMapToggle.js
@@ -1,30 +1,67 @@
-import React, { useContext, useState } from 'react';
-import { GisContext } from './Gis';
+import React, { useContext, useState } from "react";
+import { GisContext } from "./Gis";
 
-export default React.memo(function MapToggleBtn() {
-	const { gisCore } = useContext(GisContext);
-	const [activeMap, setActiveMap] = useState({ label: '일반', type: 'base' }); // 기본 선택값
+export default React.memo(function MapToggleBtn({ alwaysVisibleTabs = false }) {
+  const { gisCore } = useContext(GisContext);
+  const [activeMap, setActiveMap] = useState({ label: "일반", type: "base" }); // 기본 선택값
 
-	const handleSelect = mapObj => {
-		setActiveMap(mapObj);
-		gisCore.changeBaseLayer(mapObj.type);
-	};
+  const handleSelect = (mapObj) => {
+    setActiveMap(mapObj);
+    gisCore.changeBaseLayer(mapObj.type);
+  };
 
-	return (
-		<div className="mapbtn">
-			<button className="sprite_gis viewer" title="지도선택">지도 선택</button>
-			<ul className="choice_map">
-			<li className={activeMap.type === 'base' ? 'on' : ''}>
-				<button className="map1" id="base" title="일반지도" onClick={() => handleSelect({ label: '일반', type: 'base' })}>
-				<div>일반지도</div>
-				</button>
-			</li>
-			<li className={activeMap.type === 'satellite' ? 'on' : ''}>
-				<button className="map2" id="satelite" title="위성지도" onClick={() => handleSelect({ label: '위성', type: 'satellite' })}>
-				<div>위성지도</div>
-				</button>
-			</li>
-			</ul>
-		</div>
-	);
+  if (alwaysVisibleTabs) {
+    return (
+      <div className="mapbtn mapbtn-tabs">
+        <div className="map-type-tabs" role="group" aria-label="지도 유형 선택">
+          <button
+            type="button"
+            aria-pressed={activeMap.type === "base"}
+            className={activeMap.type === "base" ? "on" : ""}
+            onClick={() => handleSelect({ label: "일반", type: "base" })}
+          >
+            일반지도
+          </button>
+          <button
+            type="button"
+            aria-pressed={activeMap.type === "satellite"}
+            className={activeMap.type === "satellite" ? "on" : ""}
+            onClick={() => handleSelect({ label: "위성", type: "satellite" })}
+          >
+            위성지도
+          </button>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="mapbtn">
+      <button className="sprite_gis viewer" title="지도선택">
+        지도 선택
+      </button>
+      <ul className="choice_map">
+        <li className={activeMap.type === "base" ? "on" : ""}>
+          <button
+            className="map1"
+            id="base"
+            title="일반지도"
+            onClick={() => handleSelect({ label: "일반", type: "base" })}
+          >
+            <div>일반지도</div>
+          </button>
+        </li>
+        <li className={activeMap.type === "satellite" ? "on" : ""}>
+          <button
+            className="map2"
+            id="satelite"
+            title="위성지도"
+            onClick={() => handleSelect({ label: "위성", type: "satellite" })}
+          >
+            <div>위성지도</div>
+          </button>
+        </li>
+      </ul>
+    </div>
+  );
 });
diff --git a/packages/common/business_components/src/ui/map/GisToolBar.js b/packages/common/business_components/src/ui/map/GisToolBar.js
index c5c613cc9..5a714c354 100644
--- a/packages/common/business_components/src/ui/map/GisToolBar.js
+++ b/packages/common/business_components/src/ui/map/GisToolBar.js
@@ -1,71 +1,102 @@
-import React from 'react';
-import GisApp from './lib/gis.core';
-import GisOlMeasure from './lib/gis.measure';
-import { useContext } from 'react';
-import { useGisContext } from './Gis';
-export default React.memo(function GisToolBar() {
-	const { gisMap } = useGisContext();
-	if (!gisMap) return <></>;
-	const gisMeasuer = new GisOlMeasure(gisMap);
-	GisApp.Module.measure = gisMeasuer;
-	const zoomIn = () => {
-		if (gisMap.getView().getMaxZoom() > gisMap.getView().getZoom()) {
-			gisMap.getView().animate({
-				zoom: gisMap.getView().getZoom() + 1,
-				duration: 250,
-			});
-		}
-	};
-	const zoomOut = () => {
-		if (gisMap.getView().getMaxZoom() > gisMap.getView().getZoom()) {
-			gisMap.getView().animate({
-				zoom: gisMap.getView().getZoom() - 1,
-				duration: 250,
-			});
-		}
-	};
+import React from "react";
+import { RotateCcw, Ruler, Scan, ZoomIn, ZoomOut } from "lucide-react";
+import GisApp from "./lib/gis.core";
+import GisOlMeasure from "./lib/gis.measure";
+import { useContext } from "react";
+import { useGisContext } from "./Gis";
+export default React.memo(function GisToolBar({ iconSize }) {
+  const { gisMap } = useGisContext();
+  const useVectorIcons = Number.isFinite(iconSize) && iconSize > 0;
+  if (!gisMap) return <></>;
+  const gisMeasuer = new GisOlMeasure(gisMap);
+  GisApp.Module.measure = gisMeasuer;
+  const zoomIn = () => {
+    if (gisMap.getView().getMaxZoom() > gisMap.getView().getZoom()) {
+      gisMap.getView().animate({
+        zoom: gisMap.getView().getZoom() + 1,
+        duration: 250,
+      });
+    }
+  };
+  const zoomOut = () => {
+    if (gisMap.getView().getMaxZoom() > gisMap.getView().getZoom()) {
+      gisMap.getView().animate({
+        zoom: gisMap.getView().getZoom() - 1,
+        duration: 250,
+      });
+    }
+  };
 
-	const measure = type => {
-		gisMeasuer.addInteraction(type);
-	};
+  const measure = (type) => {
+    gisMeasuer.addInteraction(type);
+  };
 
-	const reset = () => {
-		gisMeasuer.removeFeature();
-	};
-	return (
-		<>
-			<div className="custom-toolbar">
-				<div className="tool-bar">
-					<h3>toolbar 영역</h3>
-					<ul>
-						<li>
-							<div className="btn_control_zoomin" title="확대" onClick={zoomIn}>
-								<span>확대</span>
-							</div>
-						</li>
-						<li>
-							<div className="btn_control_zoomout" title="축소" onClick={zoomOut}>
-								<span>축소</span>
-							</div>
-						</li>
-						<li>
-							<div className="btn_control_ruler btn_control_measure" title="거리 측정" onClick={() => measure(GisApp.measure.LineString)}>
-								<span>거리측정</span>
-							</div>
-						</li>
-						<li>
-							<div className="btn_control_area btn_control_measure" title="면적 측정" onClick={() => measure(GisApp.measure.Polygon)}>
-								<span>면적측정</span>
-							</div>
-						</li>
-						<li>
-							<div className="sprite_gis icon4 btn_select_cancel" title="리셋" onClick={() => reset()}>
-								<span>리셋</span>
-							</div>
-						</li>
-					</ul>
-				</div>
-			</div>
-		</>
-	);
+  const reset = () => {
+    gisMeasuer.removeFeature();
+  };
+  return (
+    <>
+      <div className="custom-toolbar">
+        <div
+          className={`tool-bar ${useVectorIcons ? "tool-bar-vector-icons" : ""}`}
+        >
+          <h3>toolbar 영역</h3>
+          <ul>
+            <li>
+              <div className="btn_control_zoomin" title="확대" onClick={zoomIn}>
+                {useVectorIcons && (
+                  <ZoomIn size={iconSize} aria-hidden="true" />
+                )}
+                <span>확대</span>
+              </div>
+            </li>
+            <li>
+              <div
+                className="btn_control_zoomout"
+                title="축소"
+                onClick={zoomOut}
+              >
+                {useVectorIcons && (
+                  <ZoomOut size={iconSize} aria-hidden="true" />
+                )}
+                <span>축소</span>
+              </div>
+            </li>
+            <li>
+              <div
+                className="btn_control_ruler btn_control_measure"
+                title="거리 측정"
+                onClick={() => measure(GisApp.measure.LineString)}
+              >
+                {useVectorIcons && <Ruler size={iconSize} aria-hidden="true" />}
+                <span>거리측정</span>
+              </div>
+            </li>
+            <li>
+              <div
+                className="btn_control_area btn_control_measure"
+                title="면적 측정"
+                onClick={() => measure(GisApp.measure.Polygon)}
+              >
+                {useVectorIcons && <Scan size={iconSize} aria-hidden="true" />}
+                <span>면적측정</span>
+              </div>
+            </li>
+            <li>
+              <div
+                className="sprite_gis icon4 btn_select_cancel"
+                title="리셋"
+                onClick={() => reset()}
+              >
+                {useVectorIcons && (
+                  <RotateCcw size={iconSize} aria-hidden="true" />
+                )}
+                <span>리셋</span>
+              </div>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </>
+  );
 });
diff --git a/packages/common/business_components/src/ui/map/GisTree.js b/packages/common/business_components/src/ui/map/GisTree.js
index 9bfac1400..52dee096b 100644
--- a/packages/common/business_components/src/ui/map/GisTree.js
+++ b/packages/common/business_components/src/ui/map/GisTree.js
@@ -4,7 +4,7 @@ import {
 	getBackendOptions,
 	DndProvider,
 } from "@minoru/react-dnd-treeview";
-import { ChevronLeft, ChevronRight } from "lucide-react";
+import { ChevronLeft, ChevronRight, Layers } from "lucide-react";
 import React, { useEffect, useLayoutEffect, useState, useRef, useCallback } from "react";
 
 import { showBusinessUserMessage } from "../../lib/user-message";
@@ -33,7 +33,9 @@ import GisApp from "./lib/gis.core";
  * - layerIconVisible: (선택) 레이어 행 우측 액션 아이콘 노출 여부를 결정하는 함수
  * - layerLegendIconVisible: (선택) 레이어 행 범례 아이콘 노출 여부를 결정하는 함수
  * - layerIconRequiresChecked: (선택) 액션 실행 전에 레이어 체크를 요구할지 여부
+ * - layerActionIconOnly: (선택) 목록 액션을 텍스트 대신 목록 아이콘으로 표시할지 여부
  * - detachedToggleButton: (선택) 접기/펼치기 버튼을 패널 밖 고정 핸들로 노출할지 여부
+ * - sectionedPanel: (선택) 트리와 선택 레이어 설정을 회색 배경 위의 독립 카드로 표시할지 여부
  */
 export default React.memo(function GisTree({
 	checkedNodes = [],
@@ -53,12 +55,14 @@ export default React.memo(function GisTree({
 	layerIconVisible,
 	layerLegendIconVisible = () => true,
 	layerIconRequiresChecked = true,
+	layerActionIconOnly = false,
 	sinkholeLegendIconVisible = false,
 	inlineLayerSettingView,
 	treeSectionClassName = "",
 	toggleButtonPosition = "center",
 	showLayerPanelTitle = true,
 	detachedToggleButton = false,
+	sectionedPanel = false,
 }) {
 	const { gisCore, treeData } = useGisContext();
 
@@ -584,38 +588,57 @@ export default React.memo(function GisTree({
 	// 렌더링
 	// =====================
 
-	if (!treeData || treeData.length === 0) return null;
-
 	const toggleButtonPositionClass =
 		toggleButtonPosition === "top" ? "top-4" : "top-1/2 -translate-y-1/2";
 	const thinScrollbarClass =
-		"[scrollbar-width:thin] [&::-webkit-scrollbar]:w-[4px]";
-	const treeSectionClassNames = [treeSectionClassName, thinScrollbarClass].filter(Boolean).join(" ");
+		"[scrollbar-gutter:stable] [scrollbar-width:thin] [&::-webkit-scrollbar]:w-[4px]";
+	const treeSectionClassNames = [treeSectionClassName].filter(Boolean).join(" ");
+	// 섹션형 패널은 지도 트리와 선택 레이어 설정을 각각 독립된 카드로 구분한다.
+	const panelShellClassName = sectionedPanel
+		? "gap-[6px] border-r-0 bg-[#E5E5E5] p-1"
+		: "border-r border-border bg-background";
+	const treePanelClassName = sectionedPanel
+		? "min-h-0 grow flex-col overflow-hidden rounded-[6px] border border-border bg-background shadow-none"
+		: "min-h-0 grow overflow-hidden border-none bg-background shadow-none";
+	const treeContentScrollClassName = sectionedPanel
+		? `min-h-0 flex-1 overflow-y-scroll ${thinScrollbarClass}`
+		: `h-full overflow-y-auto p-2 ${showLayerPanelTitle ? "pt-0" : "pt-2"} ${thinScrollbarClass}`;
 
 	return (
 		<>
 			{/* 사이드 패널 */}
 			<div
-				className={`gis-layer-panel absolute left-0 top-0 z-40 flex h-full w-[250px] flex-col overflow-hidden border-r border-border bg-background text-foreground transition-all duration-300 ${visible
-					? "translate-x-0 opacity-100"
-					: "pointer-events-none -translate-x-full opacity-0"
+				className={`gis-layer-panel absolute left-0 top-0 z-40 flex h-full w-[250px] flex-col overflow-hidden text-foreground duration-300 ${sectionedPanel ? "transition-transform ease-in-out" : "transition-all"} ${panelShellClassName} ${visible
+					? sectionedPanel ? "translate-x-0" : "translate-x-0 opacity-100"
+					: sectionedPanel ? "pointer-events-none -translate-x-full" : "pointer-events-none -translate-x-full opacity-0"
 					}`}
 			>
 				<div
-					ref={layerPanelScrollRef}
-					onScroll={handleLayerPanelScroll}
-					className={`grow overflow-y-auto border-none p-2 ${showLayerPanelTitle ? "pt-0" : "pt-2"} shadow-none ${activeTab === "layers" ? "block" : "hidden"
+					className={`${treePanelClassName} ${activeTab === "layers" ? (sectionedPanel ? "flex" : "block") : "hidden"
 						}`}
 				>
-					{showLayerPanelTitle && (
-						<>
-							<h3 className="gis-layer-panel-title mx-2 my-4 text-center text-3xl font-bold text-label">시설물</h3>
-							<hr className="mb-4 border-border" />
-						</>
+					{sectionedPanel && (
+						<div className="gis-layer-section-header flex h-[38px] shrink-0 items-center gap-2 border-b border-border bg-background px-3">
+							<span className="flex h-8 w-8 shrink-0 items-center justify-center rounded-sm bg-[#EAF3FF] text-[#168CFF]">
+								<Layers size={14} strokeWidth={2} />
+							</span>
+							<h3 className="text-[1.4rem] font-bold text-foreground">레이어 관리</h3>
+						</div>
 					)}
-					{/* DnD Tree */}
-					<div className={treeSectionClassNames || undefined}>
-						<DndProvider backend={MultiBackend} options={getBackendOptions()}>
+					<div
+						ref={layerPanelScrollRef}
+						onScroll={handleLayerPanelScroll}
+						className={treeContentScrollClassName}
+					>
+						{showLayerPanelTitle && (
+							<>
+								<h3 className="gis-layer-panel-title mx-2 my-4 text-center text-3xl font-bold text-label">시설물</h3>
+								<hr className="mb-4 border-border" />
+							</>
+						)}
+						{/* DnD Tree */}
+						<div className={treeSectionClassNames || undefined}>
+							<DndProvider backend={MultiBackend} options={getBackendOptions()}>
 						<Tree
 							tree={nodes}
 							rootId={null}
@@ -642,7 +665,7 @@ export default React.memo(function GisTree({
 								return (
 									<div style={{ display: isVisible ? "block" : "none" }}>
 										<div
-											className="gis-layer-row flex w-full items-center gap-2 rounded px-2 py-1 hover:bg-accent"
+										className={`gis-layer-row flex w-full items-center gap-2 rounded px-2 py-1 ${sectionedPanel ? "hover:bg-[#f5f5f5]" : "hover:bg-accent"}`}
 											style={{
 												marginInlineStart: depth * 16,
 												width: `calc(100% - ${depth * 16}px)`,
@@ -671,21 +694,39 @@ export default React.memo(function GisTree({
 											>
 												{node.text}
 											</span>
-											{showLayerActionButton && (
-												<button
-													type="button"
-													className="gis-layer-action-button ml-auto shrink-0 rounded-sm border border-primary bg-background px-2 py-[1px] text-[1.1rem] font-medium leading-5 text-primary transition-colors hover:bg-accent"
-													onClick={() =>
-														handleLayerImgClick(
+										{showLayerActionButton && (
+											<button
+												type="button"
+												className={layerActionIconOnly
+													? "gis-layer-action-button ml-auto grid h-[24px] w-[24px] shrink-0 place-items-center rounded-sm bg-transparent p-0 text-[#168CFF] transition-colors hover:bg-accent"
+													: "gis-layer-action-button ml-auto shrink-0 rounded-sm border border-primary bg-background px-2 py-[1px] text-[1.1rem] font-medium leading-5 text-primary transition-colors hover:bg-accent"}
+												onClick={() =>
+													handleLayerImgClick(
 															node.data.lyrTyNm,
 															node.id,
 															node
-														)
-													}
-													title={`${node.text} 목록보기`}
-												>
-													목록보기
-												</button>
+													)
+												}
+												title={`${node.text} 목록보기`}
+												aria-label={`${node.text} 목록보기`}
+											>
+												{layerActionIconOnly ? (
+													<svg
+														aria-hidden="true"
+														viewBox="0 0 24 24"
+														className="h-[18px] w-[18px]"
+														fill="none"
+														stroke="currentColor"
+														strokeWidth="2"
+														strokeLinecap="round"
+													>
+														<path d="M9 6h11M9 12h11M9 18h11" />
+														<path d="M4 6h.01M4 12h.01M4 18h.01" strokeWidth="3" />
+													</svg>
+												) : (
+													"목록보기"
+												)}
+											</button>
 											)}
 											{!showLayerActionButton && showLayerActionIcon && (
 												<span className="shrink-0">
@@ -720,11 +761,16 @@ export default React.memo(function GisTree({
 								return aOrder - bOrder;
 							}}
 						/>
-						</DndProvider>
+							</DndProvider>
+						</div>
 					</div>
 				</div>
 				{LayerSettingView && (
-					<div className="gis-layer-setting shrink-0 bg-background px-2 pb-3">
+					<div
+						className={sectionedPanel
+							? "gis-layer-setting shrink-0 bg-transparent p-0"
+							: "gis-layer-setting shrink-0 bg-background px-2 pb-3"}
+					>
 						<LayerSettingView />
 					</div>
 				)}
@@ -737,24 +783,31 @@ export default React.memo(function GisTree({
 					</button>
 				)}
 			</div>
-			{detachedToggleButton && visible && (
+			{detachedToggleButton && (
 				<button
-					onClick={() => setVisible(false)}
-					className={`gis-layer-toggle absolute left-[250px] z-50 flex h-[36px] w-[20px] transform items-center justify-center rounded-[4px] border border-border bg-background text-primary shadow-[0_8px_18px_rgba(15,23,42,0.14)] transition hover:bg-accent ${toggleButtonPositionClass}`}
-					title="접기"
+					onClick={() => setVisible(!visible)}
+					className={`gis-layer-toggle absolute left-[250px] z-50 flex h-[36px] transform items-center justify-center border border-border bg-background shadow-[0_8px_18px_rgba(15,23,42,0.14)] transition-transform duration-300 ease-in-out hover:bg-accent ${visible ? "translate-x-0" : "-translate-x-[250px]"} ${sectionedPanel
+						? "w-[20px] rounded-l-none rounded-r-[4px] text-[#666666]"
+						: "w-[20px] rounded-[4px] text-primary"
+						} ${toggleButtonPositionClass}`}
+					title={visible ? "접기" : "열기"}
+					aria-label={visible ? "레이어 패널 접기" : "레이어 패널 열기"}
+					aria-expanded={visible}
 				>
-					<ChevronLeft className="h-4 w-4" />
+					{visible ? (
+						<ChevronLeft className={sectionedPanel ? "h-8 w-8" : "h-4 w-4"} />
+					) : (
+						<ChevronRight className={sectionedPanel ? "h-8 w-8" : "h-4 w-4"} />
+					)}
 				</button>
 			)}
-			{!visible && (
+			{!visible && !detachedToggleButton && (
 				<button
 					onClick={() => setVisible(true)}
-					className={detachedToggleButton
-						? `gis-layer-toggle absolute left-0 z-50 flex h-[36px] w-[20px] transform items-center justify-center rounded-[4px] border border-border bg-background text-primary shadow-[0_8px_18px_rgba(15,23,42,0.14)] transition hover:bg-accent ${toggleButtonPositionClass}`
-						: `gis-layer-toggle absolute left-[-3px] z-50 transform rounded-r border border-r border-border bg-background px-1 py-2 text-foreground shadow-sm ${toggleButtonPositionClass}`}
+					className={`gis-layer-toggle absolute left-[-3px] z-50 transform rounded-r border border-r border-border bg-background px-1 py-2 text-foreground shadow-sm ${toggleButtonPositionClass}`}
 					title="열기"
 				>
-					{detachedToggleButton ? <ChevronRight className="h-4 w-4" /> : <ChevronRight size={16} />}
+					<ChevronRight size={16} />
 				</button>
 			)}
 		</>
diff --git a/packages/common/business_components/src/ui/map/lib/css/gis.common.css b/packages/common/business_components/src/ui/map/lib/css/gis.common.css
index 1ecf520ab..c7436fcab 100644
--- a/packages/common/business_components/src/ui/map/lib/css/gis.common.css
+++ b/packages/common/business_components/src/ui/map/lib/css/gis.common.css
@@ -101,6 +101,56 @@
 	text-align: center;
 }
 
+.mapbtn.mapbtn-tabs {
+	width: auto;
+}
+
+.mapbtn .map-type-tabs {
+	display: flex;
+	width: 144px;
+	height: 40px;
+	padding: 2px;
+	overflow: hidden;
+	box-sizing: border-box;
+	background: #fff;
+	border: 1px solid #9aa7b8;
+	border-radius: 6px;
+	box-shadow: 0 0 5px #999;
+}
+
+.mapbtn .map-type-tabs button {
+	display: flex;
+	flex: 1;
+	align-items: center;
+	justify-content: center;
+	min-width: 0;
+	height: 100%;
+	padding: 0 8px;
+	box-sizing: border-box;
+	background: #fff;
+    border-radius: 6px;
+	border: 0;
+	color: #666;
+	font-family: inherit;
+	font-size: 12px;
+	font-weight: 600;
+	line-height: 18px;
+	white-space: nowrap;
+}
+
+
+.mapbtn .map-type-tabs button.on {
+	background: #0279fa;
+	color: #fff;
+}
+
+.mapbtn .map-type-tabs button:focus-visible {
+	position: relative;
+	z-index: 1;
+	outline: 2px solid #2094fa;
+	outline-offset: -2px;
+}
+
 .tool-bar {
 	position: absolute;
 	top: 70px;
@@ -186,9 +236,9 @@
 	bottom: 6px;
 	display: flex;
 	flex-direction: column;
-	gap: 4px;
-	min-width: 126px;
-	padding: 7px 10px;
+	gap: 8px;
+	min-width: 130px;
+	padding: 8px 10px;
 	border: 1px solid #9aa7b8;
 	border-radius: 6px;
 	background: rgba(255, 255, 255, 0.96);
diff --git a/packages/common/business_components/src/ui/map/searchBar/procSearchBar.tsx b/packages/common/business_components/src/ui/map/searchBar/procSearchBar.tsx
index bca6bf2f6..c26f72ae0 100644
--- a/packages/common/business_components/src/ui/map/searchBar/procSearchBar.tsx
+++ b/packages/common/business_components/src/ui/map/searchBar/procSearchBar.tsx
@@ -32,6 +32,8 @@ interface SearchBarProps {
   facilityTypes: { text: string; val: string }[];
   sidoSearchZoom?: number;
   facilityLayerFilter?: FacilityLayerFilter;
+  /** 관망도 전용 3개 셀렉트와 조회 버튼을 하나로 연결한 검색바 레이아웃이다. */
+  integrated?: boolean;
 }
 
 interface CenterSelectDataType extends SelectDataType {
@@ -43,6 +45,7 @@ export const ProcSearchBar = ({
   facilityTypes,
   sidoSearchZoom = 11,
   facilityLayerFilter,
+  integrated = false,
 }: SearchBarProps) => {
   const [sidoValue, setSidoValue] = useState("0");
   const [sigunValue, setSigunValue] = useState("0");
@@ -473,6 +476,75 @@ export const ProcSearchBar = ({
     await searchLayer.showSearchResultsFromGeoJSON(layerNm, featureId);
   };
 
+  if (integrated) {
+    const selectRootClass = "box-border !h-[44px] !w-full !p-0";
+    const selectTriggerClass =
+      "relative box-border !h-[44px] !w-full !border-0 !bg-white !px-4 !py-0 !text-[14px] !font-normal !leading-[20px] !text-[#374151] focus:!z-[2] focus:!ring-2 focus:!ring-inset focus:!ring-[#2094FA] data-[state=open]:!z-[2] data-[state=open]:!ring-2 data-[state=open]:!ring-inset data-[state=open]:!ring-[#2094FA] [&>span]:!block [&>span]:min-w-0 [&>span]:overflow-hidden [&>span]:text-ellipsis [&>span]:whitespace-nowrap [&>span]:!leading-[20px] [&>span]:pr-2 [&>svg]:!h-8 [&>svg]:!w-8 [&>svg]:shrink-0 [&>svg]:!text-[#6B7280] [&>svg]:!opacity-100";
+
+    return (
+      <div className="flex h-[44px] w-[656px] box-border items-center overflow-hidden rounded-[8px] bg-white p-0 shadow-[0_2px_4px_rgba(60,64,67,0.3),0_4px_10px_rgba(60,64,67,0.18)]">
+        <div className="group relative h-[44px] w-[192px] shrink-0 box-border">
+          <SelectBox
+            labelClass="hidden"
+            className={selectRootClass}
+            selectClass={`${selectTriggerClass} !rounded-none focus:!rounded-l-[8px] data-[state=open]:!rounded-l-[8px]`}
+            label=""
+            selectArray={sidoData}
+            onSelectValue={(val: any) =>
+              onSelectValue(val.toString(), "ctpvCd")
+            }
+            value={sidoValue}
+            selectContentClass="z-[101]"
+          />
+          <span
+            aria-hidden="true"
+            className="pointer-events-none absolute right-0 top-1/2 z-[1] h-[24px] w-px -translate-y-1/2 bg-[#D5DCE5] group-focus-within:hidden"
+          />
+        </div>
+        <div className="group relative h-[44px] w-[192px] shrink-0 box-border">
+          <SelectBox
+            labelClass="hidden"
+            className={selectRootClass}
+            selectClass={`${selectTriggerClass} !rounded-none`}
+            label=""
+            selectArray={filteredSigunData}
+            onSelectValue={(val: any) =>
+              onSelectValue(val.toString(), "sggCd")
+            }
+            value={sigunValue}
+            selectContentClass="z-[101]"
+          />
+          <span
+            aria-hidden="true"
+            className="pointer-events-none absolute right-0 top-1/2 z-[1] h-[24px] w-px -translate-y-1/2 bg-[#D5DCE5] group-focus-within:hidden"
+          />
+        </div>
+        <div className="h-[44px] w-[192px] shrink-0 box-border">
+          <SelectBox
+            labelClass="hidden"
+            className={selectRootClass}
+            selectClass={`${selectTriggerClass} !rounded-none`}
+            label=""
+            selectArray={facilityData}
+            onSelectValue={(val: any) =>
+              onSelectValue(val.toString(), "fcltCd")
+            }
+            value={facilityValue}
+            selectContentClass="z-[101]"
+          />
+        </div>
+        <Button
+          color="primary"
+          className="box-border !h-[44px] !w-[80px] shrink-0 !rounded-none !bg-[#0279FA] !p-0 text-[14px] font-semibold leading-5 text-white"
+          size="default"
+          onClick={handleSearch}
+        >
+          조회
+        </Button>
+      </div>
+    );
+  }
+
   return (
     <div className="grid grid-cols-4 gap-4">
       <div className="col-span-4">

From 8a8504dca9fd5450159508116cc017baac377f19 Mon Sep 17 00:00:00 2001
From: ljpark <mind-one005@mind-one.co.kr>
Date: Mon, 7 Sep 2026 17:51:36 +0900
Subject: [PATCH 09/13] =?UTF-8?q?sn:=20=EC=9A=B4=EC=98=81=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EB=B2=84=ED=8A=BC=20=EC=9C=84=EC=B9=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ctyFldngPrvtnBiz/ui/CtyFldngPrvtnBizListPage.tsx | 12 ++++++------
 .../sn/src/features/obsltPpl/ui/ObsltPplListPage.tsx | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/sn/src/features/ctyFldngPrvtnBiz/ui/CtyFldngPrvtnBizListPage.tsx b/apps/sn/src/features/ctyFldngPrvtnBiz/ui/CtyFldngPrvtnBizListPage.tsx
index 031511650..d5d753ff8 100644
--- a/apps/sn/src/features/ctyFldngPrvtnBiz/ui/CtyFldngPrvtnBizListPage.tsx
+++ b/apps/sn/src/features/ctyFldngPrvtnBiz/ui/CtyFldngPrvtnBizListPage.tsx
@@ -757,6 +757,12 @@ export function CtyFldngPrvtnBizListPage() {
           onRowClick={handleOpenDetail}
           actions={
             <>
+              <Button type="button" onClick={handleRegister}>
+                등록
+              </Button>
+              <Button type="button" onClick={() => fileRef.current?.click()}>
+                업로드
+              </Button>
               <Button type="button" onClick={() => void handleDownload()}>
                 엑셀다운로드
               </Button>
@@ -766,12 +772,6 @@ export function CtyFldngPrvtnBizListPage() {
               >
                 양식다운로드
               </Button>
-              <Button type="button" onClick={handleRegister}>
-                등록
-              </Button>
-              <Button type="button" onClick={() => fileRef.current?.click()}>
-                업로드
-              </Button>
             </>
           }
         />
diff --git a/apps/sn/src/features/obsltPpl/ui/ObsltPplListPage.tsx b/apps/sn/src/features/obsltPpl/ui/ObsltPplListPage.tsx
index d27f76b49..ee64be2d9 100644
--- a/apps/sn/src/features/obsltPpl/ui/ObsltPplListPage.tsx
+++ b/apps/sn/src/features/obsltPpl/ui/ObsltPplListPage.tsx
@@ -654,15 +654,12 @@ export function ObsltPplListPage() {
           onRowClick={handleOpenDetail}
           actions={
             <>
-              <Button type="button" onClick={() => void handleDownload()}>
-                엑셀다운로드
+              <Button type="button" onClick={handleOpenCfmtnBgt}>
+                최종확정예산사업
               </Button>
               <Button type="button" onClick={handleRegister}>
                 등록
               </Button>
-              <Button type="button" onClick={handleOpenCfmtnBgt}>
-                최종확정예산사업
-              </Button>
               <input
                 ref={fileInputRef}
                 type="file"
@@ -676,6 +673,9 @@ export function ObsltPplListPage() {
               >
                 업로드
               </Button>
+              <Button type="button" onClick={() => void handleDownload()}>
+                엑셀다운로드
+              </Button>
             </>
           }
         />

From 569e003827d5d3cceb442aff11b121e0de68b257 Mon Sep 17 00:00:00 2001
From: ljpark <mind-one005@mind-one.co.kr>
Date: Tue, 8 Sep 2026 11:01:53 +0900
Subject: [PATCH 10/13] =?UTF-8?q?sn:=20=ED=8C=9D=EC=97=85=20=ED=99=94?=
 =?UTF-8?q?=EB=A9=B4=20=EC=97=AC=EB=B0=B1=20=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AgedPipeStatusByCtpvPopupPage.tsx                     | 2 ++
 .../agedPipeStatusByCtpv/agedPipeStatusByCtpvUtils.ts     | 8 ++++----
 .../map/components/floodDngrMap/FloodDngrMapPopupPage.tsx | 2 --
 .../sn/src/features/windowPopup/model/popupDefinitions.ts | 2 +-
 .../src/ui/standard_data_table/index.tsx                  | 2 +-
 .../business_components/src/ui/standard_popup/index.tsx   | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/AgedPipeStatusByCtpvPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/AgedPipeStatusByCtpvPopupPage.tsx
index 05dd3447c..499722b85 100644
--- a/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/AgedPipeStatusByCtpvPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/AgedPipeStatusByCtpvPopupPage.tsx
@@ -286,6 +286,7 @@ export default function AgedPipeStatusByCtpvPopupPage() {
 
       <StandardDataTable
         table={table}
+        className="!w-full !max-w-full"
         title="시도별 노후관로 목록"
         total={rows.length}
         scrollMode="horizontal"
@@ -295,6 +296,7 @@ export default function AgedPipeStatusByCtpvPopupPage() {
             엑셀다운로드
           </Button>
         }
+        flushOuterMargin
       />
     </StandardPopupLayout>
   );
diff --git a/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvUtils.ts b/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvUtils.ts
index 253395321..d65a9a18a 100644
--- a/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvUtils.ts
+++ b/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvUtils.ts
@@ -65,16 +65,16 @@ export const normalizeAgedPipeStatusByCtpvFilters = (
   filters: Partial<AgedPipeStatusByCtpvFilters>,
 ): AgedPipeStatusByCtpvFilters => {
   const currentYear = new Date().getFullYear();
-  let startYear = Math.trunc(Number(filters.startYear ?? currentYear));
-  let endYear = Math.trunc(Number(filters.endYear ?? startYear));
+  let startYear = Math.trunc(Number(filters.startYear ?? currentYear - 2));
+  let endYear = Math.trunc(Number(filters.endYear ?? currentYear));
   let elapsedYears = Math.trunc(
     Number(
       filters.elapsedYears ?? AGED_PIPE_STATUS_BY_CTPV_DEFAULT_ELAPSED_YEARS,
     ),
   );
 
-  if (!Number.isFinite(startYear)) startYear = currentYear;
-  if (!Number.isFinite(endYear)) endYear = startYear;
+  if (!Number.isFinite(startYear)) startYear = currentYear - 2;
+  if (!Number.isFinite(endYear)) endYear = currentYear;
   if (
     !Number.isFinite(elapsedYears) ||
     elapsedYears < 1 ||
diff --git a/apps/sn/app/(map-layout)/map/components/floodDngrMap/FloodDngrMapPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/floodDngrMap/FloodDngrMapPopupPage.tsx
index 62821229f..6b272923c 100644
--- a/apps/sn/app/(map-layout)/map/components/floodDngrMap/FloodDngrMapPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/floodDngrMap/FloodDngrMapPopupPage.tsx
@@ -390,8 +390,6 @@ export default function FloodDngrMapPopupPage() {
         onPageChange={(page) => void loadRows(page, appliedFilters)}
         onRowClick={(row) => void handleRowClick(row)}
         rowId={(row, index) => `${row.sggCd}-${row.sbmrgFrqExpln}-${index}`}
-        scrollMode="horizontal"
-        minTableWidth="120rem"
       />
     </StandardPopupLayout>
   );
diff --git a/apps/sn/src/features/windowPopup/model/popupDefinitions.ts b/apps/sn/src/features/windowPopup/model/popupDefinitions.ts
index 237206abe..477a46ef1 100644
--- a/apps/sn/src/features/windowPopup/model/popupDefinitions.ts
+++ b/apps/sn/src/features/windowPopup/model/popupDefinitions.ts
@@ -191,7 +191,7 @@ export const windowPopupDefinitions = {
   agedPipeStatusByCtpvPopup: {
     key: "agedPipeStatusByCtpvPopup",
     title: "시도별 노후관로현황",
-    width: 1160,
+    width: 1400,
     height: 820,
   },
   fldngHstryPopup: {
diff --git a/packages/common/business_components/src/ui/standard_data_table/index.tsx b/packages/common/business_components/src/ui/standard_data_table/index.tsx
index f044b851c..f5f67714f 100644
--- a/packages/common/business_components/src/ui/standard_data_table/index.tsx
+++ b/packages/common/business_components/src/ui/standard_data_table/index.tsx
@@ -253,7 +253,7 @@ function StandardDataTable<T>({
   return (
     <div
       className={cn(
-        "standard-data-table card card-border min-w-0 overflow-hidden",
+        "standard-data-table card card-border w-full max-w-full min-w-0 overflow-hidden",
         flushOuterMargin && "!m-0",
         shouldFillAvailableHeight ? "flex min-h-0 flex-1 flex-col" : "shrink-0",
         className,
diff --git a/packages/common/business_components/src/ui/standard_popup/index.tsx b/packages/common/business_components/src/ui/standard_popup/index.tsx
index d5b53c0a2..e85338065 100644
--- a/packages/common/business_components/src/ui/standard_popup/index.tsx
+++ b/packages/common/business_components/src/ui/standard_popup/index.tsx
@@ -43,7 +43,7 @@ function StandardPopupLayout({
           className,
         )}
       >
-        <header className="card-header min-h-[5.2rem] shrink-0 gap-3">
+        <header className="card-header !mx-0 min-h-[5.2rem] shrink-0 gap-3 !px-[1.2rem]">
           <h1 className="min-w-0 text-[1.8rem] font-semibold text-label">
             {title}
           </h1>
@@ -66,7 +66,7 @@ function StandardPopupLayout({
 
         <div
           className={cn(
-            "flex min-h-0 flex-1 flex-col gap-[1.2rem] overflow-y-auto bg-background p-3",
+            "flex min-h-0 flex-1 flex-col gap-[1.2rem] overflow-y-auto bg-background p-3 !px-[1.2rem]",
             bodyClassName,
           )}
         >

From f742feca4b2f71e36defa5f70dea4c8006fa7fc9 Mon Sep 17 00:00:00 2001
From: ljpark <mind-one005@mind-one.co.kr>
Date: Tue, 8 Sep 2026 15:12:40 +0900
Subject: [PATCH 11/13] =?UTF-8?q?sn:=20=EC=83=81=EB=8B=A8=20=EC=A3=BC?=
 =?UTF-8?q?=EC=84=9D=20=EC=99=B8=20=EC=B9=A8=EC=88=98=ED=9D=94=EC=A0=81?=
 =?UTF-8?q?=EB=8F=84=20=EA=B4=80=EB=A0=A8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/sn/.env.local                            |   4 +-
 .../map/components/InputSection.tsx           |   1 +
 .../agedPipe/AgedPipeLayerSettingPanel.tsx    |   4 +
 .../components/agedPipe/AgedPipePopupPage.tsx |   4 +
 .../map/components/agedPipe/agedPipeExport.ts |   1 +
 .../map/components/agedPipe/agedPipeUtils.ts  |   1 +
 .../AgedPipeStatusByCtpvPopupPage.tsx         |   4 +
 .../agedPipeStatusByCtpvExport.ts             |   1 +
 .../agedPipeStatusByCtpvUtils.ts              |   1 +
 .../analysisMenu/AnalysisPopupMenu.tsx        |   4 +
 .../map/components/common/codeMapper.ts       |   3 +-
 .../map/components/common/index.ts            |   1 +
 .../map/components/common/table.ts            |   1 +
 .../components/exmn/ExmnLayerSettingPanel.tsx |   4 +
 .../exmn/ExmnSurveyResultSection.tsx          |   4 +
 .../map/components/exmn/exmnMapApi.ts         |   1 +
 .../map/components/exmn/exmnMapTypes.ts       |   1 +
 .../fldngHstry/FldngHstryDetailPanel.tsx      |   4 +
 .../FldngHstryLayerSettingPanel.tsx           |   4 +
 .../fldngHstry/FldngHstryPopupPage.tsx        |   3 +-
 .../components/fldngHstry/fldngHstryTypes.ts  | 175 ++++++++++++++++++
 .../floodDngrMap/FloodDngrMapPopupPage.tsx    |   4 +
 .../floodDngrMap/floodDngrMapTypes.ts         |   1 +
 .../gisEdit/GisEditPipeSessionPopup.tsx       |   4 +
 .../gisEdit/GisEditSessionPanel.tsx           |   4 +
 .../map/components/gisEdit/GisEditToolbar.tsx |   4 +
 .../map/components/gisEdit/gisEditTypes.ts    |   1 +
 .../map/components/gisEdit/useGisEdit.ts      |   1 +
 .../gisEdit/useGisEditCommonCodes.ts          |   1 +
 .../gisManagement/GisManagementPopupPage.tsx  |   4 +
 .../gisManagement/GisUploadPreviewMap.tsx     |   4 +
 .../useGisManagementCommonCodes.ts            |   1 +
 .../inftwtResult/InftwtResultPopupPage.tsx    |   4 +
 .../inftwtResult/inftwtResultTypes.ts         |   1 +
 .../inftwtResult/useInftwtResultMap.ts        |   1 +
 .../layerSetting/LayerSettingCard.tsx         |   4 +
 .../PipeAnalysisDetailPopupPage.tsx           |   4 +
 .../pipeAnalysis/PipeAnalysisPopupPage.tsx    |   4 +
 .../pipeAnalysis/pipeAnalysisUtils.ts         |   1 +
 .../components/popupComponent/MsSwagePpl.tsx  |   1 +
 .../map/components/popupComponent/Ssc.tsx     |   1 +
 .../components/popupComponent/SwtrmtFclt.tsx  |   1 +
 .../popupComponent/SwtrmtPrcsZoneAnalysis.tsx |   4 +
 .../popupComponent/chart/aplcnYms.ts          |   3 +-
 .../popupComponent/chart/infilChart.tsx       |   4 +
 .../popupComponent/chart/rdiiChart.tsx        |   4 +
 .../popupComponent/featureClickEventPopup.tsx | 104 ++++-------
 .../components/popupComponent/sewagePump.tsx  |   1 +
 .../map/components/popupComponent/smh.tsx     |   1 +
 .../popupComponent/stormWaterPump.tsx         |   3 +-
 .../swtrmtPrcsZoneAnalysisApi.ts              |   1 +
 .../rdiiResult/RdiiResultPopupPage.tsx        |   4 +
 .../components/rdiiResult/rdiiResultTypes.ts  |   3 +-
 .../components/rdiiResult/useRdiiResultMap.ts |   1 +
 .../repairHistory/RepairHistoryPopupPage.tsx  |   4 +
 .../sbmrgDngrMap/SbmrgDngrMapPopupPage.tsx    |   4 +
 .../sbmrgDngrMap/sbmrgDngrMapTypes.ts         |   1 +
 .../sinkhole/SinkholeDetailPanel.tsx          |   4 +
 .../sinkhole/SinkholeLayerSettingPanel.tsx    |   4 +
 .../components/sinkhole/SinkholePopupPage.tsx |   4 +
 .../map/components/sinkhole/sinkholeTypes.ts  |   1 +
 .../sinkhole/useSinkholeCommonCodes.ts        |   1 +
 .../waterRisk/WaterRiskPopupPage.tsx          |   4 +
 .../components/waterRisk/waterRiskClient.ts   |   1 +
 .../components/waterRisk/waterRiskTypes.ts    |   1 +
 apps/sn/app/(map-layout)/map/page.tsx         |   6 +-
 .../components/DredgingRegisterModal.tsx      |  10 +-
 apps/sn/src/types/lucide-react.d.ts           |   1 +
 68 files changed, 383 insertions(+), 73 deletions(-)

diff --git a/apps/sn/.env.local b/apps/sn/.env.local
index 3d871b007..dce96bf40 100644
--- a/apps/sn/.env.local
+++ b/apps/sn/.env.local
@@ -12,8 +12,8 @@ NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver
 NEXT_PUBLIC_NGII_URL = https://map.ngii.go.kr
 NEXT_PUBLIC_NGII_PARAM = 04trYP9_xwLAfALjwZ-B8g&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={x}&tilerow={y}
 SERVER_API_URL = http://dev.onasys.co.kr:8000
-# SEWERAGE_API_URL = http://localhost:8883
-SEWERAGE_API_URL = http://con.mind-one.co.kr:11083
+SEWERAGE_API_URL = http://localhost:8883
+# SEWERAGE_API_URL = http://con.mind-one.co.kr:11083
 DC_URL     = https://apigateway.apps.rsonesoft.com
 # NEXT_PUBLIC_CM_LOGIN_PAGE_URL = http://dev.onasys.co.kr:3000/auth/login
 NEXT_PUBLIC_CM_LOGIN_PAGE_URL = /auth/login
diff --git a/apps/sn/app/(map-layout)/map/components/InputSection.tsx b/apps/sn/app/(map-layout)/map/components/InputSection.tsx
index 68c4a3a83..87b904d58 100644
--- a/apps/sn/app/(map-layout)/map/components/InputSection.tsx
+++ b/apps/sn/app/(map-layout)/map/components/InputSection.tsx
@@ -1,3 +1,4 @@
+/** 시설 상세정보 화면의 운영정보 입력 영역을 공통 형식으로 표시한다. */
 import {
   Table,
   TableHeader,
diff --git a/apps/sn/app/(map-layout)/map/components/agedPipe/AgedPipeLayerSettingPanel.tsx b/apps/sn/app/(map-layout)/map/components/agedPipe/AgedPipeLayerSettingPanel.tsx
index 94edaeaef..7e29c6c4f 100644
--- a/apps/sn/app/(map-layout)/map/components/agedPipe/AgedPipeLayerSettingPanel.tsx
+++ b/apps/sn/app/(map-layout)/map/components/agedPipe/AgedPipeLayerSettingPanel.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 노후관로 레이어 설정
+ * 사업차수와 구조적·운영적 상태등급별 지도 표시 조건을 설정한다.
+ */
 "use client";
 
 import { useEffect, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/agedPipe/AgedPipePopupPage.tsx b/apps/sn/app/(map-layout)/map/components/agedPipe/AgedPipePopupPage.tsx
index b2a12c783..7fe989125 100644
--- a/apps/sn/app/(map-layout)/map/components/agedPipe/AgedPipePopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/agedPipe/AgedPipePopupPage.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 노후관로 목록
+ * 노후관로를 검색하고 목록·엑셀 다운로드·지도 위치 확인 기능을 제공한다.
+ */
 "use client";
 
 import { useCallback, useEffect, useMemo, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/agedPipe/agedPipeExport.ts b/apps/sn/app/(map-layout)/map/components/agedPipe/agedPipeExport.ts
index c915c21ee..dad972961 100644
--- a/apps/sn/app/(map-layout)/map/components/agedPipe/agedPipeExport.ts
+++ b/apps/sn/app/(map-layout)/map/components/agedPipe/agedPipeExport.ts
@@ -1,3 +1,4 @@
+/** 노후관로 목록의 엑셀 다운로드 데이터와 서식을 생성한다. */
 "use client";
 
 import { postBlobData } from "@/components/lib/api";
diff --git a/apps/sn/app/(map-layout)/map/components/agedPipe/agedPipeUtils.ts b/apps/sn/app/(map-layout)/map/components/agedPipe/agedPipeUtils.ts
index 736bb9478..a08f997d7 100644
--- a/apps/sn/app/(map-layout)/map/components/agedPipe/agedPipeUtils.ts
+++ b/apps/sn/app/(map-layout)/map/components/agedPipe/agedPipeUtils.ts
@@ -1,3 +1,4 @@
+/** 노후관로 검색 조건, 표시값 변환 및 지도 연계 유틸을 제공한다. */
 "use client";
 
 import type { SelectDataType } from "@common/business_components";
diff --git a/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/AgedPipeStatusByCtpvPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/AgedPipeStatusByCtpvPopupPage.tsx
index 499722b85..1a9d8a220 100644
--- a/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/AgedPipeStatusByCtpvPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/AgedPipeStatusByCtpvPopupPage.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 시도별 노후관로현황
+ * 기준연도별 시도 단위 노후관로 현황을 조회하고 엑셀로 내려받는다.
+ */
 "use client";
 
 import { useCallback, useEffect, useMemo, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvExport.ts b/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvExport.ts
index 9946bc815..e7f797f34 100644
--- a/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvExport.ts
+++ b/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvExport.ts
@@ -1,3 +1,4 @@
+/** 시도별 노후관로 현황의 연도 그룹형 엑셀 데이터를 생성한다. */
 "use client";
 
 import * as XLSX from "xlsx";
diff --git a/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvUtils.ts b/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvUtils.ts
index d65a9a18a..430e81a73 100644
--- a/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvUtils.ts
+++ b/apps/sn/app/(map-layout)/map/components/agedPipeStatusByCtpv/agedPipeStatusByCtpvUtils.ts
@@ -1,3 +1,4 @@
+/** 시도별 노후관로 현황의 조회 연도와 그룹 컬럼을 구성한다. */
 "use client";
 
 import type { UiHeadProps } from "@common/business_components/ui";
diff --git a/apps/sn/app/(map-layout)/map/components/analysisMenu/AnalysisPopupMenu.tsx b/apps/sn/app/(map-layout)/map/components/analysisMenu/AnalysisPopupMenu.tsx
index 3a11a4f99..0bf3b952f 100644
--- a/apps/sn/app/(map-layout)/map/components/analysisMenu/AnalysisPopupMenu.tsx
+++ b/apps/sn/app/(map-layout)/map/components/analysisMenu/AnalysisPopupMenu.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 분석도구 메뉴
+ * 지도에서 실행할 분석·현황 팝업 메뉴를 펼치고 선택한다.
+ */
 "use client";
 
 import { useEffect, useState, type ComponentType, type ReactNode } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/common/codeMapper.ts b/apps/sn/app/(map-layout)/map/components/common/codeMapper.ts
index 7b591b09c..df355381e 100644
--- a/apps/sn/app/(map-layout)/map/components/common/codeMapper.ts
+++ b/apps/sn/app/(map-layout)/map/components/common/codeMapper.ts
@@ -1,3 +1,4 @@
+/** 지도 시설 상세정보의 코드값을 업무 표시명으로 변환한다. */
 import { MS_SWAGE_PPL_USE_CODES, MS_SWAGE_PPL_CODES, MS_SWAGE_MHL_CODES, MS_SWAGE_MHL_USE_CODES, DRTW_SEWAGE_PUMP_USE_CODES } from './table';
 
 interface CodeMapperProps {
@@ -159,4 +160,4 @@ export const reverseCodeMapper = ({ layerName, data }: CodeMapperProps): any =>
 };
 
 // 기본 내보내기
-export default { codeMapper, reverseCodeMapper };
\ No newline at end of file
+export default { codeMapper, reverseCodeMapper };
diff --git a/apps/sn/app/(map-layout)/map/components/common/index.ts b/apps/sn/app/(map-layout)/map/components/common/index.ts
index 377df2344..bba16ce69 100644
--- a/apps/sn/app/(map-layout)/map/components/common/index.ts
+++ b/apps/sn/app/(map-layout)/map/components/common/index.ts
@@ -1,3 +1,4 @@
+/** 선택한 지도 레이어 종류에 맞는 시설 상세 컴포넌트를 반환한다. */
 import MsSwagePpl from "../popupComponent/MsSwagePpl"; // 하수관로
 import sewagePump from "../popupComponent/sewagePump"; // 하수펌프
 import smh from "../popupComponent/smh";
diff --git a/apps/sn/app/(map-layout)/map/components/common/table.ts b/apps/sn/app/(map-layout)/map/components/common/table.ts
index b8ba17b4f..8a13eb830 100644
--- a/apps/sn/app/(map-layout)/map/components/common/table.ts
+++ b/apps/sn/app/(map-layout)/map/components/common/table.ts
@@ -1,3 +1,4 @@
+/** 지도 시설 상세 및 목록에서 사용하는 컬럼·코드 정의를 제공한다. */
 // 하수관로
 export const MsSwagePplCol = [
   { id: 'fclt_mng_no', title: '시설관리번호' },
diff --git a/apps/sn/app/(map-layout)/map/components/exmn/ExmnLayerSettingPanel.tsx b/apps/sn/app/(map-layout)/map/components/exmn/ExmnLayerSettingPanel.tsx
index 42131793e..a46f7a714 100644
--- a/apps/sn/app/(map-layout)/map/components/exmn/ExmnLayerSettingPanel.tsx
+++ b/apps/sn/app/(map-layout)/map/components/exmn/ExmnLayerSettingPanel.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 관로조사 레이어 설정
+ * 사업차수와 조사 종류·상태등급별 지도 표시 조건을 설정한다.
+ */
 "use client";
 
 import type { ExmnMapFilters, ExmnMapJobType } from "./exmnMapTypes";
diff --git a/apps/sn/app/(map-layout)/map/components/exmn/ExmnSurveyResultSection.tsx b/apps/sn/app/(map-layout)/map/components/exmn/ExmnSurveyResultSection.tsx
index 601d34a30..67bbf2ae5 100644
--- a/apps/sn/app/(map-layout)/map/components/exmn/ExmnSurveyResultSection.tsx
+++ b/apps/sn/app/(map-layout)/map/components/exmn/ExmnSurveyResultSection.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 관로조사 결과
+ * 선택 시설의 조사 결과와 상세 판정 정보를 표시한다.
+ */
 "use client";
 
 import {
diff --git a/apps/sn/app/(map-layout)/map/components/exmn/exmnMapApi.ts b/apps/sn/app/(map-layout)/map/components/exmn/exmnMapApi.ts
index 390bdf31f..4c959f4f4 100644
--- a/apps/sn/app/(map-layout)/map/components/exmn/exmnMapApi.ts
+++ b/apps/sn/app/(map-layout)/map/components/exmn/exmnMapApi.ts
@@ -1,3 +1,4 @@
+/** 관로조사 지도 데이터 조회 API와 응답 변환 함수를 제공한다. */
 import { getRawJson } from "../../../../components/lib/api";
 import type { ExmnMapFilters, ExmnMapJobType } from "./exmnMapTypes";
 
diff --git a/apps/sn/app/(map-layout)/map/components/exmn/exmnMapTypes.ts b/apps/sn/app/(map-layout)/map/components/exmn/exmnMapTypes.ts
index 248c8547b..f06b12e3e 100644
--- a/apps/sn/app/(map-layout)/map/components/exmn/exmnMapTypes.ts
+++ b/apps/sn/app/(map-layout)/map/components/exmn/exmnMapTypes.ts
@@ -1,3 +1,4 @@
+/** 관로조사 지도 화면에서 사용하는 타입·상수와 표시 조건을 정의한다. */
 export const EXMN_RESULT_ROOT_NODE_ID = "SN_EXMN_RESULT";
 export const EXMN_RESULT_PPL_NODE_ID = "SN_EXMN_RESULT_PPL";
 export const EXMN_RESULT_MNHL_NODE_ID = "SN_EXMN_RESULT_MNHL";
diff --git a/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryDetailPanel.tsx b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryDetailPanel.tsx
index d0ad85a20..7398a4d70 100644
--- a/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryDetailPanel.tsx
+++ b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryDetailPanel.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 침수흔적도 상세정보
+ * 지도에서 선택한 침수흔적의 기본정보·강우정보·피해정보를 표시한다.
+ */
 "use client";
 
 import { useMemo, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryLayerSettingPanel.tsx b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryLayerSettingPanel.tsx
index ac00e2220..c5a8cd190 100644
--- a/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryLayerSettingPanel.tsx
+++ b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryLayerSettingPanel.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 침수흔적도 레이어 설정
+ * 침수흔적위선·심선의 표시 여부와 조회 연도 범위를 설정한다.
+ */
 "use client";
 
 import { SelectBox } from "@common/business_components/ui";
diff --git a/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryPopupPage.tsx
index 42750f87d..43bd0d5f0 100644
--- a/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryPopupPage.tsx
@@ -1,5 +1,6 @@
 /**
- * 침수발생이력 popup
+ * 화면명: 침수발생이력 목록
+ * 침수발생이력을 검색하고 엑셀 다운로드 및 지도 위치 확인 기능을 제공한다.
  */
 "use client";
 
diff --git a/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryTypes.ts b/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryTypes.ts
index 3d5649b7f..10eb2e363 100644
--- a/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryTypes.ts
+++ b/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryTypes.ts
@@ -1,7 +1,14 @@
+/**
+ * 침수흔적 화면에서 사용하는 타입·상수·조회 조건과 feature 캐시 유틸을 제공한다.
+ */
 "use client";
 
 import type { UiHeadProps } from "@common/business_components/ui";
 import { appendApiSearchParams } from "@/shared/util/util";
+import { getData } from "@/components/lib/api";
+import GisApp from "@common/business_components/ui/map/lib/gis.core";
+import type Feature from "ol/Feature.js";
+import VectorSource from "ol/source/Vector.js";
 
 export const FLOOD_HISTORY_POPUP_KEY = "fldngHstryPopup";
 export const FLDNG_HSTRY_ROW_SELECT_MESSAGE = "SN_FLOOD_HISTORY_ROW_SELECT";
@@ -17,6 +24,174 @@ export const FLDNG_HSTRY_PAGE_SIZE = 10;
 export const FLDNG_HSTRY_DOWNLOAD_BATCH_SIZE = 2000;
 export const FLOOD_HISTORY_MIN_YEAR = 2002;
 
+export type FldngHstryDetailCacheValue = {
+  rainAnalysis: Record<string, unknown>;
+  depthRows: Record<string, unknown>[];
+  waterLevelRows: Record<string, unknown>[];
+  complete: boolean;
+};
+
+const normalizeFldngHstryRainAnalysisPayload = (data: any) => {
+  if (!data || typeof data !== "object") return {};
+  return {
+    rain_bgng_tm: data.rainBgngTm ?? data.rain_bgng_tm ?? null,
+    rainBgngTm: data.rainBgngTm ?? data.rain_bgng_tm ?? null,
+    rain_end_tm: data.rainEndTm ?? data.rain_end_tm ?? null,
+    rainEndTm: data.rainEndTm ?? data.rain_end_tm ?? null,
+    rain_tot: data.rainTot ?? data.rain_tot ?? null,
+    rainTot: data.rainTot ?? data.rain_tot ?? null,
+    rain_str: data.rainStr ?? data.rain_str ?? null,
+    rainStr: data.rainStr ?? data.rain_str ?? null,
+  };
+};
+
+/** 침수흔적 강우분석과 연결된 심선·위선 목록을 함께 조회한다. */
+export const loadFldngHstryDetail = async (
+  fldngHstryFid: string,
+): Promise<FldngHstryDetailCacheValue> => {
+  const [rainResult, depthResult] = await Promise.allSettled([
+    getData(
+      `v1/fldng/hstry/rain-anls/${encodeURIComponent(fldngHstryFid)}`,
+    ),
+    getData(
+      `v1/fldng/hstry/depth-map/${encodeURIComponent(fldngHstryFid)}`,
+    ),
+  ]);
+
+  if (rainResult.status === "rejected") {
+    console.warn("침수강우분석 조회 실패:", rainResult.reason);
+  }
+  if (depthResult.status === "rejected") {
+    console.warn("침수깊이지도 조회 실패:", depthResult.reason);
+  }
+
+  const depthPayload =
+    depthResult.status === "fulfilled"
+      ? (depthResult.value?.data ?? depthResult.value)
+      : null;
+  const depthItems = Array.isArray(depthPayload)
+    ? depthPayload
+    : depthPayload?.depthMaps;
+  const waterLevelItems = Array.isArray(depthPayload?.waterLevelMaps)
+    ? depthPayload.waterLevelMaps
+    : [];
+
+  return {
+    rainAnalysis:
+      rainResult.status === "fulfilled"
+        ? normalizeFldngHstryRainAnalysisPayload(rainResult.value)
+        : {},
+    depthRows: Array.isArray(depthItems)
+      ? depthItems.filter((row) => row && typeof row === "object")
+      : [],
+    waterLevelRows: waterLevelItems.filter(
+      (row: unknown) => row && typeof row === "object",
+    ),
+    complete:
+      rainResult.status === "fulfilled" && depthResult.status === "fulfilled",
+  };
+};
+
+type FldngHstryGisLayer = {
+  searchLayer?: {
+    getSource?: () => VectorSource | null;
+  } | null;
+  clearSearchLayer: (option: unknown) => void;
+  ensureSearchLayer: (option: unknown) => {
+    set: (key: string, value: unknown) => void;
+    setSource: (source: VectorSource) => void;
+  };
+  showSearchResultsFromGeoJSON: (
+    layerTypeName: string,
+    featureId: string,
+  ) => void | Promise<void>;
+};
+
+/** 침수흔적 심선·위선의 GeoServer 조회 결과를 화면 생명주기와 분리해 보관한다. */
+export const fldngHstryFeatureCache = new Map<
+  string,
+  Promise<Feature[]>
+>();
+
+/** OpenLayers Feature.clone()이 복사하지 않는 feature ID까지 보존한다. */
+const cloneFldngHstryFeature = (feature: Feature) => {
+  const clonedFeature = feature.clone();
+  const featureId = feature.getId();
+  if (featureId !== undefined) {
+    clonedFeature.setId(featureId);
+  }
+  return clonedFeature;
+};
+
+const displayCachedFldngHstryFeatures = (
+  gisLayer: FldngHstryGisLayer,
+  layerTypeName: string,
+  features: Feature[],
+) => {
+  const matched = Object.values(GisApp.layerCode ?? {}).find(
+    (item: any) => item?.lyrTyNm === layerTypeName,
+  ) as any;
+  if (!matched || features.length === 0) return;
+
+  gisLayer.clearSearchLayer(matched);
+  const layer = gisLayer.ensureSearchLayer(matched);
+  layer.set("gobjTy", matched.gobjTy);
+  const clonedFeatures = features.map(cloneFldngHstryFeature);
+  layer.setSource(new VectorSource({ features: clonedFeatures }));
+  (GisApp.Module.select as any)?.selectFeature(clonedFeatures[0], false);
+};
+
+/** 침수흔적 심선·위선을 최초 한 번만 조회하고 이후에는 캐시로 highlight한다. */
+export const showFldngHstryFeature = async (
+  gisLayer: FldngHstryGisLayer,
+  layerTypeName: string,
+  featureId: string,
+) => {
+  const cacheKey = `${layerTypeName}:${featureId}`;
+  const cachedRequest = fldngHstryFeatureCache.get(cacheKey);
+  if (cachedRequest) {
+    const cachedFeatures = await cachedRequest;
+    displayCachedFldngHstryFeatures(
+      gisLayer,
+      layerTypeName,
+      cachedFeatures,
+    );
+    return;
+  }
+
+  await gisLayer.showSearchResultsFromGeoJSON(layerTypeName, featureId);
+  const source = gisLayer.searchLayer?.getSource?.();
+  if (!source) return;
+
+  const featureRequest = new Promise<Feature[]>((resolve, reject) => {
+    const resolveFeatures = () => {
+      const features = source.getFeatures();
+      if (features.length > 0) {
+        resolve(features.map(cloneFldngHstryFeature));
+      } else {
+        reject(new Error("침수흔적 위치 정보가 없습니다."));
+      }
+    };
+    const rejectFeatures = () =>
+      reject(new Error("침수흔적 위치 조회에 실패했습니다."));
+
+    if (source.getFeatures().length > 0) {
+      resolveFeatures();
+      return;
+    }
+    source.once("featuresloadend", resolveFeatures);
+    source.once("featuresloaderror", rejectFeatures);
+  });
+
+  fldngHstryFeatureCache.set(cacheKey, featureRequest);
+  try {
+    await featureRequest;
+  } catch (error) {
+    fldngHstryFeatureCache.delete(cacheKey);
+    console.warn(error);
+  }
+};
+
 /** 지도 침수흔적위선·심선이 공통으로 사용하는 침수년도 범위다. */
 export type FloodHistoryYearRange = {
   startYear: string;
diff --git a/apps/sn/app/(map-layout)/map/components/floodDngrMap/FloodDngrMapPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/floodDngrMap/FloodDngrMapPopupPage.tsx
index 6b272923c..4124dbe94 100644
--- a/apps/sn/app/(map-layout)/map/components/floodDngrMap/FloodDngrMapPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/floodDngrMap/FloodDngrMapPopupPage.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 도시침수지도 목록
+ * 빈도별 도시침수지도를 검색하고 목록·엑셀·지도 보기 기능을 제공한다.
+ */
 "use client";
 
 import { useCallback, useEffect, useMemo, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/floodDngrMap/floodDngrMapTypes.ts b/apps/sn/app/(map-layout)/map/components/floodDngrMap/floodDngrMapTypes.ts
index 1d4d2df65..d6356607b 100644
--- a/apps/sn/app/(map-layout)/map/components/floodDngrMap/floodDngrMapTypes.ts
+++ b/apps/sn/app/(map-layout)/map/components/floodDngrMap/floodDngrMapTypes.ts
@@ -1,3 +1,4 @@
+/** 도시침수지도 화면의 검색 조건, 범례, 컬럼과 응답 변환을 정의한다. */
 "use client";
 
 import type { UiHeadProps } from "@common/business_components/ui";
diff --git a/apps/sn/app/(map-layout)/map/components/gisEdit/GisEditPipeSessionPopup.tsx b/apps/sn/app/(map-layout)/map/components/gisEdit/GisEditPipeSessionPopup.tsx
index 2591591c6..0c8f062eb 100644
--- a/apps/sn/app/(map-layout)/map/components/gisEdit/GisEditPipeSessionPopup.tsx
+++ b/apps/sn/app/(map-layout)/map/components/gisEdit/GisEditPipeSessionPopup.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 하수관로 편집정보
+ * 편집 중인 하수관로의 기본정보와 입력정보를 표시하고 수정한다.
+ */
 "use client";
 
 import { useEffect, useMemo, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/gisEdit/GisEditSessionPanel.tsx b/apps/sn/app/(map-layout)/map/components/gisEdit/GisEditSessionPanel.tsx
index c5ef3e8d5..931c7b993 100644
--- a/apps/sn/app/(map-layout)/map/components/gisEdit/GisEditSessionPanel.tsx
+++ b/apps/sn/app/(map-layout)/map/components/gisEdit/GisEditSessionPanel.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 하수관로 편집 세션
+ * 현재 편집 대상과 변경 상태를 표시하고 저장·취소 동작을 제공한다.
+ */
 "use client";
 
 import { Button } from "@common/components";
diff --git a/apps/sn/app/(map-layout)/map/components/gisEdit/GisEditToolbar.tsx b/apps/sn/app/(map-layout)/map/components/gisEdit/GisEditToolbar.tsx
index b12290773..a5f7a9dd1 100644
--- a/apps/sn/app/(map-layout)/map/components/gisEdit/GisEditToolbar.tsx
+++ b/apps/sn/app/(map-layout)/map/components/gisEdit/GisEditToolbar.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 하수관로 편집 도구
+ * 관로 추가·이동·꼭지점 편집·삭제 도구를 선택하고 제어한다.
+ */
 "use client";
 
 import { Check, Move, PenTool, Plus, Trash2, X } from "lucide-react";
diff --git a/apps/sn/app/(map-layout)/map/components/gisEdit/gisEditTypes.ts b/apps/sn/app/(map-layout)/map/components/gisEdit/gisEditTypes.ts
index 930e48c07..ed6021e94 100644
--- a/apps/sn/app/(map-layout)/map/components/gisEdit/gisEditTypes.ts
+++ b/apps/sn/app/(map-layout)/map/components/gisEdit/gisEditTypes.ts
@@ -1,3 +1,4 @@
+/** 하수관로 GIS 편집에서 사용하는 도구·세션·변경 데이터 타입을 정의한다. */
 export type GisEditTool = "ADD" | "MOVE" | "VERTEX_EDIT" | "DELETE";
 
 export type GisEditGeometryType = "Point" | "LineString" | "Polygon";
diff --git a/apps/sn/app/(map-layout)/map/components/gisEdit/useGisEdit.ts b/apps/sn/app/(map-layout)/map/components/gisEdit/useGisEdit.ts
index a27bcc6b5..9cdd5de4a 100644
--- a/apps/sn/app/(map-layout)/map/components/gisEdit/useGisEdit.ts
+++ b/apps/sn/app/(map-layout)/map/components/gisEdit/useGisEdit.ts
@@ -1,3 +1,4 @@
+/** 하수관로 GIS 편집 도구의 선택 상태와 변경 내역을 관리하는 훅이다. */
 "use client";
 
 import { useCallback, useMemo, useRef, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/gisEdit/useGisEditCommonCodes.ts b/apps/sn/app/(map-layout)/map/components/gisEdit/useGisEditCommonCodes.ts
index 6fba5128c..b543d6997 100644
--- a/apps/sn/app/(map-layout)/map/components/gisEdit/useGisEditCommonCodes.ts
+++ b/apps/sn/app/(map-layout)/map/components/gisEdit/useGisEditCommonCodes.ts
@@ -1,3 +1,4 @@
+/** 하수관로 GIS 편집에 필요한 공통코드를 조회하는 훅이다. */
 "use client";
 
 import { useEffect, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/gisManagement/GisManagementPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/gisManagement/GisManagementPopupPage.tsx
index a4a224440..708cedb58 100644
--- a/apps/sn/app/(map-layout)/map/components/gisManagement/GisManagementPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/gisManagement/GisManagementPopupPage.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: GIS 관리
+ * GIS 자료 업로드 이력을 조회하고 등록·검증·반영 기능을 제공한다.
+ */
 "use client";
 
 import type { ChangeEvent } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/gisManagement/GisUploadPreviewMap.tsx b/apps/sn/app/(map-layout)/map/components/gisManagement/GisUploadPreviewMap.tsx
index 95e60dff7..dd842a155 100644
--- a/apps/sn/app/(map-layout)/map/components/gisManagement/GisUploadPreviewMap.tsx
+++ b/apps/sn/app/(map-layout)/map/components/gisManagement/GisUploadPreviewMap.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: GIS 업로드 미리보기 지도
+ * 업로드한 공간정보를 지도에 미리 표시하고 검증 결과를 확인한다.
+ */
 "use client";
 
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/gisManagement/useGisManagementCommonCodes.ts b/apps/sn/app/(map-layout)/map/components/gisManagement/useGisManagementCommonCodes.ts
index f1a75f2f5..f8c5fffc3 100644
--- a/apps/sn/app/(map-layout)/map/components/gisManagement/useGisManagementCommonCodes.ts
+++ b/apps/sn/app/(map-layout)/map/components/gisManagement/useGisManagementCommonCodes.ts
@@ -1,3 +1,4 @@
+/** GIS 관리 화면에 필요한 공통코드를 조회하고 선택 항목으로 제공한다. */
 "use client";
 
 import { useEffect, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/inftwtResult/InftwtResultPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/inftwtResult/InftwtResultPopupPage.tsx
index a0cf5765e..e3772768a 100644
--- a/apps/sn/app/(map-layout)/map/components/inftwtResult/InftwtResultPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/inftwtResult/InftwtResultPopupPage.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 침입수 분석결과 목록
+ * 침입수 분석결과를 검색하고 목록·엑셀·지도 보기 기능을 제공한다.
+ */
 "use client";
 
 import { useCallback, useEffect, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/inftwtResult/inftwtResultTypes.ts b/apps/sn/app/(map-layout)/map/components/inftwtResult/inftwtResultTypes.ts
index 5112afe49..8e03a3d89 100644
--- a/apps/sn/app/(map-layout)/map/components/inftwtResult/inftwtResultTypes.ts
+++ b/apps/sn/app/(map-layout)/map/components/inftwtResult/inftwtResultTypes.ts
@@ -1,3 +1,4 @@
+/** 침입수 분석결과 화면의 타입·검색 조건·컬럼과 응답 변환을 정의한다. */
 "use client";
 
 export const INFTWT_RESULT_ROW_SELECT_MESSAGE = "SN_INFTWT_RESULT_ROW_SELECT";
diff --git a/apps/sn/app/(map-layout)/map/components/inftwtResult/useInftwtResultMap.ts b/apps/sn/app/(map-layout)/map/components/inftwtResult/useInftwtResultMap.ts
index c36e83898..c81d97854 100644
--- a/apps/sn/app/(map-layout)/map/components/inftwtResult/useInftwtResultMap.ts
+++ b/apps/sn/app/(map-layout)/map/components/inftwtResult/useInftwtResultMap.ts
@@ -1,5 +1,6 @@
 "use client";
 
+/** 침입수 분석결과 선택 시 부모 지도에 결과 레이어를 표시하는 훅이다. */
 import { useCallback, useEffect, useRef, useState, type MutableRefObject } from "react";
 import GeoJSON from "ol/format/GeoJSON.js";
 import VectorLayer from "ol/layer/Vector.js";
diff --git a/apps/sn/app/(map-layout)/map/components/layerSetting/LayerSettingCard.tsx b/apps/sn/app/(map-layout)/map/components/layerSetting/LayerSettingCard.tsx
index 91c9766f8..2789f6807 100644
--- a/apps/sn/app/(map-layout)/map/components/layerSetting/LayerSettingCard.tsx
+++ b/apps/sn/app/(map-layout)/map/components/layerSetting/LayerSettingCard.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 선택 레이어 설정 카드
+ * 레이어별 설정 제목과 활성화·닫기 영역을 공통 레이아웃으로 제공한다.
+ */
 "use client";
 
 import type { ReactNode } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/pipeAnalysis/PipeAnalysisDetailPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/pipeAnalysis/PipeAnalysisDetailPopupPage.tsx
index 969f472d8..49e025a19 100644
--- a/apps/sn/app/(map-layout)/map/components/pipeAnalysis/PipeAnalysisDetailPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/pipeAnalysis/PipeAnalysisDetailPopupPage.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 관로현황 목록
+ * 관로분석 집계 항목에 해당하는 개별 관로 목록을 표시한다.
+ */
 "use client";
 
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/pipeAnalysis/PipeAnalysisPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/pipeAnalysis/PipeAnalysisPopupPage.tsx
index e657c6f2d..f053073d3 100644
--- a/apps/sn/app/(map-layout)/map/components/pipeAnalysis/PipeAnalysisPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/pipeAnalysis/PipeAnalysisPopupPage.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 관로분석
+ * 행정구역·처리구역과 분석구분별 관로 집계 결과를 조회한다.
+ */
 "use client";
 
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/pipeAnalysis/pipeAnalysisUtils.ts b/apps/sn/app/(map-layout)/map/components/pipeAnalysis/pipeAnalysisUtils.ts
index dbce492b3..6e8327d1e 100644
--- a/apps/sn/app/(map-layout)/map/components/pipeAnalysis/pipeAnalysisUtils.ts
+++ b/apps/sn/app/(map-layout)/map/components/pipeAnalysis/pipeAnalysisUtils.ts
@@ -1,3 +1,4 @@
+/** 관로분석 검색 조건, 집계 컬럼과 표시값 변환 유틸을 제공한다. */
 "use client";
 
 import type { SelectDataType } from "@common/business_components";
diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/MsSwagePpl.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/MsSwagePpl.tsx
index b081f5506..aadf5751b 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/MsSwagePpl.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/MsSwagePpl.tsx
@@ -1,4 +1,5 @@
 /**
+ * 화면명: 하수관로 정보
  * ➡️ 경로 : 하수관망도 메인 페이지 (시설물 클릭) - 오른쪽 팝업창 (하수관로)
  * 
  * 📄 MsSwagePpl
diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/Ssc.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/Ssc.tsx
index 3a070cce1..5a0fcadde 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/Ssc.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/Ssc.tsx
@@ -1,4 +1,5 @@
 /**
+ * 화면명: 우수토실 정보
  * ➡️ 경로 : 하수관망도 메인 페이지 (시설물 클릭) - 오른쪽 팝업창 (우수토실)
  *
  * 📄 Ssc
diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/SwtrmtFclt.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/SwtrmtFclt.tsx
index aaee3f048..3ef836edf 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/SwtrmtFclt.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/SwtrmtFclt.tsx
@@ -1,4 +1,5 @@
 /**
+ * 화면명: 하수처리시설 정보
  * ➡️ 경로 : 하수관망도 메인 페이지 (시설물 클릭) - 오른쪽 팝업창 (하수처리시설)
  * 
  * 📄 SwtrmtFclt
diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/SwtrmtPrcsZoneAnalysis.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/SwtrmtPrcsZoneAnalysis.tsx
index 68ee568c1..a15e37b55 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/SwtrmtPrcsZoneAnalysis.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/SwtrmtPrcsZoneAnalysis.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 처리구역내 관로분석정보
+ * 선택한 하수처리구역의 관로 분석 현황과 보수이력 연계 기능을 제공한다.
+ */
 "use client";
 
 import React, {
diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/aplcnYms.ts b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/aplcnYms.ts
index eab5b6e9d..0c33df1e1 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/aplcnYms.ts
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/aplcnYms.ts
@@ -1,3 +1,4 @@
+/** 침입수·RDII 분석의 적용연월 선택 상태와 월 목록을 제공한다. */
 import { useState, useEffect } from "react";
 import moment from "moment";
 import { getData } from "@/components/lib/api";
@@ -295,4 +296,4 @@ export const getChartDataRainData = (arr: TRainData[]) => {
     lineVal0: 0,
     barVal0: roundTo(data.amrf, 2),
   }));
-};
\ No newline at end of file
+};
diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx
index 515d6ad8a..4cf5c5d45 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 침입수 분석
+ * 침입수 분석 조건 입력, 실행 상태와 분석결과를 표시한다.
+ */
 "use client";
 
 import React, { useEffect, useMemo, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx
index 0a5abc436..44c384ace 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: RDII 분석
+ * RDII 분석 조건 입력, 실행 상태와 분석결과를 표시한다.
+ */
 "use client";
 
 import React, { useEffect, useMemo, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/featureClickEventPopup.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/featureClickEventPopup.tsx
index 29654473d..3d2a2c5c5 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/featureClickEventPopup.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/featureClickEventPopup.tsx
@@ -1,4 +1,5 @@
 /**
+ * 화면명: 시설 상세정보
  * ➡️ 경로 : 하수관망도 메인 페이지 (시설물 클릭) - 오른쪽 팝업창
  *
  * 📄 FeatureClickEventPopup
@@ -69,6 +70,11 @@ import { useAlertStore } from "@/shared/lib";
 import { useConfirm } from "@frontend-opensource/use-react-hooks";
 import useStore from "@/store/useStore";
 import ExmnSurveyResultSection from "../exmn/ExmnSurveyResultSection";
+import {
+  loadFldngHstryDetail,
+  showFldngHstryFeature,
+  type FldngHstryDetailCacheValue,
+} from "../fldngHstry/fldngHstryTypes";
 
 const linkedFacilityHighlightStyle = new Style({
   image: new CircleStyle({
@@ -105,20 +111,6 @@ const normalizeFldngWtlvMapApiFid = (value: unknown) => {
   return normalizeFldngWtlvMapDisplayId(normalized);
 };
 
-const normalizeRainAnalysisPayload = (data: any) => {
-  if (!data || typeof data !== "object") return {};
-  return {
-    rain_bgng_tm: data.rainBgngTm ?? data.rain_bgng_tm ?? null,
-    rainBgngTm: data.rainBgngTm ?? data.rain_bgng_tm ?? null,
-    rain_end_tm: data.rainEndTm ?? data.rain_end_tm ?? null,
-    rainEndTm: data.rainEndTm ?? data.rain_end_tm ?? null,
-    rain_tot: data.rainTot ?? data.rain_tot ?? null,
-    rainTot: data.rainTot ?? data.rain_tot ?? null,
-    rain_str: data.rainStr ?? data.rain_str ?? null,
-    rainStr: data.rainStr ?? data.rain_str ?? null,
-  };
-};
-
 // 침수흔적도 침수시작일시, 침수종료일시 한줄로 보이도록
 const formatFldngWtlvDateTime = (dateValue: unknown, timeValue: unknown) => {
   const rawDate = String(dateValue ?? "").trim();
@@ -182,6 +174,9 @@ const FeatureClickEventPopup = ({
   const flowDirectionBasisRequestCacheRef = useRef(
     new Map<string, Promise<any | null>>(),
   );
+  const fldngHstryDetailCacheRef = useRef(
+    new Map<string, Promise<FldngHstryDetailCacheValue>>(),
+  );
   const [mngInstOptions, setMngInstOptions] = useState<MngInstOption[]>([]);
   const [floodDepthRows, setFloodDepthRows] = useState<
     Record<string, unknown>[]
@@ -855,60 +850,41 @@ const FeatureClickEventPopup = ({
         }
 
         if (selectedLayerName === "침수흔적위선" && featureId) {
-          const depthLookupKey = normalizeFldngWtlvMapApiFid(featureId);
           setFloodDepthRows([]);
           setFloodWtlvRows([]);
           setSelectedFloodDepthFid(null);
           setSelectedFloodWtlvFid(null);
-          try {
-            const normalizedFloodMapFid =
-              normalizeFldngWtlvMapApiFid(featureId);
-            if (!normalizedFloodMapFid) {
-              throw new Error("침수흔적도 fid가 비어 있습니다.");
-            }
-            const rainAnalysis = await getData(
-              `v1/fldng/hstry/rain-anls/${encodeURIComponent(normalizedFloodMapFid)}`,
+          const fldngHstryFid = normalizeFldngWtlvMapApiFid(featureId);
+          if (!fldngHstryFid) {
+            throw new Error("침수흔적도 fid가 비어 있습니다.");
+          }
+
+          const fldngHstryCacheKey = `tb_ms_fldng_wtlv_map:${fldngHstryFid}`;
+          let fldngHstryDetailRequest =
+            fldngHstryDetailCacheRef.current.get(fldngHstryCacheKey);
+          if (!fldngHstryDetailRequest) {
+            fldngHstryDetailRequest = loadFldngHstryDetail(fldngHstryFid);
+            fldngHstryDetailCacheRef.current.set(
+              fldngHstryCacheKey,
+              fldngHstryDetailRequest,
             );
-            if (rainAnalysis) {
-              const mergedData = {
-                ...formattedData,
-                ...normalizeRainAnalysisPayload(rainAnalysis),
-              };
-              setFetchData(mergedData);
-              setTableData(mergedData);
-            }
-          } catch (rainError) {
-            console.warn("침수강우분석 조회 실패:", rainError);
           }
-          try {
-            if (depthLookupKey) {
-              const depthRows = await getData(
-                `v1/fldng/hstry/depth-map/${encodeURIComponent(depthLookupKey)}`,
-              );
-              const depthPayload = depthRows?.data ?? depthRows;
-              const depthItems = Array.isArray(depthPayload)
-                ? depthPayload
-                : depthPayload?.depthMaps;
-              const waterLevelItems = Array.isArray(
-                depthPayload?.waterLevelMaps,
-              )
-                ? depthPayload.waterLevelMaps
-                : [];
-              const normalizedDepthRows = Array.isArray(depthItems)
-                ? depthItems.filter((row) => row && typeof row === "object")
-                : [];
-              const normalizedWaterLevelRows = waterLevelItems.filter(
-                (row: unknown) => row && typeof row === "object",
-              );
-              setFloodDepthRows(normalizedDepthRows);
-              setFloodWtlvRows(normalizedWaterLevelRows);
-              // 최초에는 연계 항목을 선택하지 않고 버튼 목록만 표시한다.
-              setSelectedFloodDepthFid(null);
-              setSelectedFloodWtlvFid(null);
-            }
-          } catch (depthError) {
-            console.warn("침수깊이지도 조회 실패:", depthError);
+
+          const fldngHstryDetail = await fldngHstryDetailRequest;
+          if (!fldngHstryDetail.complete) {
+            fldngHstryDetailCacheRef.current.delete(fldngHstryCacheKey);
           }
+          const mergedFldngHstryData = {
+            ...formattedData,
+            ...fldngHstryDetail.rainAnalysis,
+          };
+          setFetchData(mergedFldngHstryData);
+          setTableData(mergedFldngHstryData);
+          setFloodDepthRows(fldngHstryDetail.depthRows);
+          setFloodWtlvRows(fldngHstryDetail.waterLevelRows);
+          // 최초에는 연계 항목을 선택하지 않고 버튼 목록만 표시한다.
+          setSelectedFloodDepthFid(null);
+          setSelectedFloodWtlvFid(null);
         }
       } catch (error) {
         console.error("데이터 로딩 중 오류:", error);
@@ -1170,7 +1146,8 @@ const FeatureClickEventPopup = ({
                                 setSelectedFloodDepthFid(depthFid);
                                 setSelectedFloodWtlvFid(null);
                                 const core = GisApp.Module.layer as any;
-                                await core.showSearchResultsFromGeoJSON?.(
+                                await showFldngHstryFeature(
+                                  core,
                                   "tb_ms_fldng_dpth_map",
                                   `tb_ms_fldng_dpth_map.${depthFid.replace(/^tb_ms_fldng_dpth_map\./, "")}`,
                                 );
@@ -1233,7 +1210,8 @@ const FeatureClickEventPopup = ({
                               setSelectedFloodWtlvFid(waterLevelFid);
                               setSelectedFloodDepthFid(null);
                               const core = GisApp.Module.layer as any;
-                              await core.showSearchResultsFromGeoJSON?.(
+                              await showFldngHstryFeature(
+                                core,
                                 "tb_ms_fldng_wtlv_map",
                                 `tb_ms_fldng_wtlv_map.${waterLevelFid.replace(/^tb_ms_fldng_wtlv_map\./, "")}`,
                               );
diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/sewagePump.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/sewagePump.tsx
index 07d78a7d1..8712a7b31 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/sewagePump.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/sewagePump.tsx
@@ -1,4 +1,5 @@
 /**
+ * 화면명: 하수펌프장 정보
  * ➡️ 경로 : 하수관망도 메인 페이지 (시설물 클릭) - 오른쪽 팝업창 (하수펌프장)
  * 
  * 📄 sewagePump
diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/smh.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/smh.tsx
index e4a8fa0ba..9b7042c17 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/smh.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/smh.tsx
@@ -1,4 +1,5 @@
 /**
+ * 화면명: 하수맨홀 정보
  * ➡️ 경로 : 하수관망도 메인 페이지 (시설물 클릭) - 오른쪽 팝업창 (하수맨홀)
  * 
  * 📄 Smh
diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/stormWaterPump.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/stormWaterPump.tsx
index 92973b133..7b365b59e 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/stormWaterPump.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/stormWaterPump.tsx
@@ -1,4 +1,5 @@
 /**
+ * 화면명: 빗물펌프 정보
  * ➡️ 경로 : 하수관망도 메인 페이지 (시설물 클릭) - 오른쪽 팝업창 (빗물펌프)
  * 
  * 📄 StormWaterPump
@@ -34,4 +35,4 @@ const StormWaterPump = ({ featureData }: { featureData: Record<string, any> }) =
   )
 }
 
-export default StormWaterPump
\ No newline at end of file
+export default StormWaterPump
diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/swtrmtPrcsZoneAnalysisApi.ts b/apps/sn/app/(map-layout)/map/components/popupComponent/swtrmtPrcsZoneAnalysisApi.ts
index 21b6899dc..d0c92d678 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/swtrmtPrcsZoneAnalysisApi.ts
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/swtrmtPrcsZoneAnalysisApi.ts
@@ -1,3 +1,4 @@
+/** 처리구역 관로분석정보와 보수이력을 조회·다운로드하는 API를 제공한다. */
 import { getBlobDataWithHeaders, getData } from "@/components/lib/api";
 
 export type SwtrmtPrcsZoneAnalysisMetric = {
diff --git a/apps/sn/app/(map-layout)/map/components/rdiiResult/RdiiResultPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/rdiiResult/RdiiResultPopupPage.tsx
index 06641fed8..eea62cc47 100644
--- a/apps/sn/app/(map-layout)/map/components/rdiiResult/RdiiResultPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/rdiiResult/RdiiResultPopupPage.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: RDII 분석결과 목록
+ * RDII 분석결과를 검색하고 목록·엑셀·지도 보기 기능을 제공한다.
+ */
 "use client";
 
 import { useCallback, useEffect, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/rdiiResult/rdiiResultTypes.ts b/apps/sn/app/(map-layout)/map/components/rdiiResult/rdiiResultTypes.ts
index 7dc76db34..a90b88591 100644
--- a/apps/sn/app/(map-layout)/map/components/rdiiResult/rdiiResultTypes.ts
+++ b/apps/sn/app/(map-layout)/map/components/rdiiResult/rdiiResultTypes.ts
@@ -1,3 +1,4 @@
+/** RDII 분석결과 화면의 타입·검색 조건·컬럼과 응답 변환을 정의한다. */
 "use client";
 
 export const RDII_RESULT_ROW_SELECT_MESSAGE = "SN_RDII_RESULT_ROW_SELECT";
@@ -44,4 +45,4 @@ export type RdiiResultMapViewResponse = {
   pipeGeometry: Record<string, unknown>;
   pipes: RdiiResultMapViewPipe[];
   pipeCount: number;
-};
\ No newline at end of file
+};
diff --git a/apps/sn/app/(map-layout)/map/components/rdiiResult/useRdiiResultMap.ts b/apps/sn/app/(map-layout)/map/components/rdiiResult/useRdiiResultMap.ts
index 6369daa08..98db366c5 100644
--- a/apps/sn/app/(map-layout)/map/components/rdiiResult/useRdiiResultMap.ts
+++ b/apps/sn/app/(map-layout)/map/components/rdiiResult/useRdiiResultMap.ts
@@ -1,3 +1,4 @@
+/** RDII 분석결과 선택 시 부모 지도에 결과 레이어를 표시하는 훅이다. */
 "use client";
 
 import { useCallback, useEffect, useRef, useState, type MutableRefObject } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/repairHistory/RepairHistoryPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/repairHistory/RepairHistoryPopupPage.tsx
index 6b7c2ad33..228b1c1b8 100644
--- a/apps/sn/app/(map-layout)/map/components/repairHistory/RepairHistoryPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/repairHistory/RepairHistoryPopupPage.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 보수이력 목록
+ * 선택 시설의 보수이력을 조회하고 목록으로 표시한다.
+ */
 "use client";
 
 import { useCallback, useEffect, useMemo, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/SbmrgDngrMapPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/SbmrgDngrMapPopupPage.tsx
index a6e2190e4..cf09f4cf2 100644
--- a/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/SbmrgDngrMapPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/SbmrgDngrMapPopupPage.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 침수위험지도 목록
+ * 침수위험지도를 검색하고 목록·엑셀·지도 보기 기능을 제공한다.
+ */
 "use client";
 
 import { useCallback, useEffect, useMemo, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/sbmrgDngrMapTypes.ts b/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/sbmrgDngrMapTypes.ts
index 3d27a82c9..c21c749cf 100644
--- a/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/sbmrgDngrMapTypes.ts
+++ b/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/sbmrgDngrMapTypes.ts
@@ -1,3 +1,4 @@
+/** 침수위험지도 화면의 검색 조건, 컬럼과 응답 변환을 정의한다. */
 "use client";
 
 import type { UiHeadProps } from "@common/business_components/ui";
diff --git a/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholeDetailPanel.tsx b/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholeDetailPanel.tsx
index bd5a44c58..7ed216afc 100644
--- a/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholeDetailPanel.tsx
+++ b/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholeDetailPanel.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 지반침하 상세정보
+ * 선택한 지반침하 정보와 주변 관로 조회 결과를 표시한다.
+ */
 "use client";
 
 import { useEffect, useMemo, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholeLayerSettingPanel.tsx b/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholeLayerSettingPanel.tsx
index 7448849ba..d230f8269 100644
--- a/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholeLayerSettingPanel.tsx
+++ b/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholeLayerSettingPanel.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 지반침하정보 레이어 설정
+ * 발생연도와 위험도 등 지도 표시 조건을 설정한다.
+ */
 "use client";
 
 import { useEffect, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholePopupPage.tsx b/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholePopupPage.tsx
index c5268b167..8f55f825d 100644
--- a/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholePopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/sinkhole/SinkholePopupPage.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 지반침하 목록
+ * 지반침하 정보를 검색하고 목록·엑셀·지도 보기 기능을 제공한다.
+ */
 "use client";
 
 import { useCallback, useEffect, useMemo, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/sinkhole/sinkholeTypes.ts b/apps/sn/app/(map-layout)/map/components/sinkhole/sinkholeTypes.ts
index e526ec992..ef392c48f 100644
--- a/apps/sn/app/(map-layout)/map/components/sinkhole/sinkholeTypes.ts
+++ b/apps/sn/app/(map-layout)/map/components/sinkhole/sinkholeTypes.ts
@@ -1,3 +1,4 @@
+/** 지반침하 화면에서 사용하는 타입·상수·검색 조건을 정의한다. */
 "use client";
 
 import type { SelectDataType } from "@common/business_components";
diff --git a/apps/sn/app/(map-layout)/map/components/sinkhole/useSinkholeCommonCodes.ts b/apps/sn/app/(map-layout)/map/components/sinkhole/useSinkholeCommonCodes.ts
index f5de60b24..445bab9ff 100644
--- a/apps/sn/app/(map-layout)/map/components/sinkhole/useSinkholeCommonCodes.ts
+++ b/apps/sn/app/(map-layout)/map/components/sinkhole/useSinkholeCommonCodes.ts
@@ -1,3 +1,4 @@
+/** 지반침하 화면에 필요한 공통코드를 조회하고 선택 항목으로 제공한다. */
 "use client";
 
 import { useEffect, useMemo, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/waterRisk/WaterRiskPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/waterRisk/WaterRiskPopupPage.tsx
index 6758738f5..96a47fb8c 100644
--- a/apps/sn/app/(map-layout)/map/components/waterRisk/WaterRiskPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/waterRisk/WaterRiskPopupPage.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 통수위험 분석
+ * 통수위험 분석 결과와 과거 분석이력을 조회하고 지도에 표시한다.
+ */
 "use client";
 
 import { useEffect, useMemo, useState } from "react";
diff --git a/apps/sn/app/(map-layout)/map/components/waterRisk/waterRiskClient.ts b/apps/sn/app/(map-layout)/map/components/waterRisk/waterRiskClient.ts
index 9cbf64e65..0094c8c16 100644
--- a/apps/sn/app/(map-layout)/map/components/waterRisk/waterRiskClient.ts
+++ b/apps/sn/app/(map-layout)/map/components/waterRisk/waterRiskClient.ts
@@ -1,3 +1,4 @@
+/** 통수위험 분석 대상과 결과를 조회하는 API 함수를 제공한다. */
 import { getData } from "@/app/components/lib/api";
 import type { UiTableSort } from "@common/business_components/ui/table";
 
diff --git a/apps/sn/app/(map-layout)/map/components/waterRisk/waterRiskTypes.ts b/apps/sn/app/(map-layout)/map/components/waterRisk/waterRiskTypes.ts
index c60e09dc9..00bf70dff 100644
--- a/apps/sn/app/(map-layout)/map/components/waterRisk/waterRiskTypes.ts
+++ b/apps/sn/app/(map-layout)/map/components/waterRisk/waterRiskTypes.ts
@@ -1,3 +1,4 @@
+/** 통수위험 분석 화면에서 사용하는 타입·상수와 표시값 변환을 정의한다. */
 "use client";
 
 export type WaterRiskStatus = "DANGER" | "NORMAL";
diff --git a/apps/sn/app/(map-layout)/map/page.tsx b/apps/sn/app/(map-layout)/map/page.tsx
index e5266b909..71d22ff65 100644
--- a/apps/sn/app/(map-layout)/map/page.tsx
+++ b/apps/sn/app/(map-layout)/map/page.tsx
@@ -7007,7 +7007,9 @@ const Map = () => {
     }
 
     const desiredLayerIds = new Set(desiredLayers.map((item) => item.id));
-    const mapLayers = gisMaps.current?.getLayers?.()?.getArray?.() ?? [];
+    const mapLayers = [
+      ...(gisMaps.current?.getLayers?.()?.getArray?.() ?? []),
+    ];
     const isManagedFloodLayerId = (id: string) =>
       id === FLDNG_HSTRY_WFS_LAYER_ID ||
       id.startsWith(`${FLDNG_DEPTH_WFS_LAYER_ID_PREFIX}_`);
@@ -7016,7 +7018,7 @@ const Map = () => {
     mapLayers.forEach((mapLayer: any) => {
       const layerId = String(mapLayer?.get?.("id") ?? "");
       if (isManagedFloodLayerId(layerId) && !desiredLayerIds.has(layerId)) {
-        core?.deleteLayer?.(layerId);
+        gisMaps.current?.removeLayer?.(mapLayer);
       }
     });
 
diff --git a/apps/sn/app/(with-base-layout)/oper/dredging/components/DredgingRegisterModal.tsx b/apps/sn/app/(with-base-layout)/oper/dredging/components/DredgingRegisterModal.tsx
index 0f8b0fc0b..234405264 100644
--- a/apps/sn/app/(with-base-layout)/oper/dredging/components/DredgingRegisterModal.tsx
+++ b/apps/sn/app/(with-base-layout)/oper/dredging/components/DredgingRegisterModal.tsx
@@ -1,3 +1,7 @@
+/**
+ * 화면명: 준설실적 등록
+ * 준설 사진을 등록하고 촬영정보·위치·인접 관로를 확인하여 준설실적을 저장하는 화면이다.
+ */
 "use client";
 
 import dynamic from "next/dynamic";
@@ -789,7 +793,11 @@ const DredgingRegisterModal = ({
                                 </TableCell>
                                 <TableCell className="overflow-hidden px-3">
                                   <span
-                                    title={statusLabel(photo.metadata.status)}
+                                    title={
+                                      photoStatusLabels[
+                                        photo.metadata.status
+                                      ] || "수동 입력 필요"
+                                    }
                                     className={`inline-block max-w-full truncate rounded-sm px-2 py-1 align-middle text-sm font-medium ${
                                       photo.metadata.status === "COMPLETE"
                                         ? "bg-emerald-100 text-emerald-800"
diff --git a/apps/sn/src/types/lucide-react.d.ts b/apps/sn/src/types/lucide-react.d.ts
index 708828bd1..54a07d5f0 100644
--- a/apps/sn/src/types/lucide-react.d.ts
+++ b/apps/sn/src/types/lucide-react.d.ts
@@ -26,6 +26,7 @@ declare module "lucide-react" {
   export const Circle: LucideIcon;
   export const CloudUpload: LucideIcon;
   export const History: LucideIcon;
+  export const ListTree: LucideIcon;
   export const Move: LucideIcon;
   export const MoreHorizontal: LucideIcon;
   export const PanelsTopLeft: LucideIcon;

From b99f4904b04277776163c57a603e820a74879e49 Mon Sep 17 00:00:00 2001
From: ljpark <mind-one005@mind-one.co.kr>
Date: Tue, 8 Sep 2026 17:13:36 +0900
Subject: [PATCH 12/13] =?UTF-8?q?sn:=20featureClickEventPopup=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EC=B9=A8=EC=88=98=ED=9D=94=EC=A0=81=EB=8F=84=20?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fldngHstry/FldngHstryDetailPanel.tsx      |  13 +-
 .../fldngHstry/FldngHstryFeatureClick.tsx     | 330 +++++++++
 .../FldngHstryLayerSettingPanel.tsx           |  18 +-
 .../fldngHstry/FldngHstryPopupPage.tsx        |  59 +-
 .../components/fldngHstry/fldngHstryClient.ts |  61 ++
 .../components/fldngHstry/fldngHstryTypes.ts  | 675 ++----------------
 .../components/fldngHstry/fldngHstryUtils.ts  | 440 ++++++++++++
 .../popupComponent/featureClickEventPopup.tsx | 254 +------
 apps/sn/app/(map-layout)/map/page.tsx         | 198 ++---
 9 files changed, 1054 insertions(+), 994 deletions(-)
 create mode 100644 apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryFeatureClick.tsx
 create mode 100644 apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryClient.ts
 create mode 100644 apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryUtils.ts

diff --git a/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryDetailPanel.tsx b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryDetailPanel.tsx
index 7398a4d70..dfba25f39 100644
--- a/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryDetailPanel.tsx
+++ b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryDetailPanel.tsx
@@ -5,11 +5,8 @@
 "use client";
 
 import { useMemo, useState } from "react";
-import {
-  formatFloodArea,
-  formatFloodDepth,
-  type FldngHstryItem,
-} from "./fldngHstryTypes";
+import type { FldngHstryItem } from "./fldngHstryTypes";
+import { formatFldngHstryArea, formatFldngHstryDepth } from "./fldngHstryUtils";
 
 type Props = {
   detail: FldngHstryItem;
@@ -54,8 +51,8 @@ export default function FldngHstryDetailPanel({
   const yearRows = useMemo(
     () =>
       [
-        ["침수심", `${detail.floodDepthM.toFixed(2)} m`],
-        ["침수면적", formatFloodArea(detail.floodAreaHa)],
+        ["침수심", `${formatFldngHstryDepth(detail.floodDepthM)} m`],
+        ["침수면적", formatFldngHstryArea(detail.floodAreaHa)],
         ["침수년도", `${detail.floodYear}년`],
         ["등급", detail.gradeLabel],
         ["침수구역", detail.districtName],
@@ -67,7 +64,7 @@ export default function FldngHstryDetailPanel({
     () =>
       [
         ["침수재해명", detail.disasterName],
-        ["침수면적", formatFloodArea(detail.floodAreaHa)],
+        ["침수면적", formatFldngHstryArea(detail.floodAreaHa)],
         ["침수원인상세명", detail.causeDetailName],
         ["침수시작년월일", detail.startDate],
         ["침수종료년월일", detail.endDate],
diff --git a/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryFeatureClick.tsx b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryFeatureClick.tsx
new file mode 100644
index 000000000..a379b5e40
--- /dev/null
+++ b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryFeatureClick.tsx
@@ -0,0 +1,330 @@
+/**
+ * 화면명: 침수흔적위선 연계정보
+ * 우측 정보 화면의 심선·위선 목록, 선택 상태와 화면 생명주기 캐시를 관리한다.
+ */
+"use client";
+
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import GisApp from "@common/business_components/ui/map/lib/gis.core";
+import type Feature from "ol/Feature.js";
+import VectorSource from "ol/source/Vector.js";
+
+import { loadFldngHstryDetail } from "./fldngHstryClient";
+import {
+  FLDNG_HSTRY_DEPTH_LAYER_TYPE,
+  FLDNG_HSTRY_LAYER_TYPE,
+  type FldngHstryDetailCacheValue,
+} from "./fldngHstryTypes";
+
+type FldngHstryGisLayer = {
+  searchLayer?: { getSource?: () => VectorSource | null } | null;
+  clearSearchLayer: (option: unknown) => void;
+  ensureSearchLayer: (option: unknown) => {
+    set: (key: string, value: unknown) => void;
+    setSource: (source: VectorSource) => void;
+  };
+  showSearchResultsFromGeoJSON: (
+    layerTypeName: string,
+    featureId: string,
+  ) => void | Promise<void>;
+};
+
+const cloneFldngHstryFeature = (feature: Feature) => {
+  const clonedFeature = feature.clone();
+  const featureId = feature.getId();
+  if (featureId !== undefined) clonedFeature.setId(featureId);
+  return clonedFeature;
+};
+
+const displayCachedFldngHstryFeatures = (
+  gisLayer: FldngHstryGisLayer,
+  layerTypeName: string,
+  features: Feature[],
+) => {
+  const matched = Object.values(GisApp.layerCode ?? {}).find(
+    (item: any) => item?.lyrTyNm === layerTypeName,
+  ) as any;
+  if (!matched || features.length === 0) return;
+
+  gisLayer.clearSearchLayer(matched);
+  const layer = gisLayer.ensureSearchLayer(matched);
+  layer.set("gobjTy", matched.gobjTy);
+  const clonedFeatures = features.map(cloneFldngHstryFeature);
+  layer.setSource(new VectorSource({ features: clonedFeatures }));
+  (GisApp.Module.select as any)?.selectFeature(clonedFeatures[0], false);
+};
+
+const showFldngHstryFeature = async (
+  cache: Map<string, Promise<Feature[]>>,
+  gisLayer: FldngHstryGisLayer,
+  layerTypeName: string,
+  featureId: string,
+) => {
+  const cacheKey = `${layerTypeName}:${featureId}`;
+  const cachedRequest = cache.get(cacheKey);
+  if (cachedRequest) {
+    displayCachedFldngHstryFeatures(
+      gisLayer,
+      layerTypeName,
+      await cachedRequest,
+    );
+    return;
+  }
+
+  await gisLayer.showSearchResultsFromGeoJSON(layerTypeName, featureId);
+  const source = gisLayer.searchLayer?.getSource?.();
+  if (!source) return;
+
+  const featureRequest = new Promise<Feature[]>((resolve, reject) => {
+    const resolveFeatures = () => {
+      const features = source.getFeatures();
+      if (features.length > 0) {
+        resolve(features.map(cloneFldngHstryFeature));
+      } else {
+        reject(new Error("침수흔적 위치 정보가 없습니다."));
+      }
+    };
+    const rejectFeatures = () =>
+      reject(new Error("침수흔적 위치 조회에 실패했습니다."));
+
+    if (source.getFeatures().length > 0) {
+      resolveFeatures();
+      return;
+    }
+    source.once("featuresloadend", resolveFeatures);
+    source.once("featuresloaderror", rejectFeatures);
+  });
+
+  cache.set(cacheKey, featureRequest);
+  try {
+    await featureRequest;
+  } catch (error) {
+    cache.delete(cacheKey);
+    console.warn(error);
+  }
+};
+
+export const useFldngHstryFeatureClick = () => {
+  const fldngHstryDetailCacheRef = useRef(
+    new Map<string, Promise<FldngHstryDetailCacheValue>>(),
+  );
+  const fldngHstryFeatureCacheRef = useRef(
+    new Map<string, Promise<Feature[]>>(),
+  );
+  const [fldngHstryDepthRows, setFldngHstryDepthRows] = useState<
+    Record<string, unknown>[]
+  >([]);
+  const [fldngHstryWtlvRows, setFldngHstryWtlvRows] = useState<
+    Record<string, unknown>[]
+  >([]);
+  const [selectedFldngHstryDepthFid, setSelectedFldngHstryDepthFid] = useState<
+    string | null
+  >(null);
+  const [selectedFldngHstryWtlvFid, setSelectedFldngHstryWtlvFid] = useState<
+    string | null
+  >(null);
+  const fldngHstryDepthYearListRef = useRef<HTMLDivElement>(null);
+  const fldngHstryWtlvListRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    const detailCache = fldngHstryDetailCacheRef.current;
+    const featureCache = fldngHstryFeatureCacheRef.current;
+    return () => {
+      detailCache.clear();
+      featureCache.clear();
+    };
+  }, []);
+
+  const resetFldngHstryFeatureClick = useCallback(() => {
+    setFldngHstryDepthRows([]);
+    setFldngHstryWtlvRows([]);
+    setSelectedFldngHstryDepthFid(null);
+    setSelectedFldngHstryWtlvFid(null);
+  }, []);
+
+  const loadFldngHstryFeatureClickDetail = useCallback(
+    async (fldngHstryFid: string) => {
+      const cacheKey = `${FLDNG_HSTRY_LAYER_TYPE}:${fldngHstryFid}`;
+      let request = fldngHstryDetailCacheRef.current.get(cacheKey);
+      if (!request) {
+        request = loadFldngHstryDetail(fldngHstryFid);
+        fldngHstryDetailCacheRef.current.set(cacheKey, request);
+      }
+
+      const detail = await request;
+      if (!detail.complete) fldngHstryDetailCacheRef.current.delete(cacheKey);
+      setFldngHstryDepthRows(detail.fldngHstryDepthRows);
+      setFldngHstryWtlvRows(detail.fldngHstryWtlvRows);
+      setSelectedFldngHstryDepthFid(null);
+      setSelectedFldngHstryWtlvFid(null);
+      return detail;
+    },
+    [],
+  );
+
+  const headName = useMemo(
+    () => (
+      <div className="flex w-full min-w-0 flex-col items-start gap-2">
+        <span>기본정보</span>
+        {fldngHstryDepthRows.length > 0 && (
+          <div className="flex w-full items-center gap-1">
+            <span className="w-9 shrink-0 text-[1.1rem] font-semibold">
+              심선
+            </span>
+            <button
+              type="button"
+              aria-label="이전 연도"
+              className="shrink-0 px-1 text-lg leading-none text-foreground"
+              onClick={() =>
+                fldngHstryDepthYearListRef.current?.scrollBy({
+                  left: -120,
+                  behavior: "smooth",
+                })
+              }
+            >
+              ‹
+            </button>
+            <div
+              ref={fldngHstryDepthYearListRef}
+              className="flex min-w-0 flex-1 gap-2 overflow-x-auto whitespace-nowrap [scrollbar-width:none] [&::-webkit-scrollbar]:hidden"
+            >
+              {[...fldngHstryDepthRows]
+                .map((row, index) => ({
+                  row,
+                  index,
+                  year: String(
+                    row.fldng_yr ?? row.fldngYr ?? row.yr ?? "",
+                  ).trim(),
+                }))
+                .filter(({ year }) => Boolean(year))
+                .sort((left, right) => {
+                  const yearOrder = left.year.localeCompare(
+                    right.year,
+                    undefined,
+                    { numeric: true },
+                  );
+                  return yearOrder !== 0 ? yearOrder : left.index - right.index;
+                })
+                .map(({ row, index, year }) => {
+                  const depthFid = String(
+                    row.fldng_dpth_map_sn ?? row.fid ?? "",
+                  ).trim();
+                  return (
+                    <button
+                      key={`${depthFid || "row"}-${index}`}
+                      type="button"
+                      onClick={async () => {
+                        if (!depthFid) return;
+                        setSelectedFldngHstryDepthFid(depthFid);
+                        setSelectedFldngHstryWtlvFid(null);
+                        await showFldngHstryFeature(
+                          fldngHstryFeatureCacheRef.current,
+                          GisApp.Module.layer as any,
+                          FLDNG_HSTRY_DEPTH_LAYER_TYPE,
+                          `${FLDNG_HSTRY_DEPTH_LAYER_TYPE}.${depthFid.replace(new RegExp(`^${FLDNG_HSTRY_DEPTH_LAYER_TYPE}\\.`), "")}`,
+                        );
+                      }}
+                      className={`shrink-0 rounded border px-3 py-1 text-[1.2rem] font-medium leading-5 ${selectedFldngHstryDepthFid === depthFid ? "border-blue-600 bg-white text-blue-700" : "border-border bg-muted text-muted-foreground"}`}
+                    >
+                      {year}년
+                    </button>
+                  );
+                })}
+            </div>
+            <button
+              type="button"
+              aria-label="다음 연도"
+              className="shrink-0 px-1 text-lg leading-none text-foreground"
+              onClick={() =>
+                fldngHstryDepthYearListRef.current?.scrollBy({
+                  left: 120,
+                  behavior: "smooth",
+                })
+              }
+            >
+              ›
+            </button>
+          </div>
+        )}
+        {fldngHstryWtlvRows.length > 0 && (
+          <div className="flex w-full items-center gap-1">
+            <span className="w-9 shrink-0 text-[1.1rem] font-semibold">
+              위선
+            </span>
+            <button
+              type="button"
+              aria-label="이전 위선"
+              className="shrink-0 px-1 text-lg leading-none text-foreground"
+              onClick={() =>
+                fldngHstryWtlvListRef.current?.scrollBy({
+                  left: -120,
+                  behavior: "smooth",
+                })
+              }
+            >
+              ‹
+            </button>
+            <div
+              ref={fldngHstryWtlvListRef}
+              className="flex min-w-0 flex-1 gap-2 overflow-x-auto whitespace-nowrap [scrollbar-width:none] [&::-webkit-scrollbar]:hidden"
+            >
+              {fldngHstryWtlvRows.map((row, index) => {
+                const waterLevelFid = String(row.fid ?? "").trim();
+                const disasterName = String(
+                  row.fldng_dstr_nm ?? row.fldngDstrNm ?? "",
+                ).trim();
+                return (
+                  <button
+                    key={`${waterLevelFid || "wtlv"}-${index}`}
+                    type="button"
+                    onClick={async () => {
+                      if (!waterLevelFid) return;
+                      setSelectedFldngHstryWtlvFid(waterLevelFid);
+                      setSelectedFldngHstryDepthFid(null);
+                      await showFldngHstryFeature(
+                        fldngHstryFeatureCacheRef.current,
+                        GisApp.Module.layer as any,
+                        FLDNG_HSTRY_LAYER_TYPE,
+                        `${FLDNG_HSTRY_LAYER_TYPE}.${waterLevelFid.replace(new RegExp(`^${FLDNG_HSTRY_LAYER_TYPE}\\.`), "")}`,
+                      );
+                    }}
+                    className={`shrink-0 rounded border px-3 py-1 text-[1.2rem] font-medium leading-5 ${selectedFldngHstryWtlvFid === waterLevelFid ? "border-blue-600 bg-white text-blue-700" : "border-border bg-muted text-muted-foreground"}`}
+                  >
+                    {disasterName || "재해명 없음"}
+                  </button>
+                );
+              })}
+            </div>
+            <button
+              type="button"
+              aria-label="다음 위선"
+              className="shrink-0 px-1 text-lg leading-none text-foreground"
+              onClick={() =>
+                fldngHstryWtlvListRef.current?.scrollBy({
+                  left: 120,
+                  behavior: "smooth",
+                })
+              }
+            >
+              ›
+            </button>
+          </div>
+        )}
+      </div>
+    ),
+    [
+      fldngHstryDepthRows,
+      fldngHstryWtlvRows,
+      selectedFldngHstryDepthFid,
+      selectedFldngHstryWtlvFid,
+    ],
+  );
+
+  return {
+    hasFldngHstryLinkedFeatures:
+      fldngHstryDepthRows.length > 0 || fldngHstryWtlvRows.length > 0,
+    fldngHstryFeatureClickHeadName: headName,
+    loadFldngHstryFeatureClickDetail,
+    resetFldngHstryFeatureClick,
+  };
+};
diff --git a/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryLayerSettingPanel.tsx b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryLayerSettingPanel.tsx
index c5a8cd190..3f8998bf1 100644
--- a/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryLayerSettingPanel.tsx
+++ b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryLayerSettingPanel.tsx
@@ -6,16 +6,16 @@
 
 import { SelectBox } from "@common/business_components/ui";
 import {
-  FLOOD_HISTORY_MIN_YEAR,
-  normalizeFloodHistoryYearRange,
-  type FloodHistoryYearRange,
+  FLDNG_HSTRY_MIN_YEAR,
+  type FldngHstryYearRange,
 } from "./fldngHstryTypes";
+import { normalizeFldngHstryYearRange } from "./fldngHstryUtils";
 import LayerSettingCard from "../layerSetting/LayerSettingCard";
 
 type Props = {
-  yearRange: FloodHistoryYearRange;
+  yearRange: FldngHstryYearRange;
   enabled: boolean;
-  onYearRangeChange: (yearRange: FloodHistoryYearRange) => void;
+  onYearRangeChange: (yearRange: FldngHstryYearRange) => void;
   onEnabledChange: (enabled: boolean) => void;
   onClose: () => void;
 };
@@ -28,10 +28,10 @@ export default function FldngHstryLayerSettingPanel({
   onEnabledChange,
   onClose,
 }: Props) {
-  const normalizedRange = normalizeFloodHistoryYearRange(yearRange);
+  const normalizedRange = normalizeFldngHstryYearRange(yearRange);
   const currentYear = new Date().getFullYear();
   const yearOptions = Array.from(
-    { length: currentYear - FLOOD_HISTORY_MIN_YEAR + 1 },
+    { length: currentYear - FLDNG_HSTRY_MIN_YEAR + 1 },
     (_, index) => String(currentYear - index),
   );
   const startYearOptions = yearOptions
@@ -43,9 +43,9 @@ export default function FldngHstryLayerSettingPanel({
   const yearSelectClass =
     "!h-[26px] w-full !rounded border border-input bg-background px-2 py-0 text-center text-[12px] leading-none text-foreground";
 
-  const changeYear = (key: keyof FloodHistoryYearRange, value: string) => {
+  const changeYear = (key: keyof FldngHstryYearRange, value: string) => {
     onYearRangeChange(
-      normalizeFloodHistoryYearRange({
+      normalizeFldngHstryYearRange({
         ...normalizedRange,
         [key]: value,
       }),
diff --git a/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryPopupPage.tsx b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryPopupPage.tsx
index 43bd0d5f0..a82e6962a 100644
--- a/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryPopupPage.tsx
+++ b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryPopupPage.tsx
@@ -17,22 +17,24 @@ import LoadingOverlay from "@/components/ui/LoadingBar";
 import MapPopupDataTable from "@/features/windowPopup/ui/MapPopupDataTable";
 import PopupSearchPanel from "@/features/windowPopup/ui/PopupSearchPanel";
 import {
-  FLOOD_HISTORY_LAYER_TYPE,
+  FLDNG_HSTRY_LAYER_TYPE,
   FLDNG_HSTRY_DEFAULT_FILTERS,
   FLDNG_HSTRY_DOWNLOAD_BATCH_SIZE,
   FLDNG_HSTRY_DOWNLOAD_HEADERS,
   FLDNG_HSTRY_LIST_HEADLIST,
   FLDNG_HSTRY_PAGE_SIZE,
   FLDNG_HSTRY_ROW_SELECT_MESSAGE,
+  type FldngHstryApiItem,
+  type FldngHstryFilters,
+  type FldngHstryTableRow,
+} from "./fldngHstryTypes";
+import {
   attachFldngHstryGeometry,
   buildFldngHstryListQueryString,
   buildFldngHstryYearOptions,
   normalizeFldngHstryFilters,
   toFldngHstryTableRows,
-  type FldngHstryApiItem,
-  type FldngHstryFilters,
-  type FldngHstryTableRow,
-} from "./fldngHstryTypes";
+} from "./fldngHstryUtils";
 
 const unwrapPayload = <T,>(response: any): T =>
   (response?.data ?? response) as T;
@@ -50,8 +52,8 @@ const resolveOptionText = (
 
 const resolveFldngHstryMapFeatureFid = (row: FldngHstryTableRow) => {
   const fid = String(row.fid ?? "").trim();
-  if (fid.startsWith(`${FLOOD_HISTORY_LAYER_TYPE}.`)) return fid;
-  if (fid) return `${FLOOD_HISTORY_LAYER_TYPE}.${fid}`;
+  if (fid.startsWith(`${FLDNG_HSTRY_LAYER_TYPE}.`)) return fid;
+  if (fid) return `${FLDNG_HSTRY_LAYER_TYPE}.${fid}`;
 
   return "";
 };
@@ -123,7 +125,6 @@ export default function FldngHstryPopupPage() {
 
   const fldngYearOptions = useMemo(() => buildFldngHstryYearOptions(), []);
 
-
   const sggOptions = useMemo(
     () =>
       filters.ctpvCd === "0"
@@ -157,11 +158,15 @@ export default function FldngHstryPopupPage() {
           ...hydrated,
           ctpvNm:
             resolveOptionText(hydrated.ctpvCd ?? "", ctpv as any, 2) ||
-            String((hydrated as any).ctpvNm ?? (hydrated as any).ctpv_nm ?? "").trim() ||
+            String(
+              (hydrated as any).ctpvNm ?? (hydrated as any).ctpv_nm ?? "",
+            ).trim() ||
             String(hydrated.ctpvCd ?? "").trim(),
           sggNm:
             resolveOptionText(hydrated.sggCd ?? "", sgg as any, 5) ||
-            String((hydrated as any).sggNm ?? (hydrated as any).sgg_nm ?? "").trim() ||
+            String(
+              (hydrated as any).sggNm ?? (hydrated as any).sgg_nm ?? "",
+            ).trim() ||
             String(hydrated.sggCd ?? "").trim(),
         };
       });
@@ -233,7 +238,7 @@ export default function FldngHstryPopupPage() {
         {
           type: WINDOW_POPUP_MESSAGE_TYPE.MAP_SEARCH_SELECT_FEATURE,
           payload: {
-            layerNm: FLOOD_HISTORY_LAYER_TYPE,
+            layerNm: FLDNG_HSTRY_LAYER_TYPE,
             fid: mapFeatureFid,
           },
         },
@@ -262,8 +267,7 @@ export default function FldngHstryPopupPage() {
     try {
       const response = await fetchAllPages({
         batchSize: FLDNG_HSTRY_DOWNLOAD_BATCH_SIZE,
-        fetchPage: (page, size) =>
-          fetchRows(page + 1, appliedFilters, size),
+        fetchPage: (page, size) => fetchRows(page + 1, appliedFilters, size),
         getItems: (page) => page.rows,
         getTotal: (page) => page.total,
       });
@@ -362,7 +366,9 @@ export default function FldngHstryPopupPage() {
         </label>
 
         <label className="flex items-center gap-2">
-          <span className="whitespace-nowrap text-[1.3rem] text-label">강우시작일</span>
+          <span className="whitespace-nowrap text-[1.3rem] text-label">
+            강우시작일
+          </span>
           <Input
             className="w-[11rem]"
             type="date"
@@ -370,13 +376,32 @@ export default function FldngHstryPopupPage() {
             min={filters.floodYear ? `${filters.floodYear}-01-01` : undefined}
             max={filters.floodYear ? `${filters.floodYear}-12-31` : undefined}
             disabled={!filters.floodYear}
-            onChange={(event) => setFilters((current) => ({ ...current, rainStartDate: event.target.value }))}
+            onChange={(event) =>
+              setFilters((current) => ({
+                ...current,
+                rainStartDate: event.target.value,
+              }))
+            }
           />
         </label>
 
         <label className="flex items-center gap-2">
-          <span className="whitespace-nowrap text-[1.3rem] text-label">침수지구명</span>
-          <Input type="text" value={filters.districtName} onChange={(event) => setFilters((current) => ({ ...current, districtName: event.target.value }))} onKeyDown={(event) => { if (event.key === "Enter") void handleSearch(1); }} />
+          <span className="whitespace-nowrap text-[1.3rem] text-label">
+            침수지구명
+          </span>
+          <Input
+            type="text"
+            value={filters.districtName}
+            onChange={(event) =>
+              setFilters((current) => ({
+                ...current,
+                districtName: event.target.value,
+              }))
+            }
+            onKeyDown={(event) => {
+              if (event.key === "Enter") void handleSearch(1);
+            }}
+          />
         </label>
 
         <label className="flex items-center gap-2">
diff --git a/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryClient.ts b/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryClient.ts
new file mode 100644
index 000000000..927a70c93
--- /dev/null
+++ b/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryClient.ts
@@ -0,0 +1,61 @@
+/** 침수흔적 강우분석과 연결된 심선·위선 목록 조회를 담당한다. */
+
+import { getData } from "@/components/lib/api";
+
+import type { FldngHstryDetailCacheValue } from "./fldngHstryTypes";
+
+const normalizeFldngHstryRainAnalysisPayload = (data: any) => {
+  if (!data || typeof data !== "object") return {};
+  return {
+    rain_bgng_tm: data.rainBgngTm ?? data.rain_bgng_tm ?? null,
+    rainBgngTm: data.rainBgngTm ?? data.rain_bgng_tm ?? null,
+    rain_end_tm: data.rainEndTm ?? data.rain_end_tm ?? null,
+    rainEndTm: data.rainEndTm ?? data.rain_end_tm ?? null,
+    rain_tot: data.rainTot ?? data.rain_tot ?? null,
+    rainTot: data.rainTot ?? data.rain_tot ?? null,
+    rain_str: data.rainStr ?? data.rain_str ?? null,
+    rainStr: data.rainStr ?? data.rain_str ?? null,
+  };
+};
+
+export const loadFldngHstryDetail = async (
+  fldngHstryFid: string,
+): Promise<FldngHstryDetailCacheValue> => {
+  const [rainResult, depthResult] = await Promise.allSettled([
+    getData(`v1/fldng/hstry/rain-anls/${encodeURIComponent(fldngHstryFid)}`),
+    getData(`v1/fldng/hstry/depth-map/${encodeURIComponent(fldngHstryFid)}`),
+  ]);
+
+  if (rainResult.status === "rejected") {
+    console.warn("침수강우분석 조회 실패:", rainResult.reason);
+  }
+  if (depthResult.status === "rejected") {
+    console.warn("침수깊이지도 조회 실패:", depthResult.reason);
+  }
+
+  const depthPayload =
+    depthResult.status === "fulfilled"
+      ? (depthResult.value?.data ?? depthResult.value)
+      : null;
+  const depthItems = Array.isArray(depthPayload)
+    ? depthPayload
+    : depthPayload?.depthMaps;
+  const waterLevelItems = Array.isArray(depthPayload?.waterLevelMaps)
+    ? depthPayload.waterLevelMaps
+    : [];
+
+  return {
+    rainAnalysis:
+      rainResult.status === "fulfilled"
+        ? normalizeFldngHstryRainAnalysisPayload(rainResult.value)
+        : {},
+    fldngHstryDepthRows: Array.isArray(depthItems)
+      ? depthItems.filter((row) => row && typeof row === "object")
+      : [],
+    fldngHstryWtlvRows: waterLevelItems.filter(
+      (row: unknown) => row && typeof row === "object",
+    ),
+    complete:
+      rainResult.status === "fulfilled" && depthResult.status === "fulfilled",
+  };
+};
diff --git a/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryTypes.ts b/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryTypes.ts
index 10eb2e363..c1744a2d5 100644
--- a/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryTypes.ts
+++ b/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryTypes.ts
@@ -1,238 +1,27 @@
-/**
- * 침수흔적 화면에서 사용하는 타입·상수·조회 조건과 feature 캐시 유틸을 제공한다.
- */
-"use client";
-
+/** 침수흔적 화면에서 사용하는 타입·상수와 화면 설정값을 정의한다. */
 import type { UiHeadProps } from "@common/business_components/ui";
-import { appendApiSearchParams } from "@/shared/util/util";
-import { getData } from "@/components/lib/api";
-import GisApp from "@common/business_components/ui/map/lib/gis.core";
-import type Feature from "ol/Feature.js";
-import VectorSource from "ol/source/Vector.js";
 
-export const FLOOD_HISTORY_POPUP_KEY = "fldngHstryPopup";
+export const FLDNG_HSTRY_POPUP_KEY = "fldngHstryPopup";
 export const FLDNG_HSTRY_ROW_SELECT_MESSAGE = "SN_FLOOD_HISTORY_ROW_SELECT";
-export const FLOOD_HISTORY_LAYER_TYPE = "tb_ms_fldng_wtlv_map";
-export const FLOOD_HISTORY_DEPTH_LAYER_TYPE = "tb_ms_fldng_dpth_map";
-export const FLOOD_HISTORY_PREVIEW_LAYER_TYPE = "tb_sn_flood_trace_mock";
-export const FLOOD_HISTORY_LAYER_NAME = "침수흔적위선";
-export const FLOOD_HISTORY_DEPTH_LAYER_NAME = "침수흔적심선";
-export const FLOOD_HISTORY_ROOT_NAME = "침수흔적도";
-export const FLOOD_HISTORY_AREA_LAYER_ID = "SN_FLOOD_HISTORY_AREA";
-export const FLOOD_HISTORY_DEPTH_LAYER_ID = "SN_FLOOD_HISTORY_DEPTH";
+export const FLDNG_HSTRY_LAYER_TYPE = "tb_ms_fldng_wtlv_map";
+export const FLDNG_HSTRY_DEPTH_LAYER_TYPE = "tb_ms_fldng_dpth_map";
+export const FLDNG_HSTRY_PREVIEW_LAYER_TYPE = "tb_sn_flood_trace_mock";
+export const FLDNG_HSTRY_LAYER_NAME = "침수흔적위선";
+export const FLDNG_HSTRY_DEPTH_LAYER_NAME = "침수흔적심선";
+export const FLDNG_HSTRY_ROOT_NAME = "침수흔적도";
+export const FLDNG_HSTRY_AREA_LAYER_ID = "SN_FLOOD_HISTORY_AREA";
+export const FLDNG_HSTRY_DEPTH_LAYER_ID = "SN_FLOOD_HISTORY_DEPTH";
 export const FLDNG_HSTRY_PAGE_SIZE = 10;
 export const FLDNG_HSTRY_DOWNLOAD_BATCH_SIZE = 2000;
-export const FLOOD_HISTORY_MIN_YEAR = 2002;
+export const FLDNG_HSTRY_MIN_YEAR = 2002;
 
 export type FldngHstryDetailCacheValue = {
   rainAnalysis: Record<string, unknown>;
-  depthRows: Record<string, unknown>[];
-  waterLevelRows: Record<string, unknown>[];
+  fldngHstryDepthRows: Record<string, unknown>[];
+  fldngHstryWtlvRows: Record<string, unknown>[];
   complete: boolean;
 };
-
-const normalizeFldngHstryRainAnalysisPayload = (data: any) => {
-  if (!data || typeof data !== "object") return {};
-  return {
-    rain_bgng_tm: data.rainBgngTm ?? data.rain_bgng_tm ?? null,
-    rainBgngTm: data.rainBgngTm ?? data.rain_bgng_tm ?? null,
-    rain_end_tm: data.rainEndTm ?? data.rain_end_tm ?? null,
-    rainEndTm: data.rainEndTm ?? data.rain_end_tm ?? null,
-    rain_tot: data.rainTot ?? data.rain_tot ?? null,
-    rainTot: data.rainTot ?? data.rain_tot ?? null,
-    rain_str: data.rainStr ?? data.rain_str ?? null,
-    rainStr: data.rainStr ?? data.rain_str ?? null,
-  };
-};
-
-/** 침수흔적 강우분석과 연결된 심선·위선 목록을 함께 조회한다. */
-export const loadFldngHstryDetail = async (
-  fldngHstryFid: string,
-): Promise<FldngHstryDetailCacheValue> => {
-  const [rainResult, depthResult] = await Promise.allSettled([
-    getData(
-      `v1/fldng/hstry/rain-anls/${encodeURIComponent(fldngHstryFid)}`,
-    ),
-    getData(
-      `v1/fldng/hstry/depth-map/${encodeURIComponent(fldngHstryFid)}`,
-    ),
-  ]);
-
-  if (rainResult.status === "rejected") {
-    console.warn("침수강우분석 조회 실패:", rainResult.reason);
-  }
-  if (depthResult.status === "rejected") {
-    console.warn("침수깊이지도 조회 실패:", depthResult.reason);
-  }
-
-  const depthPayload =
-    depthResult.status === "fulfilled"
-      ? (depthResult.value?.data ?? depthResult.value)
-      : null;
-  const depthItems = Array.isArray(depthPayload)
-    ? depthPayload
-    : depthPayload?.depthMaps;
-  const waterLevelItems = Array.isArray(depthPayload?.waterLevelMaps)
-    ? depthPayload.waterLevelMaps
-    : [];
-
-  return {
-    rainAnalysis:
-      rainResult.status === "fulfilled"
-        ? normalizeFldngHstryRainAnalysisPayload(rainResult.value)
-        : {},
-    depthRows: Array.isArray(depthItems)
-      ? depthItems.filter((row) => row && typeof row === "object")
-      : [],
-    waterLevelRows: waterLevelItems.filter(
-      (row: unknown) => row && typeof row === "object",
-    ),
-    complete:
-      rainResult.status === "fulfilled" && depthResult.status === "fulfilled",
-  };
-};
-
-type FldngHstryGisLayer = {
-  searchLayer?: {
-    getSource?: () => VectorSource | null;
-  } | null;
-  clearSearchLayer: (option: unknown) => void;
-  ensureSearchLayer: (option: unknown) => {
-    set: (key: string, value: unknown) => void;
-    setSource: (source: VectorSource) => void;
-  };
-  showSearchResultsFromGeoJSON: (
-    layerTypeName: string,
-    featureId: string,
-  ) => void | Promise<void>;
-};
-
-/** 침수흔적 심선·위선의 GeoServer 조회 결과를 화면 생명주기와 분리해 보관한다. */
-export const fldngHstryFeatureCache = new Map<
-  string,
-  Promise<Feature[]>
->();
-
-/** OpenLayers Feature.clone()이 복사하지 않는 feature ID까지 보존한다. */
-const cloneFldngHstryFeature = (feature: Feature) => {
-  const clonedFeature = feature.clone();
-  const featureId = feature.getId();
-  if (featureId !== undefined) {
-    clonedFeature.setId(featureId);
-  }
-  return clonedFeature;
-};
-
-const displayCachedFldngHstryFeatures = (
-  gisLayer: FldngHstryGisLayer,
-  layerTypeName: string,
-  features: Feature[],
-) => {
-  const matched = Object.values(GisApp.layerCode ?? {}).find(
-    (item: any) => item?.lyrTyNm === layerTypeName,
-  ) as any;
-  if (!matched || features.length === 0) return;
-
-  gisLayer.clearSearchLayer(matched);
-  const layer = gisLayer.ensureSearchLayer(matched);
-  layer.set("gobjTy", matched.gobjTy);
-  const clonedFeatures = features.map(cloneFldngHstryFeature);
-  layer.setSource(new VectorSource({ features: clonedFeatures }));
-  (GisApp.Module.select as any)?.selectFeature(clonedFeatures[0], false);
-};
-
-/** 침수흔적 심선·위선을 최초 한 번만 조회하고 이후에는 캐시로 highlight한다. */
-export const showFldngHstryFeature = async (
-  gisLayer: FldngHstryGisLayer,
-  layerTypeName: string,
-  featureId: string,
-) => {
-  const cacheKey = `${layerTypeName}:${featureId}`;
-  const cachedRequest = fldngHstryFeatureCache.get(cacheKey);
-  if (cachedRequest) {
-    const cachedFeatures = await cachedRequest;
-    displayCachedFldngHstryFeatures(
-      gisLayer,
-      layerTypeName,
-      cachedFeatures,
-    );
-    return;
-  }
-
-  await gisLayer.showSearchResultsFromGeoJSON(layerTypeName, featureId);
-  const source = gisLayer.searchLayer?.getSource?.();
-  if (!source) return;
-
-  const featureRequest = new Promise<Feature[]>((resolve, reject) => {
-    const resolveFeatures = () => {
-      const features = source.getFeatures();
-      if (features.length > 0) {
-        resolve(features.map(cloneFldngHstryFeature));
-      } else {
-        reject(new Error("침수흔적 위치 정보가 없습니다."));
-      }
-    };
-    const rejectFeatures = () =>
-      reject(new Error("침수흔적 위치 조회에 실패했습니다."));
-
-    if (source.getFeatures().length > 0) {
-      resolveFeatures();
-      return;
-    }
-    source.once("featuresloadend", resolveFeatures);
-    source.once("featuresloaderror", rejectFeatures);
-  });
-
-  fldngHstryFeatureCache.set(cacheKey, featureRequest);
-  try {
-    await featureRequest;
-  } catch (error) {
-    fldngHstryFeatureCache.delete(cacheKey);
-    console.warn(error);
-  }
-};
-
-/** 지도 침수흔적위선·심선이 공통으로 사용하는 침수년도 범위다. */
-export type FloodHistoryYearRange = {
-  startYear: string;
-  endYear: string;
-};
-
-/** 침수년도 설정의 초기 범위는 데이터 최소연도부터 현재년도까지다. */
-export const buildFloodHistoryDefaultYearRange = (
-  currentYear = new Date().getFullYear(),
-): FloodHistoryYearRange => ({
-  startYear: String(FLOOD_HISTORY_MIN_YEAR),
-  endYear: String(currentYear),
-});
-
-/** 연도 설정값을 4자리 숫자로 정규화하고 유효하지 않으면 기본 범위를 사용한다. */
-export const normalizeFloodHistoryYearRange = (
-  range?: Partial<FloodHistoryYearRange> | null,
-  fallback: FloodHistoryYearRange = buildFloodHistoryDefaultYearRange(),
-): FloodHistoryYearRange => {
-  const normalizeYear = (value: unknown) =>
-    String(value ?? "")
-      .replace(/[^0-9]/g, "")
-      .slice(0, 4);
-  const startYear = normalizeYear(range?.startYear);
-  const endYear = normalizeYear(range?.endYear);
-  return {
-    startYear: /^\d{4}$/.test(startYear) ? startYear : fallback.startYear,
-    endYear: /^\d{4}$/.test(endYear) ? endYear : fallback.endYear,
-  };
-};
-
-/** 위선·심선 WFS에 동일하게 결합할 침수년도 CQL 조건을 생성한다. */
-export const buildFloodHistoryYearCql = (
-  range: FloodHistoryYearRange,
-  enabled: boolean,
-) => {
-  if (!enabled) return "";
-  const normalized = normalizeFloodHistoryYearRange(range);
-  return `(fldng_yr >= '${normalized.startYear}' AND fldng_yr <= '${normalized.endYear}')`;
-};
-
+export type FldngHstryYearRange = { startYear: string; endYear: string };
 export type FldngHstryFilters = {
   ctpvCd: string;
   sggCd: string;
@@ -241,47 +30,44 @@ export type FldngHstryFilters = {
   rainStartDate: string;
   districtName: string;
 };
-
 export type FldngHstryDepthZone = {
   zoneId: string;
   depthLabel: string;
   color: string;
   ring: [number, number][];
 };
-
 export type FldngHstryApiItem = {
-  fid: string; // FID
-  fldngMapFid?: string; // 침수흔적도지도 FID
-  fldngWtlvMapSn?: number | null; // 침수흔적도지도 일련번호
-  taskClCd?: string; // 업무 구분 코드
-  fldngDstrNm?: string; // 침수재해명
-  exmnYr?: string; // 조사년도
-  avgFldngWtlv?: number | null; // 평균침수위
-  fldngArea?: number | null; // 침수면적
-  dtlOcrnCsCn?: string; // 상세발생원인내용
-  stdgCd?: string; // 표준지역코드
-  ctpvCd?: string; // 시도코드
-  sggCd?: string; // 시군구코드
-  dataSn?: number | null; // 데이터 일련번호
-  bgngYmd?: string; // 시작일자
-  endYmd?: string; // 종료일자
-  fldngBgngHm?: string; // 침수시작시분
-  fldngEndHm?: string; // 침수종료시분
-  fldngCsDtlCd?: string; // 침수원인상세코드
-  fldngDstrctNm?: string; // 침수지구명
-  damAmt?: number | null; // 피해금액
-  fldngHr?: number | null; // 침수시간
-  fldngYr?: string; // 침수년도
-  cstrnFbctnYn?: string; // 공사여부
-  atchFileSn?: number | null; // 첨부파일 일련번호
-  confArea?: number | null; // 확정면적
-  confLen?: number | null; // 확정연장
-  rainBgngTm?: string | null; // 강우시작일시
-  rainEndTm?: string | null; // 강우종료일시
-  rainTot?: number | null; // 총강우량
-  rainStr?: number | null; // 강우강도
+  fid: string;
+  fldngMapFid?: string;
+  fldngWtlvMapSn?: number | null;
+  taskClCd?: string;
+  fldngDstrNm?: string;
+  exmnYr?: string;
+  avgFldngWtlv?: number | null;
+  fldngArea?: number | null;
+  dtlOcrnCsCn?: string;
+  stdgCd?: string;
+  ctpvCd?: string;
+  sggCd?: string;
+  dataSn?: number | null;
+  bgngYmd?: string;
+  endYmd?: string;
+  fldngBgngHm?: string;
+  fldngEndHm?: string;
+  fldngCsDtlCd?: string;
+  fldngDstrctNm?: string;
+  damAmt?: number | null;
+  fldngHr?: number | null;
+  fldngYr?: string;
+  cstrnFbctnYn?: string;
+  atchFileSn?: number | null;
+  confArea?: number | null;
+  confLen?: number | null;
+  rainBgngTm?: string | null;
+  rainEndTm?: string | null;
+  rainTot?: number | null;
+  rainStr?: number | null;
 };
-
 export type FldngHstryItem = FldngHstryApiItem & {
   historyId: string;
   ctpvNm: string;
@@ -311,7 +97,6 @@ export type FldngHstryItem = FldngHstryApiItem & {
   areaRing: [number, number][];
   depthZones: FldngHstryDepthZone[];
 };
-
 export type FldngHstryTableRow = FldngHstryItem & {
   rowNo: number;
   floodYearDisplay: string;
@@ -334,7 +119,6 @@ export const FLDNG_HSTRY_DEFAULT_FILTERS: FldngHstryFilters = {
   rainStartDate: "",
   districtName: "",
 };
-
 export const FLDNG_HSTRY_DEPTH_LEGEND_ITEMS = [
   { color: "#fff27a", label: "0.0~0.5m" },
   { color: "#c2f13d", label: "0.5~1.0m" },
@@ -342,7 +126,6 @@ export const FLDNG_HSTRY_DEPTH_LEGEND_ITEMS = [
   { color: "#8f8bff", label: "2.0~5.0m" },
   { color: "#f2528b", label: "5.0m 이상" },
 ] as const;
-
 export const FLDNG_HSTRY_LIST_HEADLIST: UiHeadProps[] = [
   { id: "rowNo", title: "순번", widthPercent: 3 },
   { id: "floodYearDisplay", title: "침수\n년도", widthPercent: 4 },
@@ -356,11 +139,10 @@ export const FLDNG_HSTRY_LIST_HEADLIST: UiHeadProps[] = [
   { id: "floodHourDisplay", title: "침수시간", widthPercent: 7 },
   { id: "districtName", title: "침수지구명", widthPercent: 10 },
   { id: "avgFloodDepthDisplay", title: "평균\n침수위", widthPercent: 7 },
-  { id: "floodAreaDisplay", title: "침수\n면적\(ha)", widthPercent: 7 },
+  { id: "floodAreaDisplay", title: "침수\n면적(ha)", widthPercent: 7 },
   { id: "exmnYearDisplay", title: "조사년도", widthPercent: 6 },
   { id: "damageAmountDisplay", title: "피해금액", widthPercent: 9 },
 ];
-
 export const FLDNG_HSTRY_DOWNLOAD_HEADERS: Record<string, string> = {
   rowNo: "순번",
   floodYearDisplay: "침수년도",
@@ -380,370 +162,3 @@ export const FLDNG_HSTRY_DOWNLOAD_HEADERS: Record<string, string> = {
   exmnYearDisplay: "조사년도",
   damageAmountDisplay: "피해금액",
 };
-
-const toRadian = (degree: number) => (degree * Math.PI) / 180;
-
-const createIrregularRing = ({
-  centerX,
-  centerY,
-  radiusX,
-  radiusY,
-  scales,
-  rotationDeg = 0,
-}: {
-  centerX: number;
-  centerY: number;
-  radiusX: number;
-  radiusY: number;
-  scales: number[];
-  rotationDeg?: number;
-}): [number, number][] => {
-  const rotation = toRadian(rotationDeg);
-  const points = scales.map((scale, index) => {
-    const angle = rotation + (Math.PI * 2 * index) / scales.length;
-    const jitterX = radiusX * scale * Math.cos(angle);
-    const jitterY = radiusY * scale * Math.sin(angle);
-    return [centerX + jitterX, centerY + jitterY] as [number, number];
-  });
-
-  return points.length > 0 ? [...points, points[0]!] : [];
-};
-
-const toNumericSeed = (value: string) =>
-  Array.from(value).reduce(
-    (sum, char, index) => sum + char.charCodeAt(0) * (index + 1),
-    0,
-  );
-
-const buildGeometrySeed = (fid: string) => {
-  const seed = toNumericSeed(fid);
-  return {
-    centerX: 1050000 + (seed % 120000),
-    centerY: 1680000 + (seed % 150000),
-    width: 14000 + (seed % 9000),
-    height: 11000 + (seed % 7000),
-  };
-};
-
-const createFldngHstryDepthZones = (
-  historyId: string,
-  centerX: number,
-  centerY: number,
-): FldngHstryDepthZone[] => {
-  return [
-    {
-      zoneId: `${historyId}-depth-1`,
-      depthLabel: "0.0~0.5m",
-      color: "#fff27a",
-      ring: createIrregularRing({
-        centerX: centerX - 2600,
-        centerY: centerY - 1200,
-        radiusX: 2900,
-        radiusY: 2300,
-        rotationDeg: -18,
-        scales: [1.02, 0.78, 0.9, 1.08, 0.86, 0.72, 0.94, 1.04],
-      }),
-    },
-    {
-      zoneId: `${historyId}-depth-2`,
-      depthLabel: "0.5~1.0m",
-      color: "#c2f13d",
-      ring: createIrregularRing({
-        centerX: centerX + 1800,
-        centerY: centerY - 600,
-        radiusX: 3500,
-        radiusY: 2800,
-        rotationDeg: 12,
-        scales: [1.04, 0.88, 1.02, 0.8, 0.92, 1.08, 0.84, 0.95],
-      }),
-    },
-    {
-      zoneId: `${historyId}-depth-3`,
-      depthLabel: "1.0~2.0m",
-      color: "#67d8ff",
-      ring: createIrregularRing({
-        centerX,
-        centerY: centerY + 1800,
-        radiusX: 4700,
-        radiusY: 3900,
-        rotationDeg: 8,
-        scales: [1.12, 0.86, 0.94, 1.06, 0.82, 0.97, 1.04, 0.9, 1.08, 0.84],
-      }),
-    },
-    {
-      zoneId: `${historyId}-depth-4`,
-      depthLabel: "2.0~5.0m",
-      color: "#8f8bff",
-      ring: createIrregularRing({
-        centerX: centerX + 3200,
-        centerY: centerY + 3200,
-        radiusX: 2600,
-        radiusY: 2000,
-        rotationDeg: 26,
-        scales: [1.05, 0.82, 1.08, 0.88, 0.96, 0.78, 1.02, 0.9],
-      }),
-    },
-    {
-      zoneId: `${historyId}-depth-5`,
-      depthLabel: "5.0m 이상",
-      color: "#f2528b",
-      ring: createIrregularRing({
-        centerX: centerX + 400,
-        centerY: centerY - 3600,
-        radiusX: 1200,
-        radiusY: 1050,
-        rotationDeg: -10,
-        scales: [1.0, 0.8, 1.06, 0.84, 0.94, 0.76, 0.98],
-      }),
-    },
-  ];
-};
-
-const normalizeDate = (value?: string | null) => {
-  const source = String(value ?? "").trim();
-  if (!/^\d{8}$/.test(source)) return "";
-  return `${source.slice(0, 4)}-${source.slice(4, 6)}-${source.slice(6, 8)}`;
-};
-
-const normalizeHm = (value?: string | null) => {
-  const digits = String(value ?? "").replace(/[^0-9]/g, "");
-  if (!digits) return "";
-  if (digits.length === 1) return `0${digits}:00`;
-  if (digits.length === 2) return `${digits}:00`;
-  if (digits.length === 3)
-    return `0${digits.slice(0, 1)}:${digits.slice(1, 3)}`;
-  return `${digits.slice(0, 2)}:${digits.slice(2, 4)}`;
-};
-
-const normalizeDateTime = (value?: string | null) => {
-  const source = String(value ?? "").trim();
-  if (!source) return "";
-  if (/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}$/.test(source)) return source;
-  const date = new Date(source);
-  if (Number.isNaN(date.getTime()))
-    return source.slice(0, 16).replace("T", " ");
-  const yyyy = date.getFullYear();
-  const mm = `${date.getMonth() + 1}`.padStart(2, "0");
-  const dd = `${date.getDate()}`.padStart(2, "0");
-  const hh = `${date.getHours()}`.padStart(2, "0");
-  const mi = `${date.getMinutes()}`.padStart(2, "0");
-  return `${yyyy}-${mm}-${dd} ${hh}:${mi}`;
-};
-
-const formatNumber = (value?: number | null, digits = 1, suffix = "") => {
-  const numeric = Number(value ?? 0);
-  if (!Number.isFinite(numeric)) return `0${suffix}`;
-  return `${numeric.toFixed(digits)}${suffix}`;
-};
-
-const formatInteger = (value?: number | null, suffix = "") => {
-  const numeric = Number(value ?? 0);
-  if (!Number.isFinite(numeric)) return `0${suffix}`;
-  return `${numeric.toLocaleString("ko-KR")}${suffix}`;
-};
-
-const formatOptionalNumber = (
-  value?: number | null,
-  digits = 1,
-  suffix = "",
-) => {
-  if (value === null || value === undefined) return "-";
-  const numeric = Number(value);
-  if (!Number.isFinite(numeric)) return "-";
-  return `${numeric.toFixed(digits)}${suffix}`;
-};
-
-const buildCauseDetailName = (item: FldngHstryApiItem) => {
-  const direct = String(item.dtlOcrnCsCn ?? "").trim();
-  if (direct) return direct;
-  const code = String(item.fldngCsDtlCd ?? "").trim();
-  return code ? `원인코드 ${code}` : "-";
-};
-
-const buildGradeLabel = (avgFloodDepthM: number) => {
-  if (avgFloodDepthM >= 2) return "3등급";
-  if (avgFloodDepthM >= 1) return "2등급";
-  return "1등급";
-};
-
-export const normalizeFldngHstryFilters = (
-  filters: FldngHstryFilters,
-): FldngHstryFilters => ({
-  ctpvCd: String(filters.ctpvCd ?? "0") || "0",
-  sggCd: String(filters.sggCd ?? "0") || "0",
-  floodYear: String(filters.floodYear ?? "")
-    .replace(/[^0-9]/g, "")
-    .slice(0, 4),
-  disasterName: String(filters.disasterName ?? "").trim(),
-  rainStartDate: String(filters.rainStartDate ?? "").trim(),
-  districtName: String(filters.districtName ?? "").trim(),
-});
-
-export const buildFldngHstryYearOptions = () => {
-  const currentYear = new Date().getFullYear();
-  return Array.from({ length: 30 }, (_, index) => String(currentYear - index));
-};
-
-export const buildFldngHstryListQueryString = (
-  filters: FldngHstryFilters,
-  page: number,
-  size: number,
-) => {
-  const normalized = normalizeFldngHstryFilters(filters);
-  const params = new URLSearchParams({
-    page: String(page - 1),
-    size: String(size),
-  });
-
-  appendApiSearchParams(params, {
-    ctpvCd: normalized.ctpvCd === "0" ? "0" : normalized.ctpvCd.slice(0, 2),
-    sggCd: normalized.sggCd === "0" ? "0" : normalized.sggCd.slice(0, 5),
-    fldngYr: normalized.floodYear,
-    fldngDstrNm: normalized.disasterName,
-    rainBgngTm: normalized.rainStartDate,
-    fldngDstrctNm: normalized.districtName,
-  });
-  return params.toString();
-};
-
-export const formatFloodArea = (value: number) =>
-  Number(value ?? 0).toLocaleString("ko-KR", {
-    minimumFractionDigits: 0,
-    maximumFractionDigits: 2,
-  });
-
-export const formatFloodDepth = (value: number) => value.toFixed(2);
-
-export const attachFldngHstryGeometry = (
-  item: FldngHstryApiItem,
-): FldngHstryItem => {
-  const historyId = String(item.fid ?? "");
-  const geometrySeed = buildGeometrySeed(historyId);
-  const startDate = normalizeDate(item.bgngYmd);
-  const endDate = normalizeDate(item.endYmd);
-  const startTime = normalizeHm(item.fldngBgngHm);
-  const endTime = normalizeHm(item.fldngEndHm);
-  const avgFloodDepthM = Number(item.avgFldngWtlv ?? 0);
-  const floodAreaHa = Number(item.fldngArea ?? 0);
-
-  return {
-    ...item,
-    historyId,
-    ctpvNm: "",
-    sggNm: "",
-    floodYear: String(item.fldngYr ?? "").trim(),
-    exmnYear: String(item.exmnYr ?? "").trim(),
-    disasterName: String(item.fldngDstrNm ?? "").trim(),
-    districtName: String(item.fldngDstrctNm ?? "").trim(),
-    floodAreaHa,
-    avgFloodDepthM,
-    floodDepthM: avgFloodDepthM,
-    gradeLabel: buildGradeLabel(avgFloodDepthM),
-    startDate,
-    endDate,
-    startTime,
-    endTime,
-    floodHour: formatNumber(Number(item.fldngHr ?? 0), 1),
-    causeDetailCode: String(item.fldngCsDtlCd ?? "").trim(),
-    causeDetailName: buildCauseDetailName(item),
-    damageAmount: formatInteger(Number(item.damAmt ?? 0)),
-    rainStartDateTime: normalizeDateTime(item.rainBgngTm),
-    rainEndDateTime: normalizeDateTime(item.rainEndTm),
-    rainStartTime: normalizeDateTime(item.rainBgngTm).slice(11, 16),
-    rainEndTime: normalizeDateTime(item.rainEndTm).slice(11, 16),
-    totalRainfallMm: Number(item.rainTot ?? 0),
-    rainfallIntensityMmHr: Number(item.rainStr ?? 0),
-    areaRing: createIrregularRing({
-      centerX: geometrySeed.centerX,
-      centerY: geometrySeed.centerY,
-      radiusX: geometrySeed.width / 2,
-      radiusY: geometrySeed.height / 2,
-      rotationDeg: 9,
-      scales: [1.08, 0.9, 1.04, 0.82, 0.98, 1.12, 0.88, 0.96, 1.03, 0.86],
-    }),
-    depthZones: createFldngHstryDepthZones(
-      historyId,
-      geometrySeed.centerX,
-      geometrySeed.centerY,
-    ),
-  };
-};
-
-export const toFldngHstryTableRows = (
-  items: FldngHstryItem[],
-  page: number,
-  pageSize = FLDNG_HSTRY_PAGE_SIZE,
-): FldngHstryTableRow[] =>
-  items.map((item, index) => ({
-    ...item,
-    rowNo: (page - 1) * pageSize + index + 1,
-    floodYearDisplay: item.floodYear || "-",
-    floodHourDisplay: item.floodHour || "-",
-    avgFloodDepthDisplay: formatFloodDepth(item.avgFloodDepthM),
-    floodAreaDisplay: formatFloodArea(item.floodAreaHa),
-    exmnYearDisplay: item.exmnYear || "-",
-    damageAmountDisplay: item.damageAmount || "-",
-    rainBgngTmDisplay: item.rainStartDateTime || "-",
-    rainEndTmDisplay: item.rainEndDateTime || "-",
-    rainTotDisplay: formatOptionalNumber(item.rainTot, 1),
-    rainStrDisplay: formatOptionalNumber(item.rainStr, 1),
-  }));
-
-const resolveFldngHstryNodeName = (node: any) =>
-  String(
-    node?.text ??
-      node?.data?.lyrNm ??
-      node?.data?.name ??
-      node?.lyrNm ??
-      node?.name ??
-      "",
-  ).trim();
-
-const resolveFldngHstryLayerType = (node: any) =>
-  String(
-    node?.data?.lyrTyNm ??
-      node?.data?.lyrTypeNm ??
-      node?.lyrTyNm ??
-      node?.lyrTypeNm ??
-      "",
-  ).trim();
-
-export const isFldngHstryNode = (node: any) => {
-  const name = resolveFldngHstryNodeName(node);
-  const layerType = resolveFldngHstryLayerType(node);
-  return (
-    name === FLOOD_HISTORY_LAYER_NAME ||
-    name === FLOOD_HISTORY_DEPTH_LAYER_NAME ||
-    layerType === FLOOD_HISTORY_LAYER_TYPE ||
-    layerType === FLOOD_HISTORY_DEPTH_LAYER_TYPE ||
-    layerType === FLOOD_HISTORY_PREVIEW_LAYER_TYPE
-  );
-};
-
-/** 침수흔적위선 체크 상태를 심선과 분리해 판별한다. */
-export const isFloodHistoryWaterLevelNode = (node: any) => {
-  const name = resolveFldngHstryNodeName(node);
-  const layerType = resolveFldngHstryLayerType(node);
-  return (
-    name === FLOOD_HISTORY_LAYER_NAME || layerType === FLOOD_HISTORY_LAYER_TYPE
-  );
-};
-
-/** 침수흔적심선 체크 상태를 위선과 분리해 판별한다. */
-export const isFloodHistoryDepthNode = (node: any) => {
-  const name = resolveFldngHstryNodeName(node);
-  const layerType = resolveFldngHstryLayerType(node);
-  return (
-    name === FLOOD_HISTORY_DEPTH_LAYER_NAME ||
-    layerType === FLOOD_HISTORY_DEPTH_LAYER_TYPE
-  );
-};
-
-export const isFldngHstryRootNode = (node: any) =>
-  resolveFldngHstryNodeName(node) === FLOOD_HISTORY_ROOT_NAME;
-
-export const isFloodHistoryNode = isFldngHstryNode;
-export const FLOOD_HISTORY_ROW_SELECT_MESSAGE = FLDNG_HSTRY_ROW_SELECT_MESSAGE;
-export const FLOOD_HISTORY_PAGE_SIZE = FLDNG_HSTRY_PAGE_SIZE;
-export const FLOOD_HISTORY_DOWNLOAD_BATCH_SIZE =
-  FLDNG_HSTRY_DOWNLOAD_BATCH_SIZE;
diff --git a/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryUtils.ts b/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryUtils.ts
new file mode 100644
index 000000000..d28e0d43a
--- /dev/null
+++ b/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryUtils.ts
@@ -0,0 +1,440 @@
+/** 침수흔적 검색조건·표시값·geometry·레이어 판별 변환을 제공한다. */
+
+import { appendApiSearchParams } from "@/shared/util/util";
+
+import {
+  FLDNG_HSTRY_PAGE_SIZE,
+  FLDNG_HSTRY_DEPTH_LAYER_NAME,
+  FLDNG_HSTRY_DEPTH_LAYER_TYPE,
+  FLDNG_HSTRY_LAYER_NAME,
+  FLDNG_HSTRY_LAYER_TYPE,
+  FLDNG_HSTRY_MIN_YEAR,
+  FLDNG_HSTRY_PREVIEW_LAYER_TYPE,
+  FLDNG_HSTRY_ROOT_NAME,
+  type FldngHstryApiItem,
+  type FldngHstryDepthZone,
+  type FldngHstryFilters,
+  type FldngHstryItem,
+  type FldngHstryTableRow,
+  type FldngHstryYearRange,
+} from "./fldngHstryTypes";
+
+export const normalizeFldngHstryWtlvDisplayId = (value: unknown) => {
+  const normalized = String(value ?? "").trim();
+  const prefix = `${FLDNG_HSTRY_LAYER_TYPE}.`;
+  return normalized.startsWith(prefix)
+    ? normalized.slice(prefix.length)
+    : normalized;
+};
+
+export const normalizeFldngHstryWtlvApiFid = (value: unknown) => {
+  const normalized = String(value ?? "").trim();
+  return normalized ? normalizeFldngHstryWtlvDisplayId(normalized) : "";
+};
+
+export const formatFldngHstryDateTime = (
+  dateValue: unknown,
+  timeValue: unknown,
+) => {
+  const rawDate = String(dateValue ?? "").trim();
+  const rawTime = String(timeValue ?? "").trim();
+  const normalizedDate = /^\d{8}$/.test(rawDate)
+    ? `${rawDate.slice(0, 4)}-${rawDate.slice(4, 6)}-${rawDate.slice(6, 8)}`
+    : rawDate;
+  const timeDigits = rawTime.replace(/[^0-9]/g, "");
+  const normalizedTime = !timeDigits
+    ? ""
+    : timeDigits.length <= 2
+      ? `${timeDigits.padStart(2, "0")}:00`
+      : `${timeDigits.padStart(4, "0").slice(0, 2)}:${timeDigits.padStart(4, "0").slice(2, 4)}`;
+  return [normalizedDate, normalizedTime].filter(Boolean).join(" ");
+};
+
+export const buildFldngHstryDefaultYearRange = (
+  currentYear = new Date().getFullYear(),
+): FldngHstryYearRange => ({
+  startYear: String(FLDNG_HSTRY_MIN_YEAR),
+  endYear: String(currentYear),
+});
+
+export const normalizeFldngHstryYearRange = (
+  range?: Partial<FldngHstryYearRange> | null,
+  fallback: FldngHstryYearRange = buildFldngHstryDefaultYearRange(),
+): FldngHstryYearRange => {
+  const normalizeYear = (value: unknown) =>
+    String(value ?? "")
+      .replace(/[^0-9]/g, "")
+      .slice(0, 4);
+  const startYear = normalizeYear(range?.startYear);
+  const endYear = normalizeYear(range?.endYear);
+  return {
+    startYear: /^\d{4}$/.test(startYear) ? startYear : fallback.startYear,
+    endYear: /^\d{4}$/.test(endYear) ? endYear : fallback.endYear,
+  };
+};
+
+export const buildFldngHstryYearCql = (
+  range: FldngHstryYearRange,
+  enabled: boolean,
+) => {
+  if (!enabled) return "";
+  const normalized = normalizeFldngHstryYearRange(range);
+  return `(fldng_yr >= '${normalized.startYear}' AND fldng_yr <= '${normalized.endYear}')`;
+};
+
+const toRadian = (degree: number) => (degree * Math.PI) / 180;
+
+const createIrregularRing = ({
+  centerX,
+  centerY,
+  radiusX,
+  radiusY,
+  scales,
+  rotationDeg = 0,
+}: {
+  centerX: number;
+  centerY: number;
+  radiusX: number;
+  radiusY: number;
+  scales: number[];
+  rotationDeg?: number;
+}): [number, number][] => {
+  const rotation = toRadian(rotationDeg);
+  const points = scales.map((scale, index) => {
+    const angle = rotation + (Math.PI * 2 * index) / scales.length;
+    return [
+      centerX + radiusX * scale * Math.cos(angle),
+      centerY + radiusY * scale * Math.sin(angle),
+    ] as [number, number];
+  });
+  return points.length > 0 ? [...points, points[0]!] : [];
+};
+
+const toNumericSeed = (value: string) =>
+  Array.from(value).reduce(
+    (sum, char, index) => sum + char.charCodeAt(0) * (index + 1),
+    0,
+  );
+
+const buildGeometrySeed = (fid: string) => {
+  const seed = toNumericSeed(fid);
+  return {
+    centerX: 1050000 + (seed % 120000),
+    centerY: 1680000 + (seed % 150000),
+    width: 14000 + (seed % 9000),
+    height: 11000 + (seed % 7000),
+  };
+};
+
+const createFldngHstryDepthZones = (
+  historyId: string,
+  centerX: number,
+  centerY: number,
+): FldngHstryDepthZone[] => [
+  {
+    zoneId: `${historyId}-depth-1`,
+    depthLabel: "0.0~0.5m",
+    color: "#fff27a",
+    ring: createIrregularRing({
+      centerX: centerX - 2600,
+      centerY: centerY - 1200,
+      radiusX: 2900,
+      radiusY: 2300,
+      rotationDeg: -18,
+      scales: [1.02, 0.78, 0.9, 1.08, 0.86, 0.72, 0.94, 1.04],
+    }),
+  },
+  {
+    zoneId: `${historyId}-depth-2`,
+    depthLabel: "0.5~1.0m",
+    color: "#c2f13d",
+    ring: createIrregularRing({
+      centerX: centerX + 1800,
+      centerY: centerY - 600,
+      radiusX: 3500,
+      radiusY: 2800,
+      rotationDeg: 12,
+      scales: [1.04, 0.88, 1.02, 0.8, 0.92, 1.08, 0.84, 0.95],
+    }),
+  },
+  {
+    zoneId: `${historyId}-depth-3`,
+    depthLabel: "1.0~2.0m",
+    color: "#67d8ff",
+    ring: createIrregularRing({
+      centerX,
+      centerY: centerY + 1800,
+      radiusX: 4700,
+      radiusY: 3900,
+      rotationDeg: 8,
+      scales: [1.12, 0.86, 0.94, 1.06, 0.82, 0.97, 1.04, 0.9, 1.08, 0.84],
+    }),
+  },
+  {
+    zoneId: `${historyId}-depth-4`,
+    depthLabel: "2.0~5.0m",
+    color: "#8f8bff",
+    ring: createIrregularRing({
+      centerX: centerX + 3200,
+      centerY: centerY + 3200,
+      radiusX: 2600,
+      radiusY: 2000,
+      rotationDeg: 26,
+      scales: [1.05, 0.82, 1.08, 0.88, 0.96, 0.78, 1.02, 0.9],
+    }),
+  },
+  {
+    zoneId: `${historyId}-depth-5`,
+    depthLabel: "5.0m 이상",
+    color: "#f2528b",
+    ring: createIrregularRing({
+      centerX: centerX + 400,
+      centerY: centerY - 3600,
+      radiusX: 1200,
+      radiusY: 1050,
+      rotationDeg: -10,
+      scales: [1, 0.8, 1.06, 0.84, 0.94, 0.76, 0.98],
+    }),
+  },
+];
+
+const normalizeDate = (value?: string | null) => {
+  const source = String(value ?? "").trim();
+  return /^\d{8}$/.test(source)
+    ? `${source.slice(0, 4)}-${source.slice(4, 6)}-${source.slice(6, 8)}`
+    : "";
+};
+
+const normalizeHm = (value?: string | null) => {
+  const digits = String(value ?? "").replace(/[^0-9]/g, "");
+  if (!digits) return "";
+  if (digits.length === 1) return `0${digits}:00`;
+  if (digits.length === 2) return `${digits}:00`;
+  if (digits.length === 3)
+    return `0${digits.slice(0, 1)}:${digits.slice(1, 3)}`;
+  return `${digits.slice(0, 2)}:${digits.slice(2, 4)}`;
+};
+
+const normalizeDateTime = (value?: string | null) => {
+  const source = String(value ?? "").trim();
+  if (!source) return "";
+  if (/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}$/.test(source)) return source;
+  const date = new Date(source);
+  if (Number.isNaN(date.getTime()))
+    return source.slice(0, 16).replace("T", " ");
+  const yyyy = date.getFullYear();
+  const mm = `${date.getMonth() + 1}`.padStart(2, "0");
+  const dd = `${date.getDate()}`.padStart(2, "0");
+  const hh = `${date.getHours()}`.padStart(2, "0");
+  const mi = `${date.getMinutes()}`.padStart(2, "0");
+  return `${yyyy}-${mm}-${dd} ${hh}:${mi}`;
+};
+
+const formatNumber = (value?: number | null, digits = 1, suffix = "") => {
+  const numeric = Number(value ?? 0);
+  return Number.isFinite(numeric)
+    ? `${numeric.toFixed(digits)}${suffix}`
+    : `0${suffix}`;
+};
+
+const formatInteger = (value?: number | null, suffix = "") => {
+  const numeric = Number(value ?? 0);
+  return Number.isFinite(numeric)
+    ? `${numeric.toLocaleString("ko-KR")}${suffix}`
+    : `0${suffix}`;
+};
+
+const formatOptionalNumber = (
+  value?: number | null,
+  digits = 1,
+  suffix = "",
+) => {
+  if (value === null || value === undefined) return "-";
+  const numeric = Number(value);
+  return Number.isFinite(numeric) ? `${numeric.toFixed(digits)}${suffix}` : "-";
+};
+
+const buildCauseDetailName = (item: FldngHstryApiItem) => {
+  const direct = String(item.dtlOcrnCsCn ?? "").trim();
+  if (direct) return direct;
+  const code = String(item.fldngCsDtlCd ?? "").trim();
+  return code ? `원인코드 ${code}` : "-";
+};
+
+const buildGradeLabel = (avgFloodDepthM: number) => {
+  if (avgFloodDepthM >= 2) return "3등급";
+  if (avgFloodDepthM >= 1) return "2등급";
+  return "1등급";
+};
+
+export const normalizeFldngHstryFilters = (
+  filters: FldngHstryFilters,
+): FldngHstryFilters => ({
+  ctpvCd: String(filters.ctpvCd ?? "0") || "0",
+  sggCd: String(filters.sggCd ?? "0") || "0",
+  floodYear: String(filters.floodYear ?? "")
+    .replace(/[^0-9]/g, "")
+    .slice(0, 4),
+  disasterName: String(filters.disasterName ?? "").trim(),
+  rainStartDate: String(filters.rainStartDate ?? "").trim(),
+  districtName: String(filters.districtName ?? "").trim(),
+});
+
+export const buildFldngHstryYearOptions = () => {
+  const currentYear = new Date().getFullYear();
+  return Array.from({ length: 30 }, (_, index) => String(currentYear - index));
+};
+
+export const buildFldngHstryListQueryString = (
+  filters: FldngHstryFilters,
+  page: number,
+  size: number,
+) => {
+  const normalized = normalizeFldngHstryFilters(filters);
+  const params = new URLSearchParams({
+    page: String(page - 1),
+    size: String(size),
+  });
+  appendApiSearchParams(params, {
+    ctpvCd: normalized.ctpvCd === "0" ? "0" : normalized.ctpvCd.slice(0, 2),
+    sggCd: normalized.sggCd === "0" ? "0" : normalized.sggCd.slice(0, 5),
+    fldngYr: normalized.floodYear,
+    fldngDstrNm: normalized.disasterName,
+    rainBgngTm: normalized.rainStartDate,
+    fldngDstrctNm: normalized.districtName,
+  });
+  return params.toString();
+};
+
+export const formatFldngHstryArea = (value: number) =>
+  Number(value ?? 0).toLocaleString("ko-KR", {
+    minimumFractionDigits: 0,
+    maximumFractionDigits: 2,
+  });
+
+export const formatFldngHstryDepth = (value: number) => value.toFixed(2);
+
+export const attachFldngHstryGeometry = (
+  item: FldngHstryApiItem,
+): FldngHstryItem => {
+  const historyId = String(item.fid ?? "");
+  const geometrySeed = buildGeometrySeed(historyId);
+  const startDate = normalizeDate(item.bgngYmd);
+  const endDate = normalizeDate(item.endYmd);
+  const startTime = normalizeHm(item.fldngBgngHm);
+  const endTime = normalizeHm(item.fldngEndHm);
+  const avgFloodDepthM = Number(item.avgFldngWtlv ?? 0);
+  const floodAreaHa = Number(item.fldngArea ?? 0);
+  return {
+    ...item,
+    historyId,
+    ctpvNm: "",
+    sggNm: "",
+    floodYear: String(item.fldngYr ?? "").trim(),
+    exmnYear: String(item.exmnYr ?? "").trim(),
+    disasterName: String(item.fldngDstrNm ?? "").trim(),
+    districtName: String(item.fldngDstrctNm ?? "").trim(),
+    floodAreaHa,
+    avgFloodDepthM,
+    floodDepthM: avgFloodDepthM,
+    gradeLabel: buildGradeLabel(avgFloodDepthM),
+    startDate,
+    endDate,
+    startTime,
+    endTime,
+    floodHour: formatNumber(Number(item.fldngHr ?? 0), 1),
+    causeDetailCode: String(item.fldngCsDtlCd ?? "").trim(),
+    causeDetailName: buildCauseDetailName(item),
+    damageAmount: formatInteger(Number(item.damAmt ?? 0)),
+    rainStartDateTime: normalizeDateTime(item.rainBgngTm),
+    rainEndDateTime: normalizeDateTime(item.rainEndTm),
+    rainStartTime: normalizeDateTime(item.rainBgngTm).slice(11, 16),
+    rainEndTime: normalizeDateTime(item.rainEndTm).slice(11, 16),
+    totalRainfallMm: Number(item.rainTot ?? 0),
+    rainfallIntensityMmHr: Number(item.rainStr ?? 0),
+    areaRing: createIrregularRing({
+      centerX: geometrySeed.centerX,
+      centerY: geometrySeed.centerY,
+      radiusX: geometrySeed.width / 2,
+      radiusY: geometrySeed.height / 2,
+      rotationDeg: 9,
+      scales: [1.08, 0.9, 1.04, 0.82, 0.98, 1.12, 0.88, 0.96, 1.03, 0.86],
+    }),
+    depthZones: createFldngHstryDepthZones(
+      historyId,
+      geometrySeed.centerX,
+      geometrySeed.centerY,
+    ),
+  };
+};
+
+export const toFldngHstryTableRows = (
+  items: FldngHstryItem[],
+  page: number,
+  pageSize = FLDNG_HSTRY_PAGE_SIZE,
+): FldngHstryTableRow[] =>
+  items.map((item, index) => ({
+    ...item,
+    rowNo: (page - 1) * pageSize + index + 1,
+    floodYearDisplay: item.floodYear || "-",
+    floodHourDisplay: item.floodHour || "-",
+    avgFloodDepthDisplay: formatFldngHstryDepth(item.avgFloodDepthM),
+    floodAreaDisplay: formatFldngHstryArea(item.floodAreaHa),
+    exmnYearDisplay: item.exmnYear || "-",
+    damageAmountDisplay: item.damageAmount || "-",
+    rainBgngTmDisplay: item.rainStartDateTime || "-",
+    rainEndTmDisplay: item.rainEndDateTime || "-",
+    rainTotDisplay: formatOptionalNumber(item.rainTot, 1),
+    rainStrDisplay: formatOptionalNumber(item.rainStr, 1),
+  }));
+
+const resolveFldngHstryNodeName = (node: any) =>
+  String(
+    node?.text ??
+      node?.data?.lyrNm ??
+      node?.data?.name ??
+      node?.lyrNm ??
+      node?.name ??
+      "",
+  ).trim();
+
+const resolveFldngHstryLayerType = (node: any) =>
+  String(
+    node?.data?.lyrTyNm ??
+      node?.data?.lyrTypeNm ??
+      node?.lyrTyNm ??
+      node?.lyrTypeNm ??
+      "",
+  ).trim();
+
+export const isFldngHstryNode = (node: any) => {
+  const name = resolveFldngHstryNodeName(node);
+  const layerType = resolveFldngHstryLayerType(node);
+  return (
+    name === FLDNG_HSTRY_LAYER_NAME ||
+    name === FLDNG_HSTRY_DEPTH_LAYER_NAME ||
+    layerType === FLDNG_HSTRY_LAYER_TYPE ||
+    layerType === FLDNG_HSTRY_DEPTH_LAYER_TYPE ||
+    layerType === FLDNG_HSTRY_PREVIEW_LAYER_TYPE
+  );
+};
+
+export const isFldngHstryWtlvNode = (node: any) => {
+  const name = resolveFldngHstryNodeName(node);
+  const layerType = resolveFldngHstryLayerType(node);
+  return (
+    name === FLDNG_HSTRY_LAYER_NAME || layerType === FLDNG_HSTRY_LAYER_TYPE
+  );
+};
+
+export const isFldngHstryDepthNode = (node: any) => {
+  const name = resolveFldngHstryNodeName(node);
+  const layerType = resolveFldngHstryLayerType(node);
+  return (
+    name === FLDNG_HSTRY_DEPTH_LAYER_NAME ||
+    layerType === FLDNG_HSTRY_DEPTH_LAYER_TYPE
+  );
+};
+
+export const isFldngHstryRootNode = (node: any) =>
+  resolveFldngHstryNodeName(node) === FLDNG_HSTRY_ROOT_NAME;
diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/featureClickEventPopup.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/featureClickEventPopup.tsx
index 3d2a2c5c5..5aa1622fa 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/featureClickEventPopup.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/featureClickEventPopup.tsx
@@ -71,10 +71,11 @@ import { useConfirm } from "@frontend-opensource/use-react-hooks";
 import useStore from "@/store/useStore";
 import ExmnSurveyResultSection from "../exmn/ExmnSurveyResultSection";
 import {
-  loadFldngHstryDetail,
-  showFldngHstryFeature,
-  type FldngHstryDetailCacheValue,
-} from "../fldngHstry/fldngHstryTypes";
+  formatFldngHstryDateTime,
+  normalizeFldngHstryWtlvApiFid,
+  normalizeFldngHstryWtlvDisplayId,
+} from "../fldngHstry/fldngHstryUtils";
+import { useFldngHstryFeatureClick } from "../fldngHstry/FldngHstryFeatureClick";
 
 const linkedFacilityHighlightStyle = new Style({
   image: new CircleStyle({
@@ -97,39 +98,6 @@ const linkedFacilityHighlightStyle = new Style({
   zIndex: 9999,
 });
 
-const normalizeFldngWtlvMapDisplayId = (value: unknown) => {
-  const normalized = String(value ?? "").trim();
-  const prefix = "tb_ms_fldng_wtlv_map.";
-  return normalized.startsWith(prefix)
-    ? normalized.slice(prefix.length)
-    : normalized;
-};
-
-const normalizeFldngWtlvMapApiFid = (value: unknown) => {
-  const normalized = String(value ?? "").trim();
-  if (!normalized) return "";
-  return normalizeFldngWtlvMapDisplayId(normalized);
-};
-
-// 침수흔적도 침수시작일시, 침수종료일시 한줄로 보이도록
-const formatFldngWtlvDateTime = (dateValue: unknown, timeValue: unknown) => {
-  const rawDate = String(dateValue ?? "").trim();
-  const rawTime = String(timeValue ?? "").trim();
-
-  const normalizedDate = /^\d{8}$/.test(rawDate)
-    ? `${rawDate.slice(0, 4)}-${rawDate.slice(4, 6)}-${rawDate.slice(6, 8)}`
-    : rawDate;
-
-  const timeDigits = rawTime.replace(/[^0-9]/g, "");
-  const normalizedTime = !timeDigits
-    ? ""
-    : timeDigits.length <= 2
-      ? `${timeDigits.padStart(2, "0")}:00`
-      : `${timeDigits.padStart(4, "0").slice(0, 2)}:${timeDigits.padStart(4, "0").slice(2, 4)}`;
-
-  return [normalizedDate, normalizedTime].filter(Boolean).join(" ");
-};
-
 type MngInstOption = {
   mngInstCd: string;
   lwrInstNm: string;
@@ -174,24 +142,13 @@ const FeatureClickEventPopup = ({
   const flowDirectionBasisRequestCacheRef = useRef(
     new Map<string, Promise<any | null>>(),
   );
-  const fldngHstryDetailCacheRef = useRef(
-    new Map<string, Promise<FldngHstryDetailCacheValue>>(),
-  );
   const [mngInstOptions, setMngInstOptions] = useState<MngInstOption[]>([]);
-  const [floodDepthRows, setFloodDepthRows] = useState<
-    Record<string, unknown>[]
-  >([]);
-  const [floodWtlvRows, setFloodWtlvRows] = useState<Record<string, unknown>[]>(
-    [],
-  );
-  const [selectedFloodDepthFid, setSelectedFloodDepthFid] = useState<
-    string | null
-  >(null);
-  const [selectedFloodWtlvFid, setSelectedFloodWtlvFid] = useState<
-    string | null
-  >(null);
-  const floodDepthYearListRef = useRef<HTMLDivElement>(null);
-  const floodWtlvListRef = useRef<HTMLDivElement>(null);
+  const {
+    hasFldngHstryLinkedFeatures,
+    fldngHstryFeatureClickHeadName,
+    loadFldngHstryFeatureClickDetail,
+    resetFldngHstryFeatureClick,
+  } = useFldngHstryFeatureClick();
   const { ctpv, sgg, fetchCtpv, fetchSgg } = useStore();
 
   // 🎯 관로관리번호 추출
@@ -483,7 +440,7 @@ const FeatureClickEventPopup = ({
           result = "침수흔적위선";
           setHeadlist(FldngWtlvMapCol);
           setLayerSpecificNm(
-            normalizeFldngWtlvMapDisplayId(
+            normalizeFldngHstryWtlvDisplayId(
               featureData.values_.fid ?? featureId,
             ),
           );
@@ -563,7 +520,7 @@ const FeatureClickEventPopup = ({
         case "tb_ms_fldng_wtlv_map": {
           result = "침수흔적위선";
           setHeadlist(FldngWtlvMapCol2);
-          setLayerSpecificNm(normalizeFldngWtlvMapDisplayId(featureData.fid));
+          setLayerSpecificNm(normalizeFldngHstryWtlvDisplayId(featureData.fid));
           break;
         }
         case "tb_ms_fldng_dpth_map": {
@@ -637,7 +594,7 @@ const FeatureClickEventPopup = ({
           formatDisplayData(normalizedRegionData),
         );
         if (selectedLayerName === "침수흔적위선") {
-          const fldngBgngDtm = formatFldngWtlvDateTime(
+          const fldngBgngDtm = formatFldngHstryDateTime(
             formattedData.bgngYmd ??
               formattedData.bgng_ymd ??
               data.bgngYmd ??
@@ -647,7 +604,7 @@ const FeatureClickEventPopup = ({
               data.fldngBgngHm ??
               data.fldng_bgng_hm,
           );
-          const fldngEndDtm = formatFldngWtlvDateTime(
+          const fldngEndDtm = formatFldngHstryDateTime(
             formattedData.endYmd ??
               formattedData.end_ymd ??
               data.endYmd ??
@@ -850,41 +807,20 @@ const FeatureClickEventPopup = ({
         }
 
         if (selectedLayerName === "침수흔적위선" && featureId) {
-          setFloodDepthRows([]);
-          setFloodWtlvRows([]);
-          setSelectedFloodDepthFid(null);
-          setSelectedFloodWtlvFid(null);
-          const fldngHstryFid = normalizeFldngWtlvMapApiFid(featureId);
+          resetFldngHstryFeatureClick();
+          const fldngHstryFid = normalizeFldngHstryWtlvApiFid(featureId);
           if (!fldngHstryFid) {
             throw new Error("침수흔적도 fid가 비어 있습니다.");
           }
 
-          const fldngHstryCacheKey = `tb_ms_fldng_wtlv_map:${fldngHstryFid}`;
-          let fldngHstryDetailRequest =
-            fldngHstryDetailCacheRef.current.get(fldngHstryCacheKey);
-          if (!fldngHstryDetailRequest) {
-            fldngHstryDetailRequest = loadFldngHstryDetail(fldngHstryFid);
-            fldngHstryDetailCacheRef.current.set(
-              fldngHstryCacheKey,
-              fldngHstryDetailRequest,
-            );
-          }
-
-          const fldngHstryDetail = await fldngHstryDetailRequest;
-          if (!fldngHstryDetail.complete) {
-            fldngHstryDetailCacheRef.current.delete(fldngHstryCacheKey);
-          }
+          const fldngHstryDetail =
+            await loadFldngHstryFeatureClickDetail(fldngHstryFid);
           const mergedFldngHstryData = {
             ...formattedData,
             ...fldngHstryDetail.rainAnalysis,
           };
           setFetchData(mergedFldngHstryData);
           setTableData(mergedFldngHstryData);
-          setFloodDepthRows(fldngHstryDetail.depthRows);
-          setFloodWtlvRows(fldngHstryDetail.waterLevelRows);
-          // 최초에는 연계 항목을 선택하지 않고 버튼 목록만 표시한다.
-          setSelectedFloodDepthFid(null);
-          setSelectedFloodWtlvFid(null);
         }
       } catch (error) {
         console.error("데이터 로딩 중 오류:", error);
@@ -1089,156 +1025,8 @@ const FeatureClickEventPopup = ({
       >
         <VerticalTable
           headName={
-            layerNm === "침수흔적위선" &&
-            (floodDepthRows.length > 0 || floodWtlvRows.length > 0) ? (
-              <div className="flex w-full min-w-0 flex-col items-start gap-2">
-                <span>기본정보</span>
-                {floodDepthRows.length > 0 && (
-                  <div className="flex w-full items-center gap-1">
-                    <span className="w-9 shrink-0 text-[1.1rem] font-semibold">
-                      심선
-                    </span>
-                    <button
-                      type="button"
-                      aria-label="이전 연도"
-                      className="shrink-0 px-1 text-lg leading-none text-foreground"
-                      onClick={() =>
-                        floodDepthYearListRef.current?.scrollBy({
-                          left: -120,
-                          behavior: "smooth",
-                        })
-                      }
-                    >
-                      ‹
-                    </button>
-                    <div
-                      ref={floodDepthYearListRef}
-                      className="flex min-w-0 flex-1 gap-2 overflow-x-auto whitespace-nowrap [scrollbar-width:none] [&::-webkit-scrollbar]:hidden"
-                    >
-                      {[...floodDepthRows]
-                        .map((row, index) => ({
-                          row,
-                          index,
-                          year: String(
-                            row.fldng_yr ?? row.fldngYr ?? row.yr ?? "",
-                          ).trim(),
-                        }))
-                        .filter(({ year }) => Boolean(year))
-                        .sort((left, right) => {
-                          const yearOrder = left.year.localeCompare(
-                            right.year,
-                            undefined,
-                            { numeric: true },
-                          );
-                          return yearOrder !== 0
-                            ? yearOrder
-                            : left.index - right.index;
-                        })
-                        .map(({ row, index, year }) => (
-                          <button
-                            key={`${String(row.fldng_dpth_map_sn ?? row.fid ?? "row")}-${index}`}
-                            type="button"
-                            onClick={async () => {
-                              const depthFid = String(
-                                row.fldng_dpth_map_sn ?? row.fid ?? "",
-                              ).trim();
-                              if (depthFid) {
-                                setSelectedFloodDepthFid(depthFid);
-                                setSelectedFloodWtlvFid(null);
-                                const core = GisApp.Module.layer as any;
-                                await showFldngHstryFeature(
-                                  core,
-                                  "tb_ms_fldng_dpth_map",
-                                  `tb_ms_fldng_dpth_map.${depthFid.replace(/^tb_ms_fldng_dpth_map\./, "")}`,
-                                );
-                              }
-                            }}
-                            className={`shrink-0 rounded border px-3 py-1 text-[1.2rem] font-medium leading-5 ${selectedFloodDepthFid === String(row.fldng_dpth_map_sn ?? row.fid ?? "").trim() ? "border-blue-600 bg-white text-blue-700" : "border-border bg-muted text-muted-foreground"}`}
-                          >
-                            {year}년
-                          </button>
-                        ))}
-                    </div>
-                    <button
-                      type="button"
-                      aria-label="다음 연도"
-                      className="shrink-0 px-1 text-lg leading-none text-foreground"
-                      onClick={() =>
-                        floodDepthYearListRef.current?.scrollBy({
-                          left: 120,
-                          behavior: "smooth",
-                        })
-                      }
-                    >
-                      ›
-                    </button>
-                  </div>
-                )}
-                {floodWtlvRows.length > 0 && (
-                  <div className="flex w-full items-center gap-1">
-                    <span className="w-9 shrink-0 text-[1.1rem] font-semibold">
-                      위선
-                    </span>
-                    <button
-                      type="button"
-                      aria-label="이전 위선"
-                      className="shrink-0 px-1 text-lg leading-none text-foreground"
-                      onClick={() =>
-                        floodWtlvListRef.current?.scrollBy({
-                          left: -120,
-                          behavior: "smooth",
-                        })
-                      }
-                    >
-                      ‹
-                    </button>
-                    <div
-                      ref={floodWtlvListRef}
-                      className="flex min-w-0 flex-1 gap-2 overflow-x-auto whitespace-nowrap [scrollbar-width:none] [&::-webkit-scrollbar]:hidden"
-                    >
-                      {floodWtlvRows.map((row, index) => {
-                        const waterLevelFid = String(row.fid ?? "").trim();
-                        const disasterName = String(
-                          row.fldng_dstr_nm ?? row.fldngDstrNm ?? "",
-                        ).trim();
-                        return (
-                          <button
-                            key={`${waterLevelFid || "wtlv"}-${index}`}
-                            type="button"
-                            onClick={async () => {
-                              if (!waterLevelFid) return;
-                              setSelectedFloodWtlvFid(waterLevelFid);
-                              setSelectedFloodDepthFid(null);
-                              const core = GisApp.Module.layer as any;
-                              await showFldngHstryFeature(
-                                core,
-                                "tb_ms_fldng_wtlv_map",
-                                `tb_ms_fldng_wtlv_map.${waterLevelFid.replace(/^tb_ms_fldng_wtlv_map\./, "")}`,
-                              );
-                            }}
-                            className={`shrink-0 rounded border px-3 py-1 text-[1.2rem] font-medium leading-5 ${selectedFloodWtlvFid === waterLevelFid ? "border-blue-600 bg-white text-blue-700" : "border-border bg-muted text-muted-foreground"}`}
-                          >
-                            {disasterName || "재해명 없음"}
-                          </button>
-                        );
-                      })}
-                    </div>
-                    <button
-                      type="button"
-                      aria-label="다음 위선"
-                      className="shrink-0 px-1 text-lg leading-none text-foreground"
-                      onClick={() =>
-                        floodWtlvListRef.current?.scrollBy({
-                          left: 120,
-                          behavior: "smooth",
-                        })
-                      }
-                    >
-                      ›
-                    </button>
-                  </div>
-                )}
-              </div>
+            layerNm === "침수흔적위선" && hasFldngHstryLinkedFeatures ? (
+              fldngHstryFeatureClickHeadName
             ) : layerNm === "하수관로" && tableData?.elapsedYears ? (
               <>
                 기본정보{" "}
diff --git a/apps/sn/app/(map-layout)/map/page.tsx b/apps/sn/app/(map-layout)/map/page.tsx
index 71d22ff65..d181460cf 100644
--- a/apps/sn/app/(map-layout)/map/page.tsx
+++ b/apps/sn/app/(map-layout)/map/page.tsx
@@ -145,23 +145,25 @@ import {
   type SinkholeYearRange,
 } from "./components/sinkhole/sinkholeTypes";
 import {
-  FLOOD_HISTORY_AREA_LAYER_ID,
-  FLOOD_HISTORY_DEPTH_LAYER_NAME,
-  FLOOD_HISTORY_DEPTH_LAYER_TYPE,
-  FLOOD_HISTORY_DEPTH_LAYER_ID,
-  FLOOD_HISTORY_PREVIEW_LAYER_TYPE,
-  FLOOD_HISTORY_LAYER_TYPE,
-  FLOOD_HISTORY_LAYER_NAME,
-  FLOOD_HISTORY_POPUP_KEY,
+  FLDNG_HSTRY_AREA_LAYER_ID,
+  FLDNG_HSTRY_DEPTH_LAYER_NAME,
+  FLDNG_HSTRY_DEPTH_LAYER_TYPE,
+  FLDNG_HSTRY_DEPTH_LAYER_ID,
+  FLDNG_HSTRY_PREVIEW_LAYER_TYPE,
+  FLDNG_HSTRY_LAYER_TYPE,
+  FLDNG_HSTRY_LAYER_NAME,
+  FLDNG_HSTRY_POPUP_KEY,
   FLDNG_HSTRY_ROW_SELECT_MESSAGE,
-  buildFloodHistoryDefaultYearRange,
-  buildFloodHistoryYearCql,
-  isFloodHistoryDepthNode,
-  isFloodHistoryWaterLevelNode,
-  isFldngHstryRootNode,
-  type FloodHistoryYearRange,
+  type FldngHstryYearRange,
   type FldngHstryItem,
 } from "./components/fldngHstry/fldngHstryTypes";
+import {
+  buildFldngHstryDefaultYearRange,
+  buildFldngHstryYearCql,
+  isFldngHstryDepthNode,
+  isFldngHstryWtlvNode,
+  isFldngHstryRootNode,
+} from "./components/fldngHstry/fldngHstryUtils";
 import {
   SBMRG_DNGR_MAP_POPUP_KEY,
   isSbmrgDngrMapRootNode,
@@ -268,7 +270,7 @@ const WATER_RISK_AREA_LAYER_ID = "SN_WATER_RISK_AREA";
 const WATER_RISK_PIPE_LAYER_ID = "SN_WATER_RISK_PIPE";
 const WATER_RISK_MANHOLE_LAYER_ID = "SN_WATER_RISK_MANHOLE";
 const SHORT_TERM_FORECAST_GRID_LAYER_NAME = "초단기예보격자망";
-const FLOOD_HISTORY_SELECTION_PADDING: [number, number, number, number] = [
+const FLDNG_HSTRY_SELECTION_PADDING: [number, number, number, number] = [
   100, 380, 120, 120,
 ];
 const RIGHT_PANEL_TAB_LIMIT = 5;
@@ -1090,7 +1092,7 @@ const getRightPanelFeatureTitle = (data: any) => {
     case "tb_ms_swage_prcs_zone":
       return "처리구역";
     case "tb_ms_fldng_wtlv_map":
-      return FLOOD_HISTORY_LAYER_NAME;
+      return FLDNG_HSTRY_LAYER_NAME;
     case "tb_ms_fldng_dpth_map":
       return "침수흔적심선";
     case "om_dt_untrt_swg_rain":
@@ -3035,28 +3037,27 @@ const Map = () => {
     useState(true);
   const [isFldngHstryChecked, setIsFldngHstryChecked] = useState(false);
   // 침수흔적위선과 심선은 하나의 연도 범위를 공유하지만 체크 상태는 독립적으로 관리한다.
-  const [isFloodWtlvChecked, setIsFloodWtlvChecked] = useState(false);
-  const [isFloodDepthChecked, setIsFloodDepthChecked] = useState(false);
+  const [isFldngHstryWtlvChecked, setIsFldngHstryWtlvChecked] = useState(false);
+  const [isFldngHstryDepthChecked, setIsFldngHstryDepthChecked] =
+    useState(false);
   // 심선은 6개 깊이 등급 중 사용자가 실제 체크한 lyrSn만 필터 레이어로 생성한다.
-  const [checkedFloodDepthLayerKeys, setCheckedFloodDepthLayerKeys] = useState<
-    string[]
-  >([]);
-  const [floodYearRange, setFloodYearRange] = useState<FloodHistoryYearRange>(
-    () => buildFloodHistoryDefaultYearRange(),
-  );
-  const [isFloodYearFilterEnabled, setIsFloodYearFilterEnabled] =
+  const [checkedFldngHstryDepthLayerKeys, setCheckedFldngHstryDepthLayerKeys] =
+    useState<string[]>([]);
+  const [fldngHstryYearRange, setFldngHstryYearRange] =
+    useState<FldngHstryYearRange>(() => buildFldngHstryDefaultYearRange());
+  const [isFldngHstryYearFilterEnabled, setIsFldngHstryYearFilterEnabled] =
     useState(true);
-  const [isFloodYearSettingVisible, setIsFloodYearSettingVisible] =
+  const [isFldngHstryYearSettingVisible, setIsFldngHstryYearSettingVisible] =
     useState(true);
   // 닫힌 설정 카드는 레이어가 완전히 해제된 뒤 다시 체크될 때만 자동으로 연다.
-  const floodLayerCheckedRef = useRef(false);
+  const fldngHstryLayerCheckedRef = useRef(false);
   const sinkholeLayerCheckedRef = useRef(false);
   const agedPipeLayerCheckedRef = useRef(false);
   const exmnPplLayerCheckedRef = useRef(false);
   const exmnMnhlLayerCheckedRef = useRef(false);
   const waterDepthLayerCheckedRef = useRef(false);
   // 체크 등급 변경과 연도 필터 변경을 구분해 연도 변경 때만 기존 선택 상세를 정리한다.
-  const floodYearFilterSignatureRef = useRef("");
+  const fldngHstryYearFilterSignatureRef = useRef("");
   const [isExmnPplChecked, setIsExmnPplChecked] = useState(false);
   const [isExmnMnhlChecked, setIsExmnMnhlChecked] = useState(false);
   const [exmnPplFilters, setExmnPplFilters] = useState<ExmnMapFilters>(() => ({
@@ -5344,7 +5345,7 @@ const Map = () => {
       // Select 컬렉션에 다시 넣어도 강조가 렌더링되지 않는다. 탭으로 돌아올
       // 때는 FID로 search-layer를 복원한 뒤 로드된 feature를 선택하게 한다.
       if (
-        layerTypeName === FLOOD_HISTORY_LAYER_TYPE ||
+        layerTypeName === FLDNG_HSTRY_LAYER_TYPE ||
         layerTypeName === "tb_ms_fldng_dpth_map"
       ) {
         clearSinkholeFocusedPipeLayer();
@@ -5404,9 +5405,9 @@ const Map = () => {
         source,
         zIndex: 9993,
       });
-      layer.set("id", FLOOD_HISTORY_AREA_LAYER_ID);
-      layer.set("lyrNm", FLOOD_HISTORY_LAYER_NAME);
-      layer.set("lyrTyNm", FLOOD_HISTORY_PREVIEW_LAYER_TYPE);
+      layer.set("id", FLDNG_HSTRY_AREA_LAYER_ID);
+      layer.set("lyrNm", FLDNG_HSTRY_LAYER_NAME);
+      layer.set("lyrTyNm", FLDNG_HSTRY_PREVIEW_LAYER_TYPE);
       layer.set("clickPsblYn", "N");
       gisMaps.current.addLayer(layer);
       fldngHstryAreaLayerRef.current = layer;
@@ -5424,9 +5425,9 @@ const Map = () => {
         source,
         zIndex: 9992,
       });
-      layer.set("id", FLOOD_HISTORY_DEPTH_LAYER_ID);
-      layer.set("lyrNm", FLOOD_HISTORY_LAYER_NAME);
-      layer.set("lyrTyNm", FLOOD_HISTORY_PREVIEW_LAYER_TYPE);
+      layer.set("id", FLDNG_HSTRY_DEPTH_LAYER_ID);
+      layer.set("lyrNm", FLDNG_HSTRY_LAYER_NAME);
+      layer.set("lyrTyNm", FLDNG_HSTRY_PREVIEW_LAYER_TYPE);
       layer.set("clickPsblYn", "N");
       gisMaps.current.addLayer(layer);
       fldngHstryDepthLayerRef.current = layer;
@@ -5480,7 +5481,7 @@ const Map = () => {
     const geometry = new Polygon([detail.areaRing]);
     gisMaps.current.getView?.().fit?.(geometry.getExtent(), {
       duration: 350,
-      padding: FLOOD_HISTORY_SELECTION_PADDING,
+      padding: FLDNG_HSTRY_SELECTION_PADDING,
       maxZoom: 15,
       constrainResolution: true,
       nearest: true,
@@ -5508,7 +5509,7 @@ const Map = () => {
   );
 
   const openFldngHstryPopupWindow = useCallback(() => {
-    const popup = openWindowPopup(FLOOD_HISTORY_POPUP_KEY as WindowPopupKey);
+    const popup = openWindowPopup(FLDNG_HSTRY_POPUP_KEY as WindowPopupKey);
     if (!popup) {
       alert("브라우저 팝업이 차단되었습니다. 팝업 허용 후 다시 시도해주세요.");
       return null;
@@ -6053,7 +6054,7 @@ const Map = () => {
       // 제거되지 않는다. 마지막 탭을 닫는 경우와 다른 일반 feature 탭으로
       // 전환되는 경우 모두 잔상으로 남지 않도록 여기서 명시적으로 제거한다.
       if (
-        closingLayerTypeName === FLOOD_HISTORY_LAYER_TYPE ||
+        closingLayerTypeName === FLDNG_HSTRY_LAYER_TYPE ||
         closingLayerTypeName === "tb_ms_fldng_dpth_map"
       ) {
         const layerModule = GisApp.Module.layer as any;
@@ -6478,33 +6479,33 @@ const Map = () => {
       agedPipeLayerCheckedRef.current = agedPipeChecked;
       waterDepthLayerCheckedRef.current = waterDepthChecked;
       setIsAgedPipeChecked(agedPipeChecked);
-      const floodWtlvChecked = checkedNodesData.some((node) =>
-        isFloodHistoryWaterLevelNode(node),
+      const fldngHstryWtlvChecked = checkedNodesData.some((node) =>
+        isFldngHstryWtlvNode(node),
       );
-      const checkedFloodDepthNodes = checkedNodesData.filter((node) =>
-        isFloodHistoryDepthNode(node),
+      const checkedFldngHstryDepthNodes = checkedNodesData.filter((node) =>
+        isFldngHstryDepthNode(node),
       );
-      const checkedDepthLayerKeys = Array.from(
+      const checkedFldngHstryDepthLayerKeys = Array.from(
         new Set(
-          checkedFloodDepthNodes
+          checkedFldngHstryDepthNodes
             .map((node) => String(node?.data?.lyrSn ?? node?.id ?? "").trim())
             .filter(Boolean),
         ),
       ).sort((left, right) => Number(left) - Number(right));
-      const floodDepthChecked = checkedDepthLayerKeys.length > 0;
-      const fldngHstryChecked = floodWtlvChecked || floodDepthChecked;
-      setIsFloodWtlvChecked(floodWtlvChecked);
-      setIsFloodDepthChecked(floodDepthChecked);
-      setCheckedFloodDepthLayerKeys((currentKeys) =>
-        currentKeys.join(",") === checkedDepthLayerKeys.join(",")
+      const fldngHstryDepthChecked = checkedFldngHstryDepthLayerKeys.length > 0;
+      const fldngHstryChecked = fldngHstryWtlvChecked || fldngHstryDepthChecked;
+      setIsFldngHstryWtlvChecked(fldngHstryWtlvChecked);
+      setIsFldngHstryDepthChecked(fldngHstryDepthChecked);
+      setCheckedFldngHstryDepthLayerKeys((currentKeys) =>
+        currentKeys.join(",") === checkedFldngHstryDepthLayerKeys.join(",")
           ? currentKeys
-          : checkedDepthLayerKeys,
+          : checkedFldngHstryDepthLayerKeys,
       );
       setIsFldngHstryChecked(fldngHstryChecked);
-      if (fldngHstryChecked && !floodLayerCheckedRef.current) {
-        setIsFloodYearSettingVisible(true);
+      if (fldngHstryChecked && !fldngHstryLayerCheckedRef.current) {
+        setIsFldngHstryYearSettingVisible(true);
       }
-      floodLayerCheckedRef.current = fldngHstryChecked;
+      fldngHstryLayerCheckedRef.current = fldngHstryChecked;
       if (!fldngHstryChecked) {
         clearFldngHstrySelection();
       }
@@ -6693,18 +6694,18 @@ const Map = () => {
       });
     }
 
-    if (isFldngHstryChecked && isFloodYearSettingVisible) {
+    if (isFldngHstryChecked && isFldngHstryYearSettingVisible) {
       nextItems.push({
         key: "fldngHstry",
         label: "침수흔적도",
         order: resolveSettingOrder("fldngHstry", 9997),
         content: (
           <FldngHstryLayerSettingPanel
-            yearRange={floodYearRange}
-            enabled={isFloodYearFilterEnabled}
-            onYearRangeChange={setFloodYearRange}
-            onEnabledChange={setIsFloodYearFilterEnabled}
-            onClose={() => setIsFloodYearSettingVisible(false)}
+            yearRange={fldngHstryYearRange}
+            enabled={isFldngHstryYearFilterEnabled}
+            onYearRangeChange={setFldngHstryYearRange}
+            onEnabledChange={setIsFldngHstryYearFilterEnabled}
+            onClose={() => setIsFldngHstryYearSettingVisible(false)}
           />
         ),
       });
@@ -6798,7 +6799,7 @@ const Map = () => {
     exmnMnhlFilters,
     exmnPplFilters,
     handleApplyAgedPipeFilters,
-    floodYearRange,
+    fldngHstryYearRange,
     isAgedPipeChecked,
     isAgedPipeSettingEnabled,
     isAgedPipeSettingVisible,
@@ -6809,8 +6810,8 @@ const Map = () => {
     isExmnPplSettingEnabled,
     isExmnPplSettingVisible,
     isFldngHstryChecked,
-    isFloodYearFilterEnabled,
-    isFloodYearSettingVisible,
+    isFldngHstryYearFilterEnabled,
+    isFldngHstryYearSettingVisible,
     isSinkholeChecked,
     isSinkholeSettingEnabled,
     isSinkholeSettingVisible,
@@ -6934,60 +6935,60 @@ const Map = () => {
     if (!mapReady || !gisMaps.current) return;
 
     const core = GisApp.Module.core as any;
-    const yearCql = buildFloodHistoryYearCql(
-      floodYearRange,
-      isFloodYearFilterEnabled,
+    const yearCql = buildFldngHstryYearCql(
+      fldngHstryYearRange,
+      isFldngHstryYearFilterEnabled,
     );
-    const yearFilterSignature = `${floodYearRange.startYear}:${floodYearRange.endYear}:${isFloodYearFilterEnabled}`;
+    const yearFilterSignature = `${fldngHstryYearRange.startYear}:${fldngHstryYearRange.endYear}:${isFldngHstryYearFilterEnabled}`;
     if (
-      floodYearFilterSignatureRef.current &&
-      floodYearFilterSignatureRef.current !== yearFilterSignature
+      fldngHstryYearFilterSignatureRef.current &&
+      fldngHstryYearFilterSignatureRef.current !== yearFilterSignature
     ) {
       clearFldngHstrySelection();
     }
-    floodYearFilterSignatureRef.current = yearFilterSignature;
+    fldngHstryYearFilterSignatureRef.current = yearFilterSignature;
 
     /** 기준 레이어 필터를 보존하면서 선택한 침수년도 조건을 결합한다. */
-    const resolveFloodFilter = (baseLayerCode: any) => {
+    const resolveFldngHstryFilter = (baseLayerCode: any) => {
       const baseFilter = String(baseLayerCode?.flterSql ?? "").trim();
       return [baseFilter && `(${baseFilter})`, yearCql]
         .filter(Boolean)
         .join(" AND ");
     };
 
-    type FloodLayerSpec = {
+    type FldngHstryLayerSpec = {
       id: string;
       layerType: string;
       layerName: string;
       baseLayerCode: any;
       filterSql: string;
     };
-    const desiredLayers: FloodLayerSpec[] = [];
+    const desiredLayers: FldngHstryLayerSpec[] = [];
     const layerCodes = Object.values(GisApp.layerCode ?? {}) as any[];
 
-    if (isFloodWtlvChecked) {
+    if (isFldngHstryWtlvChecked) {
       const baseLayerCode = layerCodes.find(
         (item) =>
-          item?.lyrTyNm === FLOOD_HISTORY_LAYER_TYPE && item?.actlLyrYn === "Y",
+          item?.lyrTyNm === FLDNG_HSTRY_LAYER_TYPE && item?.actlLyrYn === "Y",
       );
       if (baseLayerCode) {
         desiredLayers.push({
           id: FLDNG_HSTRY_WFS_LAYER_ID,
-          layerType: FLOOD_HISTORY_LAYER_TYPE,
-          layerName: baseLayerCode?.lyrNm || FLOOD_HISTORY_LAYER_NAME,
+          layerType: FLDNG_HSTRY_LAYER_TYPE,
+          layerName: baseLayerCode?.lyrNm || FLDNG_HSTRY_LAYER_NAME,
           baseLayerCode,
-          filterSql: resolveFloodFilter(baseLayerCode),
+          filterSql: resolveFldngHstryFilter(baseLayerCode),
         });
       }
     }
 
-    if (isFloodDepthChecked) {
-      const selectedDepthLayerKeys = new Set(checkedFloodDepthLayerKeys);
+    if (isFldngHstryDepthChecked) {
+      const selectedDepthLayerKeys = new Set(checkedFldngHstryDepthLayerKeys);
       layerCodes
         .filter((item) => {
           const layerKey = String(item?.lyrSn ?? item?.id ?? "").trim();
           return (
-            item?.lyrTyNm === FLOOD_HISTORY_DEPTH_LAYER_TYPE &&
+            item?.lyrTyNm === FLDNG_HSTRY_DEPTH_LAYER_TYPE &&
             item?.actlLyrYn === "Y" &&
             selectedDepthLayerKeys.has(layerKey)
           );
@@ -6998,26 +6999,27 @@ const Map = () => {
           ).trim();
           desiredLayers.push({
             id: `${FLDNG_DEPTH_WFS_LAYER_ID_PREFIX}_${layerKey}`,
-            layerType: FLOOD_HISTORY_DEPTH_LAYER_TYPE,
-            layerName: baseLayerCode?.lyrNm || FLOOD_HISTORY_DEPTH_LAYER_NAME,
+            layerType: FLDNG_HSTRY_DEPTH_LAYER_TYPE,
+            layerName: baseLayerCode?.lyrNm || FLDNG_HSTRY_DEPTH_LAYER_NAME,
             baseLayerCode,
-            filterSql: resolveFloodFilter(baseLayerCode),
+            filterSql: resolveFldngHstryFilter(baseLayerCode),
           });
         });
     }
 
     const desiredLayerIds = new Set(desiredLayers.map((item) => item.id));
-    const mapLayers = [
-      ...(gisMaps.current?.getLayers?.()?.getArray?.() ?? []),
-    ];
-    const isManagedFloodLayerId = (id: string) =>
+    const mapLayers = [...(gisMaps.current?.getLayers?.()?.getArray?.() ?? [])];
+    const isManagedFldngHstryLayerId = (id: string) =>
       id === FLDNG_HSTRY_WFS_LAYER_ID ||
       id.startsWith(`${FLDNG_DEPTH_WFS_LAYER_ID_PREFIX}_`);
 
     // 체크 해제된 등급만 삭제하고, 계속 체크된 등급은 지도에 그대로 유지한다.
     mapLayers.forEach((mapLayer: any) => {
       const layerId = String(mapLayer?.get?.("id") ?? "");
-      if (isManagedFloodLayerId(layerId) && !desiredLayerIds.has(layerId)) {
+      if (
+        isManagedFldngHstryLayerId(layerId) &&
+        !desiredLayerIds.has(layerId)
+      ) {
         gisMaps.current?.removeLayer?.(mapLayer);
       }
     });
@@ -7032,7 +7034,9 @@ const Map = () => {
         ?.find(
           (mapLayer: any) => String(mapLayer?.get?.("id") ?? "") === spec.id,
         );
-      if (existingLayer?.get?.("floodFilterSignature") === filterSignature) {
+      if (
+        existingLayer?.get?.("fldngHstryFilterSignature") === filterSignature
+      ) {
         existingLayer?.setVisible?.(true);
         return;
       }
@@ -7056,7 +7060,7 @@ const Map = () => {
       layer?.set?.("id", spec.id);
       layer?.set?.("lyrNm", spec.layerName);
       layer?.set?.("lyrTyNm", spec.layerType);
-      layer?.set?.("floodFilterSignature", filterSignature);
+      layer?.set?.("fldngHstryFilterSignature", filterSignature);
     });
 
     // 전용 필터 레이어가 담당하는 유형의 원본 레이어만 숨겨 중복 표출을 막는다.
@@ -7071,19 +7075,19 @@ const Map = () => {
         const layerType = String(mapLayer?.get?.("lyrTyNm") ?? "");
         if (
           activeFilteredTypes.has(layerType) &&
-          !isManagedFloodLayerId(layerId)
+          !isManagedFldngHstryLayerId(layerId)
         ) {
           mapLayer?.setVisible?.(false);
         }
       });
   }, [
-    checkedFloodDepthLayerKeys,
+    checkedFldngHstryDepthLayerKeys,
     clearFldngHstrySelection,
-    floodYearRange,
+    fldngHstryYearRange,
     isFldngHstryChecked,
-    isFloodDepthChecked,
-    isFloodWtlvChecked,
-    isFloodYearFilterEnabled,
+    isFldngHstryDepthChecked,
+    isFldngHstryWtlvChecked,
+    isFldngHstryYearFilterEnabled,
     mapReady,
   ]);
 

From 23341b93c73e7496cda812a58bbbc627ab4adbdf Mon Sep 17 00:00:00 2001
From: ljpark <mind-one005@mind-one.co.kr>
Date: Tue, 8 Sep 2026 18:15:40 +0900
Subject: [PATCH 13/13] =?UTF-8?q?sn:=20=EC=B9=A8=EC=88=98=ED=9D=94?=
 =?UTF-8?q?=EC=A0=81=EC=8B=AC=EC=84=A0/=EC=9C=84=EC=84=A0=20=ED=99=94?=
 =?UTF-8?q?=EC=82=B4=ED=91=9C=20=EC=97=B0=EC=86=8D=20scroll=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fldngHstry/FldngHstryFeatureClick.tsx     | 155 +++++++++++++-----
 .../src/ui/map/lib/css/gis.common.css         |   5 +
 2 files changed, 116 insertions(+), 44 deletions(-)

diff --git a/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryFeatureClick.tsx b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryFeatureClick.tsx
index a379b5e40..8c717a2f9 100644
--- a/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryFeatureClick.tsx
+++ b/apps/sn/app/(map-layout)/map/components/fldngHstry/FldngHstryFeatureClick.tsx
@@ -5,6 +5,7 @@
 "use client";
 
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import type { RefObject } from "react";
 import GisApp from "@common/business_components/ui/map/lib/gis.core";
 import type Feature from "ol/Feature.js";
 import VectorSource from "ol/source/Vector.js";
@@ -29,6 +30,96 @@ type FldngHstryGisLayer = {
   ) => void | Promise<void>;
 };
 
+type FldngHstryScrollButtonProps = {
+  targetRef: RefObject<HTMLDivElement | null>;
+  direction: -1 | 1;
+  label: string;
+  children: string;
+};
+
+const FLDNG_HSTRY_SCROLL_CLICK_DISTANCE = 120;
+const FLDNG_HSTRY_SCROLL_HOLD_DELAY = 300;
+const FLDNG_HSTRY_SCROLL_HOLD_SPEED = 4;
+
+/** 짧게 누르면 한 칸, 길게 누르면 목록을 해당 방향으로 계속 이동한다. */
+const FldngHstryScrollButton = ({
+  targetRef,
+  direction,
+  label,
+  children,
+}: FldngHstryScrollButtonProps) => {
+  const holdTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const animationFrameRef = useRef<number | null>(null);
+  const pointerClickHandledRef = useRef(false);
+
+  const stopContinuousScroll = useCallback(() => {
+    if (holdTimerRef.current !== null) {
+      clearTimeout(holdTimerRef.current);
+      holdTimerRef.current = null;
+    }
+    if (animationFrameRef.current !== null) {
+      cancelAnimationFrame(animationFrameRef.current);
+      animationFrameRef.current = null;
+    }
+  }, []);
+
+  const scrollOnce = useCallback(() => {
+    targetRef.current?.scrollBy({
+      left: direction * FLDNG_HSTRY_SCROLL_CLICK_DISTANCE,
+      behavior: "smooth",
+    });
+  }, [direction, targetRef]);
+
+  const startContinuousScroll = useCallback(() => {
+    const scroll = () => {
+      const target = targetRef.current;
+      if (!target) {
+        stopContinuousScroll();
+        return;
+      }
+      target.scrollLeft += direction * FLDNG_HSTRY_SCROLL_HOLD_SPEED;
+      animationFrameRef.current = requestAnimationFrame(scroll);
+    };
+    animationFrameRef.current = requestAnimationFrame(scroll);
+  }, [direction, stopContinuousScroll, targetRef]);
+
+  useEffect(() => stopContinuousScroll, [stopContinuousScroll]);
+
+  return (
+    <button
+      type="button"
+      aria-label={label}
+      className="shrink-0 select-none px-1 text-lg leading-none text-foreground"
+      onPointerDown={(event) => {
+        if (event.button !== 0) return;
+        stopContinuousScroll();
+        pointerClickHandledRef.current = true;
+        event.currentTarget.setPointerCapture(event.pointerId);
+        scrollOnce();
+        holdTimerRef.current = setTimeout(
+          startContinuousScroll,
+          FLDNG_HSTRY_SCROLL_HOLD_DELAY,
+        );
+      }}
+      onPointerUp={stopContinuousScroll}
+      onPointerCancel={() => {
+        stopContinuousScroll();
+        pointerClickHandledRef.current = false;
+      }}
+      onLostPointerCapture={stopContinuousScroll}
+      onClick={() => {
+        if (pointerClickHandledRef.current) {
+          pointerClickHandledRef.current = false;
+          return;
+        }
+        scrollOnce();
+      }}
+    >
+      {children}
+    </button>
+  );
+};
+
 const cloneFldngHstryFeature = (feature: Feature) => {
   const clonedFeature = feature.clone();
   const featureId = feature.getId();
@@ -171,19 +262,13 @@ export const useFldngHstryFeatureClick = () => {
             <span className="w-9 shrink-0 text-[1.1rem] font-semibold">
               심선
             </span>
-            <button
-              type="button"
-              aria-label="이전 연도"
-              className="shrink-0 px-1 text-lg leading-none text-foreground"
-              onClick={() =>
-                fldngHstryDepthYearListRef.current?.scrollBy({
-                  left: -120,
-                  behavior: "smooth",
-                })
-              }
+            <FldngHstryScrollButton
+              targetRef={fldngHstryDepthYearListRef}
+              direction={-1}
+              label="이전 연도"
             >
               ‹
-            </button>
+            </FldngHstryScrollButton>
             <div
               ref={fldngHstryDepthYearListRef}
               className="flex min-w-0 flex-1 gap-2 overflow-x-auto whitespace-nowrap [scrollbar-width:none] [&::-webkit-scrollbar]:hidden"
@@ -231,19 +316,13 @@ export const useFldngHstryFeatureClick = () => {
                   );
                 })}
             </div>
-            <button
-              type="button"
-              aria-label="다음 연도"
-              className="shrink-0 px-1 text-lg leading-none text-foreground"
-              onClick={() =>
-                fldngHstryDepthYearListRef.current?.scrollBy({
-                  left: 120,
-                  behavior: "smooth",
-                })
-              }
+            <FldngHstryScrollButton
+              targetRef={fldngHstryDepthYearListRef}
+              direction={1}
+              label="다음 연도"
             >
               ›
-            </button>
+            </FldngHstryScrollButton>
           </div>
         )}
         {fldngHstryWtlvRows.length > 0 && (
@@ -251,19 +330,13 @@ export const useFldngHstryFeatureClick = () => {
             <span className="w-9 shrink-0 text-[1.1rem] font-semibold">
               위선
             </span>
-            <button
-              type="button"
-              aria-label="이전 위선"
-              className="shrink-0 px-1 text-lg leading-none text-foreground"
-              onClick={() =>
-                fldngHstryWtlvListRef.current?.scrollBy({
-                  left: -120,
-                  behavior: "smooth",
-                })
-              }
+            <FldngHstryScrollButton
+              targetRef={fldngHstryWtlvListRef}
+              direction={-1}
+              label="이전 위선"
             >
               ‹
-            </button>
+            </FldngHstryScrollButton>
             <div
               ref={fldngHstryWtlvListRef}
               className="flex min-w-0 flex-1 gap-2 overflow-x-auto whitespace-nowrap [scrollbar-width:none] [&::-webkit-scrollbar]:hidden"
@@ -295,19 +368,13 @@ export const useFldngHstryFeatureClick = () => {
                 );
               })}
             </div>
-            <button
-              type="button"
-              aria-label="다음 위선"
-              className="shrink-0 px-1 text-lg leading-none text-foreground"
-              onClick={() =>
-                fldngHstryWtlvListRef.current?.scrollBy({
-                  left: 120,
-                  behavior: "smooth",
-                })
-              }
+            <FldngHstryScrollButton
+              targetRef={fldngHstryWtlvListRef}
+              direction={1}
+              label="다음 위선"
             >
               ›
-            </button>
+            </FldngHstryScrollButton>
           </div>
         )}
       </div>
diff --git a/packages/common/business_components/src/ui/map/lib/css/gis.common.css b/packages/common/business_components/src/ui/map/lib/css/gis.common.css
index c7436fcab..c28560482 100644
--- a/packages/common/business_components/src/ui/map/lib/css/gis.common.css
+++ b/packages/common/business_components/src/ui/map/lib/css/gis.common.css
@@ -292,9 +292,14 @@
 	cursor: pointer;
 }
 
+.zoom-level-panel .zoom-level-btn:first-child {
+	border-radius: 3px 3px 0 0;
+}
+
 .zoom-level-panel .zoom-level-btn:last-child {
 	border-top: 1px solid #eeeeee;
 	border-bottom: 0 none;
+	border-radius: 0 0 3px 3px;
 }
 
 .zoom-level-btn:hover {