upwards and onwards

Author: jvde-github

Application/Receiver.h

@@ -160,7 +160,7 @@ class Receiver {
 	// Receiver output are Messages or JSON
 	Connection<AIS::Message>& Output(int i) { return models[i]->Output().out; }
 	Connection<AIS::GPS>& OutputGPS(int i) { return models[i]->OutputGPS().out; }
-	Connection<Plane::ADSB>& OutputADSB(int i) { return models[i]->OutputADSB().out; }
+	Connection<JSON::JSON>& OutputADSB(int i) { return models[i]->OutputADSB().out; }
 
 	Connection<JSON::JSON>& OutputJSON(int i) { return jsonais[i].out; }
 

Application/WebViewer.cpp

@@ -313,7 +313,7 @@ void WebViewer::connect(Receiver &r)
 
 			r.OutputJSON(j).Connect((StreamIn<JSON::JSON> *)&ships);
 			r.OutputGPS(j).Connect((StreamIn<AIS::GPS> *)&ships);
-			r.OutputADSB(j).Connect((StreamIn<Plane::ADSB> *)&planes);
+			r.OutputADSB(j).Connect((StreamIn<JSON::JSON> *)&planes);
 
 			*r.device >> raw_counter;
 		}

DSP/Model.h

@@ -73,18 +73,18 @@ namespace AIS
 
 	// idea is to avoid that message threads from different devices cause issues downstream (e.g. with sending UDP or updating the database).
 	// can also be done further downstream
-	class MessageMutexADSB : public SimpleStreamInOut<Plane::ADSB, Plane::ADSB>
+	class MessageMutexADSB : public SimpleStreamInOut<JSON::JSON, JSON::JSON>
 	{
 		static std::mutex mtx;
 
 	public:
 		virtual ~MessageMutexADSB() {}
-		virtual void Receive(const Plane::ADSB *data, int len, TAG &tag)
+		virtual void Receive(const JSON::JSON *data, int len, TAG &tag)
 		{
 			std::lock_guard<std::mutex> lock(mtx);
 			Send(data, len, tag);
 		}
-		virtual void Receive(Plane::ADSB *data, int len, TAG &tag)
+		virtual void Receive(JSON::JSON *data, int len, TAG &tag)
 		{
 			std::lock_guard<std::mutex> lock(mtx);
 			Send(data, len, tag);
@@ -114,7 +114,7 @@ namespace AIS
 
 		StreamOut<Message> &Output() { return output; }
 		StreamOut<GPS> &OutputGPS() { return output_gps; }
-		StreamOut<Plane::ADSB> &OutputADSB() { return outputADSB; }
+		StreamOut<JSON::JSON> &OutputADSB() { return outputADSB; }
 
 		void setName(std::string s) { name = s; }
 		std::string getName() { return name; }

Library/Basestation.h

@@ -26,7 +26,7 @@
 #include "Keys.h"
 #include "ADSB.h"
 
-class Basestation : public SimpleStreamInOut<RAW, Plane::ADSB>
+class Basestation : public SimpleStreamInOut<RAW, JSON::JSON>
 {
     std::string line;
 
@@ -152,7 +152,7 @@ class Basestation : public SimpleStreamInOut<RAW, Plane::ADSB>
 
         //msg.Print();
 
-        Send(&msg, 1, tag);
+        //Send(&msg, 1, tag);
     }
 
 public:

Library/Beast.h

@@ -6,7 +6,7 @@
 #include <sstream>
 #include <stdexcept>
 
-class Beast : public SimpleStreamInOut<RAW, Plane::ADSB>
+class Beast : public SimpleStreamInOut<RAW, JSON::JSON>
 {
     static constexpr size_t MAX_MESSAGE_SIZE = 1024; // Reasonable maximum size
     static constexpr double BEAST_CLOCK_MHZ = 12.0;  // 12 MHz clock rate

Tracking/PlaneDB.h

@@ -1,7 +1,7 @@
 #include "ADSB.h"
 #include "Stream.h"
 
-class PlaneDB : public StreamIn<Plane::ADSB>
+class PlaneDB : public StreamIn<JSON::JSON>
 {
     std::mutex mtx;
 private:
@@ -66,9 +66,9 @@ class PlaneDB : public StreamIn<Plane::ADSB>
         return -1;
     }
 
-       void Receive(const Plane::ADSB* msg, int len, TAG& tag) {
+       void Receive(const JSON::JSON* msg, int len, TAG& tag) {
         std::lock_guard<std::mutex> lock(mtx);
-        
+        /*
         // Skip invalid messages
         if (msg->getHexIdent() == 0) return;
 
@@ -136,6 +136,7 @@ class PlaneDB : public StreamIn<Plane::ADSB>
             tag.lat = msg->getLat();
             tag.lon = msg->getLon();
         }
+        */
     }
 
   std::string getCompactArray(bool include_inactive = false) {