Store my position in decoder. D-Star: compute bearing and distance fr…

…om my position
f4exb · Sep 28, 2016 · a263cdc · a263cdc
1 parent 4101a06
commit a263cdc
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/dsd_decoder.h b/dsd_decoder.h
@@ -29,6 +29,7 @@
 #include "dpmr.h"
 #include "dstar.h"
 #include "nxdn.h"
+#include "locator.h"
 
 #define DSD_SQUELCH_TIMEOUT_SAMPLES 960 // 200ms timeout after return to sync search
 
@@ -260,6 +261,7 @@ class DSDDecoder
     void enableAudioOut(bool on);
     void enableScanResumeAfterTDULCFrames(int nbFrames);
     void setDataRate(DSDRate dataRate);
+    void setMyPoint(float lat, float lon) { m_myPoint.setLatLon(lat, lon); }
 
     // parameter getters:
 
@@ -348,6 +350,7 @@ class DSDDecoder
     DSDRate m_dataRate;
     DSDSyncType m_syncType;
     DSDSyncType m_lastSyncType;
+    LocPoint m_myPoint;
 };
 
 } // namespace dsdcc

diff --git a/dstar.cpp b/dstar.cpp
@@ -573,7 +573,9 @@ void DSDDstar::processDPRS()
         {
             if (m_dprs.matchDSTAR(m_slowData.gpsNMEA))
             {
-                m_dprs.m_locator.toCSting(m_slowData.locator);
+                m_dprs.m_locPoint.getLocator().toCSting(m_slowData.locator);
+                m_slowData.bearing = m_dsdDecoder->m_myPoint.bearingTo(m_dprs.m_locPoint);
+                m_slowData.distance = m_dsdDecoder->m_myPoint.distanceTo(m_dprs.m_locPoint);
 //                std::cerr << "DSDDstar::processDPRS: " << m_dprs.lat << ":" << m_dprs.lon << ":" <<  m_dprs.m_locator.toString() << std::endl;
             }
         }
@@ -621,7 +623,7 @@ bool DSDDstar::DPRS::matchDSTAR(const char *d)
         min = modf(x, &deg);
         m_lon = (deg + ((min*100.0f)/60.0f))*(lonH == 'E' ? 1 : -1);
 
-        m_locator.setLatLon(m_lat, m_lon);
+        m_locPoint.setLatLon(m_lat, m_lon);
 
         return true;
     }

diff --git a/dstar.h b/dstar.h
@@ -172,7 +172,7 @@ class DSDDstar
 
        float m_lon;
        float m_lat;
-       Locator m_locator;
+       LocPoint m_locPoint;
    };
 
    void initVoiceFrame();

diff --git a/locator.cpp b/locator.cpp
@@ -105,7 +105,7 @@ void Locator::setIndexes()
     m_lon_index3 = int(lon_rem * 12.0);
 }
 
-std::string Locator::toString()
+std::string Locator::toString() const
 {
   std::string returned = "";
 
@@ -131,7 +131,7 @@ void Locator::toCSting(char *locator) const
 
 // LocPoint class
 
-float LocPoint::bearingTo(LocPoint& distant_point)
+float LocPoint::bearingTo(const LocPoint& distant_point)
 {
   double lat1 = m_locator.latitude() * (M_PI / 180.0);
   double lon1 = m_locator.longitude() * (M_PI / 180.0);
@@ -149,7 +149,7 @@ float LocPoint::bearingTo(LocPoint& distant_point)
     return 360.0 + (bear_rad * (180.0 / M_PI));
 }
 
-float LocPoint::distanceTo(LocPoint& distant_point)
+float LocPoint::distanceTo(const LocPoint& distant_point)
 {
   double lat1 = m_locator.latitude() * (M_PI / 180.0);
   double lon1 = m_locator.longitude() * (M_PI / 180.0);

diff --git a/locator.h b/locator.h
@@ -19,6 +19,9 @@
 
  */
 
+#ifndef LOCATOR_H_
+#define LOCATOR_H_
+
 #include <string>
 
 class LocatorInvalidException
@@ -36,7 +39,7 @@ class Locator
     Locator();
     Locator(std::string locator_str);
     Locator(float lat, float lon);
-    std::string toString();
+    std::string toString() const;
     void toCSting(char *locator) const;
     float latitude() const { return m_lat; };
     float longitude() const { return m_lon; };
@@ -69,10 +72,12 @@ class LocPoint
     LocPoint(float lat, float lon) : m_locator(lat, lon) {};
     float latitude() const { return m_locator.latitude(); }
     float longitude() const { return m_locator.longitude(); }
-    float bearingTo(LocPoint& distant_point);
-    float distanceTo(LocPoint& distant_point);
+    float bearingTo(const LocPoint& distant_point);
+    float distanceTo(const LocPoint& distant_point);
     void setLatLon(float lat, float lon) { m_locator.setLatLon(lat, lon); }
+    const Locator& getLocator() { return m_locator; }
   protected:
     Locator m_locator;
 };
 
+#endif // define LOCATOR_H_