diff --git a/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/featureClickEventPopup.tsx
similarity index 84%
rename from apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx
rename to apps/sn/app/(map-layout)/map/components/popupComponent/featureClickEventPopup.tsx
index e9a4f9e9a..679122d6b 100644
--- a/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/featureClickEventPopup.tsx
@@ -5,13 +5,13 @@ import { VerticalTable } from "@/components/ui/verticalTable";
 import { useGisContext } from "@common/business_components/ui/map/Gis";
 import { Button } from "@common/components/ui";
 import { useEffect, useRef, useState, useCallback, useMemo } from "react";
-import { getLayerContentComponent } from "./components/common";
-import { SwtrmtFcltCol, SwtrmtFcltCol2, SwtrmtPrcsZoneCol, SwtrmtPrcsZoneCol2, untrtSwgRainCol1, untrtSwgRainCol2, MsSwagePplCol, MsSwagePplCol2, ExclnSewagePumpCol, ExclnSewagePumpCol2, DrtwSewagePumpCol, DrtwSewagePumpCol2, MsSwageMhlCol, MsSwageMhlCol2, stofcbrCol, stofcbrCol2, MS_SWAGE_MHL_CODES, DRTW_SEWAGE_PUMP_USE_CODES } from "./components/common/table";
-import InfilChart from './components/popupComponent/chart/infilChart';
-import RdiiChart from './components/popupComponent/chart/rdiiChart';
-import { useInfilChartModalStore, useRdiiChartModalStore } from "./components/popupComponent/chartModalStore";
+import { getLayerContentComponent } from "../common";
+import { SwtrmtFcltCol, SwtrmtFcltCol2, SwtrmtPrcsZoneCol, SwtrmtPrcsZoneCol2, untrtSwgRainCol1, untrtSwgRainCol2, MsSwagePplCol, MsSwagePplCol2, ExclnSewagePumpCol, ExclnSewagePumpCol2, DrtwSewagePumpCol, DrtwSewagePumpCol2, MsSwageMhlCol, MsSwageMhlCol2, stofcbrCol, stofcbrCol2, MS_SWAGE_MHL_CODES, DRTW_SEWAGE_PUMP_USE_CODES } from "../common/table";
+import InfilChart from './chart/infilChart';
+import RdiiChart from './chart/rdiiChart';
+import { useInfilChartModalStore, useRdiiChartModalStore } from "./chartModalStore";
 import { formatDisplayData } from '@/components/lib/utils/formatDisplayValue';
-import { codeMapper } from "./components/common/codeMapper";
+import { codeMapper } from "../common/codeMapper";
 import { searchUpperPpls } from '@common/business_components/ui/map/Gis';
 import LoadingOverlay from '@/components/ui/LoadingBar';
 
@@ -33,9 +33,10 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void,
   // 🎯 InfilChart 및 RdiiChart 관련 상태 추가
   const { setIsOpen: setIsModalInfil } = useInfilChartModalStore();
   const { setIsOpen: setIsModalRdii } = useRdiiChartModalStore();
-  const [curPage, setCurPage] = useState(1); // 현재 페이지 상태
   const [isClicked, setIsClicked] = useState(true); // 클릭 여부 상태
   const [isLoading, setIsLoading] = useState(false); // 로딩 상태
+  const [chmbrXcnts, setChmbrXcnts] = useState(); // 로딩 상태
+  const [chmbrYdnts, setChmbrYdnts] = useState(); // 로딩 상태
 
   // 🎯 관로관리번호 추출
   const pplMngNo = featureData?.values_?.fclt_mng_no || "";
@@ -263,18 +264,9 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void,
               data: { ...processedFormattedData }
             }));
 
-            // 강우/측정 정보 데이터 호출
-            if (tableData?.chmbr_xcnts && tableData?.chmbr_ydnts) {
-              fetchRainMeasureData(tableData.chmbr_xcnts, tableData.chmbr_ydnts)
-                .then(response => {
-                  console.log('additionalResponse', response);
-                  setRainMeasureData(response || []);
-                })
-                .catch(error => {
-                  console.error('추가 데이터 로딩 실패:', error);
-                  setRainMeasureData([]);
-                });
-            }
+            setChmbrXcnts(data.chmbr_xcnts);
+            setChmbrYdnts(data.chmbr_ydnts);
+
             break;
           default:
             break;
@@ -317,76 +309,6 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void,
     fetchData();
   }, [featureId, processedData]);
 
-  // 🎯 추가 데이터 API 호출 함수
-  const fetchRainMeasureData = useCallback(async (chmbrXcnts: string, chmbrYdnts: string) => {
-    if (!chmbrXcnts || !chmbrYdnts) {
-      console.warn('추가 데이터 호출 실패: 필수 매개변수 누락', { chmbrXcnts, chmbrYdnts });
-      return [];
-    }
-
-    try {
-      const queryParams = new URLSearchParams({
-        chmbrXcnts: chmbrXcnts,
-        chmbrYdnts: chmbrYdnts,
-        pageable: `{}`,
-      });
-
-      console.log(`추가 데이터 API 호출 시작: v1/onsemiro/getSwgRainsByGeomety?${queryParams.toString()}`);
-
-      const result = await getData(`v1/onsemiro/getSwgRainsByGeomety?${queryParams.toString()}`);
-
-      console.log('추가 데이터 API 호출 성공:', result);
-
-      // 🎯 result가 페이지네이션 객체인 경우 content 배열 추출
-      let dataArray: any[] = [];
-      if (result && typeof result === 'object' && 'content' in result && Array.isArray(result.content)) {
-        dataArray = result.content;
-      } else if (Array.isArray(result)) {
-        dataArray = result;
-      } else {
-        console.warn('예상치 못한 API 응답 형식:', result);
-        return [];
-      }
-
-      // 🎯 각 아이템을 전처리하여 반환
-      const processedDataArray = dataArray.map((data: any) => {
-        // 🎯 formatDisplayData로 기본 포맷팅 적용
-        const formattedItem = formatDisplayData(data);
-
-        // 🎯 추가 데이터 조합
-        return {
-          ...formattedItem,
-          flwmtrCombined: `${data.flwmtrMesureTpEtc || '-'} / ${data.flwmtrKnd || '-'}`,
-        };
-      });
-
-      return processedDataArray;
-    } catch (error) {
-      console.error('추가 데이터 로딩 실패:', error);
-      return [];
-    }
-  }, []);
-
-  // 🎯 추가 데이터는 별도 useEffect로 비동기 로딩
-  useEffect(() => {
-    if (layerNm === '중점우수토실' && featureData?.values_) {
-      const data = featureData.values_;
-
-      if (data?.chmbr_xcnts && data?.chmbr_ydnts) {
-        // 🎯 추가 데이터를 비동기로 로딩 (UI 블로킹 없음)
-        fetchRainMeasureData(data.chmbr_xcnts, data.chmbr_ydnts)
-          .then(response => {
-            console.log('추가 데이터 로딩 완료:', response);
-            setRainMeasureData(response || []);
-          })
-          .catch(error => {
-            console.error('추가 데이터 최종 로딩 실패:', error);
-            setRainMeasureData([]);
-          });
-      }
-    }
-  }, [layerNm, featureData?.values_, fetchRainMeasureData]);
-
   // 저장 시 모달 띄우기
   const handleSaveClick = () => {
     setIsModalOpen(true); // 모달 열기
@@ -555,8 +477,10 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void,
             featureData={fetchData}
             isMainSsc={isMainSsc}
             isDrtwSewagePump={isDrtwSewagePump}
-            rainMeasureData={rainMeasureData}
+            // rainMeasureData={rainMeasureData}
             onSaveClick={handleSaveClick}
+            chmbrXcnts={chmbrXcnts}
+            chmbrYdnts={chmbrYdnts}
           />
         }
       </div>