From 5b0ab14718f57644efbd8f521b0c17cb9c24c3dd Mon Sep 17 00:00:00 2001
From: unknown <klp2797@naver.com>
Date: Tue, 13 Jan 2026 20:39:54 +0900
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=EC=A7=80=EB=8F=84=20=EC=BB=B4?=
 =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EB=B6=84?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/nowait-user/src/assets/logo/yeungnam.png | Bin 0 -> 13232 bytes
 .../remittenceWait/RemittanceWaitPage.tsx     |   3 +-
 .../waiting/BoothMapManage/MapManagePage.tsx  |  27 ++++--
 .../src/pages/waiting/boothMap/MapPage.tsx    |  17 ++--
 .../boothMap/components/BoothMarker.tsx       |  91 ++++++++++++++++++
 .../boothMap/components/BoothMarkers.tsx      |  48 ++++-----
 .../waiting/boothMap/components/MapHeader.tsx |   6 +-
 .../boothMap/components/UniversityPolygon.tsx |   6 +-
 .../boothMap/constants/boothPosition.ts       |   3 +-
 .../waiting/boothMap/constants/university.ts  |   7 +-
 .../waiting/boothMap/hooks/useGeoPolygon.ts   |   2 +
 .../boothMap/hooks/useIsInsidePolyon.ts       |  52 ++++++++++
 .../waiting/boothMap/hooks/useMyLocation.ts   |  46 ++++++++-
 13 files changed, 248 insertions(+), 60 deletions(-)
 create mode 100644 apps/nowait-user/src/assets/logo/yeungnam.png
 create mode 100644 apps/nowait-user/src/pages/waiting/boothMap/components/BoothMarker.tsx
 create mode 100644 apps/nowait-user/src/pages/waiting/boothMap/hooks/useIsInsidePolyon.ts

diff --git a/apps/nowait-user/src/assets/logo/yeungnam.png b/apps/nowait-user/src/assets/logo/yeungnam.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6d543c9b9aa02c615b242f3dab4e18a9a57839a
GIT binary patch
literal 13232
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
DTLA9>

literal 0
HcmV?d00001

diff --git a/apps/nowait-user/src/pages/order/remittenceWait/RemittanceWaitPage.tsx b/apps/nowait-user/src/pages/order/remittenceWait/RemittanceWaitPage.tsx
index 0c46e357..8386ca62 100644
--- a/apps/nowait-user/src/pages/order/remittenceWait/RemittanceWaitPage.tsx
+++ b/apps/nowait-user/src/pages/order/remittenceWait/RemittanceWaitPage.tsx
@@ -35,7 +35,6 @@ const RemittanceWaitPage = () => {
     })),
     totalPrice,
   };
-
   const orderButton = async () => {
     if (isLoading) return;
     try {
@@ -70,6 +69,8 @@ const RemittanceWaitPage = () => {
       >
         <img
           src={isLoaded ? loadedSrc : remittanceWaitFallback}
+          // src={remittanceWait}
+
           alt="입금 대기중인 이미지"
           width={"150px"}
           height={"150px"}
diff --git a/apps/nowait-user/src/pages/waiting/BoothMapManage/MapManagePage.tsx b/apps/nowait-user/src/pages/waiting/BoothMapManage/MapManagePage.tsx
index 7281ee8b..25111b11 100644
--- a/apps/nowait-user/src/pages/waiting/BoothMapManage/MapManagePage.tsx
+++ b/apps/nowait-user/src/pages/waiting/BoothMapManage/MapManagePage.tsx
@@ -4,7 +4,6 @@ import { Container as MapDiv, NaverMap, Marker } from "react-naver-maps";
 import { useGeoPolygon } from "../boothMap/hooks/useGeoPolygon";
 import { useMyLocation } from "../boothMap/hooks/useMyLocation";
 import UniversityPolygon from "../boothMap/components/UniversityPolygon";
-import MapControlButtons from "../boothMap/components/mapControls/MapControls";
 
 const MapManagePage = () => {
   const [markers, setMarkers] = useState<
@@ -50,7 +49,8 @@ const MapManagePage = () => {
   }, [map, status, markers]);
 
   return (
-    <div className="relative top-0 left-0 min-h-dvh w-full">
+    // <div className="relative top-0 left-0 min-h-dvh w-full">
+    <div className="fixed top-0 left-0 min-h-dvh w-[1194px]! my-0!">
       <MapDiv style={{ width: "100%", height: "100vh" }}>
         <NaverMap
           defaultCenter={myLocation.center}
@@ -58,7 +58,7 @@ const MapManagePage = () => {
           ref={setMap}
         >
           <UniversityPolygon paths={paths} />
-          <MapControlButtons center={myLocation.center} map={map} />
+          {/* <MapControlButtons center={myLocation.center} map={map} /> */}
           {markers.map((marker) => {
             return (
               <Marker
@@ -84,18 +84,31 @@ const MapManagePage = () => {
           }}
         >
           <textarea
-            className="bg-white w-full min-h-48"
+            className="bg-white w-full min-h-48 outline-none"
+            placeholder="데이터를 입력해주세요."
             onChange={(e) => setGeoData(e.target.value)}
             value={geoData}
           />
-          <Button>데이터 변경</Button>
+          <Button>데이터 변경 및 복사</Button>
         </form>
       </div>
       <div className="flex gap-1 fixed left-1/2 bottom-2.5 -translate-x-1/2 w-full z-50 px-2.5">
-        <Button className="text-15-medium" onClick={() => setStatus(true)}>
+        <Button
+          disabled={status}
+          className="text-15-medium"
+          onClick={() => {
+            setStatus(true);
+          }}
+        >
           시작
         </Button>
-        <Button className="text-15-medium" onClick={() => setStatus(false)}>
+        <Button
+          disabled={!status}
+          className="text-15-medium"
+          onClick={() => {
+            setStatus(false);
+          }}
+        >
           중지
         </Button>
         <Button
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/MapPage.tsx b/apps/nowait-user/src/pages/waiting/boothMap/MapPage.tsx
index 525d0197..19957aee 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/MapPage.tsx
+++ b/apps/nowait-user/src/pages/waiting/boothMap/MapPage.tsx
@@ -11,6 +11,7 @@ import MapControlButtons from "./components/mapControls/MapControls";
 import { Container as MapDiv, NaverMap, Marker } from "react-naver-maps";
 import { useMapZoom } from "./hooks/useMapZoom";
 import { useMapEvents } from "./hooks/useMapEvents";
+// import { useIsInsidePolygon } from "./hooks/useIsInsidePolyon";
 
 declare global {
   interface Window {
@@ -21,7 +22,6 @@ declare global {
 const MapPage = () => {
   const [selectedBooth, setSelectedBooth] = useState<number | null>(null);
   const [map, setMap] = useState<any | null>(null);
-
   // const { setIsCompassMode } = isCompassModeStore();
   //대학교 폴리곤(영역) 설정
   const paths = useGeoPolygon();
@@ -31,6 +31,7 @@ const MapPage = () => {
   const myLocation = useMyLocation();
   //줌레벨 가져오기
   const zoom = useMapZoom(map);
+  // const isInsideServiceArea = useIsInsidePolygon(paths, myLocation.center);
   //맵 드래그, 클릭 컨트롤
   useMapEvents(map, () => setSelectedBooth(null));
 
@@ -56,11 +57,7 @@ const MapPage = () => {
             height: "600px",
           }}
         >
-          <NaverMap
-            defaultCenter={myLocation.center}
-            defaultZoom={16}
-            ref={setMap}
-          >
+          <NaverMap center={myLocation.center} zoom={16} ref={setMap}>
             <MapControlButtons center={myLocation.center} map={map} />
             <UniversityPolygon paths={paths} />
             {!myLocation.isLoading && <Marker position={myLocation.center} />}
@@ -80,6 +77,14 @@ const MapPage = () => {
       ) : (
         <BoothList booths={booths!} totalBooth={booths?.length} />
       )}
+      {/* {!isInsideServiceArea && (
+        <div
+          className="absolute top-16 left-1/2 -translate-x-1/2 z-50
+                  bg-black/80 text-white px-4 py-2 rounded-lg text-sm"
+        >
+          현재 위치는 서비스 지역이 아닙니다
+        </div>
+      )} */}
     </div>
   );
 };
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/components/BoothMarker.tsx b/apps/nowait-user/src/pages/waiting/boothMap/components/BoothMarker.tsx
new file mode 100644
index 00000000..d8e04218
--- /dev/null
+++ b/apps/nowait-user/src/pages/waiting/boothMap/components/BoothMarker.tsx
@@ -0,0 +1,91 @@
+import React from "react";
+import { Marker } from "react-naver-maps";
+import DotMarker from "../../../../assets/icon/DotMarker.svg?url";
+
+interface BoothMarkerProps {
+  booth: {
+    storeId: number;
+    lat: number;
+    lng: number;
+    profileImage?: {
+      imageUrl?: string;
+    };
+  };
+  zoomLevel: number;
+  openBooth: (id: number) => void;
+}
+
+const BoothMarker = React.memo(
+  ({ booth, zoomLevel, openBooth }: BoothMarkerProps) => {
+    const isZoomed = zoomLevel >= 19;
+
+    const imageUrl =
+      booth.profileImage?.imageUrl &&
+      booth.profileImage.imageUrl.trim().length > 0
+        ? booth.profileImage.imageUrl
+        : DotMarker;
+
+    const icon = !isZoomed
+      ? {
+          url: DotMarker,
+          size: { width: 12, height: 12 },
+          scaledSize: { width: 12, height: 12 },
+        }
+      : {
+          content: `
+  <div style="
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    
+  ">
+    <!-- 원형 마커 -->
+    <div style="
+      width:44px;
+      height:44px;
+      border-radius:50%;
+      background:#fff;
+      display:flex;
+      align-items:center;
+      justify-content:center;
+    ">
+      <img
+        src="${imageUrl}"
+        style="
+          width:36px;
+          height:36px;
+          border-radius:50%;
+          object-fit:cover;
+        "
+      />
+    </div>
+
+    <!-- 아래 화살표 -->
+    <div style="
+      width: 0;
+      height: 0;
+      border-left: 7px solid transparent;
+      border-right: 7px solid transparent;
+      border-radius : 2px;
+      border-top: 10px solid #fff;
+      margin-top: -3px;
+    //   filter: drop-shadow(0 2px 2px rgba(0,0,0,0.25));
+    "></div>
+  </div>
+`,
+          size: { width: 44, height: 44 },
+          anchor: { x: 22, y: 22 },
+        };
+
+    return (
+      <Marker
+        position={{ lat: booth.lat, lng: booth.lng }}
+        icon={icon}
+        onClick={() => openBooth(booth.storeId)}
+      />
+    );
+  }
+);
+
+export default BoothMarker;
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/components/BoothMarkers.tsx b/apps/nowait-user/src/pages/waiting/boothMap/components/BoothMarkers.tsx
index 77249211..3a9a1582 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/components/BoothMarkers.tsx
+++ b/apps/nowait-user/src/pages/waiting/boothMap/components/BoothMarkers.tsx
@@ -1,33 +1,19 @@
-// import BoothMarker from "../../../../assets/icon/BoothMarker.svg?url";
-import MarkerTest from "../../../../assets/markerTest2.svg?url"
-import DotMarker from "../../../../assets/icon/DotMarker.svg?url";
-import React from "react";
-import { Marker } from "react-naver-maps";
+import BoothMarker from "./BoothMarker";
 
-interface BoothMarkersProps {
-  booths: { storeId: number; lat: number; lng: number }[];
-  openBooth: (id: number) => void;
-  zoomLevel: number;
-}
+const BoothMarkers = ({ booths, zoomLevel, openBooth }:any) => {
+  console.log(booths)
+  return (
+    <>
+      {booths.map((booth:any) => (
+        <BoothMarker
+          key={booth.storeId}
+          booth={booth}
+          zoomLevel={zoomLevel}
+          openBooth={openBooth}
+        />
+      ))}
+    </>
+  );
+};
 
-const BoothMarkers = React.memo(
-  ({ booths, openBooth, zoomLevel }: BoothMarkersProps) => {
-
-    return (
-      <>
-        {booths.map((booth) => (
-          <Marker
-            key={booth.storeId}
-            position={{ lat: booth.lat, lng: booth.lng }}
-            icon={{
-              url: zoomLevel >= 18 ? MarkerTest : DotMarker,
-            }}
-            onClick={() => openBooth(booth.storeId)}
-          />
-        ))}
-      </>
-    );
-  }
-);
-
-export default BoothMarkers;
+export default BoothMarkers;
\ No newline at end of file
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/components/MapHeader.tsx b/apps/nowait-user/src/pages/waiting/boothMap/components/MapHeader.tsx
index a2a26c72..fbbf60a0 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/components/MapHeader.tsx
+++ b/apps/nowait-user/src/pages/waiting/boothMap/components/MapHeader.tsx
@@ -8,11 +8,11 @@ import Cancel from "../../../../assets/icon/cancel.svg?react";
 import Portal from "../../../../components/common/modal/Portal";
 import SearchModal from "../../../../components/common/modal/SearchModal";
 
-const HomeHeader = React.memo(() => {
+const MapHeader = React.memo(() => {
   const [isMenuOpen, setIsMenuOpen] = useState(false);
   const [isSearchOpen, setIsSearchOpen] = useState(false);
   const navigate = useNavigate();
-  console.log("헤더 렌더링")
+  
   const toggleMenu = () => {
     setIsMenuOpen(!isMenuOpen);
   };
@@ -187,4 +187,4 @@ const HomeHeader = React.memo(() => {
   );
 });
 
-export default HomeHeader;
+export default MapHeader;
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/components/UniversityPolygon.tsx b/apps/nowait-user/src/pages/waiting/boothMap/components/UniversityPolygon.tsx
index e9a8bd3e..a5eef6d6 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/components/UniversityPolygon.tsx
+++ b/apps/nowait-user/src/pages/waiting/boothMap/components/UniversityPolygon.tsx
@@ -10,10 +10,10 @@ const UniversityPolygon = ({
   return (
     <Polygon
       paths={paths}
-      strokeWeight={2}
-      strokeColor="#ffffff"
+      strokeWeight={1}
+      strokeColor="#5e5e5e"
       strokeOpacity={0.8}
-      fillColor="#686868"
+      fillColor="#5c5c5c"
       fillOpacity={0.6}
     />
   );
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/constants/boothPosition.ts b/apps/nowait-user/src/pages/waiting/boothMap/constants/boothPosition.ts
index 30512d42..d6856881 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/constants/boothPosition.ts
+++ b/apps/nowait-user/src/pages/waiting/boothMap/constants/boothPosition.ts
@@ -6,5 +6,6 @@ export const BOOTHPOSITION: Record<number, { lat: number; lng: number }> = {
   2: { lat: 37.4547305, lng: 127.1350393 },
   3: { lat: 37.4547837, lng: 127.1350393 },
   4: { lat: 37.454837, lng: 127.1350286 },
-  5: { lat: 37.4548944, lng: 127.1350205 },
+  24: { lat: 37.4548944, lng: 127.1350205 },
+
 };
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/constants/university.ts b/apps/nowait-user/src/pages/waiting/boothMap/constants/university.ts
index 5cfddc93..9cc8ddfc 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/constants/university.ts
+++ b/apps/nowait-user/src/pages/waiting/boothMap/constants/university.ts
@@ -1,5 +1,6 @@
 import GachonLogo from "../../../../assets/logo/gachon.png";
 import KonkukLogo from "../../../../assets/logo/konkuk.png";
+import yeungnam from "../../../../assets/logo/yeungnam.png";
 
 export const UNIVERSITY = [
   {
@@ -21,9 +22,9 @@ export const UNIVERSITY = [
     lng: 126.95368082522316,
   },
   {
-    id: 1,
-    name: "영남대학교 서울캠퍼스",
-    logo: KonkukLogo,
+    id: 2,
+    name: "영남대학교",
+    logo: yeungnam,
     period: "9.30-10.1",
     festival: "녹색지대",
     lat: 37.4209795,
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/hooks/useGeoPolygon.ts b/apps/nowait-user/src/pages/waiting/boothMap/hooks/useGeoPolygon.ts
index 16163ab6..4e12a904 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/hooks/useGeoPolygon.ts
+++ b/apps/nowait-user/src/pages/waiting/boothMap/hooks/useGeoPolygon.ts
@@ -3,10 +3,12 @@ import { useEffect, useState } from "react";
 
 export const useGeoPolygon = () => {
   const [paths, setPaths] = useState<{ lat: number; lng: number }[][]>([]);
+
   useEffect(() => {
     const fetchPolygons = async () => {
       try {
         const { data } = await axios.get("/geojson/university.geojson");
+
         // 좌표 변환
         const coords = data.features.map((feature: any) => {
           return feature.geometry.coordinates[0].map(
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/hooks/useIsInsidePolyon.ts b/apps/nowait-user/src/pages/waiting/boothMap/hooks/useIsInsidePolyon.ts
new file mode 100644
index 00000000..86f0e877
--- /dev/null
+++ b/apps/nowait-user/src/pages/waiting/boothMap/hooks/useIsInsidePolyon.ts
@@ -0,0 +1,52 @@
+import { useEffect, useState } from "react";
+
+declare global {
+  interface Window {
+    naver: any;
+  }
+}
+
+interface LatLng {
+  lat: number;
+  lng: number;
+}
+
+export const useIsInsidePolygon = (paths: LatLng[][], location?: LatLng) => {
+  const [isInside, setIsInside] = useState(true);
+
+  useEffect(() => {
+    if (!paths.length || !location) return;
+
+    const check = () => {
+      if (
+        !window.naver?.maps?.geometry?.poly
+      ) {
+        // 🔥 geometry 아직이면 다시 시도
+        setTimeout(check, 200);
+        return;
+      }
+
+      const point = new window.naver.maps.LatLng(
+        location.lat,
+        location.lng
+      );
+
+      const insideAnyPolygon = paths.some((polygonPath) => {
+        const naverPath = polygonPath.map(
+          (p) => new window.naver.maps.LatLng(p.lat, p.lng)
+        );
+
+        return window.naver.maps.geometry.poly.containsPoint(
+          naverPath,
+          point
+        );
+      });
+
+      setIsInside(insideAnyPolygon);
+    };
+
+    check();
+  }, [paths, location]);
+
+  return isInside;
+};
\ No newline at end of file
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/hooks/useMyLocation.ts b/apps/nowait-user/src/pages/waiting/boothMap/hooks/useMyLocation.ts
index 56b6cce1..79c6052d 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/hooks/useMyLocation.ts
+++ b/apps/nowait-user/src/pages/waiting/boothMap/hooks/useMyLocation.ts
@@ -4,16 +4,52 @@ export const useMyLocation = () => {
   const [location, setLocation] = useState({
     center: { lat: 33.450701, lng: 126.570667 },
     isLoading: true,
+    error: null as string | null,
   });
 
   useEffect(() => {
-    if (!navigator.geolocation) return;
-    navigator.geolocation.watchPosition((pos) => {
-      setLocation({
-        center: { lat: pos.coords.latitude, lng: pos.coords.longitude },
+    if (!navigator.geolocation) {
+      setLocation((prev) => ({
+        ...prev,
         isLoading: false,
-      });
+        error: "Geolocation not supported",
+      }));
+      return;
+    }
+
+    // 최초 위치
+    navigator.geolocation.getCurrentPosition(
+      (pos) => {
+        setLocation({
+          center: {
+            lat: pos.coords.latitude,
+            lng: pos.coords.longitude,
+          },
+          isLoading: false,
+          error: null,
+        });
+      },
+      () => {
+        setLocation((prev) => ({
+          ...prev,
+          isLoading: false,
+          error: "위치 정보를 가져올 수 없습니다",
+        }));
+      }
+    );
+
+    // 위치 변경 감지
+    const watchId = navigator.geolocation.watchPosition((pos) => {
+      setLocation((prev) => ({
+        ...prev,
+        center: {
+          lat: pos.coords.latitude,
+          lng: pos.coords.longitude,
+        },
+      }));
     });
+
+    return () => navigator.geolocation.clearWatch(watchId);
   }, []);
 
   return location;

From 5684f7af521f267176dc544d37813185bc3ea23c Mon Sep 17 00:00:00 2001
From: unknown <klp2797@naver.com>
Date: Thu, 22 Jan 2026 21:26:46 +0900
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=EB=A7=B5=20=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=20=EC=BD=94=EB=93=9C=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../waiting/BoothMapManage/MapManagePage.tsx  | 174 ++++--------------
 .../BoothMapManage/components/MapCanvas.tsx   |  26 +++
 .../BoothMapManage/hooks/useMapClick.ts       |  26 +++
 .../BoothMapManage/hooks/useMapInstance.ts    |  11 --
 .../src/pages/waiting/boothMap/MapPage.tsx    |  24 +--
 .../components/mapControls/CompassButton.tsx  |   5 +-
 .../components/mapControls/MapControls.tsx    |   6 +-
 .../mapControls/UniversityListModal.tsx       |  11 +-
 8 files changed, 108 insertions(+), 175 deletions(-)
 create mode 100644 apps/nowait-user/src/pages/waiting/BoothMapManage/components/MapCanvas.tsx
 create mode 100644 apps/nowait-user/src/pages/waiting/BoothMapManage/hooks/useMapClick.ts
 delete mode 100644 apps/nowait-user/src/pages/waiting/BoothMapManage/hooks/useMapInstance.ts

diff --git a/apps/nowait-user/src/pages/waiting/BoothMapManage/MapManagePage.tsx b/apps/nowait-user/src/pages/waiting/BoothMapManage/MapManagePage.tsx
index 25111b11..f274b1ef 100644
--- a/apps/nowait-user/src/pages/waiting/BoothMapManage/MapManagePage.tsx
+++ b/apps/nowait-user/src/pages/waiting/BoothMapManage/MapManagePage.tsx
@@ -1,148 +1,52 @@
-import { useEffect, useState } from "react";
-import { Button } from "@repo/ui";
-import { Container as MapDiv, NaverMap, Marker } from "react-naver-maps";
 import { useGeoPolygon } from "../boothMap/hooks/useGeoPolygon";
 import { useMyLocation } from "../boothMap/hooks/useMyLocation";
-import UniversityPolygon from "../boothMap/components/UniversityPolygon";
+import MapControls from "./components/MapControls";
+import GeoDataForm from "./components/GeoDataForm";
+import MapCanvas from "./components/MapCanvas";
+import { useMapClick } from "./hooks/useMapClick";
+import { useMarkerManager } from "./hooks/useMarkerManager";
+import { useMap } from "react-naver-maps";
 
 const MapManagePage = () => {
-  const [markers, setMarkers] = useState<
-    { storeId: string; lat: number; lng: number }[]
-  >([]);
-  const [status, setStatus] = useState(false);
-  const [geoData, setGeoData] = useState<string>("");
-  const [map, setMap] = useState<any | null>(null);
+  const map = useMap();
+
   const paths = useGeoPolygon();
   const myLocation = useMyLocation();
 
-  //마커 생성 컨트롤
-  useEffect(() => {
-    if (!map) return;
-
-    const listener = window.naver.maps.Event.addListener(
-      map,
-      "click",
-      (e: any) => {
-        if (!status) return;
-
-        const inputId = prompt("스토어 아이디를 입력하세요");
-        if (inputId === null || inputId.trim() === "") return;
-        const isExist = markers.some(
-          (marker) => String(marker.storeId) === String(inputId)
-        );
-        if (isExist) {
-          alert("이미 존재하는 주점입니다.");
-          return;
-        }
-
-        const lat = e.coord.lat();
-        const lng = e.coord.lng();
-
-        const newMarker = { storeId: inputId, lat, lng };
-        setMarkers((prev) => [...prev, newMarker]);
-      }
-    );
-
-    return () => {
-      window.naver.maps.Event.removeListener(listener);
-    };
-  }, [map, status, markers]);
+  const {
+    markers,
+    isActive,
+    setIsActive,
+    addMarker,
+    undoMarker,
+    resetMarkers,
+    copyMarkers,
+  } = useMarkerManager();
+
+  useMapClick({
+    map,
+    enabled: isActive,
+    onClick: addMarker,
+  });
 
   return (
     // <div className="relative top-0 left-0 min-h-dvh w-full">
-    <div className="fixed top-0 left-0 min-h-dvh w-[1194px]! my-0!">
-      <MapDiv style={{ width: "100%", height: "100vh" }}>
-        <NaverMap
-          defaultCenter={myLocation.center}
-          defaultZoom={16}
-          ref={setMap}
-        >
-          <UniversityPolygon paths={paths} />
-          {/* <MapControlButtons center={myLocation.center} map={map} /> */}
-          {markers.map((marker) => {
-            return (
-              <Marker
-                key={marker.storeId}
-                position={{ lat: marker.lat, lng: marker.lng }}
-              ></Marker>
-            );
-          })}
-        </NaverMap>
-      </MapDiv>
-      <div className="fixed left-1/2 -translate-x-1/2 bottom-20 w-full z-50 px-2.5">
-        <form
-          onSubmit={() => {
-            const parsed = JSON.parse(geoData);
-            const polygon = [
-              parsed.map(({ lat, lon }: { lat: number; lon: number }) => [
-                lon,
-                lat,
-              ]),
-            ];
-            navigator.clipboard.writeText(JSON.stringify(polygon, null, 2));
-            alert("복사가 완료 되었습니다.");
-          }}
-        >
-          <textarea
-            className="bg-white w-full min-h-48 outline-none"
-            placeholder="데이터를 입력해주세요."
-            onChange={(e) => setGeoData(e.target.value)}
-            value={geoData}
-          />
-          <Button>데이터 변경 및 복사</Button>
-        </form>
-      </div>
-      <div className="flex gap-1 fixed left-1/2 bottom-2.5 -translate-x-1/2 w-full z-50 px-2.5">
-        <Button
-          disabled={status}
-          className="text-15-medium"
-          onClick={() => {
-            setStatus(true);
-          }}
-        >
-          시작
-        </Button>
-        <Button
-          disabled={!status}
-          className="text-15-medium"
-          onClick={() => {
-            setStatus(false);
-          }}
-        >
-          중지
-        </Button>
-        <Button
-          className="text-15-medium"
-          onClick={() => {
-            setMarkers((prev) => prev.slice(0, -1));
-          }}
-        >
-          뒤로가기
-        </Button>
-        <Button
-          className="text-15-medium"
-          onClick={() => {
-            setMarkers([]);
-          }}
-        >
-          초기화
-        </Button>
-        <Button
-          className="text-15-medium"
-          onClick={() => {
-            // 좌표를 문자열로 변환 후 복사
-            const formattedMarkers = markers
-              .map((marker) => {
-                return `${marker.storeId} : {lat:${marker.lat},lng:${marker.lng}}`;
-              })
-              .join(",\n");
-            navigator.clipboard.writeText(`${formattedMarkers}\n`);
-            alert("복사가 완료 되었습니다.");
-          }}
-        >
-          복사
-        </Button>
-      </div>
+    <div className="fixed top-0 left-0 min-h-dvh w-full my-0!">
+      <MapCanvas
+        center={myLocation.center}
+        paths={paths}
+        markers={markers}
+      />
+      <GeoDataForm />
+      <MapControls
+        isActive={isActive}
+        hasMarkers={!!markers.length}
+        onStart={() => setIsActive(true)}
+        onStop={() => setIsActive(false)}
+        onUndo={undoMarker}
+        onReset={resetMarkers}
+        onCopy={copyMarkers}
+      />
     </div>
   );
 };
diff --git a/apps/nowait-user/src/pages/waiting/BoothMapManage/components/MapCanvas.tsx b/apps/nowait-user/src/pages/waiting/BoothMapManage/components/MapCanvas.tsx
new file mode 100644
index 00000000..c1f3eaf8
--- /dev/null
+++ b/apps/nowait-user/src/pages/waiting/BoothMapManage/components/MapCanvas.tsx
@@ -0,0 +1,26 @@
+import { Container as MapDiv, Marker, NaverMap } from "react-naver-maps";
+import UniversityPolygon from "../../boothMap/components/UniversityPolygon";
+import MapControlButtons from "../../boothMap/components/mapControls/MapControls";
+
+interface PropsType {
+  center: { lat: number; lng: number };
+  paths: any;
+  markers: { storeId: string; lat: number; lng: number }[];
+}
+
+const MapCanvas = ({ center, paths, markers }: PropsType) => {
+  return (
+    <MapDiv style={{ width: "100%", height: "100vh" }}>
+      <NaverMap defaultCenter={center} defaultZoom={16}>
+        <MapControlButtons center={center} />
+
+        <UniversityPolygon paths={paths} />
+        {markers.map(({ storeId, lat, lng }) => (
+          <Marker key={storeId} position={{ lat, lng }} />
+        ))}
+      </NaverMap>
+    </MapDiv>
+  );
+};
+
+export default MapCanvas;
diff --git a/apps/nowait-user/src/pages/waiting/BoothMapManage/hooks/useMapClick.ts b/apps/nowait-user/src/pages/waiting/BoothMapManage/hooks/useMapClick.ts
new file mode 100644
index 00000000..1d4695da
--- /dev/null
+++ b/apps/nowait-user/src/pages/waiting/BoothMapManage/hooks/useMapClick.ts
@@ -0,0 +1,26 @@
+import { useEffect } from "react";
+
+interface PropsType  {
+  map: any | null;
+  enabled: boolean;
+  onClick: (lat: number, lng: number) => void;
+};
+
+export const useMapClick = ({ map, enabled, onClick }: PropsType) => {
+  useEffect(() => {
+    if (!map) return;
+
+    const listener = window.naver.maps.Event.addListener(
+      map,
+      "click",
+      (e: any) => {
+        if (!enabled) return;
+        onClick(e.coord.lat(), e.coord.lng());
+      }
+    );
+
+    return () => {
+      window.naver.maps.Event.removeListener(listener);
+    };
+  }, [map, enabled, onClick]);
+};
\ No newline at end of file
diff --git a/apps/nowait-user/src/pages/waiting/BoothMapManage/hooks/useMapInstance.ts b/apps/nowait-user/src/pages/waiting/BoothMapManage/hooks/useMapInstance.ts
deleted file mode 100644
index adadb197..00000000
--- a/apps/nowait-user/src/pages/waiting/BoothMapManage/hooks/useMapInstance.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { useCallback, useState } from "react";
-
-export const useMapInstance = () => {
-  const [map, setMap] = useState<any | null>(null);
-
-  const mapRef = useCallback((instance: any | null) => {
-    if (instance) setMap(instance);
-  }, []);
-
-  return { map, mapRef };
-};
\ No newline at end of file
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/MapPage.tsx b/apps/nowait-user/src/pages/waiting/boothMap/MapPage.tsx
index 19957aee..09124398 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/MapPage.tsx
+++ b/apps/nowait-user/src/pages/waiting/boothMap/MapPage.tsx
@@ -8,10 +8,14 @@ import BoothMarkers from "./components/BoothMarkers";
 import { useBooths } from "./hooks/useBooths";
 import { useMyLocation } from "./hooks/useMyLocation";
 import MapControlButtons from "./components/mapControls/MapControls";
-import { Container as MapDiv, NaverMap, Marker } from "react-naver-maps";
+import {
+  Container as MapDiv,
+  NaverMap,
+  Marker,
+  useMap,
+} from "react-naver-maps";
 import { useMapZoom } from "./hooks/useMapZoom";
 import { useMapEvents } from "./hooks/useMapEvents";
-// import { useIsInsidePolygon } from "./hooks/useIsInsidePolyon";
 
 declare global {
   interface Window {
@@ -21,7 +25,7 @@ declare global {
 
 const MapPage = () => {
   const [selectedBooth, setSelectedBooth] = useState<number | null>(null);
-  const [map, setMap] = useState<any | null>(null);
+  const map = useMap();
   // const { setIsCompassMode } = isCompassModeStore();
   //대학교 폴리곤(영역) 설정
   const paths = useGeoPolygon();
@@ -43,7 +47,7 @@ const MapPage = () => {
         setSelectedBooth(id);
       }
     },
-    [selectedBooth]
+    [selectedBooth],
   );
 
   return (
@@ -57,8 +61,8 @@ const MapPage = () => {
             height: "600px",
           }}
         >
-          <NaverMap center={myLocation.center} zoom={16} ref={setMap}>
-            <MapControlButtons center={myLocation.center} map={map} />
+          <NaverMap center={myLocation.center} zoom={16}>
+            <MapControlButtons center={myLocation.center}/>
             <UniversityPolygon paths={paths} />
             {!myLocation.isLoading && <Marker position={myLocation.center} />}
             <BoothMarkers
@@ -77,14 +81,6 @@ const MapPage = () => {
       ) : (
         <BoothList booths={booths!} totalBooth={booths?.length} />
       )}
-      {/* {!isInsideServiceArea && (
-        <div
-          className="absolute top-16 left-1/2 -translate-x-1/2 z-50
-                  bg-black/80 text-white px-4 py-2 rounded-lg text-sm"
-        >
-          현재 위치는 서비스 지역이 아닙니다
-        </div>
-      )} */}
     </div>
   );
 };
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/CompassButton.tsx b/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/CompassButton.tsx
index b028ffe3..a07d8eb7 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/CompassButton.tsx
+++ b/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/CompassButton.tsx
@@ -1,16 +1,15 @@
 // import { useRef } from "react";
 import MyLocation from "../../../../../assets/icon/myLocation.svg?react";
 import { isCompassModeStore } from "../../../../../stores/mapStore";
-import { useNavermaps } from "react-naver-maps";
+import { useMap, useNavermaps } from "react-naver-maps";
 
 const CompassButton = ({
-  map,
   center,
 }: {
-  map: any;
   center: { lat: number; lng: number };
 }) => {
   const { isCompassMode, setIsCompassMode } = isCompassModeStore();
+  const map = useMap();
   const navermaps = useNavermaps();
 
   const handleClick = async () => {
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/MapControls.tsx b/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/MapControls.tsx
index bad40389..26b881c6 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/MapControls.tsx
+++ b/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/MapControls.tsx
@@ -5,10 +5,8 @@ import UniversityListModal from "./UniversityListModal";
 import CompassButton from "./CompassButton";
 
 const MapControlButtons = ({
-  map,
   center,
 }: {
-  map: any
   center: { lat: number; lng: number };
 }) => {
   const modal = useModal();
@@ -24,11 +22,11 @@ const MapControlButtons = ({
         >
           <University width="22px" height="22px" />
         </button>
-        <CompassButton map={map} center={center} />
+        <CompassButton center={center} />
       </div>
       {modal.isOpen === true && (
         <Portal>
-          <UniversityListModal  onClose={modal.close} map={map}/>
+          <UniversityListModal onClose={modal.close} />
         </Portal>
       )}
     </div>
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/UniversityListModal.tsx b/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/UniversityListModal.tsx
index 19563937..6d0f6e54 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/UniversityListModal.tsx
+++ b/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/UniversityListModal.tsx
@@ -1,12 +1,7 @@
 import { UNIVERSITY } from "../../constants/university";
-import { useNavermaps } from "react-naver-maps";
-const UniversityListModal = ({
-  map,
-  onClose,
-}: {
-  map: any;
-  onClose: () => void;
-}) => {
+import { useMap, useNavermaps } from "react-naver-maps";
+const UniversityListModal = ({ onClose }: { onClose: () => void }) => {
+  const map = useMap();
   const navermaps = useNavermaps();
 
   return (