Browse Source

드론마커, 드론상세내역 이미지 변경

pull/2/head
이준희 1 year ago
parent
commit
f35dc31116
  1. BIN
      src/assets/images/uam_img.jpg
  2. 21
      src/components/map/naver/dron/DronMarker.js
  3. 8
      src/views/control/report/ControlReportDetail.js

BIN
src/assets/images/uam_img.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 459 KiB

21
src/components/map/naver/dron/DronMarker.js

@ -137,15 +137,27 @@ export const DronMarker = props => {
let imageUrl; let imageUrl;
arrMarkers.map(clickMarker => { arrMarkers.map(clickMarker => {
if (objectId === clickMarker.controlId && isClickObject) { if (objectId === clickMarker.controlId && isClickObject) {
// console.log(clickMarker.gps.objectId, '><><');
imageUrl = imageUrl =
clickMarker.type === 'DRONE' ? DronUamDetailIcon : FlightDetailIcon; // clickMarker.type === 'DRONE' ? DronUamDetailIcon : FlightDetailIcon;
clickMarker.type === 'DRONE'
? clickMarker.gps.objectId.includes('UAM')
? DronUamDetailIcon
: DronDetailIcon
: FlightDetailIcon;
clickMarker.setIcon({ clickMarker.setIcon({
content: `<img src="${imageUrl}" alt="" style="transform: rotate(${clickMarker.gps.heading}deg)">`, content: `<img src="${imageUrl}" alt="" style="transform: rotate(${clickMarker.gps.heading}deg)">`,
origin: new naver.maps.Point(0, 0), origin: new naver.maps.Point(0, 0),
anchor: new naver.maps.Point(15, 15) anchor: new naver.maps.Point(15, 15)
}); });
} else { } 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({ clickMarker.setIcon({
content: `<img src="${imageUrl}" alt="" style="transform: rotate(${clickMarker.gps.heading}deg)">`, content: `<img src="${imageUrl}" alt="" style="transform: rotate(${clickMarker.gps.heading}deg)">`,
origin: new naver.maps.Point(0, 0), origin: new naver.maps.Point(0, 0),
@ -178,7 +190,12 @@ export const DronMarker = props => {
prev => prev.idntfNum === gps.objectId prev => prev.idntfNum === gps.objectId
); );
if (pal || id.includes('NAMWON')) { if (pal || id.includes('NAMWON')) {
if (id.includes('UAM')) {
markerOption.url = DronUamIcon; markerOption.url = DronUamIcon;
} else {
markerOption.url = DronIcon;
}
markerOption.type = 'DRONE'; markerOption.type = 'DRONE';
gpsCnt.type = 'drone'; gpsCnt.type = 'drone';
} else { } else {

8
src/views/control/report/ControlReportDetail.js

@ -4,6 +4,7 @@ import { useState, useEffect } from 'react';
import { X } from 'react-feather'; import { X } from 'react-feather';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import drone_img from '../../../assets/images/drone.jpg'; 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 drone_yellow from '../../../assets/images/drone_yellow.png';
import { IMG_PATH } from '../../../configs/constants'; import { IMG_PATH } from '../../../configs/constants';
import { objectUnClickAction } from '../../../modules/control/map/actions/controlMapActions'; import { objectUnClickAction } from '../../../modules/control/map/actions/controlMapActions';
@ -100,10 +101,15 @@ const ControlReportDetail = props => {
: controlGpDetail?.objectId} : controlGpDetail?.objectId}
</div> </div>
<div className='drone-img'> <div className='drone-img'>
{controlDetail?.imageUrl ? ( {/* {controlDetail?.imageUrl ? (
<img src={IMG_PATH + controlDetail?.imageUrl} /> <img src={IMG_PATH + controlDetail?.imageUrl} />
) : ( ) : (
<img src={drone_img} /> <img src={drone_img} />
)} */}
{controlGpDetail?.objectId.includes('UAM') ? (
<img src={uam_img} />
) : (
<img src={drone_img} />
)} )}
</div> </div>
<div className='layer-content-info'> <div className='layer-content-info'>

Loading…
Cancel
Save