From cac6c95e47c3dfa7724f2da42e211900c2f99bd1 Mon Sep 17 00:00:00 2001
From: Gus Grubba <mavlink@grubba.com>
Date: Mon, 13 Aug 2018 19:44:06 -0400
Subject: [PATCH] Add unit to features Renamed "Invalid" (airspace) to "custom"

---
 src/Airmap/FlightFeature.qml                  | 10 +++++++
 .../AirspaceAdvisoryProvider.cc               | 30 +++++++++----------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/Airmap/FlightFeature.qml b/src/Airmap/FlightFeature.qml
index 31f555759..d7b9d38d6 100644
--- a/src/Airmap/FlightFeature.qml
+++ b/src/Airmap/FlightFeature.qml
@@ -38,6 +38,16 @@ Rectangle {
         QGCTextField {
             text:           feature.value ? feature.value : ""
             visible:        feature.type !== AirspaceRuleFeature.Boolean
+            showUnits:      true
+            unitsLabel: {
+                if(feature.unit == AirspaceRuleFeature.Kilogram)
+                    return "kg";
+                if(feature.unit == AirspaceRuleFeature.Meters)
+                    return "m";
+                if(feature.unit == AirspaceRuleFeature.MetersPerSecond)
+                    return "m/s";
+                return ""
+            }
             anchors.right:  parent.right
             anchors.left:   parent.left
             inputMethodHints: feature.type === AirspaceRuleFeature.Float ? Qt.ImhFormattedNumbersOnly :Qt.ImhNone
diff --git a/src/AirspaceManagement/AirspaceAdvisoryProvider.cc b/src/AirspaceManagement/AirspaceAdvisoryProvider.cc
index a5735bf61..14f3b9c0b 100644
--- a/src/AirspaceManagement/AirspaceAdvisoryProvider.cc
+++ b/src/AirspaceManagement/AirspaceAdvisoryProvider.cc
@@ -27,20 +27,20 @@ QString
 AirspaceAdvisory::typeStr()
 {
     switch(type()) {
-    case Airport:               return QString(tr("Airport")); break;
-    case Controlled_airspace:   return QString(tr("Controlled Airspace")); break;
-    case Special_use_airspace:  return QString(tr("Special Use Airspace")); break;
-    case Tfr:                   return QString(tr("TFR")); break;
-    case Wildfire:              return QString(tr("Wild Fire")); break;
-    case Park:                  return QString(tr("Park")); break;
-    case Power_plant:           return QString(tr("Power Plant")); break;
-    case Heliport:              return QString(tr("Heliport")); break;
-    case Prison:                return QString(tr("Prison")); break;
-    case School:                return QString(tr("School")); break;
-    case Hospital:              return QString(tr("Hospital")); break;
-    case Fire:                  return QString(tr("Fire")); break;
-    case Emergency:             return QString(tr("Emergency")); break;
-    case Invalid:               return QString(tr("Invalid")); break;
-    default:                    return QString(tr("Unknown")); break;
+    case Airport:               return QString(tr("Airport"));
+    case Controlled_airspace:   return QString(tr("Controlled Airspace"));
+    case Special_use_airspace:  return QString(tr("Special Use Airspace"));
+    case Tfr:                   return QString(tr("TFR"));
+    case Wildfire:              return QString(tr("Wild Fire"));
+    case Park:                  return QString(tr("Park"));
+    case Power_plant:           return QString(tr("Power Plant"));
+    case Heliport:              return QString(tr("Heliport"));
+    case Prison:                return QString(tr("Prison"));
+    case School:                return QString(tr("School"));
+    case Hospital:              return QString(tr("Hospital"));
+    case Fire:                  return QString(tr("Fire"));
+    case Emergency:             return QString(tr("Emergency"));
+    case Invalid:               return QString(tr("Custom"));
+    default:                    return QString(tr("Unknown"));
     }
 }
-- 
2.22.0