Merge pull request #50 from topcoderinc/Take_Picture_Command

mtwomey · web-flow · commit 2e66ad3eb9d8 · 2017-01-14T22:17:15.000-06:00
Take picture command
diff --git a/src/components/InfoWindow/InfoWindow.jsx b/src/components/InfoWindow/InfoWindow.jsx
@@ -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;
diff --git a/src/components/InfoWindow/data/commands.js b/src/components/InfoWindow/data/commands.js
@@ -38,6 +38,10 @@ const commands = [
     {
         value: 112,
         label: 'MAV_CMD_CONDITION_DELAY'
+    },
+    {
+        value: 203,
+        label: 'Take a Picture'
     }
 ]
 
diff --git a/src/routes/MissionPlanner/components/MissionPlannerView.jsx b/src/routes/MissionPlanner/components/MissionPlannerView.jsx
@@ -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">
diff --git a/src/routes/MissionPlanner/components/MissionSidebarItem/MissionSidebarItem.jsx b/src/routes/MissionPlanner/components/MissionSidebarItem/MissionSidebarItem.jsx
@@ -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;
diff --git a/src/routes/MissionPlanner/components/MissionSidebarItem/data/commands.js b/src/routes/MissionPlanner/components/MissionSidebarItem/data/commands.js
@@ -38,6 +38,10 @@ const commands = [
     value: 112,
     label: 'MAV_CMD_CONDITION_DELAY',
   },
+  {
+    value: 203,
+    label: 'Take a Picture',
+  },
 ];
 
 export default commands;

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@ class InfoWindow extends Component {`
`32`	`32`	commandText = `Waypoint (${this.props.command} / ${this.getType()} ) `;
`33`	`33`	`} else if (this.props.command === 21) {`
`34`	`34`	commandText = `Land (${this.props.command} / ${this.getType()} ) `;
	`35`	`+ } else if (this.props.command === 203) {`
	`36`	+ commandText = `Take a Picture (${this.props.command} / ${this.getType()} ) `;
`35`	`37`	`}`
`36`	`38`
`37`	`39`	`return commandText;`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,10 @@ const commands = [`
`38`	`38`	`{`
`39`	`39`	`value: 112,`
`40`	`40`	`label: 'MAV_CMD_CONDITION_DELAY'`
	`41`	`+ },`
	`42`	`+ {`
	`43`	`+ value: 203,`
	`44`	`+ label: 'Take a Picture'`
`41`	`45`	`}`
`42`	`46`	`]`
`43`	`47`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ export class MissionSidebarItem extends Component {`
`46`	`46`	commandText = `Waypoint (${this.props.command} / ${this.getType()} ) `;
`47`	`47`	`} else if (this.props.command === 21) {`
`48`	`48`	commandText = `Land (${this.props.command} / ${this.getType()} ) `;
	`49`	`+ } else if (this.props.command === 203) {`
	`50`	+ commandText = `Take a Picture (${this.props.command} / ${this.getType()} ) `;
`49`	`51`	`}`
`50`	`52`
`51`	`53`	`return commandText;`