Browse Source

수정불가 계획서 - 비행구역 변경 가능 현상 수정

pull/2/head
junh_eee 2 years ago
parent
commit
8124409aa7
  1. 1
      src/components/basis/flight/plan/FlightPlanAreaMap.js
  2. 29
      src/components/map/naver/draw/FlightPlanDraw.js

1
src/components/basis/flight/plan/FlightPlanAreaMap.js

@ -214,6 +214,7 @@ const FlightPlanAreaMap = props => {
handleCoordinates={handleCoordinates} handleCoordinates={handleCoordinates}
handleInitCoordinates={handleInitCoordinates} handleInitCoordinates={handleInitCoordinates}
handleConfirm={props.handleConfirm} handleConfirm={props.handleConfirm}
isDisabled={props.test}
/> />
) : null} ) : null}

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

@ -7,6 +7,7 @@ import { InfoModal } from '../../../modal/InfoModal';
export const FlightPlanDraw = props => { export const FlightPlanDraw = props => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const mapControl = useSelector(state => state.controlMapReducer); const mapControl = useSelector(state => state.controlMapReducer);
const isDisabled = props.isDisabled;
const [pastPolyline, setPolyline] = useState(); const [pastPolyline, setPolyline] = useState();
const [pastBuffer, setBuffer] = useState(); const [pastBuffer, setBuffer] = useState();
@ -575,6 +576,9 @@ export const FlightPlanDraw = props => {
paths.push(path); paths.push(path);
}); });
let clickSet;
{isDisabled===true ? clickSet=false : clickSet=true}
if (areas.areaType && areas.areaType === 'LINE') { if (areas.areaType && areas.areaType === 'LINE') {
//polyline 생성 //polyline 생성
if(pastPolyline) { if(pastPolyline) {
@ -605,11 +609,16 @@ export const FlightPlanDraw = props => {
radius: 17, radius: 17,
// radius: dragCircleSize, // radius: dragCircleSize,
map: map, map: map,
clickable: true // clickable: true
clickable: clickSet
}) })
) )
// dragCircleEve.push(naver.maps.Event.addListener(dragCircle[i], 'mousedown', function () { onMouseDownDrag(i) }))
{isDisabled ?
{}
:
dragCircleEve.push(naver.maps.Event.addListener(dragCircle[i], 'mousedown', function () { onMouseDownDrag(i) })) dragCircleEve.push(naver.maps.Event.addListener(dragCircle[i], 'mousedown', function () { onMouseDownDrag(i) }))
}
} }
setDragCircle(dragCircle); setDragCircle(dragCircle);
@ -703,10 +712,16 @@ export const FlightPlanDraw = props => {
radius: 15, radius: 15,
// radius: dragCircleSize, // radius: dragCircleSize,
map: map, map: map,
clickable: true // clickable: true
clickable: clickSet
}) })
) )
// dragCircleEve.push(naver.maps.Event.addListener(dragCircle[i], 'mousedown', function () { onMouseDownDrag(i) }))
{isDisabled ?
{}
:
dragCircleEve.push(naver.maps.Event.addListener(dragCircle[i], 'mousedown', function () { onMouseDownDrag(i) })) dragCircleEve.push(naver.maps.Event.addListener(dragCircle[i], 'mousedown', function () { onMouseDownDrag(i) }))
}
} }
setDragCircle(dragCircle); setDragCircle(dragCircle);
@ -783,9 +798,15 @@ export const FlightPlanDraw = props => {
center: paths[0], center: paths[0],
radius: areas.bufferZone, radius: areas.bufferZone,
map: map, map: map,
clickable: true // clickable: true
clickable: clickSet
}); });
// Eve.mousedownEve = naver.maps.Event.addListener(circle, 'mousedown', function () { onMouseDownDrag(0); })
{isDisabled ?
{}
:
Eve.mousedownEve = naver.maps.Event.addListener(circle, 'mousedown', function () { onMouseDownDrag(0); }) Eve.mousedownEve = naver.maps.Event.addListener(circle, 'mousedown', function () { onMouseDownDrag(0); })
}
setCircle([circle]); setCircle([circle]);

Loading…
Cancel
Save