From f17d7a65a6c48db0b399baeffd62cf03e45515c0 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Tue, 6 Nov 2018 07:53:11 +0000
Subject: [PATCH] Clean up static location handling.

---
 YSFGateway/APRSWriter.cpp | 20 +++++++++++++-------
 YSFGateway/APRSWriter.h   |  6 ++++--
 YSFGateway/YSFGateway.cpp | 13 ++++++++-----
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/YSFGateway/APRSWriter.cpp b/YSFGateway/APRSWriter.cpp
index f7b3533..17dd779 100644
--- a/YSFGateway/APRSWriter.cpp
+++ b/YSFGateway/APRSWriter.cpp
@@ -28,7 +28,7 @@
 CAPRSWriter::CAPRSWriter(const std::string& callsign, const std::string& rptSuffix, const std::string& password, const std::string& address, unsigned int port, const std::string& suffix) :
 m_thread(NULL),
 m_enabled(false),
-m_idTimer(1000U, 20U * 60U),		// 20 minutes
+m_idTimer(1000U),
 m_callsign(callsign),
 m_txFrequency(0U),
 m_rxFrequency(0U),
@@ -58,17 +58,21 @@ CAPRSWriter::~CAPRSWriter()
 {
 }
 
-void CAPRSWriter::setInfo(unsigned int txFrequency, unsigned int rxFrequency, float latitude, float longitude, int height, const std::string& desc)
+void CAPRSWriter::setInfo(unsigned int txFrequency, unsigned int rxFrequency, const std::string& desc)
 {
 	m_txFrequency = txFrequency;
 	m_rxFrequency = rxFrequency;
-	m_latitude    = latitude;
-	m_longitude   = longitude;
-	m_height      = height;
 	m_desc        = desc;
 }
 
-void CAPRSWriter::setMobileGPS(const std::string& address, unsigned int port)
+void CAPRSWriter::setStaticLocation(float latitude, float longitude, int height)
+{
+	m_latitude  = latitude;
+	m_longitude = longitude;
+	m_height    = height;
+}
+
+void CAPRSWriter::setMobileLocation(const std::string& address, unsigned int port)
 {
 	assert(!address.empty());
 	assert(port > 0U);
@@ -91,6 +95,8 @@ bool CAPRSWriter::open()
 
 		// Poll the GPS every minute
 		m_idTimer.setTimeout(60U);
+	} else {
+		m_idTimer.setTimeout(20U * 60U);
 	}
 
 	m_idTimer.start();
@@ -341,8 +347,8 @@ void CAPRSWriter::sendIdFrameMobile()
 		lon, (rawLongitude < 0.0F) ? 'W' : 'E');
 
 	if (pBearing != NULL && pVelocity != NULL) {
-		float rawVelocity  = ::atof(pVelocity);
 		float rawBearing   = ::atof(pBearing);
+		float rawVelocity  = ::atof(pVelocity);
 
 		::sprintf(output + ::strlen(output), "%03.0f/%03.0f", rawBearing, rawVelocity * 0.539957F);
 	}
diff --git a/YSFGateway/APRSWriter.h b/YSFGateway/APRSWriter.h
index 1839c64..bdcf395 100644
--- a/YSFGateway/APRSWriter.h
+++ b/YSFGateway/APRSWriter.h
@@ -45,9 +45,11 @@ public:
 
 	bool open();
 
-	void setInfo(unsigned int txFrequency, unsigned int rxFrequency, float latitude, float longitude, int height, const std::string& desc);
+	void setInfo(unsigned int txFrequency, unsigned int rxFrequency, const std::string& desc);
 
-	void setMobileGPS(const std::string& address, unsigned int port);
+	void setStaticLocation(float latitude, float longitude, int height);
+
+	void setMobileLocation(const std::string& address, unsigned int port);
 
 	void write(const unsigned char* source, const char* type, unsigned char radio, float latitude, float longitude);
 
diff --git a/YSFGateway/YSFGateway.cpp b/YSFGateway/YSFGateway.cpp
index 6b00450..f9684a8 100644
--- a/YSFGateway/YSFGateway.cpp
+++ b/YSFGateway/YSFGateway.cpp
@@ -439,18 +439,21 @@ void CYSFGateway::createGPS()
 
 	unsigned int txFrequency = m_conf.getTxFrequency();
 	unsigned int rxFrequency = m_conf.getRxFrequency();
-	float latitude           = m_conf.getLatitude();
-	float longitude          = m_conf.getLongitude();
-	int height               = m_conf.getHeight();
 
-	m_writer->setInfo(txFrequency, rxFrequency, latitude, longitude, height, desc);
+	m_writer->setInfo(txFrequency, rxFrequency, desc);
 
 	bool enabled = m_conf.getMobileGPSEnabled();
 	if (enabled) {
 	        std::string address = m_conf.getMobileGPSAddress();
 	        unsigned int port   = m_conf.getMobileGPSPort();
 
-	        m_writer->setMobileGPS(address, port);
+	        m_writer->setMobileLocation(address, port);
+	} else {
+	        float latitude  = m_conf.getLatitude();
+                float longitude = m_conf.getLongitude();
+                int height      = m_conf.getHeight();
+
+                m_writer->setStaticLocation(latitude, longitude, height);
 	}
 
 	bool ret = m_writer->open();