From f66335f6e52862807471fcf08fbef3e532899f1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Fri, 12 Aug 2022 10:58:21 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=EC=A0=95=EC=83=81=20=EC=83=81?= =?UTF-8?q?=ED=99=A9=20=EC=95=8C=EB=A6=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/map/naver/dron/DronMarker.js | 5 ++--- src/modules/control/gp/models/controlGpModel.ts | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js index 3bd155c..bcf406c 100644 --- a/src/components/map/naver/dron/DronMarker.js +++ b/src/components/map/naver/dron/DronMarker.js @@ -30,8 +30,7 @@ export const DronMarker = props => { if (controlGpList) { controlGpList.forEach(gps => { - if (!gps.controlWarnCd) { - // gps marker가 지도상에 표출된 이후 시점부터 toast 표출 + if (gps.controlWarnCd && gps.controlWarnNotyCd) { const marker = arrMarkers.find(marker => marker.id === gps.objectId); if(marker) { @@ -41,7 +40,7 @@ export const DronMarker = props => { message={'경로 상에 비행 구역을 이탈했습니다.'} />, { - autoClose: 3000, + // autoClose: 3000, hideProgressBar: true, position: toast.POSITION.BOTTOM_RIGHT, onClick: props => { diff --git a/src/modules/control/gp/models/controlGpModel.ts b/src/modules/control/gp/models/controlGpModel.ts index d07262e..2707796 100644 --- a/src/modules/control/gp/models/controlGpModel.ts +++ b/src/modules/control/gp/models/controlGpModel.ts @@ -89,6 +89,7 @@ export interface ControlGpData { controlStartDt: string; heading: number; controlWarnCd: boolean; + controlWarnNotyCd: boolean; } export interface ControlGroupAuthData {