From 7d1768a1d3ee84139d7ad88a0374fa0fa639d81a Mon Sep 17 00:00:00 2001
From: rcarteraz <robert.l.carter2@gmail.com>
Date: Tue, 9 Apr 2024 15:18:11 -0700
Subject: [PATCH] move GPS mode, update description, and remove deprecated
 settings.

---
 .../PageComponents/Config/Position.tsx        | 31 ++++++-------------
 src/validation/config/position.ts             |  6 ----
 2 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/src/components/PageComponents/Config/Position.tsx b/src/components/PageComponents/Config/Position.tsx
index d6254f5f..6b02f4b9 100644
--- a/src/components/PageComponents/Config/Position.tsx
+++ b/src/components/PageComponents/Config/Position.tsx
@@ -33,6 +33,16 @@ export const Position = (): JSX.Element => {
               description:
                 "Only send position when there has been a meaningful change in location",
             },
+            {
+              type: "select",
+              name: "gpsMode",
+              label: "GPS Mode",
+              description:
+                "Configure whether device GPS is Enabled, Disabled, or Not Present",
+              properties: {
+                enumValue: Protobuf.Config.Config_PositionConfig_GpsMode,
+              },
+            },
             {
               type: "toggle",
               name: "fixedPosition",
@@ -40,12 +50,6 @@ export const Position = (): JSX.Element => {
               description:
                 "Don't report GPS position, but a manually-specified one",
             },
-            {
-              type: "toggle",
-              name: "gpsEnabled",
-              label: "GPS Enabled",
-              description: "Enable the internal GPS module",
-            },
             {
               type: "multiSelect",
               name: "positionFlags",
@@ -73,15 +77,6 @@ export const Position = (): JSX.Element => {
               label: "Enable Pin",
               description: "GPS module enable pin override",
             },
-            {
-              type: "select",
-              name: "gpsMode",
-              label: "GPS Mode",
-              description: "GPS module mode",
-              properties: {
-                enumValue: Protobuf.Config.Config_PositionConfig_GpsMode,
-              },
-            },
             {
               type: "number",
               name: "channelPrecision",
@@ -106,12 +101,6 @@ export const Position = (): JSX.Element => {
               label: "GPS Update Interval",
               description: "How often a GPS fix should be acquired",
             },
-            {
-              type: "number",
-              name: "gpsAttemptTime",
-              label: "Fix Attempt Duration",
-              description: "How long the device will try to get a fix for",
-            },
             {
               type: "number",
               name: "broadcastSmartMinimumDistance",
diff --git a/src/validation/config/position.ts b/src/validation/config/position.ts
index c2630150..752a7093 100644
--- a/src/validation/config/position.ts
+++ b/src/validation/config/position.ts
@@ -14,15 +14,9 @@ export class PositionValidation
   @IsBoolean()
   fixedPosition: boolean;
 
-  @IsBoolean()
-  gpsEnabled: boolean;
-
   @IsInt()
   gpsUpdateInterval: number;
 
-  @IsInt()
-  gpsAttemptTime: number;
-
   @IsInt()
   positionFlags: number;