|
|
@ -1,5 +1,5 @@ |
|
|
|
import $ from 'jquery'; |
|
|
|
import $ from 'jquery'; |
|
|
|
import { useEffect, useState } from 'react'; |
|
|
|
import { useEffect, useState, useLayoutEffect } from 'react'; |
|
|
|
import { useDispatch, useSelector } from 'react-redux'; |
|
|
|
import { useDispatch, useSelector } from 'react-redux'; |
|
|
|
import '../../../../assets/css/custom.css'; |
|
|
|
import '../../../../assets/css/custom.css'; |
|
|
|
import FlightIcon from '../../../../assets/images/airplan_org.svg'; |
|
|
|
import FlightIcon from '../../../../assets/images/airplan_org.svg'; |
|
|
@ -15,6 +15,7 @@ import { |
|
|
|
objectClickAction, |
|
|
|
objectClickAction, |
|
|
|
objectUnClickAction |
|
|
|
objectUnClickAction |
|
|
|
} from '../../../../modules/control/map/actions/controlMapActions'; |
|
|
|
} from '../../../../modules/control/map/actions/controlMapActions'; |
|
|
|
|
|
|
|
import { controlGroupAuthAction } from '../../../../modules/control/gp'; |
|
|
|
|
|
|
|
|
|
|
|
export const DronMarker = props => { |
|
|
|
export const DronMarker = props => { |
|
|
|
const dispatch = useDispatch(); |
|
|
|
const dispatch = useDispatch(); |
|
|
@ -76,6 +77,10 @@ export const DronMarker = props => { |
|
|
|
infoWindow.open(props.map, data.coord); |
|
|
|
infoWindow.open(props.map, data.coord); |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
useLayoutEffect(() => { |
|
|
|
|
|
|
|
dispatch(controlGroupAuthAction.request()); |
|
|
|
|
|
|
|
}, [controlGpList]); |
|
|
|
|
|
|
|
|
|
|
|
useEffect(() => { |
|
|
|
useEffect(() => { |
|
|
|
markerInit(); |
|
|
|
markerInit(); |
|
|
|
}, [controlGpList]); |
|
|
|
}, [controlGpList]); |
|
|
@ -114,7 +119,8 @@ export const DronMarker = props => { |
|
|
|
//마커를 그린다.
|
|
|
|
//마커를 그린다.
|
|
|
|
const addMarkers = (position, id, controlId, gps) => { |
|
|
|
const addMarkers = (position, id, controlId, gps) => { |
|
|
|
const markerOption = {}; |
|
|
|
const markerOption = {}; |
|
|
|
|
|
|
|
console.log(controlGroupAuthInfo); |
|
|
|
|
|
|
|
console.log(gps.objectId); |
|
|
|
if (id.substring(0, 2) === 'PA') { |
|
|
|
if (id.substring(0, 2) === 'PA') { |
|
|
|
const pal = controlGroupAuthInfo?.find( |
|
|
|
const pal = controlGroupAuthInfo?.find( |
|
|
|
prev => prev.idntfNum === gps.objectId |
|
|
|
prev => prev.idntfNum === gps.objectId |
|
|
|