From 512d662f8c798052d4f1ac1331f0bcbc51a2f4d7 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: Wed, 25 Oct 2023 17:35:29 +0900 Subject: [PATCH] =?UTF-8?q?laanc=20=EB=B9=84=ED=96=89=EA=B5=AC=EC=97=AD=20?= =?UTF-8?q?=EC=B7=A8=EC=86=8C=20=EC=8B=9C=20=EC=B4=88=EA=B8=B0=ED=99=94?= =?UTF-8?q?=EB=90=98=EB=8A=94=20=ED=98=84=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 --- src/components/laanc/map/FlightArea.js | 21 ++++--------------- src/components/laanc/map/LaancAreaMap.js | 4 +++- .../map/mapbox/draw/LaancDrawControl.js | 1 + 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/components/laanc/map/FlightArea.js b/src/components/laanc/map/FlightArea.js index f650cd2..fb173a4 100644 --- a/src/components/laanc/map/FlightArea.js +++ b/src/components/laanc/map/FlightArea.js @@ -73,20 +73,12 @@ export default function FlightArea({ const [isMapLoad, setIsMapLoad] = useState(false); const [previewLayer, setPreviewLayer] = useState(); const [formModal, setFormModal] = useState(false); - const [alertModal, setAlertModal] = useState({ - isOpen: false, - title: '비행구역 설정', - desc: '구역은 최대 2개까지 설정 가능합니다.' - }); - const [addModal, setAddModal] = useState({ - isOpen: false, - title: '비행구역 설정', - desc: '모드를 변경하고 추가구역을 설정해주세요. 구역은 최대 2개까지 설정 가능합니다.' - }); const [isSaveable, setIsSaveable] = useState(false); const [addData, setAddData] = useState(initialAddData); + const [saveData, setSaveData] = useState(); + //날씨 임시 데이터 const [wheather, setWheather] = useState([]); @@ -502,10 +494,6 @@ export default function FlightArea({ const handlerAddClick = () => { if (!addData.isAddable) { - // setAddModal(prev => ({ - // ...prev, - // isOpen: true - // })); handlerAddChange('isAddable', true); const obj = drawObj .getAll() @@ -559,7 +547,7 @@ export default function FlightArea({ { setCenteredModal(!centeredModal); - handlerInitCoordinates(); + dispatch(AREA_COORDINATE_LIST_SAVE(saveData)); }} > 비행 구역 설정 @@ -573,6 +561,7 @@ export default function FlightArea({ handlerSaveCheck={handlerSaveCheck} handlerAddChange={handlerAddChange} addData={addData} + setSaveData={setSaveData} /> @@ -665,8 +654,6 @@ export default function FlightArea({ ) : null} - - state.controlMapReducer); @@ -398,6 +399,7 @@ export default function LaancAreaMap({ handlerSaveCheck={handlerSaveCheck} handlerCoordinates={handlerCoordinates} handlerInitCoordinates={handlerInitCoordinates} + setSaveData={setSaveData} /> {modal ? ( diff --git a/src/components/map/mapbox/draw/LaancDrawControl.js b/src/components/map/mapbox/draw/LaancDrawControl.js index bb0edec..027312a 100644 --- a/src/components/map/mapbox/draw/LaancDrawControl.js +++ b/src/components/map/mapbox/draw/LaancDrawControl.js @@ -535,6 +535,7 @@ export const LaancDrawControl = props => { }); } else if (areas.length > 0 && areas[0].areaType) { // 이미 그려진 지도 다시 열었을 때 + props.setSaveData(areas); areas.map(area => { const paths = []; area.coordList.forEach(coord => paths.push([coord.lon, coord.lat]));