From 978646f97226ff7de3426ab5739cbab5e7b39f7c 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 19:07:17 +0900 Subject: [PATCH 1/4] =?UTF-8?q?laanc=20=EC=8A=A4=ED=85=9D=20=EB=B2=97?= =?UTF-8?q?=EC=96=B4=EB=82=98=EB=A9=B4=20drawType=20=EC=B4=88=EA=B8=B0?= =?UTF-8?q?=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/containers/laanc/LaancPlanContainer.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/containers/laanc/LaancPlanContainer.js b/src/containers/laanc/LaancPlanContainer.js index 585d44c..2eb5f72 100644 --- a/src/containers/laanc/LaancPlanContainer.js +++ b/src/containers/laanc/LaancPlanContainer.js @@ -28,6 +28,7 @@ import { FLIGHT_PLAN_AREA_BUFFER_LIST } from '../../modules/basis/flight/actions/basisFlightAction'; import { useDispatch, useSelector } from 'react-redux'; +import { drawTypeChangeAction } from '../../modules/control/map/actions/controlMapActions'; export default function LaancPlanContainer({ currentParm, @@ -58,6 +59,12 @@ export default function LaancPlanContainer({ } ]); + useEffect(() => { + return () => { + dispatch(drawTypeChangeAction('')); + }; + }, []); + // step 핸들러 const handlerStep = step => { setStep(step); @@ -67,8 +74,6 @@ export default function LaancPlanContainer({ dispatch(Actions.logout.request()); }; - useEffect(() => {}, [detailData]); - // 날씨 핸들러 const handlerWeather = () => { setFormModal(!formModal); From 7059a928c35ea385f9787ecb4fc0b9e5b3474e85 Mon Sep 17 00:00:00 2001 From: kyw546 Date: Tue, 26 Sep 2023 19:19:27 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EB=AC=B8=EA=B5=AC=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/laanc/LaancStep1.js | 2 +- src/views/laanc/LaancStep2.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/laanc/LaancStep1.js b/src/views/laanc/LaancStep1.js index ac8089c..45e4cd3 100644 --- a/src/views/laanc/LaancStep1.js +++ b/src/views/laanc/LaancStep1.js @@ -90,7 +90,7 @@ export default function LaancStep1({
비행 유형
-
승인 유형
+
비행 유형
Date: Tue, 26 Sep 2023 19:21:47 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EB=AC=B8=EA=B5=AC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/laanc/LaacnStep3.js | 2 +- src/views/laanc/LaancStep1.js | 2 +- src/views/laanc/LaancStep2.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/laanc/LaacnStep3.js b/src/views/laanc/LaacnStep3.js index bcc9899..d46d25a 100644 --- a/src/views/laanc/LaacnStep3.js +++ b/src/views/laanc/LaacnStep3.js @@ -234,7 +234,7 @@ export default function LaacnStep3({ 비행신청이 승인되었습니다.{' '} - 조종사 준수사항을 다시 확인해주시기 바랍니다. + 조종자 준수사항을 다시 확인해주시기 바랍니다. diff --git a/src/views/laanc/LaancStep1.js b/src/views/laanc/LaancStep1.js index 45e4cd3..11e1024 100644 --- a/src/views/laanc/LaancStep1.js +++ b/src/views/laanc/LaancStep1.js @@ -71,7 +71,7 @@ export default function LaancStep1({ -
조종사 정보
+
조종자 정보
diff --git a/src/views/laanc/LaancStep2.js b/src/views/laanc/LaancStep2.js index d4ca8f1..ad80b63 100644 --- a/src/views/laanc/LaancStep2.js +++ b/src/views/laanc/LaancStep2.js @@ -148,7 +148,7 @@ export default function LaancStep2({ -
조종사 정보
+
조종자 정보
From 56cc2e58eb83c60941cb24b5d3f843d93b268d50 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 19:25:03 +0900 Subject: [PATCH 4/4] =?UTF-8?q?laanc=20=EC=8A=A4=ED=85=9D1=20=EB=B0=98?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/laanc/FlightArea.js | 15 ++++++++++++++- src/views/laanc/LaancStep1.js | 2 ++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/views/laanc/FlightArea.js b/src/views/laanc/FlightArea.js index 4b64244..2a7a4b4 100644 --- a/src/views/laanc/FlightArea.js +++ b/src/views/laanc/FlightArea.js @@ -31,7 +31,13 @@ import { ErrorModal } from '../../components/modal/ErrorModal'; import { FeatureAirZone } from '../../components/map/mapbox/feature/FeatureAirZone'; import { WeatherContainer } from '../../containers/basis/flight/plan/WeatherContainer'; -export default function FlightArea({ centeredModal, setCenteredModal, page }) { +export default function FlightArea({ + centeredModal, + setCenteredModal, + page, + handleChange, + data +}) { const dispatch = useDispatch(); const { areaCoordList } = useSelector(state => state.flightState); const mapControl = useSelector(state => state.controlMapReducer); @@ -322,6 +328,13 @@ export default function FlightArea({ centeredModal, setCenteredModal, page }) { mapObject.setPaintProperty('waypoint', 'circle-radius', 10); mapObject.getSource('preview').setData(previewGeo); } + + //스텝1에 반경도 글씨가 바뀌어야 함...!! + handleChange({ + type: 'area', + name: 'bufferZone', + value: String(areas.bufferZone) + }); } }; diff --git a/src/views/laanc/LaancStep1.js b/src/views/laanc/LaancStep1.js index 11e1024..04f7ee2 100644 --- a/src/views/laanc/LaancStep1.js +++ b/src/views/laanc/LaancStep1.js @@ -441,6 +441,8 @@ export default function LaancStep1({