From 8124409aa78e563bb4316a2f9c9920a1ea7f84eb Mon Sep 17 00:00:00 2001 From: junh_eee Date: Wed, 21 Sep 2022 12:07:43 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95=EB=B6=88=EA=B0=80=20?= =?UTF-8?q?=EA=B3=84=ED=9A=8D=EC=84=9C=20-=20=EB=B9=84=ED=96=89=EA=B5=AC?= =?UTF-8?q?=EC=97=AD=20=EB=B3=80=EA=B2=BD=20=EA=B0=80=EB=8A=A5=20=ED=98=84?= =?UTF-8?q?=EC=83=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basis/flight/plan/FlightPlanAreaMap.js | 1 + .../map/naver/draw/FlightPlanDraw.js | 29 ++++++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/components/basis/flight/plan/FlightPlanAreaMap.js b/src/components/basis/flight/plan/FlightPlanAreaMap.js index 45a8762..ea1d5e0 100644 --- a/src/components/basis/flight/plan/FlightPlanAreaMap.js +++ b/src/components/basis/flight/plan/FlightPlanAreaMap.js @@ -214,6 +214,7 @@ const FlightPlanAreaMap = props => { handleCoordinates={handleCoordinates} handleInitCoordinates={handleInitCoordinates} handleConfirm={props.handleConfirm} + isDisabled={props.test} /> ) : null} diff --git a/src/components/map/naver/draw/FlightPlanDraw.js b/src/components/map/naver/draw/FlightPlanDraw.js index 9bcccd7..0286ed2 100644 --- a/src/components/map/naver/draw/FlightPlanDraw.js +++ b/src/components/map/naver/draw/FlightPlanDraw.js @@ -7,6 +7,7 @@ import { InfoModal } from '../../../modal/InfoModal'; export const FlightPlanDraw = props => { const dispatch = useDispatch(); const mapControl = useSelector(state => state.controlMapReducer); + const isDisabled = props.isDisabled; const [pastPolyline, setPolyline] = useState(); const [pastBuffer, setBuffer] = useState(); @@ -575,6 +576,9 @@ export const FlightPlanDraw = props => { paths.push(path); }); + let clickSet; + {isDisabled===true ? clickSet=false : clickSet=true} + if (areas.areaType && areas.areaType === 'LINE') { //polyline 생성 if(pastPolyline) { @@ -605,11 +609,16 @@ export const FlightPlanDraw = props => { radius: 17, // radius: dragCircleSize, map: map, - clickable: true + // clickable: true + clickable: clickSet }) ) + // dragCircleEve.push(naver.maps.Event.addListener(dragCircle[i], 'mousedown', function () { onMouseDownDrag(i) })) + {isDisabled ? + {} + : dragCircleEve.push(naver.maps.Event.addListener(dragCircle[i], 'mousedown', function () { onMouseDownDrag(i) })) - + } } setDragCircle(dragCircle); @@ -703,10 +712,16 @@ export const FlightPlanDraw = props => { radius: 15, // radius: dragCircleSize, map: map, - clickable: true + // clickable: true + clickable: clickSet }) ) + // dragCircleEve.push(naver.maps.Event.addListener(dragCircle[i], 'mousedown', function () { onMouseDownDrag(i) })) + {isDisabled ? + {} + : dragCircleEve.push(naver.maps.Event.addListener(dragCircle[i], 'mousedown', function () { onMouseDownDrag(i) })) + } } setDragCircle(dragCircle); @@ -783,9 +798,15 @@ export const FlightPlanDraw = props => { center: paths[0], radius: areas.bufferZone, map: map, - clickable: true + // clickable: true + clickable: clickSet }); + // Eve.mousedownEve = naver.maps.Event.addListener(circle, 'mousedown', function () { onMouseDownDrag(0); }) + {isDisabled ? + {} + : Eve.mousedownEve = naver.maps.Event.addListener(circle, 'mousedown', function () { onMouseDownDrag(0); }) + } setCircle([circle]);