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

src/components/map/naver/draw/FlightPlanDraw.js

@@ -532,9 +532,12 @@ export const FlightPlanDraw = props => {
   }
 
   const setAreaInfo = (path) => {
+    let bufferZone = 100;
+    if(polygon) bufferZone = 0;
+    
     areaInfo = {
       coordinates: [],
-      bufferZone: 100,
+      bufferZone: bufferZone,
     };
 
     let prePath = [];

src/containers/basis/flight/plan/FlightPlanAreaDetailContainer.js

@@ -90,17 +90,17 @@ const FlightPlanAreaDetailContainer = ({ handleModal }) => {
     }
   }, [areaCoordList]);
 
-  useEffect(() => {
-    // detail의 area 정보가 존재하면 detail 정보로 매핑
-    if(detail.areaList) {
-      if(detail.areaList[0].planAreaSno !== 0) {
-        setAreaDetail(detail.areaList);
+  // useEffect(() => {
+  //   // detail의 area 정보가 존재하면 detail 정보로 매핑
+  //   if(detail.areaList) {
+  //     if(detail.areaList[0].planAreaSno !== 0) {
+  //       setAreaDetail(detail.areaList);
 
-        dispatch(Actions.AREA_DETAIL_LIST_SAVE(detail.areaList));
-      }
-    }
+  //       dispatch(Actions.AREA_DETAIL_LIST_SAVE(detail.areaList));
+  //     }
+  //   }
 
-  }, [])
+  // }, [])
 
 
   return (

src/containers/basis/flight/plan/FlightPlanDetailContainer.js

@@ -137,7 +137,7 @@ const FlightPlanDetailContainer = () => {
         }
     }, [arcrftSelect])
 
-    useEffect(() => {        
+    useEffect(() => {          
         if(areaList !== undefined) {
             const areas = detailData.areaList.concat();
             
@@ -153,15 +153,14 @@ const FlightPlanDetailContainer = () => {
                             planAreaCoordSno : 0
                         }
                     })
-                }
-                
+                }                
 
                 return {
                     ...area,
                     areaType : targetArea.areaType,
-                    bufferZone: targetArea.bufferZone,
-                    fltElev : targetArea.fltElev,
-                    fltMethod : targetArea.fltMethod,
+                    bufferZone: targetArea.bufferZone ? targetArea.bufferZone : 0,
+                    fltElev : targetArea.fltElev ? targetArea.fltElev : 0,
+                    fltMethod : targetArea.fltMethod ? targetArea.fltMethod : '',
                     coordList : targetCoordList
                 }
             });        
@@ -185,7 +184,7 @@ const FlightPlanDetailContainer = () => {
 
     const handleModal = (modal) => {
         if(modal.target === 'area' && modal.isOpen) {            
-            if(detailData.areaList) {
+            if(detailData.areaList) {                
                 dispatch(Actions.FLIGHT_PLAN_AREA_BUFFER_LIST.request(detailData.areaList));
             }            
         }