diff --git a/src/assets/images/uam_img.jpg b/src/assets/images/uam_img.jpg new file mode 100644 index 0000000..461bc06 Binary files /dev/null and b/src/assets/images/uam_img.jpg differ diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js index 477ee19..f27823b 100644 --- a/src/components/map/naver/dron/DronMarker.js +++ b/src/components/map/naver/dron/DronMarker.js @@ -137,15 +137,27 @@ export const DronMarker = props => { let imageUrl; arrMarkers.map(clickMarker => { if (objectId === clickMarker.controlId && isClickObject) { + // console.log(clickMarker.gps.objectId, '><><'); imageUrl = - clickMarker.type === 'DRONE' ? DronUamDetailIcon : FlightDetailIcon; + // clickMarker.type === 'DRONE' ? DronUamDetailIcon : FlightDetailIcon; + clickMarker.type === 'DRONE' + ? clickMarker.gps.objectId.includes('UAM') + ? DronUamDetailIcon + : DronDetailIcon + : FlightDetailIcon; clickMarker.setIcon({ content: ``, origin: new naver.maps.Point(0, 0), anchor: new naver.maps.Point(15, 15) }); } else { - imageUrl = clickMarker.type === 'DRONE' ? DronUamIcon : FlightIcon; + // imageUrl = clickMarker.type === 'DRONE' ? DronUamIcon : FlightIcon; + imageUrl = + clickMarker.type === 'DRONE' + ? clickMarker.gps.objectId.includes('UAM') + ? DronUamIcon + : DronIcon + : FlightIcon; clickMarker.setIcon({ content: ``, origin: new naver.maps.Point(0, 0), @@ -178,7 +190,12 @@ export const DronMarker = props => { prev => prev.idntfNum === gps.objectId ); if (pal || id.includes('NAMWON')) { - markerOption.url = DronUamIcon; + if (id.includes('UAM')) { + markerOption.url = DronUamIcon; + } else { + markerOption.url = DronIcon; + } + markerOption.type = 'DRONE'; gpsCnt.type = 'drone'; } else { diff --git a/src/views/control/report/ControlReportDetail.js b/src/views/control/report/ControlReportDetail.js index ed2c602..7ce80f7 100644 --- a/src/views/control/report/ControlReportDetail.js +++ b/src/views/control/report/ControlReportDetail.js @@ -4,6 +4,7 @@ import { useState, useEffect } from 'react'; import { X } from 'react-feather'; import { useDispatch, useSelector } from 'react-redux'; import drone_img from '../../../assets/images/drone.jpg'; +import uam_img from '../../../assets/images/uam_img.jpg'; import drone_yellow from '../../../assets/images/drone_yellow.png'; import { IMG_PATH } from '../../../configs/constants'; import { objectUnClickAction } from '../../../modules/control/map/actions/controlMapActions'; @@ -100,10 +101,15 @@ const ControlReportDetail = props => { : controlGpDetail?.objectId}
- {controlDetail?.imageUrl ? ( + {/* {controlDetail?.imageUrl ? ( ) : ( + )} */} + {controlGpDetail?.objectId.includes('UAM') ? ( + + ) : ( + )}