diff --git a/.env.production b/.env.production index 59d9170..7a49be9 100644 --- a/.env.production +++ b/.env.production @@ -1,6 +1,6 @@ # REACT_APP_HOST = http://pav.palntour.com:8080/ -REACT_APP_HOST = http://121.190.193.50:6081/ -REACT_APP_WS_HOST = ws://121.190.193.50:6082/ws +REACT_APP_HOST = http://211.253.11.189:8080/ +REACT_APP_WS_HOST = ws://211.253.11.189:8081/ws REACT_APP_IMAGE_HOST = https://palnet-file.s3.ap-northeast-2.amazonaws.com/ # Naver Search API HOST diff --git a/src/components/map/mapbox/feature/FeatureAirZone.js b/src/components/map/mapbox/feature/FeatureAirZone.js index 214dab3..5d3d1a6 100644 --- a/src/components/map/mapbox/feature/FeatureAirZone.js +++ b/src/components/map/mapbox/feature/FeatureAirZone.js @@ -6,6 +6,9 @@ import towerImg from '../../../../assets/images/transmission_tower_icon.png'; import uamRouteArea from '../../geojson/uamRouteArea.json'; import uamTowerArea from '../../geojson/uamTowerArea.json'; import axios from '../../../../modules/utils/customAxiosUtil'; +import { useEffect } from 'react'; +import geoJson from '../../geojson/airArea.json'; +import * as turf from '@turf/turf'; // 격자 공역 Source const airPort = [ diff --git a/src/modules/basis/flight/actions/basisFlightAction.ts b/src/modules/basis/flight/actions/basisFlightAction.ts index 9eb3a0e..23708d0 100644 --- a/src/modules/basis/flight/actions/basisFlightAction.ts +++ b/src/modules/basis/flight/actions/basisFlightAction.ts @@ -14,8 +14,6 @@ import { BasFlightScheduleList, weatherData, resweatherData - // FlightUamBufferRq, - // FlightUamBufferList } from '../models/basisFlightModel'; // 공역 조회 @@ -136,11 +134,6 @@ const FLIGHT_SCHEDULE_SUCCESS = const FLIGHT_SCHEDULE_FAILURE = 'basis/flight/schedule/list/FLIGHT_SCHEDULE_FAILURE'; -// uam 버퍼 좌표 가져오기 -// const UAM_BUFFER_LIST_REQUEST = 'basis/flight/adex/BUFFER_LIST_REQUEST'; -// const UAM_BUFFER_LIST_SUCCESS = 'basis/flight/adex/BUFFER_LIST_SUCCESS'; -// const UAM_BUFFER_LIST_FAILURE = 'basis/flight/adex/BUFFER_LIST_FAILURE'; - export const SEARCH_AREA = createAsyncAction( FLIGHT_SEARCH_AREA_REQUEST, FLIGHT_SEARCH_AREA_SUCCESS, @@ -299,13 +292,6 @@ export const FlightweatherAction = createAsyncAction( FLIGHT_WEATHER_FAILURE )(); -// UAM 버퍼 좌표 가져오기 -// export const FLIGHT_UAM_BUFFER_LIST = createAsyncAction( -// UAM_BUFFER_LIST_REQUEST, -// UAM_BUFFER_LIST_SUCCESS, -// UAM_BUFFER_LIST_FAILURE -// )(); - const actions = { PUBLIC_AREA_LIST, // FLIGHT_PLAN_AREA, @@ -333,7 +319,6 @@ const actions = { FLIGHT_SCHEDULE_LIST, FlightweatherAction, FLIGHT_PLAN_AREA_INAIRAREA - // FLIGHT_UAM_BUFFER_LIST }; export type FlightAction = ActionType; diff --git a/src/modules/basis/flight/apis/basisFlightApi.ts b/src/modules/basis/flight/apis/basisFlightApi.ts index 98caf89..dc4d5c0 100644 --- a/src/modules/basis/flight/apis/basisFlightApi.ts +++ b/src/modules/basis/flight/apis/basisFlightApi.ts @@ -6,7 +6,6 @@ import { FlightPlanAreaDataList, FlightPlanData, FlightPlanListRqData, - // FlightUamBufferRq, weatherData } from '../models/basisFlightModel'; @@ -89,8 +88,4 @@ export const flightPlanAPI = { const res = await axios.post(`api/bas/flight/airspace/contains`, data); return res.data.result; } - - // uamBufferList: async (data: FlightUamBufferRq) => { - // return await axios.post('/api/bas/flight/adex/buffer', data); - // } }; diff --git a/src/modules/basis/flight/models/basisFlightModel.ts b/src/modules/basis/flight/models/basisFlightModel.ts index d3c908e..bc30cc0 100644 --- a/src/modules/basis/flight/models/basisFlightModel.ts +++ b/src/modules/basis/flight/models/basisFlightModel.ts @@ -22,7 +22,6 @@ export interface FlightState { listSelect: ListGroupData | undefined; aprvSelect: ListGroupData | undefined; inAirArea: boolean | undefined; - // uamBufferList: FlightUamBufferList[] | undefined; } export interface weatherData { serviceKey: string; @@ -245,21 +244,6 @@ export interface BasFlightScheduleData { list: [BasFlightScheduleList]; } -// export interface FlightUamBufferRq { -// buffer: number; -// coordinates: { -// x: number; -// y: number; -// }[]; -// } - -// export interface FlightUamBufferList { -// x: number; -// y: number; -// m: number | string; -// z: number | string; -// } - export const initFlight = { weather: undefined, page: 1, @@ -406,7 +390,6 @@ export const initFlight = { aprvList: undefined, aprvProc: undefined, scheduleList: [] - // uamBufferList: [] }; export const initFlightBas = { diff --git a/src/modules/basis/flight/sagas/basisFlightSaga.ts b/src/modules/basis/flight/sagas/basisFlightSaga.ts index 7651a00..4a665ca 100644 --- a/src/modules/basis/flight/sagas/basisFlightSaga.ts +++ b/src/modules/basis/flight/sagas/basisFlightSaga.ts @@ -446,31 +446,6 @@ function* inAirAreaSaga( } } -// get uam buffer list -// function* uamBufferListSaga( -// action: ActionType -// ) { -// try { -// const data = action.payload; -// const response = yield call(Apis.flightPlanAPI.uamBufferList, data); -// if (response.errorCode) { -// yield put( -// MessageActions.IS_ERROR({ -// errorCode: response.errorCode, -// errorMessage: response.errorMessage, -// isHistoryBack: false, -// isRefresh: false -// }) -// ); -// return; -// } - -// yield put(Actions.FLIGHT_UAM_BUFFER_LIST.success(response)); -// } catch (error: any) { -// yield put(Actions.FLIGHT_UAM_BUFFER_LIST.failure(error)); -// } -// } - export function* flightSaga() { yield takeEvery(Actions.PUBLIC_AREA_LIST.request, listAreaSaga); // yield takeEvery(Actions.FLIGHT_PLAN_AREA.request, createFlightPlanArea); @@ -488,5 +463,4 @@ export function* flightSaga() { yield takeEvery(Actions.FLIGHT_SCHEDULE_LIST.request, scheduleListSaga); yield takeEvery(Actions.FlightweatherAction.request, WeatherSaga); yield takeEvery(Actions.FLIGHT_PLAN_AREA_INAIRAREA.request, inAirAreaSaga); - // yield takeEvery(Actions.FLIGHT_UAM_BUFFER_LIST.request, uamBufferListSaga); }