From bf580c5694b573f4fd941062bf873b072e67bb4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Tue, 26 Sep 2023 18:37:54 +0900 Subject: [PATCH 1/2] =?UTF-8?q?laanc=20=EC=8A=A4=ED=85=9D1=20=EB=B0=98?= =?UTF-8?q?=EA=B2=BD=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/laanc/FlightArea.js | 4 ++-- src/views/laanc/LaancAreaMap.js | 4 ++++ src/views/laanc/LaancStep1.js | 34 +++++++++++++++++++++------------ 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/views/laanc/FlightArea.js b/src/views/laanc/FlightArea.js index 6a37ce5..4b64244 100644 --- a/src/views/laanc/FlightArea.js +++ b/src/views/laanc/FlightArea.js @@ -333,9 +333,9 @@ export default function FlightArea({ centeredModal, setCenteredModal, page }) { ref={mapContainer} style={{ width: '100%', height: '35vh' }} > - {/* {isMapLoad && mapObject ? ( + {isMapLoad && mapObject ? ( - ) : null} */} + ) : null} {page === 1 ? ( + {isMapLoad && mapObject ? ( + + ) : null} diff --git a/src/views/laanc/LaancStep1.js b/src/views/laanc/LaancStep1.js index 7e1981a..257b1ec 100644 --- a/src/views/laanc/LaancStep1.js +++ b/src/views/laanc/LaancStep1.js @@ -29,18 +29,8 @@ import { Input } from 'reactstrap'; -import { - initFlight, - initFlightBas -} from '../../modules/basis/flight/models/basisFlightModel'; -import { - areaClickAction, - environmentClickAction, - mapTypeChangeAction, - sensorClickAction -} from '../../modules/control/map/actions/controlMapActions'; import FlightArea from './FlightArea'; -import { AREA_DETAIL_INIT } from '../../modules/basis/flight/actions/basisFlightAction'; +import { FLIGHT_PLAN_AREA_BUFFER_LIST } from '../../modules/basis/flight/actions/basisFlightAction'; export default function LaancStep1({ handleChange, @@ -234,7 +224,27 @@ export default function LaancStep1({
- 비행 구역 정보 + 비행 구역 정보 +
From 0e92113343fe0edfe061b0649f8f6ca2d885cb15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Tue, 26 Sep 2023 18:55:52 +0900 Subject: [PATCH 2/2] =?UTF-8?q?laanc=20=EC=8A=A4=ED=85=9D1=20=EC=9C=A0?= =?UTF-8?q?=ED=9A=A8=EC=84=B1=EA=B2=80=EC=82=AC=20=EC=B6=94=EA=B0=80(?= =?UTF-8?q?=EB=B0=98=EA=B2=BD)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/containers/laanc/LaancPlanContainer.js | 29 ++++++++++++++++++++-- src/views/laanc/LaancStep1.js | 29 +++------------------- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/containers/laanc/LaancPlanContainer.js b/src/containers/laanc/LaancPlanContainer.js index b21fbd1..585d44c 100644 --- a/src/containers/laanc/LaancPlanContainer.js +++ b/src/containers/laanc/LaancPlanContainer.js @@ -23,14 +23,19 @@ import { Label, Input } from 'reactstrap'; -import { AREA_DETAIL_INIT } from '../../modules/basis/flight/actions/basisFlightAction'; -import { useDispatch } from 'react-redux'; +import { + AREA_DETAIL_INIT, + FLIGHT_PLAN_AREA_BUFFER_LIST +} from '../../modules/basis/flight/actions/basisFlightAction'; +import { useDispatch, useSelector } from 'react-redux'; export default function LaancPlanContainer({ currentParm, disabledAnimation, setDisabledAnimation }) { + const { areaCoordList } = useSelector(state => state.flightState); + const dispatch = useDispatch(); const [step, setStep] = useState(1); const [detailData, setDetailData] = useState(initFlightBas.initDetail); @@ -217,6 +222,25 @@ export default function LaancPlanContainer({ } }; + const handlerBufferApply = () => { + if (areaCoordList) { + if (areaCoordList[0].coordList.length > 0) { + const array = []; + const copy = { ...areaCoordList[0] }; + copy.bufferZone = detailData.areaList[0].bufferZone; + array.push(copy); + + dispatch(FLIGHT_PLAN_AREA_BUFFER_LIST.request(array)); + } + } else { + setModal2({ + isOpen: true, + title: '필수값 입력 오류', + desc: '비행 구역을 설정해 주세요.' + }); + } + }; + const handlerLaancClose = () => { setDisabledAnimation(!disabledAnimation); dispatch(AREA_DETAIL_INIT()); @@ -246,6 +270,7 @@ export default function LaancPlanContainer({ setCenteredModal={setCenteredModal} currentParm={currentParm} handlerLaancClose={handlerLaancClose} + handlerBufferApply={handlerBufferApply} /> )} diff --git a/src/views/laanc/LaancStep1.js b/src/views/laanc/LaancStep1.js index 257b1ec..ac8089c 100644 --- a/src/views/laanc/LaancStep1.js +++ b/src/views/laanc/LaancStep1.js @@ -30,7 +30,6 @@ import { } from 'reactstrap'; import FlightArea from './FlightArea'; -import { FLIGHT_PLAN_AREA_BUFFER_LIST } from '../../modules/basis/flight/actions/basisFlightAction'; export default function LaancStep1({ handleChange, @@ -42,13 +41,12 @@ export default function LaancStep1({ centeredModal, setCenteredModal, currentParm, - handlerLaancClose + handlerLaancClose, + handlerBufferApply }) { const { user } = useSelector(state => state.authState); - const { areaCoordList } = useSelector(state => state.flightState); const history = useHistory(); - const dispatch = useDispatch(); const location = useLocation(); const queryParams = new URLSearchParams(location.search); @@ -59,10 +57,6 @@ export default function LaancStep1({ if (!currentParm) setCenteredModal(mapParam); }, [location]); - useEffect(() => { - console.log(areaCoordList, '저장상태'); - }, [areaCoordList]); - // console.log('>', data); return ( <> @@ -225,24 +219,7 @@ export default function LaancStep1({
비행 구역 정보 -