From 6915389c9b7ff0133c3ecd75a35b3812dcf5a46a Mon Sep 17 00:00:00 2001
From: Paul Traina <216482-pleasantone@users.noreply.gitlab.com>
Date: Thu, 12 Nov 2020 18:17:34 -0800
Subject: [PATCH 1/2] Respect fit-to-qrz if spots-over-grid is enabled.

---
 package.nw/lib/gt.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js
index 7b9716bb..1c35113b 100644
--- a/package.nw/lib/gt.js
+++ b/package.nw/lib/gt.js
@@ -5670,8 +5670,9 @@ function handleWsjtxStatus(newMessage) {
       txrxdec.innerHTML = "RECEIVE";
     }
 
-    if (newMessage.TxEnabled == 1 && g_spotsEnabled == 0) {
-      if (g_mapSettings.fitQRZ) {
+    if (newMessage.TxEnabled) {
+      if (g_mapSettings.fitQRZ &&
+          (!g_spotsEnabled || g_receptionSettings.mergeSpots)) {
         if (g_lastMapView == null) {
           g_lastMapView = {};
           g_lastMapView.LoLa = g_mapView.getCenter();

From 15f65e390e8363a4939e83fb9ba136b0533a0bc9 Mon Sep 17 00:00:00 2001
From: Paul Traina <216482-pleasantone@users.noreply.gitlab.com>
Date: Thu, 12 Nov 2020 18:52:38 -0800
Subject: [PATCH 2/2] Use icky prettier style rules

---
 package.nw/lib/gt.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js
index 1c35113b..2e580a44 100644
--- a/package.nw/lib/gt.js
+++ b/package.nw/lib/gt.js
@@ -5671,8 +5671,10 @@ function handleWsjtxStatus(newMessage) {
     }
 
     if (newMessage.TxEnabled) {
-      if (g_mapSettings.fitQRZ &&
-          (!g_spotsEnabled || g_receptionSettings.mergeSpots)) {
+      if (
+        g_mapSettings.fitQRZ &&
+        (!g_spotsEnabled || g_receptionSettings.mergeSpots)
+      ) {
         if (g_lastMapView == null) {
           g_lastMapView = {};
           g_lastMapView.LoLa = g_mapView.getCenter();