planeDB

Author: jvde-github

Application/Receiver.h

@@ -160,6 +160,8 @@ 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>& OutputJSON(int i) { return jsonais[i].out; }
 
 	void setSampleRate(int s) { sample_rate = s; }

Application/WebViewer.cpp

@@ -312,6 +312,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.device >> raw_counter;
 		}
@@ -579,6 +580,11 @@ void WebViewer::Request(TCP::ServerConnection &c, const std::string &response, b
 	{
 		std::string content = ships.getJSONcompact();
 		Response(c, "application/json", content, use_zlib & gzip);
+	}
+		else if (r == "/api/planes_array.json")
+	{
+		std::string content = planes.getCompactArray();
+		Response(c, "application/json", content, use_zlib & gzip);
 	}
 	else if (r == "/sb")
 	{

Application/WebViewer.h

@@ -30,6 +30,7 @@
 #include "Prometheus.h"
 #include "HTTPServer.h"
 #include "DB.h"
+#include "PlaneDB.h"
 #include "History.h"
 #include "Receiver.h"
 #include "MapTiles.h"
@@ -117,6 +118,7 @@ class WebViewer : public IO::HTTPServer, public Setting
 	std::string about = "This content can be set by the station owner";
 
 	DB ships;
+	PlaneDB planes;
 
 	// history of 180 minutes and 180 seconds
 	History<60, 60> hist_minute;

CMakeLists.txt

@@ -795,7 +795,7 @@ set(CPP
 set(HEADER
     Application/AIS-catcher.h Application/Prometheus.h Application/Config.h Application/WebDB.h Library/Logger.h Application/WebViewer.h Application/Receiver.h Tracking/Ships.h Tracking/DB.h DBMS/PostgreSQL.h IO/HTTPClient.h Application/MapTiles.h
     Device/Device.h Device/FileWAV.h Device/RTLTCP.h Device/UDP.h DSP/Demod.h DSP/Filters.h Library/AIS.h Library/Message.h Library/NMEA.h Library/ZIP.h Library/Signals.h Device/SoapySDR.h Library/JSONAIS.h JSON/JSON.h Library/Basestation.h Library/ADSB.h
-    Device/AIRSPY.h Library/FIFO.h Device/N2KsktCAN.h Device/HACKRF.h Device/SDRPLAY.h DSP/DSP.h DSP/Model.h Tracking/History.h Tracking/Statistics.h Library/Common.h Library/Stream.h Device/SpyServer.h Library/Keys.h JSON/StringBuilder.h JSON/Parser.h
+    Device/AIRSPY.h Library/FIFO.h Device/N2KsktCAN.h Device/HACKRF.h Device/SDRPLAY.h DSP/DSP.h DSP/Model.h Tracking/History.h Tracking/Statistics.h Library/Common.h Library/Stream.h Device/SpyServer.h Library/Keys.h JSON/StringBuilder.h JSON/Parser.h Tracking/PlaneDB.h
     Device/Serial.h IO/N2KInterface.h Library/N2K.h IO/N2KStream.h Device/AIRSPYHF.h Device/FileRAW.h Device/RTLSDR.h Device/ZMQ.h DSP/FFT.h IO/MsgOut.h IO/Network.h IO/HTTPServer.h Library/Utilities.h Library/TCP.h Protocol/Protocol.h)
 
 set(APP_INCLUDES . ./Tracking ./DBMS ./Library ./DSP ./Application ./IO ./Protocol)

Library/ADSB.h

@@ -40,9 +40,9 @@ namespace Plane
         ALL_CALL_REPLY = 8     // All Call Reply
     };
 
-    class ADSB
+    struct ADSB
     {
-    protected:
+        int prev, next;
         std::time_t rxtime;
         MessageType type;
         TransmissionType transmission;
@@ -52,14 +52,13 @@ namespace Plane
         FLOAT32 groundspeed; // Speed over ground
         FLOAT32 track;       // Track angle
         int vertrate;        // Vertical rate
-        char callsign[8];    // Aircraft callsign
+        char callsign[9];    // Aircraft callsign, nul terminated
         int squawk;          // Mode A squawk code
         BoolType alert;      // Squawk change flag
         BoolType emergency;  // Emergency flag
         BoolType spi;        // Ident flag
         BoolType onground;   // Ground squat switch flag
 
-    public:
         void Stamp(std::time_t t = (std::time_t)0L)
         {
             std::time(&rxtime);
@@ -83,7 +82,7 @@ namespace Plane
             vertrate = VERTRATE_UNDEFINED;
             squawk = SQUAWK_UNDEFINED;
             alert = emergency = spi = onground = BoolType::UNKNOWN;
-            std::memset(callsign, '@', 8);
+            callsign[8] = '\0';
         }
 
         // Getters
@@ -97,7 +96,7 @@ namespace Plane
         FLOAT32 getGroundSpeed() const { return groundspeed; }
         FLOAT32 getTrack() const { return track; }
         int getVertRate() const { return vertrate; }
-        std::string getCallsign() const { return std::string(callsign, 8); }
+        std::string getCallsign() const { return std::string(callsign); }
         int getSquawk() const { return squawk; }
         BoolType getAlert() const { return alert; }
         BoolType getEmergency() const { return emergency; }
@@ -120,9 +119,17 @@ namespace Plane
         void setVertRate(int vr) { vertrate = vr; }
         void setCallsign(const std::string &c)
         {
-            std::memset(callsign, '@', 8);
-            std::strncpy(callsign, c.c_str(), MIN(c.length(), sizeof(callsign)));
+            for(int i = 0; i < 8; i++)
+            {
+                if (i < c.size() && c[i] != '\0' && c[i] != '@')
+                    callsign[i] = c[i];
+                else {
+                    callsign[i] = '\0';
+                    break;
+                }
+            }
         }
+
         void setSquawk(int s) { squawk = s; }
         void setAlert(BoolType a) { alert = (BoolType)a; }
         void setEmergency(BoolType e) { emergency = (BoolType)e; }

Library/Basestation.h

@@ -146,7 +146,7 @@ class Basestation : public SimpleStreamInOut<RAW, Plane::ADSB>
             msg.setOnGround((Plane::BoolType)(fields[21] == "-1"));
         }
 
-        msg.Print();
+        //msg.Print();
         Send(&msg, 1, tag);
     }