|
|
@ -296,8 +296,9 @@ export const DronMarker = props => { |
|
|
|
// // document.querySelector('.dblock-box').style.fontSize = `${zoom}px`;
|
|
|
|
// // document.querySelector('.dblock-box').style.fontSize = `${zoom}px`;
|
|
|
|
// // document.querySelector('.dblock-ti').style.fontSize = `${zoom}px`;
|
|
|
|
// // document.querySelector('.dblock-ti').style.fontSize = `${zoom}px`;
|
|
|
|
// });
|
|
|
|
// });
|
|
|
|
|
|
|
|
if (markerOption.url) { |
|
|
|
setArrMarkers(m => [...m, marker]); |
|
|
|
setArrMarkers(m => [...m, marker]); |
|
|
|
|
|
|
|
} |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
const handlerDronClick = (controlId, idntfNum) => { |
|
|
|
const handlerDronClick = (controlId, idntfNum) => { |
|
|
@ -369,7 +370,14 @@ export const DronMarker = props => { |
|
|
|
<div class="dblock-txt-list"> |
|
|
|
<div class="dblock-txt-list"> |
|
|
|
<span>${item?.elev}M</span> |
|
|
|
<span>${item?.elev}M</span> |
|
|
|
<span>${item?.speed}km</span> |
|
|
|
<span>${item?.speed}km</span> |
|
|
|
<span>${(item?.lat).toFixed(6)} ${(item?.lng).toFixed(6)}</span> |
|
|
|
${ |
|
|
|
|
|
|
|
typeof item?.lat === 'number' && typeof item?.lng === 'number' |
|
|
|
|
|
|
|
? ` |
|
|
|
|
|
|
|
<span> |
|
|
|
|
|
|
|
${(item?.lat).toFixed(6)} ${(item?.lng).toFixed(6)} |
|
|
|
|
|
|
|
</span>` |
|
|
|
|
|
|
|
: '' |
|
|
|
|
|
|
|
} |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
@ -451,7 +459,14 @@ export const DronMarker = props => { |
|
|
|
<div class="dblock-txt-list"> |
|
|
|
<div class="dblock-txt-list"> |
|
|
|
<span>${gps?.elev}M</span> |
|
|
|
<span>${gps?.elev}M</span> |
|
|
|
<span>${gps?.speed}km</span> |
|
|
|
<span>${gps?.speed}km</span> |
|
|
|
<span>${(gps?.lat).toFixed(6)} ${(gps?.lng).toFixed(6)}</span> |
|
|
|
${ |
|
|
|
|
|
|
|
typeof gps?.lat === 'number' && typeof gps?.lng === 'number' |
|
|
|
|
|
|
|
? ` |
|
|
|
|
|
|
|
<span> |
|
|
|
|
|
|
|
${(gps?.lat).toFixed(6)} ${(gps?.lng).toFixed(6)} |
|
|
|
|
|
|
|
</span>` |
|
|
|
|
|
|
|
: '' |
|
|
|
|
|
|
|
} |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
@ -568,6 +583,7 @@ export const DronMarker = props => { |
|
|
|
if (arrInfos.filter(i => i._controlId === marker.controlId).length > 0) { |
|
|
|
if (arrInfos.filter(i => i._controlId === marker.controlId).length > 0) { |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
console.log(controlGpList[idx]); |
|
|
|
infoInit(marker, controlGpList[idx], idx); |
|
|
|
infoInit(marker, controlGpList[idx], idx); |
|
|
|
|
|
|
|
|
|
|
|
if (controlGpList.length != 0) { |
|
|
|
if (controlGpList.length != 0) { |
|
|
|