From 8d157a4fb732450df70b7c3200c94deaf6b194db Mon Sep 17 00:00:00 2001
From: Tag <tag.loomis@gmail.com>
Date: Sun, 6 Nov 2022 15:07:55 -0800
Subject: [PATCH] Code reduction

---
 package.nw/lib/gt.js   | 35 ++++++++++-------------------------
 package.nw/lib/gtws.js |  2 +-
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js
index a8dba83..eb3e5cc 100644
--- a/package.nw/lib/gt.js
+++ b/package.nw/lib/gt.js
@@ -11573,41 +11573,26 @@ function ValidateGridsquareOnly4(inputText, validDiv)
 
 function validateGridFromString(inputText)
 {
+  var validGrid = false;
   if (inputText.length == 4 || inputText.length == 6)
   {
-    var gridSquare = "";
-    var LETTERS = inputText.substr(0, 2).toUpperCase();
-    var NUMBERS = inputText.substr(2, 2).toUpperCase();
+    var LETTERS = inputText.substr(0, 2);
+    var NUMBERS = inputText.substr(2, 2);
     if (/^[A-R]+$/.test(LETTERS) && /^[0-9]+$/.test(NUMBERS))
     {
-      gridSquare = LETTERS + NUMBERS;
+      validGrid = true;
     }
-    if (inputText.length > 4)
+    if (validGrid && inputText.length == 6)
     {
-      var LETTERS_SUB = inputText.substr(4, 2).toUpperCase();
-      gridSquare = "";
-      if (
-        /^[A-R]+$/.test(LETTERS) &&
-        /^[0-9]+$/.test(NUMBERS) &&
-        /^[A-Xa-x]+$/.test(LETTERS_SUB)
-      )
+      var LETTERS_SUB = inputText.substr(4, 2);
+      if (!(/^[A-Xa-x]+$/.test(LETTERS_SUB)))
       {
-        gridSquare = LETTERS + NUMBERS + LETTERS_SUB;
+        validGrid = false;
       }
     }
-    if (gridSquare != "")
-    {
-      return true;
-    }
-    else
-    {
-      return false;
-    }
-  }
-  else
-  {
-    return false;
   }
+
+  return validGrid;
 }
 
 function ValidateGridsquare(inputText, validDiv)
diff --git a/package.nw/lib/gtws.js b/package.nw/lib/gtws.js
index 926a12c..a2dba0f 100644
--- a/package.nw/lib/gtws.js
+++ b/package.nw/lib/gtws.js
@@ -393,7 +393,7 @@ function makeGtPin(obj)
 
     if (obj.grid.length != 4 && obj.grid.length != 6) return;
 
-    if (validateGridFromString(obj.grid, null) == false) return;
+    if (validateGridFromString(obj.grid) == false) return;
 
     if (
       g_appSettings.gtFlagImgSrc == 2 &&