From 470a46f8a22b78ebcc47d0954dcc9cf620a301ad Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Wed, 17 Feb 2016 17:01:05 -0800
Subject: [PATCH] Land items default to 0 altitude

---
 src/FirmwarePlugin/APM/MavCmdInfoCommon.json |  8 +++++++-
 src/MissionManager/MavCmdInfoCommon.json     | 12 ++++++++++++
 src/MissionManager/MissionItem.cc            |  9 +++++++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/FirmwarePlugin/APM/MavCmdInfoCommon.json b/src/FirmwarePlugin/APM/MavCmdInfoCommon.json
index 7a3673040..33ba78d79 100644
--- a/src/FirmwarePlugin/APM/MavCmdInfoCommon.json
+++ b/src/FirmwarePlugin/APM/MavCmdInfoCommon.json
@@ -33,7 +33,13 @@
             "description":          "Land using VTOL mode.",
             "specifiesCoordinate":  true,
             "friendlyEdit":         true,
-            "category":             "VTOL"
+            "category":             "VTOL",
+            "param7": {
+                "label":            "Altitude:",
+                "units":            "meters",
+                "default":          0.0,
+                "decimalPlaces":    2
+            }
         }
     ]
 }
diff --git a/src/MissionManager/MavCmdInfoCommon.json b/src/MissionManager/MavCmdInfoCommon.json
index 1e6e16059..74f83dde4 100644
--- a/src/MissionManager/MavCmdInfoCommon.json
+++ b/src/MissionManager/MavCmdInfoCommon.json
@@ -120,6 +120,12 @@
                 "units":            "radians",
                 "default":          0.0,
                 "decimalPlaces":    2
+            },
+            "param7": {
+                "label":            "Altitude:",
+                "units":            "meters",
+                "default":          0.0,
+                "decimalPlaces":    2
             }
         },
         {
@@ -290,6 +296,12 @@
                 "units":            "degrees",
                 "default":          0.0,
                 "decimalPlaces":    2
+            },
+            "param7": {
+                "label":            "Altitude:",
+                "units":            "meters",
+                "default":          0.0,
+                "decimalPlaces":    2
             }
         },
         {
diff --git a/src/MissionManager/MissionItem.cc b/src/MissionManager/MissionItem.cc
index 314645ea5..76307df1a 100644
--- a/src/MissionManager/MissionItem.cc
+++ b/src/MissionManager/MissionItem.cc
@@ -329,7 +329,7 @@ void MissionItem::_setupMetaData(void)
     if (!_altitudeMetaData) {
         _altitudeMetaData = new FactMetaData(FactMetaData::valueTypeDouble);
         _altitudeMetaData->setRawUnits("meters");
-        _altitudeMetaData->setDecimalPlaces(3);
+        _altitudeMetaData->setDecimalPlaces(2);
 
         enumStrings.clear();
         enumValues.clear();
@@ -620,6 +620,7 @@ QmlObjectListModel* MissionItem::textFieldFacts(void)
         Fact*           rgParamFacts[7] =       { &_param1Fact, &_param2Fact, &_param3Fact, &_param4Fact, &_param5Fact, &_param6Fact, &_param7Fact };
         FactMetaData*   rgParamMetaData[7] =    { &_param1MetaData, &_param2MetaData, &_param3MetaData, &_param4MetaData, &_param5MetaData, &_param6MetaData, &_param7MetaData };
 
+        bool altitudeAdded = false;
         for (int i=1; i<=7; i++) {
             const QMap<int, MavCmdParamInfo*>& paramInfoMap = _missionCommands->getMavCmdInfo(command, _vehicle)->paramInfoMap();
 
@@ -634,10 +635,14 @@ QmlObjectListModel* MissionItem::textFieldFacts(void)
                 paramMetaData->setRawUnits(paramInfo->units());
                 paramFact->setMetaData(paramMetaData);
                 model->append(paramFact);
+
+                if (i == 7) {
+                    altitudeAdded = true;
+                }
             }
         }
 
-        if (specifiesCoordinate()) {
+        if (specifiesCoordinate() && !altitudeAdded) {
             _param7Fact._setName("Altitude:");
             _param7Fact.setMetaData(_altitudeMetaData);
             model->append(&_param7Fact);
-- 
2.22.0