From 5415a36754416dbdd14442dfd6f2bc5d56b3c908 Mon Sep 17 00:00:00 2001 From: sanguu Date: Thu, 11 Aug 2022 10:47:33 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EA=B5=AC=EC=97=AD=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95(waypoint,=EB=93=B1=EB=A1=9D=20=EC=98=88?= =?UTF-8?q?=EC=99=B8=EC=B2=98=EB=A6=AC)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flight/plan/FlightPlanAreaDetailForm.js | 1 + .../map/naver/draw/FlightPlanDraw.js | 32 +++++++++++++++---- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/components/basis/flight/plan/FlightPlanAreaDetailForm.js b/src/components/basis/flight/plan/FlightPlanAreaDetailForm.js index f9dbf7c..9697c1b 100644 --- a/src/components/basis/flight/plan/FlightPlanAreaDetailForm.js +++ b/src/components/basis/flight/plan/FlightPlanAreaDetailForm.js @@ -177,6 +177,7 @@ const FlightPlanAreaDetailForm = ({ handleSave, handleClose, handleChange, handl className='mr-1' color='primary' onClick={e => handleSave()} + disabled={!coordList[0].lat ? true : false } > 등록 diff --git a/src/components/map/naver/draw/FlightPlanDraw.js b/src/components/map/naver/draw/FlightPlanDraw.js index 9056860..bf45fdd 100644 --- a/src/components/map/naver/draw/FlightPlanDraw.js +++ b/src/components/map/naver/draw/FlightPlanDraw.js @@ -2,6 +2,7 @@ import $ from 'jquery'; import { useEffect, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import * as Actions from '../../../../modules/basis/flight/actions/basisFlightAction'; +import { InfoModal } from '../../../../components/modal/InfoModal'; export const FlightPlanDraw = props => { const dispatch = useDispatch(); @@ -20,10 +21,16 @@ export const FlightPlanDraw = props => { const [areaDetail, setAreaDetail] = useState(); + const [alertModal, setAlertModal] = useState({ + isOpen: false, + title: '', + desc: '' + }); + const naver = props.naver; const map = props.map; let mode = props.mode; - + let areaInfo; let lastDistance; @@ -188,11 +195,16 @@ export const FlightPlanDraw = props => { setPolyline(polyline); setAreaInfo(polypaths); } else { - // polyline.setMap(null); + setAlertModal({ + isOpen: true, + title: '우회 여부 확인', + desc: '좌표를 두 개 점으로 이어주세요.' + }) + polyline.setMap(null); polyline = ''; } - - polyline.setMap(null) + + //polyline.setMap(null) setFigure(polyline) } else if (polygon) { @@ -218,6 +230,8 @@ export const FlightPlanDraw = props => { } } + + const onClickPolyline = (e) => { console.log('onClickPolyline') var coord = e.coord; @@ -839,5 +853,11 @@ export const FlightPlanDraw = props => { return text; } - return null; -}; \ No newline at end of file + + + +return( + + ) +}; +export default FlightPlanDraw; \ No newline at end of file