diff --git a/src/components/map/mapbox/draw/LaancDrawControl.js b/src/components/map/mapbox/draw/LaancDrawControl.js index 0232dde9..735a9e05 100644 --- a/src/components/map/mapbox/draw/LaancDrawControl.js +++ b/src/components/map/mapbox/draw/LaancDrawControl.js @@ -26,7 +26,7 @@ export const LaancDrawControl = props => { const drawObj = props.drawObj; const mapObject = props.mapObject; - const [drawObjId, setDrawObjId] = useState(); + // const [drawObjId, setDrawObjId] = useState(); const [bufferId, setBufferId] = useState(); const [isDrawDone, setIsDrawDone] = useState(false); @@ -122,7 +122,6 @@ export const LaancDrawControl = props => { obj.id ); } - props.setCoordArr(prev => [...prev, [e.lngLat.lng, e.lngLat.lat]]); } } }; @@ -224,7 +223,6 @@ export const LaancDrawControl = props => { id: obj.id }; - props.setCoordArr(mode === 'LINE' ? initCoord : initCoord[0]); handlerRemoveGroupMarker(obj.id); handlerCreateGroupMarker(data, mode); handlerAbnormalityCheck(data, mode); @@ -352,14 +350,14 @@ export const LaancDrawControl = props => { props.handlerCoordinates(areaInfo); setIsDrawDone(true); - const obj = drawObj + const viewCoordObj = drawObj .getAll() .features.filter( - obj => - obj.properties.id !== 'BUFFER' && obj.geometry.coordinates.length > 0 + o => o.geometry.coordinates.length > 0 && o.properties.id !== 'BUFFER' ); - props.setViewCoordObj(obj); - if (obj.length > 1) { + props.setViewCoordObj(viewCoordObj); + + if (viewCoordObj.length > 1) { props.handlerAddChange('overAdd', true); } else { props.handlerAddChange('isViewAdd', true); @@ -523,20 +521,18 @@ export const LaancDrawControl = props => { const drawInit = () => { const mode = mapControl.drawType; if (mode !== 'DONE') { - // console.log(props.addData.isAddable, '-----'); if (!props.addData.isAddable) { + // 추가 상태가 아닐 때 drawObj.deleteAll(); handlerRemoveAllMarker(); + props.setViewCoordObj([]); props.handlerSaveCheck(false); - setDrawObjId(); props.handlerInitCoordinates(); - - props.setViewCoordObj([]); + // setDrawObjId(); } - props.setCoordArr([]); if (!mode || mode === 'RESET') { props.handlerAddChange('isAddable', false); props.handlerAddChange('isViewAdd', false); diff --git a/src/views/laanc/FlightArea.js b/src/views/laanc/FlightArea.js index 3c12310d..2e468a42 100644 --- a/src/views/laanc/FlightArea.js +++ b/src/views/laanc/FlightArea.js @@ -556,7 +556,12 @@ export default function FlightArea({ toggle={() => setCenteredModal(!centeredModal)} className='modal-dialog-centered modal-xl' > - setCenteredModal(!centeredModal)}> + { + setCenteredModal(!centeredModal); + handlerInitCoordinates(); + }} + > 비행 구역 설정 @@ -642,7 +647,8 @@ export default function FlightArea({
- ※ 비행구역설정 완료를 원하시면 마지막 좌표 지점에서 더블클릭해주시기 바랍니다. + ※ 비행구역설정 완료를 원하시면 마지막 좌표 지점에서 + 더블클릭해주시기 바랍니다.
@@ -409,59 +367,6 @@ export default function LaancAreaMap({ })} ) : null} - {/* coords-box - div - ti - coords-box-scroll - coords-box-list - coords-box-list - span - span위도, 경도 - span / - span 위도, 경도 */} - {/* {mapObject ? ( -
- {drawObj.getAll().features.length > 1 - ? drawObj - .getAll() - .features.filter(obj => obj.properties.id !== 'BUFFER') - .map((obj, i) => { - const coord = - obj.properties.id === 'LINE' - ? obj.geometry.coordinates - : obj.geometry.coordinates[0]; - - return ( -
-
비행구역 {i + 1}
-
- {coord?.map((co, idx) => { - if (idx + 1 < coord.length) { - const fCoord = FormattingCoord(co); - const current = fCoord.join(', '); - const next = FormattingCoord( - coord[idx + 1] - ).join(', '); - - return ( -
- - {current} - / - {next} - -
- ); - } - return null; - })} -
-
- ); - }) - : null} -
- ) : null} */}
{isMapLoad && mapObject ? ( <> - {/* */} - {/* */} {modal ? (