From 905b33f99409c57dbd8440ba1774c6ef2b238612 Mon Sep 17 00:00:00 2001
From: Don Gagne <Don@laptop-3.local>
Date: Mon, 5 Jun 2017 21:04:29 -0700
Subject: [PATCH] Use generic naming for entry locations

---
 src/MissionManager/Survey.SettingsGroup.json |  2 +-
 src/MissionManager/SurveyMissionItem.h       | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/MissionManager/Survey.SettingsGroup.json b/src/MissionManager/Survey.SettingsGroup.json
index aaf1e28..d29f923 100644
--- a/src/MissionManager/Survey.SettingsGroup.json
+++ b/src/MissionManager/Survey.SettingsGroup.json
@@ -160,7 +160,7 @@
     "name":             "GridEntryLocation",
     "shortDescription": "Location for entry point into survey area",
     "type":             "uint32",
-    "enumStrings":      "Top Left, Top Right, Bottom Left, Bottom Right",
+    "enumStrings":      "Position 1, Position 2, Position 3, Position 4",
     "enumValues":       "0,1,2,3",
     "defaultValue":     0
 }
diff --git a/src/MissionManager/SurveyMissionItem.h b/src/MissionManager/SurveyMissionItem.h
index 2b486d7..aa1d73d 100644
--- a/src/MissionManager/SurveyMissionItem.h
+++ b/src/MissionManager/SurveyMissionItem.h
@@ -129,6 +129,14 @@ public:
     void setTurnaroundDist  (double dist) { _turnaroundDistFact.setRawValue(dist); }
     void save               (QJsonArray&  missionItems) final;
 
+    // Must match json spec for GridEntryLocation
+    enum EntryLocation {
+        EntryLocationTopLeft,
+        EntryLocationTopRight,
+        EntryLocationBottomLeft,
+        EntryLocationBottomRight,
+    };
+
     static const char* jsonComplexItemTypeValue;
 
     static const char* settingsGroup;
@@ -178,14 +186,6 @@ private:
         CameraTriggerHoverAndCapture
     };
 
-    // Must match json spec for GridEntryLocation
-    enum EntryLocation {
-        EntryLocationTopLeft,
-        EntryLocationTopRight,
-        EntryLocationBottomLeft,
-        EntryLocationBottomRight,
-    };
-
     void _setExitCoordinate(const QGeoCoordinate& coordinate);
     void _generateGrid(void);
     void _updateCoordinateAltitude(void);