Merge branch 'master' of http://gitea.palntour.com/pav/pav-fe-kac

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);

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)
+      });
     }
   };
 

src/views/laanc/LaacnStep3.js

@@ -234,7 +234,7 @@ export default function LaacnStep3({
               <strong className='text-success'>
                 비행신청이 승인되었습니다.{' '}
               </strong>
-              <span>조종사 준수사항을 다시 확인해주시기 바랍니다.</span>
+              <span>조종자 준수사항을 다시 확인해주시기 바랍니다.</span>
             </div>
           </ModalBody>
           <ModalFooter>

src/views/laanc/LaancStep1.js

@@ -71,7 +71,7 @@ export default function LaancStep1({
           <Row>
             <Col className='list-input' md='6'>
               <FormGroup>
-                <div className='ti'>조종사 정보</div>
+                <div className='ti'>조종자 정보</div>
                 <Label for='test'>
                   <span className='necessary'>*</span>성명
                 </Label>
@@ -90,7 +90,7 @@ export default function LaancStep1({
               <FormGroup>
                 <div className='ti'>비행 유형</div>
                 <Label for='test'>
-                  <span className='necessary'>*</span>종류
+                  <span className='necessary'>*</span>승인 유형
                 </Label>
                 <Input
                   type='select'
@@ -441,6 +441,8 @@ export default function LaancStep1({
             <FlightArea
               centeredModal={centeredModal}
               setCenteredModal={setCenteredModal}
+              handleChange={handleChange}
+              data={data}
               page={1}
             />
           </div>

src/views/laanc/LaancStep2.js

@@ -148,7 +148,7 @@ export default function LaancStep2({
           <Row>
             <Col className='list-input' md='6' sm='12'>
               <FormGroup>
-                <div className='ti'>조종사 정보</div>
+                <div className='ti'>조종자 정보</div>
                 <Label for='test'>
                   <span className='necessary'>*</span>성명
                 </Label>
@@ -165,9 +165,9 @@ export default function LaancStep2({
             </Col>
             <Col className='list-input' md='6' sm='12'>
               <FormGroup>
-                <div className='ti'>승인 유형</div>
+                <div className='ti'>비행 유형</div>
                 <Label for='test'>
-                  <span className='necessary'>*</span>종류
+                  <span className='necessary'>*</span>승인 유형
                 </Label>
                 <Input
                   type='select'