fix basestation

Author: jvde-github

Library/ADSB.h

@@ -82,7 +82,7 @@ namespace Plane
             vertrate = VERTRATE_UNDEFINED;
             squawk = SQUAWK_UNDEFINED;
             alert = emergency = spi = onground = BoolType::UNKNOWN;
-            callsign[8] = '\0';
+            callsign[0] = '\0';
         }
 
         // Getters
@@ -117,12 +117,19 @@ namespace Plane
         void setGroundSpeed(FLOAT32 gs) { groundspeed = gs; }
         void setTrack(FLOAT32 t) { track = t; }
         void setVertRate(int vr) { vertrate = vr; }
-        void setCallsign(const std::string &c)
-        {
-            for(int i = 0; i < 8; i++)
-            {
-                if (i < c.size() && c[i] != '\0' && c[i] != '@')
+
+        void setCallsign(const std::string &c) {
+            callsign[0] = '\0';  
+            size_t end = c.length();
+            while (end > 0 && c[end-1] == ' ') {
+                end--;
+            }
+            
+            for(int i = 0; i < 8; i++) {
+                if (i < end && c[i] != '\0' && c[i] != '@' && c[i] >= 32 && c[i] <= 126)  
+                {
                     callsign[i] = c[i];
+                }
                 else {
                     callsign[i] = '\0';
                     break;

Library/Basestation.h

@@ -74,7 +74,10 @@ class Basestation : public SimpleStreamInOut<RAW, Plane::ADSB>
         // HexIdent (Field 4)
         if (!fields[4].empty())
         {
-            msg.setHexIdent(std::stoul(fields[4], nullptr, 16));
+            if(fields[4][0] == '~')
+                msg.setHexIdent(std::stoul(fields[4].substr(1), nullptr, 16));
+            else
+                msg.setHexIdent(std::stoul(fields[4], nullptr, 16));
         }
 
         // Timestamps (Fields 7-10)
@@ -90,6 +93,7 @@ class Basestation : public SimpleStreamInOut<RAW, Plane::ADSB>
             msg.setCallsign(fields[10]);
         }
 
+
         // Altitude (Field 11)
         if (fields.size() > 11 && !fields[11].empty())
         {
@@ -147,6 +151,7 @@ class Basestation : public SimpleStreamInOut<RAW, Plane::ADSB>
         }
 
         //msg.Print();
+
         Send(&msg, 1, tag);
     }
 
@@ -163,7 +168,12 @@ class Basestation : public SimpleStreamInOut<RAW, Plane::ADSB>
                 {
                     if (line.length() > 0)
                     {
+                        try {
                         processLine();
+                        } catch (const std::exception &e) {
+                            std::cerr << "Error processing line: " << line << " " << e.what() << std::endl;
+                        
+                        }
                         line.clear();
                     }
                 }

Tracking/PlaneDB.h

@@ -111,7 +111,7 @@ class PlaneDB : public StreamIn<Plane::ADSB>
         if (msg->getSquawk() != SQUAWK_UNDEFINED) {
             plane.setSquawk(msg->getSquawk());
         }
-        if (msg->getCallsign() != "@@@@@@@@") {
+        if (!msg->getCallsign().empty()) {
             plane.setCallsign(msg->getCallsign());
         }
 
@@ -169,7 +169,7 @@ class PlaneDB : public StreamIn<Plane::ADSB>
                     (plane.getTrack() != TRACK_UNDEFINED ? std::to_string(plane.getTrack()) : null_str) + comma +
                     (plane.getVertRate() != VERTRATE_UNDEFINED ? std::to_string(plane.getVertRate()) : null_str) + comma +
                     (plane.getSquawk() != SQUAWK_UNDEFINED ? std::to_string(plane.getSquawk()) : null_str) + comma +
-                    plane.getCallsign()  + comma +
+                    + "\"" + plane.getCallsign()  + "\"" + comma +
                     (plane.getAlert() != Plane::BoolType::UNKNOWN ? std::to_string(static_cast<int>(plane.getAlert())) : null_str) + comma +
                     (plane.getEmergency() != Plane::BoolType::UNKNOWN ? std::to_string(static_cast<int>(plane.getEmergency())) : null_str) + comma +
                     (plane.getSPI() != Plane::BoolType::UNKNOWN ? std::to_string(static_cast<int>(plane.getSPI())) : null_str) + comma +