Browse Source

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

feature/auth
이학준 2 years ago
parent
commit
3978b0f4c2
  1. 1
      src/components/basis/flight/plan/FlightPlanAreaDetailForm.js
  2. 20
      src/components/map/naver/draw/FlightPlanDraw.js

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

@ -177,6 +177,7 @@ const FlightPlanAreaDetailForm = ({ handleSave, handleClose, handleChange, handl
className='mr-1' className='mr-1'
color='primary' color='primary'
onClick={e => handleSave()} onClick={e => handleSave()}
disabled={!coordList[0].lat ? true : false }
> >
등록 등록
</Button.Ripple> </Button.Ripple>

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

@ -2,6 +2,7 @@ import $ from 'jquery';
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import * as Actions from '../../../../modules/basis/flight/actions/basisFlightAction'; import * as Actions from '../../../../modules/basis/flight/actions/basisFlightAction';
import { InfoModal } from '../../../../components/modal/InfoModal';
export const FlightPlanDraw = props => { export const FlightPlanDraw = props => {
const dispatch = useDispatch(); const dispatch = useDispatch();
@ -20,6 +21,12 @@ export const FlightPlanDraw = props => {
const [areaDetail, setAreaDetail] = useState(); const [areaDetail, setAreaDetail] = useState();
const [alertModal, setAlertModal] = useState({
isOpen: false,
title: '',
desc: ''
});
const naver = props.naver; const naver = props.naver;
const map = props.map; const map = props.map;
let mode = props.mode; let mode = props.mode;
@ -218,6 +225,8 @@ export const FlightPlanDraw = props => {
} }
} }
const onClickPolyline = (e) => { const onClickPolyline = (e) => {
console.log('onClickPolyline') console.log('onClickPolyline')
var coord = e.coord; var coord = e.coord;
@ -733,6 +742,9 @@ export const FlightPlanDraw = props => {
map: map map: map
}) })
) )
} else if(i == paths.length-1) {
// let tt = new naver.maps.EPSG3857.getDistance(paths[i], paths[])
} else { } else {
var proj = map.getProjection(), var proj = map.getProjection(),
r = proj.getDistance(paths[i-1], paths[i]); r = proj.getDistance(paths[i-1], paths[i]);
@ -839,5 +851,11 @@ export const FlightPlanDraw = props => {
return text; return text;
} }
return null;
return(
<InfoModal modal={alertModal} setModal={setAlertModal} />
)
}; };
export default FlightPlanDraw;
Loading…
Cancel
Save