From 9afa7ca3d2a00fe66974c8679c303cab02b8cd83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?sanguu516=28=EB=B0=95=EC=83=81=ED=98=84=29?= Date: Tue, 26 Sep 2023 17:05:32 +0900 Subject: [PATCH] =?UTF-8?q?=EB=82=A0=EC=94=A8=20=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EB=B0=8F=20laanc=20=EC=8A=A4=ED=85=9D=203?= =?UTF-8?q?=20=EC=99=84=EB=A3=8C=20=ED=8E=98=EC=9D=B4=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/laanc/FlightArea.js | 31 ++++++++++++++++++++++++++++++- src/views/laanc/LaacnStep3.js | 15 ++++++++------- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/src/views/laanc/FlightArea.js b/src/views/laanc/FlightArea.js index f97adc9..d4a3e94 100644 --- a/src/views/laanc/FlightArea.js +++ b/src/views/laanc/FlightArea.js @@ -28,6 +28,7 @@ import geoJson from '../../components/map/geojson/airArea.json'; import axios from '../../modules/utils/customAxiosUtil'; 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 }) { const dispatch = useDispatch(); @@ -38,12 +39,14 @@ export default function FlightArea({ centeredModal, setCenteredModal, page }) { const [mapObject, setMapObject] = useState(); const [isMapLoad, setIsMapLoad] = useState(false); const [previewLayer, setPreviewLayer] = useState(); - + const [formModal, setFormModal] = useState(false); const [alertModal, setAlertModal] = useState({ isOpen: false, title: '', desc: '' }); + //날씨 임시 데이터 + const [wheather, setWheather] = useState([]); const previewGeo = { type: 'FeatureCollection', @@ -60,6 +63,7 @@ export default function FlightArea({ centeredModal, setCenteredModal, page }) { if (area.areaType && area.areaType !== '') { if (!centeredModal && previewLayer) handlerPreviewDraw(); } + setWheather(areaCoordList); } }, [areaCoordList, centeredModal, previewLayer]); @@ -168,6 +172,11 @@ export default function FlightArea({ centeredModal, setCenteredModal, page }) { } }; + // 날씨 handler + const handlerWeather = () => { + setFormModal(!formModal); + }; + const handlerMapInit = () => { mapboxgl.accessToken = MAPBOX_TOKEN; @@ -371,6 +380,11 @@ export default function FlightArea({ centeredModal, setCenteredModal, page }) { > 초기화 + {wheather[0]?.coordList[0].lat != 0 ? ( + + ) : null}
+ +
); } diff --git a/src/views/laanc/LaacnStep3.js b/src/views/laanc/LaacnStep3.js index 228176f..450aff5 100644 --- a/src/views/laanc/LaacnStep3.js +++ b/src/views/laanc/LaacnStep3.js @@ -16,14 +16,14 @@ import { Badge } from 'reactstrap'; import { useHistory } from 'react-router-dom'; -import { AlertCircle } from 'react-feather'; - +import { AlertCircle, CheckCircle } from 'react-feather'; export default function LaacnStep3({ handlerStep, disabledAnimation, data, setDisabledAnimation }) { + const [centeredModal2, setCenteredModal2] = useState(false); const { user } = useSelector(state => state.authState); return ( <> @@ -219,9 +219,10 @@ export default function LaacnStep3({ {/* outline onClick={() => setCenteredModal2(!centeredModal2)} */} - - - {/* setCenteredModal2(!centeredModal2)}> + 다음 + + setCenteredModal2(!centeredModal2)} className='modal-dialog-centered document-pop' @@ -241,12 +242,12 @@ export default function LaacnStep3({ {' '} - */} + );