Skip to content

Take picture command #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 15, 2017
Merged

Take picture command #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dde6e9
Add initial option for take a picture mission item
mtwomey Jan 15, 2017
f373361
Temp fix to skip rendering Photo items on the map for the demo
mtwomey Jan 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/components/InfoWindow/InfoWindow.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ class InfoWindow extends Component {
commandText = `Waypoint (${this.props.command} / ${this.getType()} ) `;
} else if (this.props.command === 21) {
commandText = `Land (${this.props.command} / ${this.getType()} ) `;
} else if (this.props.command === 203) {
commandText = `Take a Picture (${this.props.command} / ${this.getType()} ) `;
}

return commandText;
Expand Down
4 changes: 4 additions & 0 deletions src/components/InfoWindow/data/commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ const commands = [
{
value: 112,
label: 'MAV_CMD_CONDITION_DELAY'
},
{
value: 203,
label: 'Take a Picture'
}
]

Expand Down
5 changes: 4 additions & 1 deletion src/routes/MissionPlanner/components/MissionPlannerView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,10 @@ export const getMarkerProps = (item, updateMissionItem) => {

export const MissionPlannerView = ({mission, updateMissionItem, addMissionItem, deleteMissionItem, loadNfz, noFlyZones}) => {
const missionItemsExt = getMissionItemsExt(mission);
const markersExt = missionItemsExt.map((item) => getMarkerProps(item, updateMissionItem));
const filteredMissionItemsExt = missionItemsExt.filter((item) => {
return (item.command !== 203);
});
const markersExt = filteredMissionItemsExt.map((item) => getMarkerProps(item, updateMissionItem));

return (
<div styleName="mission-planner-view">
Expand Down
2 changes: 2 additions & 0 deletions src/routes/MissionPlanner/components/MissionSidebarItem/MissionSidebarItem.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ export class MissionSidebarItem extends Component {
commandText = `Waypoint (${this.props.command} / ${this.getType()} ) `;
} else if (this.props.command === 21) {
commandText = `Land (${this.props.command} / ${this.getType()} ) `;
} else if (this.props.command === 203) {
commandText = `Take a Picture (${this.props.command} / ${this.getType()} ) `;
}

return commandText;
Expand Down
4 changes: 4 additions & 0 deletions src/routes/MissionPlanner/components/MissionSidebarItem/data/commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ const commands = [
value: 112,
label: 'MAV_CMD_CONDITION_DELAY',
},
{
value: 203,
label: 'Take a Picture',
},
];

export default commands;