diff --git a/src/components/laanc/map/LaancAreaMap.js b/src/components/laanc/map/LaancAreaMap.js index 583e2a7f..86e1dd0b 100644 --- a/src/components/laanc/map/LaancAreaMap.js +++ b/src/components/laanc/map/LaancAreaMap.js @@ -10,8 +10,7 @@ import { initFlightBas } from '../../../modules/basis/flight/models/basisFlightM import * as LaancAction from '../../../modules/laanc/actions/laancActions'; import { AREA_COORDINATE_LIST_SAVE, - FLIGHT_PLAN_AREA_BUFFER_LIST, - FLIGHT_PLAN_AREA_INAIRAREA + FLIGHT_PLAN_AREA_BUFFER_LIST } from '../../../modules/basis/flight/actions/basisFlightAction'; import { drawTypeChangeAction, @@ -303,7 +302,6 @@ export default function LaancAreaMap({ } dispatch(LaancAction.LAANC_ALTITUDE.request(areaList)); dispatch(LaancAction.LAANC_VALID_AREA.request(areaList)); - // dispatch(FLIGHT_PLAN_AREA_INAIRAREA.request(areaList)); }; const handlerConfirm = areaList => { diff --git a/src/components/laanc/step/LaancStep1.js b/src/components/laanc/step/LaancStep1.js index d731f514..203b3536 100644 --- a/src/components/laanc/step/LaancStep1.js +++ b/src/components/laanc/step/LaancStep1.js @@ -291,7 +291,7 @@ export default function LaancStep1({ name='memberName' size='sm' placeholder='' - value={user.memberName} + value={user?.memberName} disabled /> diff --git a/src/containers/laanc/LaancPlanContainer.js b/src/containers/laanc/LaancPlanContainer.js index 0350a0d0..456122fb 100644 --- a/src/containers/laanc/LaancPlanContainer.js +++ b/src/containers/laanc/LaancPlanContainer.js @@ -9,8 +9,7 @@ import { initFlightBas } from '../../modules/laanc/models/laancModels'; import { Modal } from 'reactstrap'; import { AREA_DETAIL_INIT, - FLIGHT_PLAN_AREA_BUFFER_LIST, - FLIGHT_PLAN_AREA_INAIRAREA + 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'; @@ -27,8 +26,6 @@ export default function LaancPlanContainer({ const { user } = useSelector(state => state.authState); const { laancArea, laancElev } = useSelector(state => state.laancState); - const [isBuffer, setIsBuffer] = useState(false); - const [step, setStep] = useState(1); const [detailData, setDetailData] = useState(initFlightBas.initDetail); const [finalDetailData, setFinalDetailData] = useState({}); @@ -149,14 +146,6 @@ export default function LaancPlanContainer({ // } }; - // 버퍼 변경될 때 관제권 포함유무 체크 - useEffect(() => { - if (isBuffer) { - dispatch(FLIGHT_PLAN_AREA_INAIRAREA.request(areaCoordList)); - setIsBuffer(false); - } - }, [areaCoordList]); - // step 핸들러 const handlerStep = step => { setStep(step); @@ -404,13 +393,14 @@ export default function LaancPlanContainer({ const handlerBufferApply = () => { if (areaCoordList) { if (areaCoordList[0].coordList.length > 0) { + dispatch(LaancAction.LAANC_ALTITUDE.request(detailData.areaList)); + dispatch(LaancAction.LAANC_VALID_AREA.request(detailData.areaList)); const array = []; const copy = { ...areaCoordList[0] }; copy.bufferZone = detailData.areaList[0].bufferZone; array.push(copy); dispatch(FLIGHT_PLAN_AREA_BUFFER_LIST.request(array)); - setIsBuffer(true); } } else { setIsErrorModal({