Skip to content

Commit 398f71a

Browse files
committed
Address copilot review comments
1 parent 8eb4e43 commit 398f71a

3 files changed

Lines changed: 37 additions & 37 deletions

File tree

gcs/src/components/mapComponents/fenceItems.jsx

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,23 @@ import DrawLineCoordinates from "./drawLineCoordinates"
2525
import MarkerPin from "./markerPin"
2626
const tailwindColors = resolveConfig(tailwindConfig).theme.colors
2727

28+
function getFenceCommandNumber(value) {
29+
return parseInt(
30+
Object.keys(FENCE_ITEM_COMMANDS_LIST).filter(
31+
(key) => FENCE_ITEM_COMMANDS_LIST[key] === value,
32+
),
33+
)
34+
}
35+
36+
const polygonCommands = [
37+
getFenceCommandNumber("MAV_CMD_NAV_FENCE_POLYGON_VERTEX_INCLUSION"),
38+
getFenceCommandNumber("MAV_CMD_NAV_FENCE_POLYGON_VERTEX_EXCLUSION"),
39+
]
40+
const circleCommands = [
41+
getFenceCommandNumber("MAV_CMD_NAV_FENCE_CIRCLE_INCLUSION"),
42+
getFenceCommandNumber("MAV_CMD_NAV_FENCE_CIRCLE_EXCLUSION"),
43+
]
44+
2845
export default function FenceItems({
2946
fenceItems,
3047
editable = false,
@@ -34,24 +51,7 @@ export default function FenceItems({
3451
const [fenceCircleItems, setFenceCircleItems] = useState([])
3552

3653
useEffect(() => {
37-
function getFenceCommandNumber(value) {
38-
return parseInt(
39-
Object.keys(FENCE_ITEM_COMMANDS_LIST).filter(
40-
(key) => FENCE_ITEM_COMMANDS_LIST[key] === value,
41-
),
42-
)
43-
}
44-
4554
// Filter out fence items based on their type
46-
const polygonCommands = [
47-
getFenceCommandNumber("MAV_CMD_NAV_FENCE_POLYGON_VERTEX_INCLUSION"),
48-
getFenceCommandNumber("MAV_CMD_NAV_FENCE_POLYGON_VERTEX_EXCLUSION"),
49-
]
50-
const circleCommands = [
51-
getFenceCommandNumber("MAV_CMD_NAV_FENCE_CIRCLE_INCLUSION"),
52-
getFenceCommandNumber("MAV_CMD_NAV_FENCE_CIRCLE_EXCLUSION"),
53-
]
54-
5555
const polygonItems = fenceItems.filter((item) =>
5656
polygonCommands.includes(item.command),
5757
)

gcs/src/components/missions/fenceItemsTableRow.jsx

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,25 @@ import {
1919

2020
const coordsFractionDigits = 9
2121

22+
function getAvailableCommands() {
23+
var commandsList = FENCE_ITEM_COMMANDS_LIST
24+
25+
return Object.entries(commandsList).map(([key, value]) => ({
26+
value: key,
27+
label: getDisplayCommandName(value),
28+
}))
29+
}
30+
31+
function getFrameName(frameId) {
32+
var frameName = MAV_FRAME_LIST[frameId]
33+
34+
if (frameName.startsWith("MAV_FRAME_")) {
35+
frameName = frameName.replace("MAV_FRAME_", "")
36+
}
37+
38+
return frameName || "UNKNOWN"
39+
}
40+
2241
export default function FenceItemsTableRow({
2342
index,
2443
fenceItem,
@@ -46,25 +65,6 @@ export default function FenceItemsTableRow({
4665
return commandName
4766
}
4867

49-
function getAvailableCommands() {
50-
var commandsList = FENCE_ITEM_COMMANDS_LIST
51-
52-
return Object.entries(commandsList).map(([key, value]) => ({
53-
value: key,
54-
label: getDisplayCommandName(value),
55-
}))
56-
}
57-
58-
function getFrameName(frameId) {
59-
var frameName = MAV_FRAME_LIST[frameId]
60-
61-
if (frameName.startsWith("MAV_FRAME_")) {
62-
frameName = frameName.replace("MAV_FRAME_", "")
63-
}
64-
65-
return frameName || "UNKNOWN"
66-
}
67-
6868
function updateFenceItemData(key, newVal) {
6969
setFenceItemData({
7070
...fenceItemData,

gcs/src/missions.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ export default function Missions() {
623623
}
624624

625625
function addFencePolygon(newFenceItems) {
626-
var seqNumber =
626+
let seqNumber =
627627
fenceItems.length > 0 ? fenceItems[fenceItems.length - 1].seq + 1 : 0
628628

629629
const newFenceMissionItems = newFenceItems.map((item) => {

0 commit comments

Comments
 (0)