realtime shows shipname instead of mmsi

Author: jvde-github

Source/Application/WebViewer.cpp

@@ -68,10 +68,15 @@ void SSEStreamer::Receive(const JSON::JSON *data, int len, TAG &tag)
 			}
 			nmea_array += "]";
 
+			std::string shipname_str;
+			std::string shipname_escaped(tag.shipname);
+			JSON::StringBuilder::stringify(shipname_escaped, shipname_str);
+
 			std::string json = "{\"mmsi\":" + std::to_string(m->mmsi()) +
 							   ",\"timestamp\":" + std::to_string(now) +
 							   ",\"channel\":\"" + m->getChannel() +
 							   "\",\"type\":" + std::to_string(m->type()) +
+							   ",\"shipname\":" + shipname_str +
 							   ",\"nmea\":" + nmea_array + "}";
 			server->sendSSE(1, "nmea", json);
 		}

Source/HTML/script.js

@@ -6949,7 +6949,16 @@ class RealtimeViewer {
 
         const mmsi = data.mmsi;
         const mmsiSpan = document.createElement('span');
-        mmsiSpan.textContent = data.mmsi;
+        
+        // Show shipname if available and not empty, otherwise show MMSI
+        const hasShipname = data.shipname && data.shipname.trim() !== '';
+        if (hasShipname) {
+            mmsiSpan.textContent = data.shipname;
+            mmsiSpan.title = 'MMSI: ' + data.mmsi;
+        } else {
+            mmsiSpan.textContent = data.mmsi;
+        }
+        
         mmsiSpan.style.border = '1px solid #d0d0d0';
         mmsiSpan.style.padding = '2px 6px';
         mmsiSpan.style.borderRadius = '3px';

Source/Library/Common.h

@@ -205,6 +205,7 @@ struct TAG
 	float level = 0;
 	float ppm = 0;
 	uint64_t group = GROUP_OUT_UNDEFINED;
+	char shipname[21] = {0};
 
 	// some data flowing from DB downstream
 	int version = VERSION_NUMBER;
@@ -247,6 +248,7 @@ struct TAG
 		shipclass = CLASS_UNKNOWN;
 		ipv4 = 0;
 		error = MESSAGE_ERROR_NONE;
+		shipname[0] = 0;
 	}
 };
 

Source/Tracking/DB.cpp

@@ -1043,6 +1043,7 @@ void DB::Receive(const JSON::JSON *data, int len, TAG &tag)
 
 	tag.shipclass = ship.shipclass;
 	tag.speed = ship.speed;
+	std::strcpy(tag.shipname, ship.shipname, sizeof(tag.shipname));
 
 	if (position_updated && isValidCoord(lat_old, lon_old))
 	{