|
|
|
@ -45,7 +45,7 @@ export const DronMarker = props => {
|
|
|
|
|
hideProgressBar: true, |
|
|
|
|
position: toast.POSITION.BOTTOM_RIGHT, |
|
|
|
|
onClick: props => {
|
|
|
|
|
if(marker) handlerDronClick(marker);
|
|
|
|
|
if(marker) handlerDronClick(marker);
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
) |
|
|
|
@ -91,13 +91,8 @@ export const DronMarker = props => {
|
|
|
|
|
title: id, |
|
|
|
|
id: id, |
|
|
|
|
controlId: controlId, |
|
|
|
|
icon: { |
|
|
|
|
// content: [
|
|
|
|
|
// '<div>dddd</div>',
|
|
|
|
|
|
|
|
|
|
// ].join(''),
|
|
|
|
|
url: DronIcon, |
|
|
|
|
// size: new naver.maps.Size(50, 50),
|
|
|
|
|
icon: {
|
|
|
|
|
url: DronIcon,
|
|
|
|
|
origin: new naver.maps.Point(0, 0), |
|
|
|
|
anchor: new naver.maps.Point(15, 15), |
|
|
|
|
} |
|
|
|
@ -109,17 +104,16 @@ export const DronMarker = props => {
|
|
|
|
|
handlerDronClick(marker); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
// drone 정보 창
|
|
|
|
|
// markerInfoWindow(marker);
|
|
|
|
|
|
|
|
|
|
setArrMarkers(m => [...m, marker]); |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
const handlerDronClick = marker => { |
|
|
|
|
const idntfNum = marker.id; |
|
|
|
|
const contorlId = marker.controlId; |
|
|
|
|
|
|
|
|
|
// 클릭한 식별번호 정보를 가진 그룹 추출
|
|
|
|
|
// const group = controlGroupAuthInfo.find(group => group.idntfNum === idntfNum);
|
|
|
|
|
|
|
|
|
|
//히스토리 불러오기
|
|
|
|
|
const contorlId = marker.controlId;
|
|
|
|
|
|
|
|
|
|
dispatch(objectClickAction(contorlId)); |
|
|
|
|
dispatch(controlGpDtlAction.request(contorlId)); |
|
|
|
|
dispatch(controlGpFlightPlanAction.request(idntfNum)); |
|
|
|
@ -169,10 +163,10 @@ export const DronMarker = props => {
|
|
|
|
|
if (isExists) { |
|
|
|
|
moveMarkers(isExists, position); |
|
|
|
|
} else { |
|
|
|
|
addMarkers(position, item.objectId, item.controlId); |
|
|
|
|
addMarkers(position, item.objectId, item.controlId);
|
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
addMarkers(position, item.objectId, item.controlId); |
|
|
|
|
addMarkers(position, item.objectId, item.controlId);
|
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
@ -182,5 +176,43 @@ export const DronMarker = props => {
|
|
|
|
|
setArrMarkers(arrData); |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
const markerInfoWindow = (marker) => { |
|
|
|
|
controlGpList.forEach(gps => { |
|
|
|
|
|
|
|
|
|
const contents = [ |
|
|
|
|
`<div class="tooltip-box">`, |
|
|
|
|
` <div class="tooltip-ti">`, |
|
|
|
|
` <span>${marker.id}</span>`, |
|
|
|
|
` </div>`, |
|
|
|
|
` <div class="tooltip-txt">`, |
|
|
|
|
` <div class="tooltip-txt-list">`,
|
|
|
|
|
` <span>${gps.speed}${gps.speedType}</span>`, |
|
|
|
|
` </div>`, |
|
|
|
|
` <div class="tooltip-txt-list">`, |
|
|
|
|
` <span>${gps.elev}${gps.elevType}</span>`, |
|
|
|
|
` </div>`, |
|
|
|
|
` <div class="tooltip-txt-list">`, |
|
|
|
|
` <span>${gps.heading}</span>`, |
|
|
|
|
` </div>`, |
|
|
|
|
` </div>`, |
|
|
|
|
`</div>` |
|
|
|
|
].join(''); |
|
|
|
|
|
|
|
|
|
const info = new naver.maps.InfoWindow({
|
|
|
|
|
id: marker.id, |
|
|
|
|
content: contents, |
|
|
|
|
backgroundColor: '#283046', //박스안쪽영역 컬러
|
|
|
|
|
anchorSize: new props.naver.maps.Size(30, -10), |
|
|
|
|
anchorSkew: false, |
|
|
|
|
anchorColor: '#283046', |
|
|
|
|
pixelOffset: new props.naver.maps.Point(20, -20) |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
console.log(info); |
|
|
|
|
|
|
|
|
|
info.open(props.map, marker); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return null; |
|
|
|
|
}; |
|
|
|
|